Merge pull request #3578 from mevan-karu/test-key

Introduce temporary configs to support multiple headers for the Console testing
wso2 · Sep 9, 2024 · 3cd7bcc · 3cd7bcc
2 parents 3c16d97 + cf6fc4f
commit 3cd7bcc
Show file tree

Hide file tree

Showing 15 changed files with 500 additions and 22 deletions.
diff --git a/adapter/config/default_config.go b/adapter/config/default_config.go
@@ -120,7 +120,7 @@ var defaultConfig = &Config{
 			},
 			Retry: upstreamRetry{
 				MaxRetryCount: 5,
-				RetryOn: "connect-failure",
+				RetryOn:       "connect-failure",
 				BaseInterval:  25 * time.Millisecond,
 				MaxInterval:   500 * time.Millisecond,
 				StatusCodes:   []uint32{504},
@@ -202,9 +202,11 @@ var defaultConfig = &Config{
 				},
 			},
 			AuthHeader: authHeader{
-				EnableOutboundAuthHeader: false,
-				AuthorizationHeader:      "authorization",
-				TestConsoleHeaderName:    "Internal-Key",
+				EnableOutboundAuthHeader:   false,
+				AuthorizationHeader:        "authorization",
+				TestConsoleHeaderName:      "Internal-Key",
+				TempTestConsoleHeaderNames: []string{},
+				TempTestConsoleHeadersMode: "monitor",
 			},
 		},
 		AuthService: authService{

diff --git a/adapter/config/types.go b/adapter/config/types.go
@@ -478,9 +478,11 @@ type analyticsEnforcer struct {
 }
 
 type authHeader struct {
-	EnableOutboundAuthHeader bool
-	AuthorizationHeader      string
-	TestConsoleHeaderName    string
+	EnableOutboundAuthHeader   bool
+	AuthorizationHeader        string
+	TestConsoleHeaderName      string
+	TempTestConsoleHeaderNames []string
+	TempTestConsoleHeadersMode string
 }
 
 type jwtIssuer struct {

diff --git a/adapter/internal/discovery/xds/marshaller.go b/adapter/internal/discovery/xds/marshaller.go
@@ -211,9 +211,11 @@ func MarshalConfig(config *config.Config) *enforcer.Config {
 		Security: &enforcer.Security{
 			TokenService: issuers,
 			AuthHeader: &enforcer.AuthHeader{
-				EnableOutboundAuthHeader: config.Enforcer.Security.AuthHeader.EnableOutboundAuthHeader,
-				AuthorizationHeader:      config.Enforcer.Security.AuthHeader.AuthorizationHeader,
-				TestConsoleHeaderName:    config.Enforcer.Security.AuthHeader.TestConsoleHeaderName,
+				EnableOutboundAuthHeader:   config.Enforcer.Security.AuthHeader.EnableOutboundAuthHeader,
+				AuthorizationHeader:        config.Enforcer.Security.AuthHeader.AuthorizationHeader,
+				TestConsoleHeaderName:      config.Enforcer.Security.AuthHeader.TestConsoleHeaderName,
+				TempTestConsoleHeaderNames: config.Enforcer.Security.AuthHeader.TempTestConsoleHeaderNames,
+				TempTestConsoleHeadersMode: config.Enforcer.Security.AuthHeader.TempTestConsoleHeadersMode,
 			},
 		},
 		Cache:     cache,

diff --git a/adapter/pkg/discovery/api/wso2/discovery/config/enforcer/auth_header.pb.go b/adapter/pkg/discovery/api/wso2/discovery/config/enforcer/auth_header.pb.go
diff --git a/api/proto/wso2/discovery/config/enforcer/auth_header.proto b/api/proto/wso2/discovery/config/enforcer/auth_header.proto
@@ -18,4 +18,8 @@ message AuthHeader {
     string authorizationHeader = 2;
 
     string testConsoleHeaderName = 3;
+
+    repeated string tempTestConsoleHeaderNames = 4;
+
+    string tempTestConsoleHeadersMode = 5;
 }