From 4f04b856e5f49e5d995a7ba4498a1e22ac953007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anderson=20Val=C3=A9rio?= Date: Thu, 5 Dec 2024 14:51:24 -0300 Subject: [PATCH] pics legacy options --- pkg/apis/options/legacy_options.go | 48 ++++------------- pkg/apis/options/legacy_options_test.go | 24 +-------- pkg/apis/options/pics_legacy_options.go | 69 +++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 59 deletions(-) create mode 100644 pkg/apis/options/pics_legacy_options.go diff --git a/pkg/apis/options/legacy_options.go b/pkg/apis/options/legacy_options.go index 64ae80f4..67d98f7e 100644 --- a/pkg/apis/options/legacy_options.go +++ b/pkg/apis/options/legacy_options.go @@ -247,7 +247,7 @@ func (l *LegacyHeaders) getRequestHeaders() []Header { } if l.PassAuthorization { - requestHeaders = append(requestHeaders, getAuthorizationHeader()...) + requestHeaders = append(requestHeaders, PicsGetAuthorizationHeader()...) } for i := range requestHeaders { @@ -272,11 +272,11 @@ func (l *LegacyHeaders) getResponseHeaders() []Header { } if l.SetAuthorization { - responseHeaders = append(responseHeaders, getAuthorizationHeader()...) + responseHeaders = append(responseHeaders, PicsGetAuthorizationHeader()...) } if l.SetIntrospectionValue { - responseHeaders = append(responseHeaders, getXAuthIntrospectionValueHeaders()) + responseHeaders = append(responseHeaders, PicsGetXAuthIntrospectionValueHeaders()) } return responseHeaders } @@ -369,31 +369,18 @@ func getPassAccessTokenHeader() Header { } } -func getAuthorizationHeader() []Header { - headers := []Header{ - { - Name: "Authorization", - Values: []HeaderValue{ - { - ClaimSource: &ClaimSource{ - Claim: "id_token", - Prefix: "Bearer ", - }, - }, - }, - }, - { - Name: "x-auth-request-id-token", - Values: []HeaderValue{ - { - ClaimSource: &ClaimSource{ - Claim: "id_token", - }, +func getAuthorizationHeader() Header { + return Header{ + Name: "Authorization", + Values: []HeaderValue{ + { + ClaimSource: &ClaimSource{ + Claim: "id_token", + Prefix: "Bearer ", }, }, }, } - return headers } func getPreferredUsernameHeader() Header { @@ -469,19 +456,6 @@ func getXAuthRequestAccessTokenHeader() Header { } } -func getXAuthIntrospectionValueHeaders() Header { - return Header{ - Name: "X-Auth-Introspect-Value", - Values: []HeaderValue{ - { - ClaimSource: &ClaimSource{ - Claim: "introspect-claims", - }, - }, - }, - } -} - type LegacyServer struct { MetricsAddress string `flag:"metrics-address" cfg:"metrics_address"` MetricsSecureAddress string `flag:"metrics-secure-address" cfg:"metrics_secure_address"` diff --git a/pkg/apis/options/legacy_options_test.go b/pkg/apis/options/legacy_options_test.go index d3cecc2a..de072bcd 100644 --- a/pkg/apis/options/legacy_options_test.go +++ b/pkg/apis/options/legacy_options_test.go @@ -454,17 +454,7 @@ var _ = Describe("Legacy Options", func() { }, } - xAuthIntrospectResponse := Header{ - Name: "X-Auth-Introspect-Value", - PreserveRequestValue: false, - Values: []HeaderValue{ - { - ClaimSource: &ClaimSource{ - Claim: "introspect-claims", - }, - }, - }, - } + xAuthIntrospectResponse := PicsGetXAuthInstrospectResponseHeader() xAuthRequestAccessToken := Header{ Name: "X-Auth-Request-Access-Token", @@ -491,17 +481,7 @@ var _ = Describe("Legacy Options", func() { }, } - idTokenHeader := Header{ - Name: "x-auth-request-id-token", - PreserveRequestValue: false, - Values: []HeaderValue{ - { - ClaimSource: &ClaimSource{ - Claim: "id_token", - }, - }, - }, - } + idTokenHeader := PicsGetIdTokenHeader() DescribeTable("should convert to injectRequestHeaders", func(in legacyHeadersTableInput) { diff --git a/pkg/apis/options/pics_legacy_options.go b/pkg/apis/options/pics_legacy_options.go new file mode 100644 index 00000000..77601003 --- /dev/null +++ b/pkg/apis/options/pics_legacy_options.go @@ -0,0 +1,69 @@ +package options + +func PicsGetAuthorizationHeader() []Header { + headers := []Header{ + { + Name: "Authorization", + Values: []HeaderValue{ + { + ClaimSource: &ClaimSource{ + Claim: "id_token", + Prefix: "Bearer ", + }, + }, + }, + }, + { + Name: "x-auth-request-id-token", + Values: []HeaderValue{ + { + ClaimSource: &ClaimSource{ + Claim: "id_token", + }, + }, + }, + }, + } + return headers +} + +func PicsGetXAuthIntrospectionValueHeaders() Header { + return Header{ + Name: "X-Auth-Introspect-Value", + Values: []HeaderValue{ + { + ClaimSource: &ClaimSource{ + Claim: "introspect-claims", + }, + }, + }, + } +} + +func PicsGetXAuthInstrospectResponseHeader() Header { + return Header{ + Name: "X-Auth-Introspect-Value", + PreserveRequestValue: false, + Values: []HeaderValue{ + { + ClaimSource: &ClaimSource{ + Claim: "introspect-claims", + }, + }, + }, + } +} + +func PicsGetIdTokenHeader() Header { + return Header{ + Name: "x-auth-request-id-token", + PreserveRequestValue: false, + Values: []HeaderValue{ + { + ClaimSource: &ClaimSource{ + Claim: "id_token", + }, + }, + }, + } +}