From 11b706adeb1ed737fc151950bb6f19bf8085b27b Mon Sep 17 00:00:00 2001 From: AllForNothing Date: Mon, 14 Dec 2020 13:43:47 +0800 Subject: [PATCH] Add admin groups parameter to http auth Signed-off-by: AllForNothing --- .../src/app/config/auth/config-auth.component.html | 6 ++++++ src/portal/src/app/config/auth/config-auth.component.ts | 9 +++++++++ src/portal/src/i18n/lang/de-de-lang.json | 5 +++-- src/portal/src/i18n/lang/en-us-lang.json | 5 +++-- src/portal/src/i18n/lang/es-es-lang.json | 5 +++-- src/portal/src/i18n/lang/fr-fr-lang.json | 5 +++-- src/portal/src/i18n/lang/pt-br-lang.json | 5 +++-- src/portal/src/i18n/lang/tr-tr-lang.json | 5 +++-- src/portal/src/i18n/lang/zh-cn-lang.json | 5 +++-- src/portal/src/i18n/lang/zh-tw-lang.json | 5 +++-- src/portal/src/lib/components/config/config.ts | 2 ++ 11 files changed, 41 insertions(+), 16 deletions(-) diff --git a/src/portal/src/app/config/auth/config-auth.component.html b/src/portal/src/app/config/auth/config-auth.component.html index b745daedb..dd530fb4c 100644 --- a/src/portal/src/app/config/auth/config-auth.component.html +++ b/src/portal/src/app/config/auth/config-auth.component.html @@ -283,6 +283,12 @@ [disabled]="!currentConfig.http_authproxy_tokenreview_endpoint.editable" /> {{'TOOLTIP.ENDPOINT_FORMAT' | translate}} + + + + diff --git a/src/portal/src/app/config/auth/config-auth.component.ts b/src/portal/src/app/config/auth/config-auth.component.ts index a88f5eb6d..b28ae023b 100644 --- a/src/portal/src/app/config/auth/config-auth.component.ts +++ b/src/portal/src/app/config/auth/config-auth.component.ts @@ -268,4 +268,13 @@ export class ConfigurationAuthComponent implements OnChanges, OnInit { this.currentConfig.oidc_user_claim.value = ""; } } + trimSpace(e: any) { + if (e && e.target) { + if (e.target.value) { + e.target.value = e.target.value.trim(); + } else { + e.target.value = ""; + } + } + } } diff --git a/src/portal/src/i18n/lang/de-de-lang.json b/src/portal/src/i18n/lang/de-de-lang.json index 46fe6b0ea..b7f25a7b0 100644 --- a/src/portal/src/i18n/lang/de-de-lang.json +++ b/src/portal/src/i18n/lang/de-de-lang.json @@ -850,7 +850,7 @@ "AUTH_MODE_DB": "Datenbank", "AUTH_MODE_LDAP": "LDAP", "AUTH_MODE_UAA": "UAA", - "AUTH_MODE_HTTP": "http_auth", + "AUTH_MODE_HTTP": "Http Auth", "AUTH_MODE_OIDC": "OIDC", "SCOPE_BASE": "Base", "SCOPE_ONE_LEVEL": "OneLevel", @@ -916,7 +916,8 @@ "ENDPOINT": "Server Endpunkt", "TOKEN_REVIEW": "Token Review Endpunkt", "SKIP_SEARCH": "Suche überspringen", - "VERIFY_CERT": "Zertifikate überprüfen" + "VERIFY_CERT": "Zertifikate überprüfen", + "ADMIN_GROUPS": "Admin Groups" }, "OIDC": { "OIDC_PROVIDER": "OIDC Provider Name", diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index c728d6027..2ed472046 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -850,7 +850,7 @@ "AUTH_MODE_DB": "Database", "AUTH_MODE_LDAP": "LDAP", "AUTH_MODE_UAA": "UAA", - "AUTH_MODE_HTTP": "http_auth", + "AUTH_MODE_HTTP": "Http Auth", "AUTH_MODE_OIDC": "OIDC", "SCOPE_BASE": "Base", "SCOPE_ONE_LEVEL": "OneLevel", @@ -916,7 +916,8 @@ "ENDPOINT": "Server Endpoint", "TOKEN_REVIEW": "Token Review Endpoint", "SKIP_SEARCH": "Skip Search", - "VERIFY_CERT": "Verify Certificate" + "VERIFY_CERT": "Verify Certificate", + "ADMIN_GROUPS": "Admin Groups" }, "OIDC": { "OIDC_PROVIDER": "OIDC Provider Name", diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index b62819cb6..dd4ede226 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -850,7 +850,7 @@ "AUTH_MODE_DB": "Base de datos", "AUTH_MODE_LDAP": "LDAP", "AUTH_MODE_UAA": "UAA", - "AUTH_MODE_HTTP": "http_auth", + "AUTH_MODE_HTTP": "Http Auth", "AUTH_MODE_OIDC": "OIDC", "SCOPE_BASE": "Base", "SCOPE_ONE_LEVEL": "UnNivel", @@ -916,7 +916,8 @@ "ENDPOINT": "Server Endpoint", "TOKEN_REVIEW": "Review Endpoint De Token", "SKIP_SEARCH": "Skip Search", - "VERIFY_CERT": "Authentication Verify Cert" + "VERIFY_CERT": "Authentication Verify Cert", + "ADMIN_GROUPS": "Admin Groups" }, "OIDC": { "OIDC_PROVIDER": "OIDC Proveedor", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index a91ebb745..fb07f1282 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -830,7 +830,7 @@ "SELF_REGISTRATION": "Autoriser l'Auto-Inscription", "AUTH_MODE_DB": "Base de données", "AUTH_MODE_LDAP": "LDAP", - "AUTH_MODE_HTTP": "http_auth", + "AUTH_MODE_HTTP": "Http Auth", "AUTH_MODE_OIDC": "OIDC", "SCOPE_BASE": "Base", "SCOPE_ONE_LEVEL": "Premier Niveau", @@ -889,7 +889,8 @@ "ENDPOINT": "serveur paramètre", "TOKEN_REVIEW": "examen symbolique paramètre", "SKIP_SEARCH": "Skip Search", - "VERIFY_CERT": "authentification vérifier cert" + "VERIFY_CERT": "authentification vérifier cert", + "ADMIN_GROUPS": "Admin Groups" }, "OIDC": { "OIDC_PROVIDER": "OIDC Fournisseur", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index b1bf25f5b..6038c3006 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -846,7 +846,7 @@ "AUTH_MODE_DB": "Banco de Dados", "AUTH_MODE_LDAP": "LDAP", "AUTH_MODE_UAA": "UAA", - "AUTH_MODE_HTTP": "http_auth", + "AUTH_MODE_HTTP": "Http Auth", "AUTH_MODE_OIDC": "OIDC", "SCOPE_BASE": "Base", "SCOPE_ONE_LEVEL": "OneLevel", @@ -912,7 +912,8 @@ "ENDPOINT": "Server endpoint", "TOKEN_REVIEW": "Ponto final do Token Review", "SKIP_SEARCH": "Skip Search", - "VERIFY_CERT": "Verificar certificado de Authentication" + "VERIFY_CERT": "Verificar certificado de Authentication", + "ADMIN_GROUPS": "Admin Groups" }, "OIDC": { "OIDC_PROVIDER": "OIDC Fornecedor", diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json index d64f01c5c..af5842483 100644 --- a/src/portal/src/i18n/lang/tr-tr-lang.json +++ b/src/portal/src/i18n/lang/tr-tr-lang.json @@ -850,7 +850,7 @@ "AUTH_MODE_DB": "Veritabanı", "AUTH_MODE_LDAP": "LDAP", "AUTH_MODE_UAA": "UAA", - "AUTH_MODE_HTTP": "http_auth", + "AUTH_MODE_HTTP": "Http Auth", "AUTH_MODE_OIDC": "OIDC", "SCOPE_BASE": "Temel", "SCOPE_ONE_LEVEL": "İlk Seviye", @@ -916,7 +916,8 @@ "ENDPOINT": "Sunucu Uç Noktası", "TOKEN_REVIEW": "Token Uç Noktasını İnceleyin", "SKIP_SEARCH": "Aramayı Atla", - "VERIFY_CERT": "Sertifikayı Doğrula" + "VERIFY_CERT": "Sertifikayı Doğrula", + "ADMIN_GROUPS": "Admin Groups" }, "OIDC": { "OIDC_PROVIDER": "OIDC Sağlayıcı Adı", diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index e2bf0989e..a72121f28 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -851,7 +851,7 @@ "AUTH_MODE_DB": "数据库", "AUTH_MODE_LDAP": "LDAP", "AUTH_MODE_UAA": "UAA", - "AUTH_MODE_HTTP": "http_auth", + "AUTH_MODE_HTTP": "Http Auth", "AUTH_MODE_OIDC": "OIDC", "SCOPE_BASE": "本层", "SCOPE_ONE_LEVEL": "下一层", @@ -916,7 +916,8 @@ "ENDPOINT": "Server Endpoint", "TOKEN_REVIEW": "Token Review Endpoint", "SKIP_SEARCH": "Skip Search", - "VERIFY_CERT": "Authentication验证证书" + "VERIFY_CERT": "Verify Certificate", + "ADMIN_GROUPS": "Admin Groups" }, "OIDC": { "OIDC_PROVIDER": "OIDC 供应商", diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json index a00ba20bb..81369472d 100644 --- a/src/portal/src/i18n/lang/zh-tw-lang.json +++ b/src/portal/src/i18n/lang/zh-tw-lang.json @@ -846,7 +846,7 @@ "AUTH_MODE_DB": "數據庫", "AUTH_MODE_LDAP":"LDAP", "AUTH_MODE_UAA":"UAA", - "AUTH_MODE_HTTP":"http_auth", + "AUTH_MODE_HTTP":"Http Auth", "AUTH_MODE_OIDC":"OIDC", "SCOPE_BASE":"本層", "SCOPE_ONE_LEVEL": "下一層", @@ -911,7 +911,8 @@ "ENDPOINT":"服務器端點", "TOKEN_REVIEW":"令牌審查端點", "SKIP_SEARCH":"跳過搜索", - "VERIFY_CERT": "Authentication驗證證書" + "VERIFY_CERT": "Authentication驗證證書", + "ADMIN_GROUPS": "Admin Groups" }, "OIDC":{ "OIDC_PROVIDER": "OIDC 供應商", diff --git a/src/portal/src/lib/components/config/config.ts b/src/portal/src/lib/components/config/config.ts index 2972a3333..3c8411844 100644 --- a/src/portal/src/lib/components/config/config.ts +++ b/src/portal/src/lib/components/config/config.ts @@ -90,6 +90,7 @@ export class Configuration { scan_all_policy: ComplexValueItem; read_only: BoolValueItem; notification_enable: BoolValueItem; + http_authproxy_admin_groups?: StringValueItem; http_authproxy_endpoint?: StringValueItem; http_authproxy_tokenreview_endpoint?: StringValueItem; http_authproxy_verify_cert?: BoolValueItem; @@ -151,6 +152,7 @@ export class Configuration { }, true); this.read_only = new BoolValueItem(false, true); this.notification_enable = new BoolValueItem(false, true); + this.http_authproxy_admin_groups = new StringValueItem("", true); this.http_authproxy_endpoint = new StringValueItem("", true); this.http_authproxy_tokenreview_endpoint = new StringValueItem("", true); this.http_authproxy_verify_cert = new BoolValueItem(false, true);