Skip to content

Commit 1684d2e

Browse files
authored
[Bugfix] [Platform] Fix NoAuth Mode (#1943)
1 parent e91ff10 commit 1684d2e

File tree

11 files changed

+62
-25
lines changed

11 files changed

+62
-25
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- (DebugPackage) Fetch All logs
1414
- (Feature) (Platform) MetaV1 List Operation
1515
- (Feature) (Platform) Enable HTTP to HTTPS Redirect
16+
- (Bugfix) (Platform) Fix NoAuth Mode
1617

1718
## [1.2.50](https://github.com/arangodb/kube-arangodb/tree/1.2.50) (2025-07-04)
1819
- (Feature) (Platform) MetaV1 Integration Service

docs/cli/arangodb_operator_integration.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ Flags:
4949
--integration.config.v1.internal Defines if Internal access to service config.v1 is enabled (Env: INTEGRATION_CONFIG_V1_INTERNAL) (default true)
5050
--integration.config.v1.module strings Module in the reference <name>=<abs path> (Env: INTEGRATION_CONFIG_V1_MODULE)
5151
--integration.envoy.auth.v3 Enable EnvoyAuthV3 Integration Service (Env: INTEGRATION_ENVOY_AUTH_V3)
52-
--integration.envoy.auth.v3.auth.enabled Defines if Auth extension is enabled (Env: INTEGRATION_ENVOY_AUTH_V3_AUTH_ENABLED)
52+
--integration.envoy.auth.v3.auth.enabled Defines if SSO Auth extension is enabled (Env: INTEGRATION_ENVOY_AUTH_V3_AUTH_ENABLED)
5353
--integration.envoy.auth.v3.auth.path string Path of the config file (Env: INTEGRATION_ENVOY_AUTH_V3_AUTH_PATH)
5454
--integration.envoy.auth.v3.auth.type string Defines type of the authentication (Env: INTEGRATION_ENVOY_AUTH_V3_AUTH_TYPE) (default "OpenID")
55+
--integration.envoy.auth.v3.enabled Defines if Auth extension is enabled (Env: INTEGRATION_ENVOY_AUTH_V3_ENABLED) (default true)
5556
--integration.envoy.auth.v3.extensions.cookie.jwt Defines if Cookie JWT extension is enabled (Env: INTEGRATION_ENVOY_AUTH_V3_EXTENSIONS_COOKIE_JWT) (default true)
5657
--integration.envoy.auth.v3.extensions.jwt Defines if JWT extension is enabled (Env: INTEGRATION_ENVOY_AUTH_V3_EXTENSIONS_JWT) (default true)
5758
--integration.envoy.auth.v3.extensions.users.create Defines if UserCreation extension is enabled (Env: INTEGRATION_ENVOY_AUTH_V3_EXTENSIONS_USERS_CREATE)

integrations/envoy/auth/v3/impl/auth_bearer/impl.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ import (
3535
)
3636

3737
func New(ctx context.Context, configuration pbImplEnvoyAuthV3Shared.Configuration) (pbImplEnvoyAuthV3Shared.AuthHandler, bool) {
38+
if !configuration.Enabled {
39+
return nil, false
40+
}
41+
3842
if !configuration.Extensions.JWT {
3943
return nil, false
4044
}

integrations/envoy/auth/v3/impl/auth_cookie/impl.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ import (
4040
const JWTAuthorizationCookieName = "X-ArangoDB-Token-JWT"
4141

4242
func New(ctx context.Context, configuration pbImplEnvoyAuthV3Shared.Configuration) (pbImplEnvoyAuthV3Shared.AuthHandler, bool) {
43+
if !configuration.Enabled {
44+
return nil, false
45+
}
46+
4347
if !configuration.Extensions.CookieJWT {
4448
logger.Info("Gateway CookieAuth Disabled")
4549
return nil, false

integrations/envoy/auth/v3/impl/auth_custom/impl.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ import (
2828
)
2929

3030
func New(ctx context.Context, configuration pbImplEnvoyAuthV3Shared.Configuration) (pbImplEnvoyAuthV3Shared.AuthHandler, bool) {
31+
if !configuration.Enabled {
32+
return nil, false
33+
}
34+
3135
if !configuration.Auth.Enabled {
3236
return nil, false
3337
}

integrations/envoy/auth/v3/impl/auth_required/impl.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ import (
3131
)
3232

3333
func New(ctx context.Context, configuration pbImplEnvoyAuthV3Shared.Configuration) (pbImplEnvoyAuthV3Shared.AuthHandler, bool) {
34+
if !configuration.Enabled {
35+
return nil, false
36+
}
37+
3438
return impl{}, true
3539
}
3640

integrations/envoy/auth/v3/impl/pass_mode/impl.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ import (
4040
)
4141

4242
func New(ctx context.Context, configuration pbImplEnvoyAuthV3Shared.Configuration) (pbImplEnvoyAuthV3Shared.AuthHandler, bool) {
43+
if !configuration.Enabled {
44+
return nil, false
45+
}
46+
4347
var z impl
4448

4549
z.configuration = configuration

integrations/envoy/auth/v3/impl/users/impl.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ import (
3636
)
3737

3838
func New(ctx context.Context, configuration pbImplEnvoyAuthV3Shared.Configuration) (pbImplEnvoyAuthV3Shared.AuthHandler, bool) {
39+
if !configuration.Enabled {
40+
return nil, false
41+
}
42+
3943
if !configuration.Extensions.UsersCreate {
4044
return nil, false
4145
}

integrations/envoy/auth/v3/shared/configuration.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import (
2525
)
2626

2727
type Configuration struct {
28+
Enabled bool
29+
2830
integrationsShared.Endpoint
2931
integrationsShared.Database
3032

pkg/integrations/envoy_auth_v3.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,11 @@ func (a *envoyAuthV3) Description() string {
5252

5353
func (a *envoyAuthV3) Register(cmd *cobra.Command, fs FlagEnvHandler) error {
5454
return errors.Errors(
55+
fs.BoolVar(&a.config.Enabled, "enabled", true, "Defines if Auth extension is enabled"),
5556
fs.BoolVar(&a.config.Extensions.JWT, "extensions.jwt", true, "Defines if JWT extension is enabled"),
5657
fs.BoolVar(&a.config.Extensions.CookieJWT, "extensions.cookie.jwt", true, "Defines if Cookie JWT extension is enabled"),
5758
fs.BoolVar(&a.config.Extensions.UsersCreate, "extensions.users.create", false, "Defines if UserCreation extension is enabled"),
58-
fs.BoolVar(&a.config.Auth.Enabled, "auth.enabled", false, "Defines if Auth extension is enabled"),
59+
fs.BoolVar(&a.config.Auth.Enabled, "auth.enabled", false, "Defines if SSO Auth extension is enabled"),
5960
fs.StringVar(&a.config.Auth.Type, "auth.type", "OpenID", "Defines type of the authentication"),
6061
fs.StringVar(&a.config.Auth.Path, "auth.path", "", "Path of the config file"),
6162
)

0 commit comments

Comments
 (0)