pics legacy options

This commit is contained in:
Anderson Valério 2024-12-05 14:51:24 -03:00
parent 125e2f0ab6
commit 4f04b856e5
No known key found for this signature in database
GPG Key ID: 92D38E56BFF005A0
3 changed files with 82 additions and 59 deletions

View File

@ -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"`

View File

@ -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) {

View File

@ -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",
},
},
},
}
}