Skip to content

Commit a81caba

Browse files
authored
Merge pull request #3592 from mevan-karu/pat_impl_choreo
Add PAT impl
2 parents faaf4ac + a658f4f commit a81caba

File tree

28 files changed

+2501
-53
lines changed

28 files changed

+2501
-53
lines changed

adapter/config/default_config.go

+6
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,12 @@ var defaultConfig = &Config{
227227
TempTestConsoleHeadersMode: "monitor",
228228
DropConsoleTestHeaders: true,
229229
},
230+
APIKeyConfig: apiKeyConfig{
231+
OAuthAgentURL: "https://localhost:9443",
232+
},
233+
PATConfig: patConfig{
234+
TokenExpiryTimeSkew: 1,
235+
},
230236
},
231237
AuthService: authService{
232238
Port: 8081,

adapter/config/types.go

+10
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,8 @@ type upstreamCircuitBreaker struct {
328328
type security struct {
329329
TokenService []tokenService
330330
AuthHeader authHeader
331+
APIKeyConfig apiKeyConfig
332+
PATConfig patConfig
331333
}
332334

333335
type authService struct {
@@ -497,6 +499,14 @@ type authHeader struct {
497499
DropConsoleTestHeaders bool
498500
}
499501

502+
type apiKeyConfig struct {
503+
OAuthAgentURL string
504+
}
505+
506+
type patConfig struct {
507+
TokenExpiryTimeSkew int32
508+
}
509+
500510
type jwtIssuer struct {
501511
Enabled bool
502512
Issuer string

adapter/internal/discovery/xds/marshaller.go

+6
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,12 @@ func MarshalConfig(config *config.Config) *enforcer.Config {
218218
TempTestConsoleHeadersMode: config.Enforcer.Security.AuthHeader.TempTestConsoleHeadersMode,
219219
DropConsoleTestHeaders: config.Enforcer.Security.AuthHeader.DropConsoleTestHeaders,
220220
},
221+
ApiKeyConfig: &enforcer.APIKeyConfig{
222+
OauthAgentURL: config.Enforcer.Security.APIKeyConfig.OAuthAgentURL,
223+
},
224+
PatConfig: &enforcer.PATConfig{
225+
TokenExpiryTimeSkew: config.Enforcer.Security.PATConfig.TokenExpiryTimeSkew,
226+
},
221227
},
222228
Cache: cache,
223229
Tracing: tracing,

adapter/pkg/discovery/api/wso2/discovery/config/enforcer/api_key_config.pb.go

+155
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adapter/pkg/discovery/api/wso2/discovery/config/enforcer/pat_config.pb.go

+155
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)