barbercollie/tinyauth
1
0
Fork 1
mirror of https://github.com/steveiliop56/tinyauth.git synced 2025-10-28 12:45:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: rename whitelist to oauth whitelist

Browse Source
This commit is contained in:
Stavros
2025-01-25 15:32:46 +02:00
parent cc480085c5
commit 9d2aef163b
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/root.go
View File

@@ -56,8 +56,8 @@ var rootCmd = &cobra.Command{
users, parseErr := utils.ParseUsers(usersString) users, parseErr := utils.ParseUsers(usersString)
HandleError(parseErr, "Failed to parse users") HandleError(parseErr, "Failed to parse users")
// Create whitelist // Create oauth whitelist
whitelist := utils.ParseCommaString(config.Whitelist) oauthWhitelist := utils.ParseCommaString(config.OAuthWhitelist)
// Create OAuth config // Create OAuth config
oauthConfig := types.OAuthConfig{ oauthConfig := types.OAuthConfig{
@@ -75,7 +75,7 @@ var rootCmd = &cobra.Command{
} }
// Create auth service // Create auth service
auth := auth.NewAuth(users, whitelist) auth := auth.NewAuth(users, oauthWhitelist)
// Create OAuth providers service // Create OAuth providers service
providers := providers.NewProviders(oauthConfig) providers := providers.NewProviders(oauthConfig)
@@ -139,7 +139,7 @@ func init() {
rootCmd.Flags().String("generic-token-url", "", "Generic OAuth token URL.") rootCmd.Flags().String("generic-token-url", "", "Generic OAuth token URL.")
rootCmd.Flags().String("generic-user-url", "", "Generic OAuth user info URL.") rootCmd.Flags().String("generic-user-url", "", "Generic OAuth user info URL.")
rootCmd.Flags().Bool("disable-continue", false, "Disable continue screen and redirect to app directly.") rootCmd.Flags().Bool("disable-continue", false, "Disable continue screen and redirect to app directly.")
rootCmd.Flags().String("whitelist", "", "Comma separated list of email addresses to whitelist (only for oauth).") rootCmd.Flags().String("oauth-whitelist", "", "Comma separated list of email addresses to whitelist when using OAuth.")
rootCmd.Flags().Int("cookie-expiry", 86400, "Cookie expiration time in seconds.") rootCmd.Flags().Int("cookie-expiry", 86400, "Cookie expiration time in seconds.")
viper.BindEnv("port", "PORT") viper.BindEnv("port", "PORT")
viper.BindEnv("address", "ADDRESS") viper.BindEnv("address", "ADDRESS")
@@ -159,7 +159,7 @@ func init() {
viper.BindEnv("generic-token-url", "GENERIC_TOKEN_URL") viper.BindEnv("generic-token-url", "GENERIC_TOKEN_URL")
viper.BindEnv("generic-user-url", "GENERIC_USER_URL") viper.BindEnv("generic-user-url", "GENERIC_USER_URL")
viper.BindEnv("disable-continue", "DISABLE_CONTINUE") viper.BindEnv("disable-continue", "DISABLE_CONTINUE")
viper.BindEnv("whitelist", "WHITELIST") viper.BindEnv("oauth-whitelist", "WHITELIST")
viper.BindEnv("cookie-expiry", "COOKIE_EXPIRY") viper.BindEnv("cookie-expiry", "COOKIE_EXPIRY")
viper.BindPFlags(rootCmd.Flags()) viper.BindPFlags(rootCmd.Flags())
} }

14
internal/auth/auth.go
View File

@@ -6,16 +6,16 @@ import (
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )
func NewAuth(userList types.Users, whitelist []string) *Auth { func NewAuth(userList types.Users, oauthWhitelist []string) *Auth {
return &Auth{ return &Auth{
Users: userList, Users: userList,
Whitelist: whitelist, OAuthWhitelist: oauthWhitelist,
} }
} }
type Auth struct { type Auth struct {
Users types.Users Users types.Users
Whitelist []string OAuthWhitelist []string
} }
func (auth *Auth) GetUser(email string) *types.User { func (auth *Auth) GetUser(email string) *types.User {
@@ -33,10 +33,10 @@ func (auth *Auth) CheckPassword(user types.User, password string) bool {
} }
func (auth *Auth) EmailWhitelisted(emailSrc string) bool { func (auth *Auth) EmailWhitelisted(emailSrc string) bool {
if len(auth.Whitelist) == 0 { if len(auth.OAuthWhitelist) == 0 {
return true return true
} }
for _, email := range auth.Whitelist { for _, email := range auth.OAuthWhitelist {
if email == emailSrc { if email == emailSrc {
return true return true
} }

2
internal/types/types.go
View File

@@ -37,7 +37,7 @@ type Config struct {
GenericTokenURL string `mapstructure:"generic-token-url"` GenericTokenURL string `mapstructure:"generic-token-url"`
GenericUserURL string `mapstructure:"generic-user-info-url"` GenericUserURL string `mapstructure:"generic-user-info-url"`
DisableContinue bool `mapstructure:"disable-continue"` DisableContinue bool `mapstructure:"disable-continue"`
Whitelist string `mapstructure:"whitelist"` OAuthWhitelist string `mapstructure:"oauth-whitelist"`
CookieExpiry int `mapstructure:"cookie-expiry"` CookieExpiry int `mapstructure:"cookie-expiry"`
} }