barbercollie/tinyauth
1
0
Fork 1
mirror of https://github.com/steveiliop56/tinyauth.git synced 2025-11-02 23:25:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: ignore unknown flags instead of filtering manually

Browse Source
This commit is contained in:
Nicolas Meienberger
2025-10-29 18:39:58 +01:00
parent f978ae155a
commit 9014be90aa
2 changed files with 3 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/root.go
View File

@@ -34,6 +34,9 @@ func (c *rootCmd) Register() {
Short: "The simplest way to protect your apps with a login screen", Short: "The simplest way to protect your apps with a login screen",
Long: `Tinyauth is a simple authentication middleware that adds a simple login screen or OAuth with Google, Github or any other provider to all of your docker apps.`, Long: `Tinyauth is a simple authentication middleware that adds a simple login screen or OAuth with Google, Github or any other provider to all of your docker apps.`,
Run: c.run, Run: c.run,
FParseErrWhitelist: cobra.FParseErrWhitelist{
UnknownFlags: true,
},
} }
c.viper.AutomaticEnv() c.viper.AutomaticEnv()
@@ -129,7 +132,6 @@ func (c *rootCmd) run(cmd *cobra.Command, args []string) {
func Run() { func Run() {
rootCmd := newRootCmd() rootCmd := newRootCmd()
rootCmd.aclFlags = utils.ExtractACLFlags(os.Args[1:]) rootCmd.aclFlags = utils.ExtractACLFlags(os.Args[1:])
os.Args = filterACLFlags(os.Args)
rootCmd.Register() rootCmd.Register()
root := rootCmd.GetCmd() root := rootCmd.GetCmd()
@@ -160,23 +162,3 @@ func Run() {
log.Fatal().Err(err).Msg("Failed to execute root command") log.Fatal().Err(err).Msg("Failed to execute root command")
} }
} }
func filterACLFlags(args []string) []string {
filtered := make([]string, 0)
for i, arg := range args {
// Program name
if i == 0 {
filtered = append(filtered, arg)
continue
}
if strings.HasPrefix(arg, "--apps-") || strings.HasPrefix(arg, "--tinyauth-apps-") {
continue
}
filtered = append(filtered, arg)
}
return filtered
}

92
internal/utils/decoders/acl_decoder_test.go
View File

@@ -1,92 +0,0 @@
package decoders_test
import (
"testing"
"tinyauth/internal/config"
"tinyauth/internal/utils/decoders"
"gotest.tools/v3/assert"
)
func TestDecodeACLEnv(t *testing.T) {
env := map[string]string{
"TINYAUTH_APPS_MY_COOL_APP_CONFIG_DOMAIN": "example.com",
"TINYAUTH_APPS_MY_COOL_APP_USERS_ALLOW": "user1,user2",
"TINYAUTH_APPS_MY_COOL_APP_USERS_BLOCK": "user3",
"TINYAUTH_APPS_MY_COOL_APP_OAUTH_WHITELIST": "provider1",
"TINYAUTH_APPS_MY_COOL_APP_OAUTH_GROUPS": "group1,group2",
"TINYAUTH_APPS_OTHERAPP_CONFIG_DOMAIN": "test.com",
"TINYAUTH_APPS_OTHERAPP_USERS_ALLOW": "admin",
}
expected := config.Apps{
Apps: map[string]config.App{
"my_cool_app": {
Config: config.AppConfig{
Domain: "example.com",
},
Users: config.AppUsers{
Allow: "user1,user2",
Block: "user3",
},
OAuth: config.AppOAuth{
Whitelist: "provider1",
Groups: "group1,group2",
},
},
"otherapp": {
Config: config.AppConfig{
Domain: "test.com",
},
Users: config.AppUsers{
Allow: "admin",
},
},
},
}
// Execute
result, err := decoders.DecodeACLEnv[config.Apps](env, "apps")
assert.NilError(t, err)
assert.DeepEqual(t, result, expected)
}
func TestDecodeACLFlags(t *testing.T) {
// Setup
flags := map[string]string{
"tinyauth-apps-webapp-config-domain": "webapp.example.com",
"tinyauth-apps-webapp-users-allow": "alice,bob",
"tinyauth-apps-webapp-oauth-whitelist": "google",
"tinyauth-apps-api-config-domain": "api.example.com",
"tinyauth-apps-api-users-block": "banned",
}
expected := config.Apps{
Apps: map[string]config.App{
"webapp": {
Config: config.AppConfig{
Domain: "webapp.example.com",
},
Users: config.AppUsers{
Allow: "alice,bob",
},
OAuth: config.AppOAuth{
Whitelist: "google",
},
},
"api": {
Config: config.AppConfig{
Domain: "api.example.com",
},
Users: config.AppUsers{
Block: "banned",
},
},
},
}
// Execute
result, err := decoders.DecodeACLFlags[config.Apps](flags, "apps")
assert.NilError(t, err)
assert.DeepEqual(t, result, expected)
}