From dc564c089807a45069d8c1dc1310424d348936ff Mon Sep 17 00:00:00 2001 From: Jozef Volak Date: Sat, 2 Mar 2024 00:07:39 +0100 Subject: [PATCH 1/3] Add the assignment of user to userinfo at azure provider --- CHANGELOG.md | 2 +- providers/azure.go | 39 +++++++++++++++++++++++++++++++++------ providers/azure_test.go | 11 +++++++++++ 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9462540846..540b6773e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ ## Breaking Changes ## Changes since v7.5.1 - +- [#2535](https://github.com/oauth2-proxy/oauth2-proxy/pull/2307) Add the assignment of user to userinfo at azure provider (@Jozefiel) - [#2381](https://github.com/oauth2-proxy/oauth2-proxy/pull/2381) Allow username authentication to Redis cluster (@rossigee) - [#2345](https://github.com/oauth2-proxy/oauth2-proxy/pull/2345) Log error details when failed loading CSRF cookie (@charvadzo) - [#2128](https://github.com/oauth2-proxy/oauth2-proxy/pull/2128) Update dependencies (@vllvll) diff --git a/providers/azure.go b/providers/azure.go index 5ae68d93da..ecddc61137 100644 --- a/providers/azure.go +++ b/providers/azure.go @@ -201,8 +201,16 @@ func (p *AzureProvider) EnrichSession(ctx context.Context, session *sessions.Ses logger.Printf("unable to get email and/or groups claims from token: %v", err) } + if session.User == "" { + user, err := p.getDataFromProfileAPI(ctx, session.AccessToken, getUserFromJSON) + if err != nil { + return fmt.Errorf("unable to get user from profile URL: %v", err) + } + session.User = user + } + if session.Email == "" { - email, err := p.getEmailFromProfileAPI(ctx, session.AccessToken) + email, err := p.getDataFromProfileAPI(ctx, session.AccessToken, getEmailFromJSON) if err != nil { return fmt.Errorf("unable to get email address from profile URL: %v", err) } @@ -410,7 +418,8 @@ func getGroupsFromJSON(json *simplejson.Json, graphGroupField string) []string { return groups } -func (p *AzureProvider) getEmailFromProfileAPI(ctx context.Context, accessToken string) (string, error) { +func (p *AzureProvider) getDataFromProfileAPI(ctx context.Context, accessToken string, jsonExtractFunc func(*simplejson.Json) (string, error)) (string, error) { + if accessToken == "" { return "", fmt.Errorf("missing access token") } @@ -424,14 +433,28 @@ func (p *AzureProvider) getEmailFromProfileAPI(ctx context.Context, accessToken return "", err } - email, err := getEmailFromJSON(json) - if email == "" { - return "", fmt.Errorf("empty email address: %v", err) + data, err := jsonExtractFunc(json) + return data, nil +} + +func getUserFromJSON(json *simplejson.Json) (string, error) { + + user, err := json.Get("name").String() + + if err != nil { + logger.Errorf("unable to find name: %s", err) + return "", err } - return email, nil + + if user == "" { + return "", fmt.Errorf("empty user: %v", err) + } + + return user, nil } func getEmailFromJSON(json *simplejson.Json) (string, error) { + email, err := json.Get("mail").String() if err != nil || email == "" { @@ -450,6 +473,10 @@ func getEmailFromJSON(json *simplejson.Json) (string, error) { } } + if email == "" { + return "", fmt.Errorf("empty email address: %v", err) + } + return email, nil } diff --git a/providers/azure_test.go b/providers/azure_test.go index 27d70b883b..4bb21fdff9 100644 --- a/providers/azure_test.go +++ b/providers/azure_test.go @@ -165,6 +165,8 @@ func testAzureBackendWithError(payload string, accessToken, refreshToken string, } ] }`)) + } else if r.URL.Path == path && r.Method == http.MethodGet { + w.Write([]byte(payload)) } else if (r.URL.Path != path) && r.Method != http.MethodPost { w.WriteHeader(404) } else if r.Method == http.MethodPost && r.Body != nil { @@ -189,6 +191,7 @@ func TestAzureProviderEnrichSession(t *testing.T) { Description string Email string PayloadFromAzureBackend string + ExpectedUser string ExpectedEmail string ExpectedError error }{ @@ -227,6 +230,13 @@ func TestAzureProviderEnrichSession(t *testing.T) { Email: "user@windows.net", ExpectedEmail: "user@windows.net", }, + { + Description: "should enrich username from Azure provider", + Email: "user@windows.net", + PayloadFromAzureBackend: `{ "name": "User" }`, + ExpectedEmail: "user@windows.net", + ExpectedUser: "User", + }, } for _, testCase := range testCases { @@ -248,6 +258,7 @@ func TestAzureProviderEnrichSession(t *testing.T) { err := p.EnrichSession(context.Background(), session) assert.Equal(t, testCase.ExpectedError, err) assert.Equal(t, testCase.ExpectedEmail, session.Email) + assert.Equal(t, testCase.ExpectedUser, session.User) }) } } From 39f66342c970a8dcc32444998eac12c111180b10 Mon Sep 17 00:00:00 2001 From: Jozef Volak Date: Mon, 4 Mar 2024 15:09:14 +0100 Subject: [PATCH 2/3] [azure] Fowrard group names only --- providers/azure.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/azure.go b/providers/azure.go index ecddc61137..9065592bbb 100644 --- a/providers/azure.go +++ b/providers/azure.go @@ -223,7 +223,7 @@ func (p *AzureProvider) EnrichSession(ctx context.Context, session *sessions.Ses if err != nil { return fmt.Errorf("unable to get groups from Microsoft Graph: %v", err) } - session.Groups = util.RemoveDuplicateStr(append(session.Groups, groups...)) + session.Groups = util.RemoveDuplicateStr(groups) } return nil } From 48b75a41e2c1451c529aeb7db16e64ea992b02fc Mon Sep 17 00:00:00 2001 From: Jozef Volak Date: Fri, 15 Mar 2024 23:00:36 +0100 Subject: [PATCH 3/3] Frinx design --- Dockerfile | 1 + Makefile | 6 +- frinx/frinx.png | Bin 0 -> 31478 bytes go.mod | 4 +- go.sum | 68 +----- pkg/app/pagewriter/sign_in.html | 354 +++++++++++++++++++++----------- 6 files changed, 253 insertions(+), 180 deletions(-) create mode 100644 frinx/frinx.png diff --git a/Dockerfile b/Dockerfile index ef4c3528e0..5f84b300e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,5 +47,6 @@ RUN case ${TARGETPLATFORM} in \ FROM ${RUNTIME_IMAGE} COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/oauth2-proxy /bin/oauth2-proxy COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/jwt_signing_key.pem /etc/ssl/private/jwt_signing_key.pem +COPY --from=builder /go/src/github.com/oauth2-proxy/oauth2-proxy/frinx /tmp/frinx ENTRYPOINT ["/bin/oauth2-proxy"] diff --git a/Makefile b/Makefile index 5b38fb3fcb..a52e726c67 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ GOLANGCILINT ?= golangci-lint BINARY := oauth2-proxy VERSION ?= $(shell git describe --always --dirty --tags 2>/dev/null || echo "undefined") # Allow to override image registry. -REGISTRY ?= quay.io/oauth2-proxy +REGISTRY ?= frinx REPOSITORY ?= oauth2-proxy DATE := $(shell date +"%Y%m%d") @@ -42,7 +42,7 @@ build: validate-go-version clean $(BINARY) $(BINARY): CGO_ENABLED=0 $(GO) build -a -installsuffix cgo -ldflags="-X main.VERSION=${VERSION}" -o $@ github.com/oauth2-proxy/oauth2-proxy/v7 -DOCKER_BUILD_PLATFORM ?= linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7 +DOCKER_BUILD_PLATFORM ?= linux/amd64 DOCKER_BUILD_RUNTIME_IMAGE ?= gcr.io/distroless/static:nonroot DOCKER_BUILDX_ARGS ?= --build-arg RUNTIME_IMAGE=${DOCKER_BUILD_RUNTIME_IMAGE} --build-arg VERSION=${VERSION} DOCKER_BUILDX := docker buildx build ${DOCKER_BUILDX_ARGS} --pull @@ -50,7 +50,7 @@ DOCKER_BUILDX_X_PLATFORM := $(DOCKER_BUILDX) --platform ${DOCKER_BUILD_PLAT DOCKER_BUILDX_PUSH := $(DOCKER_BUILDX) --push DOCKER_BUILDX_PUSH_X_PLATFORM := $(DOCKER_BUILDX_PUSH) --platform ${DOCKER_BUILD_PLATFORM} -DOCKER_BUILD_PLATFORM_ALPINE ?= linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v6,linux/arm/v7 +DOCKER_BUILD_PLATFORM_ALPINE ?= linux/amd64 DOCKER_BUILD_RUNTIME_IMAGE_ALPINE ?= alpine:3.19.1 DOCKER_BUILDX_ARGS_ALPINE ?= --build-arg RUNTIME_IMAGE=${DOCKER_BUILD_RUNTIME_IMAGE_ALPINE} --build-arg VERSION=${VERSION} DOCKER_BUILDX_X_PLATFORM_ALPINE := docker buildx build ${DOCKER_BUILDX_ARGS_ALPINE} --platform ${DOCKER_BUILD_PLATFORM_ALPINE} diff --git a/frinx/frinx.png b/frinx/frinx.png new file mode 100644 index 0000000000000000000000000000000000000000..3da6d205ccad7a714b3d00e5c2397dc26b3c10b0 GIT binary patch literal 31478 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 literal 0 HcmV?d00001 diff --git a/go.mod b/go.mod index 97ed3de7f9..d07297d428 100644 --- a/go.mod +++ b/go.mod @@ -44,9 +44,8 @@ require ( k8s.io/apimachinery v0.29.1 ) -require cloud.google.com/go/compute v1.23.3 // indirect - require ( + cloud.google.com/go/compute v1.23.3 // indirect github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect @@ -90,7 +89,6 @@ require ( google.golang.org/grpc v1.61.0 // indirect google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 6a81595810..9925854afc 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,6 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= -github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 h1:Arcl6UOIS/kgO2nW3A65HN+7CMjSDP/gofXL4CZt1V4= github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA= @@ -117,8 +115,6 @@ github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= @@ -153,14 +149,10 @@ github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= -github.com/oauth2-proxy/mockoidc v0.0.0-20220308204021-b9169deeb282 h1:TQMyrpijtkFyXpNI3rY5hsZQZw+paiH+BfAlsb81HBY= -github.com/oauth2-proxy/mockoidc v0.0.0-20220308204021-b9169deeb282/go.mod h1:rW25Kyd08Wdn3UVn0YBsDTSvReu0jqpmJKzxITPSjks= github.com/oauth2-proxy/mockoidc v0.0.0-20240213094324-6186c302dcc8 h1:DGMYYU5GYoPTxE2ZfBcAD/8j6/QZXi9iX4Vp2ojnGOc= github.com/oauth2-proxy/mockoidc v0.0.0-20240213094324-6186c302dcc8/go.mod h1:oHHSFtBUrYeEgVbIyOGqMP65t2ezJCcxeKhXvGpAcKc= github.com/oauth2-proxy/tools/reference-gen v0.0.0-20210118095127-56ffd7384404 h1:ZpzR4Ou1nhldBG/vEzauoqyaUlofaUcLkv1C/gBK8ls= github.com/oauth2-proxy/tools/reference-gen v0.0.0-20210118095127-56ffd7384404/go.mod h1:YpORG8zs14vNlpXvuHYnnDvWazIRaDk02MaY8lafqdI= -github.com/ohler55/ojg v1.21.0 h1:niqSS6yl3PQZJrqh7pKs/zinl4HebGe8urXEfpvlpYY= -github.com/ohler55/ojg v1.21.0/go.mod h1:gQhDVpQLqrmnd2eqGAvJtn+NfKoYJbe/A4Sj3/Vro4o= github.com/ohler55/ojg v1.21.1 h1:b2RLUaDcy9gvn46dmhTjezu/TDauoR0/kgKTqkwIxto= github.com/ohler55/ojg v1.21.1/go.mod h1:gQhDVpQLqrmnd2eqGAvJtn+NfKoYJbe/A4Sj3/Vro4o= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -234,28 +226,14 @@ github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= -go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= -go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel v1.23.0 h1:Df0pqjqExIywbMCMTxkAwzjLZtRf+bBKLbUcpxO2C9E= go.opentelemetry.io/otel v1.23.0/go.mod h1:YCycw9ZeKhcJFrb34iVSkyT0iczq/zYDtZYFufObyB0= -go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= -go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= -go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= -go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= go.opentelemetry.io/otel/metric v1.23.0 h1:pazkx7ss4LFVVYSxYew7L5I6qvLXHA0Ap2pwV+9Cnpo= go.opentelemetry.io/otel/metric v1.23.0/go.mod h1:MqUW2X2a6Q8RN96E2/nqNoT+z9BSms20Jb7Bbp+HiTo= -go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= -go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= -go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= -go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= go.opentelemetry.io/otel/trace v1.23.0 h1:37Ik5Ib7xfYVb4V1UtnT97T1jI+AoIYkJyPkuL4iJgI= go.opentelemetry.io/otel/trace v1.23.0/go.mod h1:GSGTbIClEsuZrGIzoEHqsVfxgn5UkggkflQwDScNUsk= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -266,13 +244,9 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM= -golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE= golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -281,8 +255,8 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -297,13 +271,9 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -331,8 +301,6 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -355,18 +323,12 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= -golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= +golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.155.0 h1:vBmGhCYs0djJttDNynWo44zosHlPvHmA0XiN2zP2DtA= -google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk= -google.golang.org/api v0.157.0 h1:ORAeqmbrrozeyw5NjnMxh7peHO0UzV4wWYSwZeCUb20= -google.golang.org/api v0.157.0/go.mod h1:+z4v4ufbZ1WEpld6yMGHyggs+PmAHiaLNj5ytP3N01g= -google.golang.org/api v0.158.0 h1:7SKwlRqzrXT2ULl6a3iESb+1pOak5IOd5F+ay5ULiV4= -google.golang.org/api v0.158.0/go.mod h1:0mu0TpK33qnydLvWqbImq2b1eQ5FHRSDCBzAxX9ZHyw= google.golang.org/api v0.164.0 h1:of5G3oE2WRMVb2yoWKME4ZP8y8zpUKC6bMhxDr8ifyk= google.golang.org/api v0.164.0/go.mod h1:2OatzO7ZDQsoS7IFf3rvsE17/TldiU3F/zxFHeqUB5o= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -376,14 +338,10 @@ google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 h1:YJ5pD9rF8o9Qtta0Cmy9rdBwkSjrTCT6XTiUQVOtIos= -google.golang.org/genproto v0.0.0-20231212172506-995d672761c0/go.mod h1:l/k7rMz0vFTBPy+tFSGvXEd3z+BcoG1k7EHbqm+YBsY= -google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3 h1:EWIeHfGuUf00zrVZGEgYFxok7plSAXBGcH7NNdMAWvA= -google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3/go.mod h1:k2dtGpRrbsSyKcNPKKI5sstZkrNCZwpU/ns96JoHbGg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac h1:nUQEQmH/csSvFECKYRv6HWEyypysidKl2I6Qpsglq/0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA= +google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe h1:USL2DhxfgRchafRvt/wYyyQNzwgL7ZiURcozOE/Pkvo= +google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 h1:FSL3lRCkhaPFxqi0s9o+V4UI2WTzAVOvkgbd4kVV4Wg= google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014/go.mod h1:SaPjaZGWb0lPqs6Ittu0spdfrOArqji4ZdeP5IC/9N4= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -391,8 +349,6 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= -google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -417,8 +373,6 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= -gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -432,8 +386,6 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= -k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= k8s.io/apimachinery v0.29.1 h1:KY4/E6km/wLBguvCZv8cKTeOwwOBqFNjwJIdMkMbbRc= k8s.io/apimachinery v0.29.1/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE= diff --git a/pkg/app/pagewriter/sign_in.html b/pkg/app/pagewriter/sign_in.html index c577a36c32..c43629e486 100644 --- a/pkg/app/pagewriter/sign_in.html +++ b/pkg/app/pagewriter/sign_in.html @@ -1,132 +1,254 @@ {{define "sign_in.html"}} - + + - + Sign In - - - - -
-
- - - -
-
- {{ if eq .Footer "-" }} - {{ else if eq .Footer ""}} -

Secured with OAuth2 Proxy version {{.Version}}

- {{ else }} -

{{.Footer}}

- {{ end }} -
-
- + + + + -{{end}} +{{end}} \ No newline at end of file