Skip to content

Dependencies update #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
5a676f3
Fix rules argument (#71)
SuperSandro2000 Sep 20, 2019
a99330e
Fix typos
thomseddon Jul 8, 2019
5dfd4f2
Add arm builds. Fixes #38
thomseddon Sep 30, 2019
5a9c6ad
Multiple provider support + OIDC provider
thomseddon Sep 18, 2019
ffa5afb
Simplify oauth server testing
thomseddon Jan 15, 2020
68c3299
Update go1.12 -> go1.13 + update dependencies + mod tidy
thomseddon Jan 18, 2020
3652a0b
Add OIDC docs + examples
thomseddon Feb 10, 2020
e678a33
Add .git to .dockerignore
SuperSandro2000 Apr 8, 2020
b413c60
Update golang arm versions
thspinto Mar 1, 2020
c3b4ba8
Allow multiple cookie domains, domains and whitelists with environmen…
LolHens Apr 14, 2020
3a66191
Document ARM releases on docker hub
thomseddon Apr 23, 2020
9abf564
Add kubernetes examples + better document methods of applying authent…
thomseddon Apr 24, 2020
1ac0ca9
traefik v1.7 kubernetes doc fixes
thomseddon Apr 28, 2020
07f9587
Modify references from Universal Authentication to Global Authentication
thomseddon May 7, 2020
f802a36
Add note on avoiding rules that might break redirect flow
thomseddon May 7, 2020
f7a94e7
Add traefik v2 kubernetes examples
thomseddon May 7, 2020
7381450
Improve internal function docs
thomseddon May 11, 2020
eec62eb
Improve logging detail and consistency
thomseddon May 11, 2020
a668454
Warn when using http without insecure cookie
thomseddon May 12, 2020
60604ad
Always prompt user to select account on google login
thomseddon May 12, 2020
3345f8e
Add traefik v2 swarm examples
thomseddon May 23, 2020
8902cf8
Use Traefik v2 in README examples and links + use consistent images i…
thomseddon May 23, 2020
00b5d9e
standardize on 'traefik-forward-auth-secrets' for kubernetes examples…
LelandSindt May 26, 2020
c63fd73
Rename selective auth + fix selective auth examples (#130)
thomseddon May 26, 2020
655edde
Add note on using auth host mode with selective auth
thomseddon May 26, 2020
8b3a950
Add logout endpoint (#107)
thomseddon Jun 3, 2020
fb8b216
Optionally match emails against *either* whitelist or domains when bo…
thomseddon Jun 3, 2020
2937b04
Add support for resource indicator to OIDC provider (#131)
thomseddon Jun 11, 2020
529e28d
Add FUNDING.yml (#135)
thomseddon Jun 26, 2020
be2b4ba
Remove unused user fields (#141)
thomseddon Jun 29, 2020
870724c
Fail if there is an error retrieving the user + extra test (#142)
thomseddon Jun 29, 2020
9e5994b
Add Generic OAuth Provider (#138)
thomseddon Jun 29, 2020
1743537
Fix simple-separate-pod url path (#148)
Sykkro Jul 17, 2020
41560fe
Support concurrent CSRF cookies by using a prefix of nonce (#187)
thomseddon Sep 23, 2020
04f5499
Allow override of domains and whitelist in rules (#169)
thomseddon Sep 23, 2020
c19f622
Create codeql-analysis.yml
thomseddon Oct 1, 2020
f96a3fb
Remove double brackets typo in readme (#218)
thomseddon Dec 10, 2020
8be8244
Switch to Github Actions for CI (#219)
thomseddon Jan 3, 2021
6c6f75e
Make listen port configurable (#230)
hesstobi Feb 1, 2021
4ffb659
Add GitHub Actions workflow for creating binaries for releases (#184)…
Feb 1, 2021
c4317b7
Allow to be run without middleware + improve request reading consiste…
thomseddon Jun 24, 2021
ce0c3f1
Sync fork with upstream
julienlevasseur Jan 12, 2024
ff8fca6
Bump github.com/traefik/traefik/v2 to v2.10.7
julienlevasseur Jan 12, 2024
9fcb557
Bump other dependencies
julienlevasseur Jan 12, 2024
e97b968
fix: Set Go version to 1.21 to comply with go.mod version expectations
julienlevasseur Jan 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
example
.travis.yml
.git
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github: thomseddon

36 changes: 36 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:

test:
name: Test
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.13

- name: Check out code into the Go module directory
uses: actions/checkout@v2

- name: Get dependencies
run: |
go get -v -t -d ./...
if [ -f Gopkg.toml ]; then
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
dep ensure
fi

- name: Build
run: go build -v ./...

- name: Test
run: go test -v ./...
71 changes: 71 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
name: "CodeQL"

on:
push:
branches: [master]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
schedule:
- cron: '0 10 * * 2'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['go']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
57 changes: 57 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Release

on:
release:
types: [published]

jobs:

build:
name: Build release binaries
runs-on: ubuntu-latest
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2

- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.13
id: go

- name: Build AMD64
run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -installsuffix nocgo -v -o traefik-forward-auth_amd64 ./cmd

- name: Build ARM
run: CGO_ENABLED=0 GOOS=linux GOARCH=arm GO111MODULE=on go build -a -installsuffix nocgo -v -o traefik-forward-auth_arm ./cmd

- name: Get tag name
run: echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Get artifact details
uses: octokit/[email protected]
id: get_release_details
with:
route: get /repos/${{ github.repository }}/releases/tags/${{ env.TAG }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload AMD64 release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ fromJson(steps.get_release_details.outputs.data).upload_url }}
asset_path: traefik-forward-auth_amd64
asset_name: traefik-forward-auth_amd64
asset_content_type: application/octet-stream

- name: Upload ARM release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ fromJson(steps.get_release_details.outputs.data).upload_url }}
asset_path: traefik-forward-auth_arm
asset_name: traefik-forward-auth_arm
asset_content_type: application/octet-stream
5 changes: 0 additions & 5 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12-alpine as builder
FROM golang:1.13-alpine as builder

# Setup
RUN mkdir -p /go/src/github.com/thomseddon/traefik-forward-auth
Expand All @@ -9,7 +9,7 @@ RUN apk add --no-cache git

# Copy & build
ADD . /go/src/github.com/thomseddon/traefik-forward-auth/
RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -installsuffix nocgo -o /traefik-forward-auth github.com/thomseddon/traefik-forward-auth/cmd
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -installsuffix nocgo -o /traefik-forward-auth github.com/thomseddon/traefik-forward-auth/cmd

# Copy into scratch container
FROM scratch
Expand Down
18 changes: 18 additions & 0 deletions Dockerfile.arm
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM golang:1.13-alpine as builder

# Setup
RUN mkdir -p /go/src/github.com/thomseddon/traefik-forward-auth
WORKDIR /go/src/github.com/thomseddon/traefik-forward-auth

# Add libraries
RUN apk add --no-cache git

# Copy & build
ADD . /go/src/github.com/thomseddon/traefik-forward-auth/
RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm GO111MODULE=on go build -a -installsuffix nocgo -o /traefik-forward-auth github.com/thomseddon/traefik-forward-auth/cmd

# Copy into scratch container
FROM scratch
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /traefik-forward-auth ./
ENTRYPOINT ["./traefik-forward-auth"]
18 changes: 18 additions & 0 deletions Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM golang:1.13-alpine as builder

# Setup
RUN mkdir -p /go/src/github.com/thomseddon/traefik-forward-auth
WORKDIR /go/src/github.com/thomseddon/traefik-forward-auth

# Add libraries
RUN apk add --no-cache git

# Copy & build
ADD . /go/src/github.com/thomseddon/traefik-forward-auth/
RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 GO111MODULE=on go build -a -installsuffix nocgo -o /traefik-forward-auth github.com/thomseddon/traefik-forward-auth/cmd

# Copy into scratch container
FROM scratch
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /traefik-forward-auth ./
ENTRYPOINT ["./traefik-forward-auth"]
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@

format:
gofmt -w -s internal/*.go cmd/*.go
gofmt -w -s internal/*.go internal/provider/*.go cmd/*.go

.PHONY: format
test:
go test -v ./...

.PHONY: format test
Loading