mirror of
https://github.com/steveiliop56/tinyauth.git
synced 2025-10-29 13:15:46 +00:00
Compare commits
3 Commits
v3.5.0-alp
...
v3.5.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
364f0e221e | ||
|
|
09635666aa | ||
|
|
9f02710114 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -11,8 +11,7 @@ docker-compose.test*
|
|||||||
users.txt
|
users.txt
|
||||||
|
|
||||||
# secret test file
|
# secret test file
|
||||||
secret.txt
|
secret*
|
||||||
secret_oauth.txt
|
|
||||||
|
|
||||||
# vscode
|
# vscode
|
||||||
.vscode
|
.vscode
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"dompurify": "^3.2.6",
|
"dompurify": "^3.2.6",
|
||||||
"i18next": "^25.3.1",
|
"i18next": "^25.3.2",
|
||||||
"i18next-browser-languagedetector": "^8.2.0",
|
"i18next-browser-languagedetector": "^8.2.0",
|
||||||
"i18next-resources-to-backend": "^1.2.1",
|
"i18next-resources-to-backend": "^1.2.1",
|
||||||
"input-otp": "^1.4.2",
|
"input-otp": "^1.4.2",
|
||||||
@@ -30,12 +30,12 @@
|
|||||||
"sonner": "^2.0.6",
|
"sonner": "^2.0.6",
|
||||||
"tailwind-merge": "^3.3.1",
|
"tailwind-merge": "^3.3.1",
|
||||||
"tailwindcss": "^4.1.11",
|
"tailwindcss": "^4.1.11",
|
||||||
"zod": "^3.25.75",
|
"zod": "^3.25.76",
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.30.1",
|
"@eslint/js": "^9.30.1",
|
||||||
"@tanstack/eslint-plugin-query": "^5.81.2",
|
"@tanstack/eslint-plugin-query": "^5.81.2",
|
||||||
"@types/node": "^24.0.10",
|
"@types/node": "^24.0.12",
|
||||||
"@types/react": "^19.1.8",
|
"@types/react": "^19.1.8",
|
||||||
"@types/react-dom": "^19.1.6",
|
"@types/react-dom": "^19.1.6",
|
||||||
"@vitejs/plugin-react": "^4.6.0",
|
"@vitejs/plugin-react": "^4.6.0",
|
||||||
@@ -354,7 +354,7 @@
|
|||||||
|
|
||||||
"@types/ms": ["@types/ms@2.1.0", "", {}, "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA=="],
|
"@types/ms": ["@types/ms@2.1.0", "", {}, "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA=="],
|
||||||
|
|
||||||
"@types/node": ["@types/node@24.0.10", "", { "dependencies": { "undici-types": "~7.8.0" } }, "sha512-ENHwaH+JIRTDIEEbDK6QSQntAYGtbvdDXnMXnZaZ6k13Du1dPMmprkEHIL7ok2Wl2aZevetwTAb5S+7yIF+enA=="],
|
"@types/node": ["@types/node@24.0.12", "", { "dependencies": { "undici-types": "~7.8.0" } }, "sha512-LtOrbvDf5ndC9Xi+4QZjVL0woFymF/xSTKZKPgrrl7H7XoeDvnD+E2IclKVDyaK9UM756W/3BXqSU+JEHopA9g=="],
|
||||||
|
|
||||||
"@types/react": ["@types/react@19.1.8", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g=="],
|
"@types/react": ["@types/react@19.1.8", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g=="],
|
||||||
|
|
||||||
@@ -582,7 +582,7 @@
|
|||||||
|
|
||||||
"html-url-attributes": ["html-url-attributes@3.0.1", "", {}, "sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ=="],
|
"html-url-attributes": ["html-url-attributes@3.0.1", "", {}, "sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ=="],
|
||||||
|
|
||||||
"i18next": ["i18next@25.3.1", "", { "dependencies": { "@babel/runtime": "^7.27.6" }, "peerDependencies": { "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-S4CPAx8LfMOnURnnJa8jFWvur+UX/LWcl6+61p9VV7SK2m0445JeBJ6tLD0D5SR0H29G4PYfWkEhivKG5p4RDg=="],
|
"i18next": ["i18next@25.3.2", "", { "dependencies": { "@babel/runtime": "^7.27.6" }, "peerDependencies": { "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-JSnbZDxRVbphc5jiptxr3o2zocy5dEqpVm9qCGdJwRNO+9saUJS0/u4LnM/13C23fUEWxAylPqKU/NpMV/IjqA=="],
|
||||||
|
|
||||||
"i18next-browser-languagedetector": ["i18next-browser-languagedetector@8.2.0", "", { "dependencies": { "@babel/runtime": "^7.23.2" } }, "sha512-P+3zEKLnOF0qmiesW383vsLdtQVyKtCNA9cjSoKCppTKPQVfKd2W8hbVo5ZhNJKDqeM7BOcvNoKJOjpHh4Js9g=="],
|
"i18next-browser-languagedetector": ["i18next-browser-languagedetector@8.2.0", "", { "dependencies": { "@babel/runtime": "^7.23.2" } }, "sha512-P+3zEKLnOF0qmiesW383vsLdtQVyKtCNA9cjSoKCppTKPQVfKd2W8hbVo5ZhNJKDqeM7BOcvNoKJOjpHh4Js9g=="],
|
||||||
|
|
||||||
@@ -912,7 +912,7 @@
|
|||||||
|
|
||||||
"yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
|
"yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
|
||||||
|
|
||||||
"zod": ["zod@3.25.75", "", {}, "sha512-OhpzAmVzabPOL6C3A3gpAifqr9MqihV/Msx3gor2b2kviCgcb+HM9SEOpMWwwNp9MRunWnhtAKUoo0AHhjyPPg=="],
|
"zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
|
||||||
|
|
||||||
"zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="],
|
"zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="],
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"dompurify": "^3.2.6",
|
"dompurify": "^3.2.6",
|
||||||
"i18next": "^25.3.1",
|
"i18next": "^25.3.2",
|
||||||
"i18next-browser-languagedetector": "^8.2.0",
|
"i18next-browser-languagedetector": "^8.2.0",
|
||||||
"i18next-resources-to-backend": "^1.2.1",
|
"i18next-resources-to-backend": "^1.2.1",
|
||||||
"input-otp": "^1.4.2",
|
"input-otp": "^1.4.2",
|
||||||
@@ -36,12 +36,12 @@
|
|||||||
"sonner": "^2.0.6",
|
"sonner": "^2.0.6",
|
||||||
"tailwind-merge": "^3.3.1",
|
"tailwind-merge": "^3.3.1",
|
||||||
"tailwindcss": "^4.1.11",
|
"tailwindcss": "^4.1.11",
|
||||||
"zod": "^3.25.75"
|
"zod": "^3.25.76"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.30.1",
|
"@eslint/js": "^9.30.1",
|
||||||
"@tanstack/eslint-plugin-query": "^5.81.2",
|
"@tanstack/eslint-plugin-query": "^5.81.2",
|
||||||
"@types/node": "^24.0.10",
|
"@types/node": "^24.0.12",
|
||||||
"@types/react": "^19.1.8",
|
"@types/react": "^19.1.8",
|
||||||
"@types/react-dom": "^19.1.6",
|
"@types/react-dom": "^19.1.6",
|
||||||
"@vitejs/plugin-react": "^4.6.0",
|
"@vitejs/plugin-react": "^4.6.0",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"loginTitle": "مرحبا بعودتك، قم بتسجيل الدخول باستخدام",
|
"loginTitle": "مرحبا بعودتك، ادخل باستخدام",
|
||||||
"loginTitleSimple": "Welcome back, please login",
|
"loginTitleSimple": "مرحبا بعودتك، سجل دخولك",
|
||||||
"loginDivider": "Or",
|
"loginDivider": "أو",
|
||||||
"loginUsername": "اسم المستخدم",
|
"loginUsername": "اسم المستخدم",
|
||||||
"loginPassword": "كلمة المرور",
|
"loginPassword": "كلمة المرور",
|
||||||
"loginSubmit": "تسجيل الدخول",
|
"loginSubmit": "تسجيل الدخول",
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
"loginFailRateLimit": "You failed to login too many times. Please try again later",
|
"loginFailRateLimit": "You failed to login too many times. Please try again later",
|
||||||
"loginSuccessTitle": "تم تسجيل الدخول",
|
"loginSuccessTitle": "تم تسجيل الدخول",
|
||||||
"loginSuccessSubtitle": "مرحبا بعودتك!",
|
"loginSuccessSubtitle": "مرحبا بعودتك!",
|
||||||
"loginOauthFailTitle": "An error occurred",
|
"loginOauthFailTitle": "حدث خطأ",
|
||||||
"loginOauthFailSubtitle": "فشل في الحصول على رابط OAuth",
|
"loginOauthFailSubtitle": "أخفق الحصول على رابط OAuth",
|
||||||
"loginOauthSuccessTitle": "إعادة توجيه",
|
"loginOauthSuccessTitle": "إعادة توجيه",
|
||||||
"loginOauthSuccessSubtitle": "إعادة توجيه إلى مزود OAuth الخاص بك",
|
"loginOauthSuccessSubtitle": "إعادة توجيه إلى مزود OAuth الخاص بك",
|
||||||
"continueRedirectingTitle": "إعادة توجيه...",
|
"continueRedirectingTitle": "إعادة توجيه...",
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
"notFoundTitle": "الصفحة غير موجودة",
|
"notFoundTitle": "الصفحة غير موجودة",
|
||||||
"notFoundSubtitle": "الصفحة التي تبحث عنها غير موجودة.",
|
"notFoundSubtitle": "الصفحة التي تبحث عنها غير موجودة.",
|
||||||
"notFoundButton": "انتقل إلى الرئيسية",
|
"notFoundButton": "انتقل إلى الرئيسية",
|
||||||
"totpFailTitle": "فشل في التحقق من الرمز",
|
"totpFailTitle": "أخفق التحقق من الرمز",
|
||||||
"totpFailSubtitle": "الرجاء التحقق من الرمز الخاص بك وحاول مرة أخرى",
|
"totpFailSubtitle": "الرجاء التحقق من الرمز الخاص بك وحاول مرة أخرى",
|
||||||
"totpSuccessTitle": "تم التحقق",
|
"totpSuccessTitle": "تم التحقق",
|
||||||
"totpSuccessSubtitle": "إعادة توجيه إلى تطبيقك",
|
"totpSuccessSubtitle": "إعادة توجيه إلى تطبيقك",
|
||||||
@@ -44,11 +44,11 @@
|
|||||||
"unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.",
|
"unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.",
|
||||||
"unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.",
|
"unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.",
|
||||||
"unauthorizedButton": "حاول مجددا",
|
"unauthorizedButton": "حاول مجددا",
|
||||||
"untrustedRedirectTitle": "Untrusted redirect",
|
"untrustedRedirectTitle": "إعادة توجيه غير موثوقة",
|
||||||
"untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?",
|
"untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?",
|
||||||
"cancelTitle": "إلغاء",
|
"cancelTitle": "إلغاء",
|
||||||
"forgotPasswordTitle": "Forgot your password?",
|
"forgotPasswordTitle": "نسيت كلمة المرور؟",
|
||||||
"failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.",
|
"failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.",
|
||||||
"errorTitle": "An error occurred",
|
"errorTitle": "حدث خطأ",
|
||||||
"errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information."
|
"errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information."
|
||||||
}
|
}
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
"unauthorizedResourceSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> har ikke tilladelse til at tilgå ressourcen <code>{{resource}}</code>.",
|
"unauthorizedResourceSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> har ikke tilladelse til at tilgå ressourcen <code>{{resource}}</code>.",
|
||||||
"unauthorizedLoginSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> har ikke tilladelse til at logge ind.",
|
"unauthorizedLoginSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> har ikke tilladelse til at logge ind.",
|
||||||
"unauthorizedGroupsSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> er ikke i de grupper, som ressourcen <code>{{resource}}</code> kræver.",
|
"unauthorizedGroupsSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> er ikke i de grupper, som ressourcen <code>{{resource}}</code> kræver.",
|
||||||
"unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.",
|
"unauthorizedIpSubtitle": "Din IP adresse <code>{{ip}}</code> er ikke autoriseret til at tilgå ressourcen <code>{{resource}}</code>.",
|
||||||
"unauthorizedButton": "Prøv igen",
|
"unauthorizedButton": "Prøv igen",
|
||||||
"untrustedRedirectTitle": "Usikker omdirigering",
|
"untrustedRedirectTitle": "Usikker omdirigering",
|
||||||
"untrustedRedirectSubtitle": "Du forsøger at omdirigere til et domæne, der ikke matcher dit konfigurerede domæne (<code>{{domain}}</code>). Er du sikker på, at du vil fortsætte?",
|
"untrustedRedirectSubtitle": "Du forsøger at omdirigere til et domæne, der ikke matcher dit konfigurerede domæne (<code>{{domain}}</code>). Er du sikker på, at du vil fortsætte?",
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
"unauthorizedResourceSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν έχει άδεια πρόσβασης στον πόρο <code>{{resource}}</code>.",
|
"unauthorizedResourceSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν έχει άδεια πρόσβασης στον πόρο <code>{{resource}}</code>.",
|
||||||
"unauthorizedLoginSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν είναι εξουσιοδοτημένος να συνδεθεί.",
|
"unauthorizedLoginSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν είναι εξουσιοδοτημένος να συνδεθεί.",
|
||||||
"unauthorizedGroupsSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν είναι στις ομάδες που απαιτούνται από τον πόρο <code>{{resource}}</code>.",
|
"unauthorizedGroupsSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν είναι στις ομάδες που απαιτούνται από τον πόρο <code>{{resource}}</code>.",
|
||||||
"unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.",
|
"unauthorizedIpSubtitle": "Η διεύθυνση IP σας <code>{{ip}}</code> δεν είναι εξουσιοδοτημένη να έχει πρόσβαση στον πόρο <code>{{resource}}</code>.",
|
||||||
"unauthorizedButton": "Προσπαθήστε ξανά",
|
"unauthorizedButton": "Προσπαθήστε ξανά",
|
||||||
"untrustedRedirectTitle": "Μη έμπιστη ανακατεύθυνση",
|
"untrustedRedirectTitle": "Μη έμπιστη ανακατεύθυνση",
|
||||||
"untrustedRedirectSubtitle": "Προσπαθείτε να ανακατευθύνετε σε ένα domain που δεν ταιριάζει με τον ρυθμισμένο domain σας (<code>{{domain}}</code>). Είστε βέβαιοι ότι θέλετε να συνεχίσετε;",
|
"untrustedRedirectSubtitle": "Προσπαθείτε να ανακατευθύνετε σε ένα domain που δεν ταιριάζει με τον ρυθμισμένο domain σας (<code>{{domain}}</code>). Είστε βέβαιοι ότι θέλετε να συνεχίσετε;",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"loginTitle": "Witaj ponownie, zaloguj się przez",
|
"loginTitle": "Witaj ponownie, zaloguj się przez",
|
||||||
"loginTitleSimple": "Witaj ponownie, zaloguj się",
|
"loginTitleSimple": "Witaj ponownie, zaloguj się",
|
||||||
"loginDivider": "lub",
|
"loginDivider": "Lub",
|
||||||
"loginUsername": "Nazwa użytkownika",
|
"loginUsername": "Nazwa użytkownika",
|
||||||
"loginPassword": "Hasło",
|
"loginPassword": "Hasło",
|
||||||
"loginSubmit": "Zaloguj się",
|
"loginSubmit": "Zaloguj się",
|
||||||
|
|||||||
@@ -233,8 +233,8 @@ func (auth *Auth) RecordLoginAttempt(identifier string, success bool) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (auth *Auth) EmailWhitelisted(emailSrc string) bool {
|
func (auth *Auth) EmailWhitelisted(email string) bool {
|
||||||
return utils.CheckWhitelist(auth.Config.OauthWhitelist, emailSrc)
|
return utils.CheckFilter(auth.Config.OauthWhitelist, email, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (auth *Auth) CreateSessionCookie(c *gin.Context, data *types.SessionCookie) error {
|
func (auth *Auth) CreateSessionCookie(c *gin.Context, data *types.SessionCookie) error {
|
||||||
@@ -368,13 +368,13 @@ func (auth *Auth) ResourceAllowed(c *gin.Context, context types.UserContext, lab
|
|||||||
// Check if oauth is allowed
|
// Check if oauth is allowed
|
||||||
if context.OAuth {
|
if context.OAuth {
|
||||||
log.Debug().Msg("Checking OAuth whitelist")
|
log.Debug().Msg("Checking OAuth whitelist")
|
||||||
return utils.CheckWhitelist(labels.OAuth.Whitelist, context.Email)
|
return utils.CheckFilter(labels.OAuth.Whitelist, context.Email, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check users
|
// Check users
|
||||||
log.Debug().Msg("Checking users")
|
log.Debug().Msg("Checking users")
|
||||||
|
|
||||||
return utils.CheckWhitelist(labels.Users, context.Username)
|
return utils.CheckFilter(labels.Users, context.Username, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (auth *Auth) OAuthGroup(c *gin.Context, context types.UserContext, labels types.Labels) bool {
|
func (auth *Auth) OAuthGroup(c *gin.Context, context types.UserContext, labels types.Labels) bool {
|
||||||
@@ -394,7 +394,7 @@ func (auth *Auth) OAuthGroup(c *gin.Context, context types.UserContext, labels t
|
|||||||
|
|
||||||
// For every group check if it is in the required groups
|
// For every group check if it is in the required groups
|
||||||
for _, group := range oauthGroups {
|
for _, group := range oauthGroups {
|
||||||
if utils.CheckWhitelist(labels.OAuth.Groups, group) {
|
if utils.CheckFilter(labels.OAuth.Groups, group, true) {
|
||||||
log.Debug().Str("group", group).Msg("Group is in required groups")
|
log.Debug().Str("group", group).Msg("Group is in required groups")
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ func (docker *Docker) GetLabels(id string, domain string) (types.Labels, error)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if the labels match the id or the domain
|
// Check if the labels match the id or the domain
|
||||||
if strings.TrimPrefix(inspect.Name, "/") == id || labels.Domain == domain {
|
if strings.TrimPrefix(inspect.Name, "/") == id || utils.CheckFilter(labels.Domain, domain, false) { // Disable regex for now
|
||||||
log.Debug().Str("id", inspect.ID).Msg("Found matching container")
|
log.Debug().Str("id", inspect.ID).Msg("Found matching container")
|
||||||
return labels, nil
|
return labels, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -292,17 +292,17 @@ func ParseSecretFile(contents string) string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if a string matches a regex or a whitelist
|
// Check if a string matches a regex or if it is included in a comma separated list
|
||||||
func CheckWhitelist(whitelist string, str string) bool {
|
func CheckFilter(filter string, str string, regex bool) bool {
|
||||||
// Check if the whitelist is empty
|
// Check if the filter is empty
|
||||||
if len(strings.TrimSpace(whitelist)) == 0 {
|
if len(strings.TrimSpace(filter)) == 0 {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if the whitelist is a regex
|
// Check if the filter is a regex
|
||||||
if strings.HasPrefix(whitelist, "/") && strings.HasSuffix(whitelist, "/") {
|
if strings.HasPrefix(filter, "/") && strings.HasSuffix(filter, "/") && regex {
|
||||||
// Create regex
|
// Create regex
|
||||||
re, err := regexp.Compile(whitelist[1 : len(whitelist)-1])
|
re, err := regexp.Compile(filter[1 : len(filter)-1])
|
||||||
|
|
||||||
// Check if there was an error
|
// Check if there was an error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -316,11 +316,11 @@ func CheckWhitelist(whitelist string, str string) bool {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Split the whitelist by comma
|
// Split the filter by comma
|
||||||
whitelistSplit := strings.Split(whitelist, ",")
|
filterSplit := strings.Split(filter, ",")
|
||||||
|
|
||||||
// Loop through the whitelist
|
// Loop through the filter items
|
||||||
for _, item := range whitelistSplit {
|
for _, item := range filterSplit {
|
||||||
// Check if the item matches with the string
|
// Check if the item matches with the string
|
||||||
if strings.TrimSpace(item) == str {
|
if strings.TrimSpace(item) == str {
|
||||||
return true
|
return true
|
||||||
|
|||||||
@@ -377,77 +377,77 @@ func TestParseUser(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test the whitelist function
|
// Test the check filter function
|
||||||
func TestCheckWhitelist(t *testing.T) {
|
func TestCheckFilter(t *testing.T) {
|
||||||
t.Log("Testing check whitelist with a comma whitelist")
|
t.Log("Testing check filter with a comma separated list")
|
||||||
|
|
||||||
// Create variables
|
// Create variables
|
||||||
whitelist := "user1,user2,user3"
|
filter := "user1,user2,user3"
|
||||||
str := "user1"
|
str := "user1"
|
||||||
expected := true
|
expected := true
|
||||||
|
|
||||||
// Test the check whitelist function
|
// Test the check filter function
|
||||||
result := utils.CheckWhitelist(whitelist, str)
|
result := utils.CheckFilter(filter, str, false)
|
||||||
|
|
||||||
// Check if the result is equal to the expected
|
// Check if the result is equal to the expected
|
||||||
if result != expected {
|
if result != expected {
|
||||||
t.Fatalf("Expected %v, got %v", expected, result)
|
t.Fatalf("Expected %v, got %v", expected, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Log("Testing check whitelist with a regex whitelist")
|
t.Log("Testing check filter with a regex filter")
|
||||||
|
|
||||||
// Create variables
|
// Create variables
|
||||||
whitelist = "/^user[0-9]+$/"
|
filter = "/^user[0-9]+$/"
|
||||||
str = "user1"
|
str = "user1"
|
||||||
expected = true
|
expected = true
|
||||||
|
|
||||||
// Test the check whitelist function
|
// Test the check filter function
|
||||||
result = utils.CheckWhitelist(whitelist, str)
|
result = utils.CheckFilter(filter, str, true)
|
||||||
|
|
||||||
// Check if the result is equal to the expected
|
// Check if the result is equal to the expected
|
||||||
if result != expected {
|
if result != expected {
|
||||||
t.Fatalf("Expected %v, got %v", expected, result)
|
t.Fatalf("Expected %v, got %v", expected, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Log("Testing check whitelist with an empty whitelist")
|
t.Log("Testing check filter with an empty filter")
|
||||||
|
|
||||||
// Create variables
|
// Create variables
|
||||||
whitelist = ""
|
filter = ""
|
||||||
str = "user1"
|
str = "user1"
|
||||||
expected = true
|
expected = true
|
||||||
|
|
||||||
// Test the check whitelist function
|
// Test the check filter function
|
||||||
result = utils.CheckWhitelist(whitelist, str)
|
result = utils.CheckFilter(filter, str, false)
|
||||||
|
|
||||||
// Check if the result is equal to the expected
|
// Check if the result is equal to the expected
|
||||||
if result != expected {
|
if result != expected {
|
||||||
t.Fatalf("Expected %v, got %v", expected, result)
|
t.Fatalf("Expected %v, got %v", expected, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Log("Testing check whitelist with an invalid regex whitelist")
|
t.Log("Testing check filter with an invalid regex filter")
|
||||||
|
|
||||||
// Create variables
|
// Create variables
|
||||||
whitelist = "/^user[0-9+$/"
|
filter = "/^user[0-9+$/"
|
||||||
str = "user1"
|
str = "user1"
|
||||||
expected = false
|
expected = false
|
||||||
|
|
||||||
// Test the check whitelist function
|
// Test the check filter function
|
||||||
result = utils.CheckWhitelist(whitelist, str)
|
result = utils.CheckFilter(filter, str, true)
|
||||||
|
|
||||||
// Check if the result is equal to the expected
|
// Check if the result is equal to the expected
|
||||||
if result != expected {
|
if result != expected {
|
||||||
t.Fatalf("Expected %v, got %v", expected, result)
|
t.Fatalf("Expected %v, got %v", expected, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Log("Testing check whitelist with a non matching whitelist")
|
t.Log("Testing check filter with a non matching list")
|
||||||
|
|
||||||
// Create variables
|
// Create variables
|
||||||
whitelist = "user1,user2,user3"
|
filter = "user1,user2,user3"
|
||||||
str = "user4"
|
str = "user4"
|
||||||
expected = false
|
expected = false
|
||||||
|
|
||||||
// Test the check whitelist function
|
// Test the check filter function
|
||||||
result = utils.CheckWhitelist(whitelist, str)
|
result = utils.CheckFilter(filter, str, false)
|
||||||
|
|
||||||
// Check if the result is equal to the expected
|
// Check if the result is equal to the expected
|
||||||
if result != expected {
|
if result != expected {
|
||||||
|
|||||||
Reference in New Issue
Block a user