From f92bc8076dda5b62f3afac8e179268626f899ae1 Mon Sep 17 00:00:00 2001 From: Daniel Jiang Date: Fri, 12 Apr 2019 22:58:49 +0800 Subject: [PATCH] "Skip verify cert" to "verify cert" This commit tweaks the attribute for auth proxy mode and OIDC auth mode. To change it from "Skip verify cert" to "verify cert" so they are more consistent with other modes. Additionally it removes a workaround in `SearchUser` in auth proxy authenticator. Signed-off-by: Daniel Jiang --- src/common/config/metadata/metadatalist.go | 4 +-- src/common/const.go | 4 +-- src/common/models/config.go | 16 +++++------ src/common/utils/oidc/helper.go | 22 +++++++-------- src/common/utils/oidc/helper_test.go | 28 +++++++++---------- src/core/auth/authproxy/auth.go | 17 ++++------- src/core/config/config.go | 16 +++++------ src/core/config/config_test.go | 28 +++++++++---------- src/core/filter/security.go | 2 +- src/core/filter/security_test.go | 20 ++++++------- src/portal/lib/src/config/config.ts | 8 +++--- .../config/auth/config-auth.component.html | 22 +++++++-------- src/portal/src/i18n/lang/en-us-lang.json | 10 +++---- src/portal/src/i18n/lang/es-es-lang.json | 4 +-- src/portal/src/i18n/lang/fr-fr-lang.json | 4 +-- src/portal/src/i18n/lang/pt-br-lang.json | 4 +-- src/portal/src/i18n/lang/zh-cn-lang.json | 4 +-- 17 files changed, 103 insertions(+), 110 deletions(-) diff --git a/src/common/config/metadata/metadatalist.go b/src/common/config/metadata/metadatalist.go index 89f037d80..9d08351c2 100644 --- a/src/common/config/metadata/metadatalist.go +++ b/src/common/config/metadata/metadatalist.go @@ -133,7 +133,7 @@ var ( {Name: common.HTTPAuthProxyEndpoint, Scope: UserScope, Group: HTTPAuthGroup, ItemType: &StringType{}}, {Name: common.HTTPAuthProxyTokenReviewEndpoint, Scope: UserScope, Group: HTTPAuthGroup, ItemType: &StringType{}}, - {Name: common.HTTPAuthProxySkipCertVerify, Scope: UserScope, Group: HTTPAuthGroup, DefaultValue: "false", ItemType: &BoolType{}}, + {Name: common.HTTPAuthProxyVerifyCert, Scope: UserScope, Group: HTTPAuthGroup, DefaultValue: "true", ItemType: &BoolType{}}, {Name: common.HTTPAuthProxyAlwaysOnboard, Scope: UserScope, Group: HTTPAuthGroup, DefaultValue: "false", ItemType: &BoolType{}}, {Name: common.OIDCName, Scope: UserScope, Group: OIDCGroup, ItemType: &StringType{}}, @@ -141,7 +141,7 @@ var ( {Name: common.OIDCCLientID, Scope: UserScope, Group: OIDCGroup, ItemType: &StringType{}}, {Name: common.OIDCClientSecret, Scope: UserScope, Group: OIDCGroup, ItemType: &PasswordType{}}, {Name: common.OIDCScope, Scope: UserScope, Group: OIDCGroup, ItemType: &StringType{}}, - {Name: common.OIDCSkipCertVerify, Scope: UserScope, Group: OIDCGroup, DefaultValue: "false", ItemType: &BoolType{}}, + {Name: common.OIDCVerifyCert, Scope: UserScope, Group: OIDCGroup, DefaultValue: "true", ItemType: &BoolType{}}, {Name: "with_chartmuseum", Scope: SystemScope, Group: BasicGroup, EnvKey: "WITH_CHARTMUSEUM", DefaultValue: "false", ItemType: &BoolType{}, Editable: true}, {Name: "with_clair", Scope: SystemScope, Group: BasicGroup, EnvKey: "WITH_CLAIR", DefaultValue: "false", ItemType: &BoolType{}, Editable: true}, diff --git a/src/common/const.go b/src/common/const.go index 914759909..4368d8d9c 100644 --- a/src/common/const.go +++ b/src/common/const.go @@ -98,13 +98,13 @@ const ( UAAVerifyCert = "uaa_verify_cert" HTTPAuthProxyEndpoint = "http_authproxy_endpoint" HTTPAuthProxyTokenReviewEndpoint = "http_authproxy_tokenreview_endpoint" - HTTPAuthProxySkipCertVerify = "http_authproxy_skip_cert_verify" + HTTPAuthProxyVerifyCert = "http_authproxy_verify_cert" HTTPAuthProxyAlwaysOnboard = "http_authproxy_always_onboard" OIDCName = "oidc_name" OIDCEndpoint = "oidc_endpoint" OIDCCLientID = "oidc_client_id" OIDCClientSecret = "oidc_client_secret" - OIDCSkipCertVerify = "oidc_skip_cert_verify" + OIDCVerifyCert = "oidc_verify_cert" OIDCScope = "oidc_scope" DefaultClairEndpoint = "http://clair:6060" diff --git a/src/common/models/config.go b/src/common/models/config.go index 8d757256d..cbcb3f810 100644 --- a/src/common/models/config.go +++ b/src/common/models/config.go @@ -69,19 +69,19 @@ type Email struct { type HTTPAuthProxy struct { Endpoint string `json:"endpoint"` TokenReviewEndpoint string `json:"tokenreivew_endpoint"` - SkipCertVerify bool `json:"skip_cert_verify"` + VerifyCert bool `json:"verify_cert"` AlwaysOnBoard bool `json:"always_onboard"` } // OIDCSetting wraps the settings for OIDC auth endpoint type OIDCSetting struct { - Name string `json:"name"` - Endpoint string `json:"endpoint"` - SkipCertVerify bool `json:"skip_cert_verify"` - ClientID string `json:"client_id"` - ClientSecret string `json:"client_secret"` - RedirectURL string `json:"redirect_url"` - Scope []string `json:"scope"` + Name string `json:"name"` + Endpoint string `json:"endpoint"` + VerifyCert bool `json:"verify_cert"` + ClientID string `json:"client_id"` + ClientSecret string `json:"client_secret"` + RedirectURL string `json:"redirect_url"` + Scope []string `json:"scope"` } // ConfigEntry ... diff --git a/src/common/utils/oidc/helper.go b/src/common/utils/oidc/helper.go index 9efe7cd32..efa276dd6 100644 --- a/src/common/utils/oidc/helper.go +++ b/src/common/utils/oidc/helper.go @@ -41,14 +41,14 @@ type providerHelper struct { } type endpoint struct { - url string - skipCertVerify bool + url string + VerifyCert bool } func (p *providerHelper) get() (*gooidc.Provider, error) { if p.instance.Load() != nil { s := p.setting.Load().(models.OIDCSetting) - if s.Endpoint != p.ep.url || s.SkipCertVerify != p.ep.skipCertVerify { // relevant settings have changed, need to re-create provider. + if s.Endpoint != p.ep.url || s.VerifyCert != p.ep.VerifyCert { // relevant settings have changed, need to re-create provider. if err := p.create(); err != nil { return nil, err } @@ -90,15 +90,15 @@ func (p *providerHelper) create() error { return errors.New("the configuration is not loaded") } s := p.setting.Load().(models.OIDCSetting) - ctx := clientCtx(context.Background(), s.SkipCertVerify) + ctx := clientCtx(context.Background(), s.VerifyCert) provider, err := gooidc.NewProvider(ctx, s.Endpoint) if err != nil { return fmt.Errorf("failed to create OIDC provider, error: %v", err) } p.instance.Store(provider) p.ep = endpoint{ - url: s.Endpoint, - skipCertVerify: s.SkipCertVerify, + url: s.Endpoint, + VerifyCert: s.VerifyCert, } return nil } @@ -162,7 +162,7 @@ func ExchangeToken(ctx context.Context, code string) (*Token, error) { return nil, err } setting := provider.setting.Load().(models.OIDCSetting) - ctx = clientCtx(ctx, setting.SkipCertVerify) + ctx = clientCtx(ctx, setting.VerifyCert) oauthToken, err := oauth.Exchange(ctx, code) if err != nil { return nil, err @@ -178,13 +178,13 @@ func VerifyToken(ctx context.Context, rawIDToken string) (*gooidc.IDToken, error } verifier := p.Verifier(&gooidc.Config{ClientID: provider.setting.Load().(models.OIDCSetting).ClientID}) setting := provider.setting.Load().(models.OIDCSetting) - ctx = clientCtx(ctx, setting.SkipCertVerify) + ctx = clientCtx(ctx, setting.VerifyCert) return verifier.Verify(ctx, rawIDToken) } -func clientCtx(ctx context.Context, skipCertVerify bool) context.Context { +func clientCtx(ctx context.Context, verifyCert bool) context.Context { var client *http.Client - if skipCertVerify { + if !verifyCert { client = &http.Client{ Transport: insecureTransport, } @@ -202,7 +202,7 @@ func RefreshToken(ctx context.Context, token *Token) (*Token, error) { return nil, err } setting := provider.setting.Load().(models.OIDCSetting) - ctx = clientCtx(ctx, setting.SkipCertVerify) + ctx = clientCtx(ctx, setting.VerifyCert) ts := oauth.TokenSource(ctx, token.Token) t, err := ts.Token() if err != nil { diff --git a/src/common/utils/oidc/helper_test.go b/src/common/utils/oidc/helper_test.go index 7ad3266d3..e1e71a8b9 100644 --- a/src/common/utils/oidc/helper_test.go +++ b/src/common/utils/oidc/helper_test.go @@ -29,13 +29,13 @@ import ( func TestMain(m *testing.M) { conf := map[string]interface{}{ - common.OIDCName: "test", - common.OIDCEndpoint: "https://accounts.google.com", - common.OIDCSkipCertVerify: "false", - common.OIDCScope: "openid, profile, offline_access", - common.OIDCCLientID: "client", - common.OIDCClientSecret: "secret", - common.ExtEndpoint: "https://harbor.test", + common.OIDCName: "test", + common.OIDCEndpoint: "https://accounts.google.com", + common.OIDCVerifyCert: "true", + common.OIDCScope: "openid, profile, offline_access", + common.OIDCCLientID: "client", + common.OIDCClientSecret: "secret", + common.ExtEndpoint: "https://harbor.test", } kp := &config2.PresetKeyProvider{Key: "naa4JtarA1Zsc3uY"} @@ -73,13 +73,13 @@ func TestHelperGet(t *testing.T) { assert.Equal(t, "https://oauth2.googleapis.com/token", p.Endpoint().TokenURL) update := map[string]interface{}{ - common.OIDCName: "test", - common.OIDCEndpoint: "https://accounts.google.com", - common.OIDCSkipCertVerify: "false", - common.OIDCScope: "openid, profile, offline_access", - common.OIDCCLientID: "client", - common.OIDCClientSecret: "new-secret", - common.ExtEndpoint: "https://harbor.test", + common.OIDCName: "test", + common.OIDCEndpoint: "https://accounts.google.com", + common.OIDCVerifyCert: "true", + common.OIDCScope: "openid, profile, offline_access", + common.OIDCCLientID: "client", + common.OIDCClientSecret: "new-secret", + common.ExtEndpoint: "https://harbor.test", } config.GetCfgManager().UpdateConfig(update) diff --git a/src/core/auth/authproxy/auth.go b/src/core/auth/authproxy/auth.go index a71786503..bfed1fe74 100644 --- a/src/core/auth/authproxy/auth.go +++ b/src/core/auth/authproxy/auth.go @@ -94,18 +94,11 @@ func (a *Auth) PostAuthenticate(u *models.User) error { return a.OnBoardUser(u) } -// SearchUser - TODO: Remove this workaround when #6767 is fixed. -// When the flag is set it always return the default model without searching +// SearchUser returns nil as authproxy does not have such capability. +// When AlwaysOnboard is set it always return the default model. func (a *Auth) SearchUser(username string) (*models.User, error) { - a.ensure() - var queryCondition = models.User{ - Username: username, - } - u, err := dao.GetUser(queryCondition) - if err != nil { - return nil, err - } - if a.AlwaysOnboard && u == nil { + var u *models.User + if a.AlwaysOnboard { u = &models.User{Username: username} if err := a.fillInModel(u); err != nil { return nil, err @@ -138,7 +131,7 @@ func (a *Auth) ensure() error { return err } a.Endpoint = setting.Endpoint - a.SkipCertVerify = setting.SkipCertVerify + a.SkipCertVerify = !setting.VerifyCert a.AlwaysOnboard = setting.AlwaysOnBoard } if a.client == nil { diff --git a/src/core/config/config.go b/src/core/config/config.go index d5259e209..093552b4e 100644 --- a/src/core/config/config.go +++ b/src/core/config/config.go @@ -476,7 +476,7 @@ func HTTPAuthProxySetting() (*models.HTTPAuthProxy, error) { return &models.HTTPAuthProxy{ Endpoint: cfgMgr.Get(common.HTTPAuthProxyEndpoint).GetString(), TokenReviewEndpoint: cfgMgr.Get(common.HTTPAuthProxyTokenReviewEndpoint).GetString(), - SkipCertVerify: cfgMgr.Get(common.HTTPAuthProxySkipCertVerify).GetBool(), + VerifyCert: cfgMgr.Get(common.HTTPAuthProxyVerifyCert).GetBool(), AlwaysOnBoard: cfgMgr.Get(common.HTTPAuthProxyAlwaysOnboard).GetBool(), }, nil @@ -496,12 +496,12 @@ func OIDCSetting() (*models.OIDCSetting, error) { } return &models.OIDCSetting{ - Name: cfgMgr.Get(common.OIDCName).GetString(), - Endpoint: cfgMgr.Get(common.OIDCEndpoint).GetString(), - SkipCertVerify: cfgMgr.Get(common.OIDCSkipCertVerify).GetBool(), - ClientID: cfgMgr.Get(common.OIDCCLientID).GetString(), - ClientSecret: cfgMgr.Get(common.OIDCClientSecret).GetString(), - RedirectURL: extEndpoint + common.OIDCCallbackPath, - Scope: scope, + Name: cfgMgr.Get(common.OIDCName).GetString(), + Endpoint: cfgMgr.Get(common.OIDCEndpoint).GetString(), + VerifyCert: cfgMgr.Get(common.OIDCVerifyCert).GetBool(), + ClientID: cfgMgr.Get(common.OIDCCLientID).GetString(), + ClientSecret: cfgMgr.Get(common.OIDCClientSecret).GetString(), + RedirectURL: extEndpoint + common.OIDCCallbackPath, + Scope: scope, }, nil } diff --git a/src/core/config/config_test.go b/src/core/config/config_test.go index be69533e4..89561778d 100644 --- a/src/core/config/config_test.go +++ b/src/core/config/config_test.go @@ -228,36 +228,36 @@ func TestConfigureValue_GetMap(t *testing.T) { func TestHTTPAuthProxySetting(t *testing.T) { m := map[string]interface{}{ - common.HTTPAuthProxyAlwaysOnboard: "true", - common.HTTPAuthProxySkipCertVerify: "true", - common.HTTPAuthProxyEndpoint: "https://auth.proxy/suffix", + common.HTTPAuthProxyAlwaysOnboard: "true", + common.HTTPAuthProxyVerifyCert: "true", + common.HTTPAuthProxyEndpoint: "https://auth.proxy/suffix", } InitWithSettings(m) v, e := HTTPAuthProxySetting() assert.Nil(t, e) assert.Equal(t, *v, models.HTTPAuthProxy{ - Endpoint: "https://auth.proxy/suffix", - AlwaysOnBoard: true, - SkipCertVerify: true, + Endpoint: "https://auth.proxy/suffix", + AlwaysOnBoard: true, + VerifyCert: true, }) } func TestOIDCSetting(t *testing.T) { m := map[string]interface{}{ - common.OIDCName: "test", - common.OIDCEndpoint: "https://oidc.test", - common.OIDCSkipCertVerify: "true", - common.OIDCScope: "openid, profile", - common.OIDCCLientID: "client", - common.OIDCClientSecret: "secret", - common.ExtEndpoint: "https://harbor.test", + common.OIDCName: "test", + common.OIDCEndpoint: "https://oidc.test", + common.OIDCVerifyCert: "true", + common.OIDCScope: "openid, profile", + common.OIDCCLientID: "client", + common.OIDCClientSecret: "secret", + common.ExtEndpoint: "https://harbor.test", } InitWithSettings(m) v, e := OIDCSetting() assert.Nil(t, e) assert.Equal(t, "test", v.Name) assert.Equal(t, "https://oidc.test", v.Endpoint) - assert.True(t, v.SkipCertVerify) + assert.True(t, v.VerifyCert) assert.Equal(t, "client", v.ClientID) assert.Equal(t, "secret", v.ClientSecret) assert.Equal(t, "https://harbor.test/c/oidc/callback", v.RedirectURL) diff --git a/src/core/filter/security.go b/src/core/filter/security.go index b75df851d..da9ecf9f6 100644 --- a/src/core/filter/security.go +++ b/src/core/filter/security.go @@ -292,7 +292,7 @@ func (ap *authProxyReqCtxModifier) Modify(ctx *beegoctx.Context) bool { }, BearerToken: proxyPwd, TLSClientConfig: rest.TLSClientConfig{ - Insecure: httpAuthProxyConf.SkipCertVerify, + Insecure: !httpAuthProxyConf.VerifyCert, }, } authClient, err := rest.RESTClientFor(authClientCfg) diff --git a/src/core/filter/security_test.go b/src/core/filter/security_test.go index bb18f901f..bce914c6c 100644 --- a/src/core/filter/security_test.go +++ b/src/core/filter/security_test.go @@ -123,14 +123,14 @@ func TestSecretReqCtxModifier(t *testing.T) { func TestOIDCCliReqCtxModifier(t *testing.T) { conf := map[string]interface{}{ - common.AUTHMode: common.OIDCAuth, - common.OIDCName: "test", - common.OIDCEndpoint: "https://accounts.google.com", - common.OIDCSkipCertVerify: "false", - common.OIDCScope: "openid, profile, offline_access", - common.OIDCCLientID: "client", - common.OIDCClientSecret: "secret", - common.ExtEndpoint: "https://harbor.test", + common.AUTHMode: common.OIDCAuth, + common.OIDCName: "test", + common.OIDCEndpoint: "https://accounts.google.com", + common.OIDCVerifyCert: "true", + common.OIDCScope: "openid, profile, offline_access", + common.OIDCCLientID: "client", + common.OIDCClientSecret: "secret", + common.ExtEndpoint: "https://harbor.test", } kp := &config2.PresetKeyProvider{Key: "naa4JtarA1Zsc3uY"} @@ -193,7 +193,7 @@ func TestAuthProxyReqCtxModifier(t *testing.T) { c := map[string]interface{}{ common.HTTPAuthProxyAlwaysOnboard: "true", - common.HTTPAuthProxySkipCertVerify: "true", + common.HTTPAuthProxyVerifyCert: "false", common.HTTPAuthProxyEndpoint: "https://auth.proxy/suffix", common.HTTPAuthProxyTokenReviewEndpoint: server.URL, common.AUTHMode: common.HTTPAuth, @@ -205,7 +205,7 @@ func TestAuthProxyReqCtxModifier(t *testing.T) { assert.Equal(t, *v, models.HTTPAuthProxy{ Endpoint: "https://auth.proxy/suffix", AlwaysOnBoard: true, - SkipCertVerify: true, + VerifyCert: false, TokenReviewEndpoint: server.URL, }) diff --git a/src/portal/lib/src/config/config.ts b/src/portal/lib/src/config/config.ts index e00c449fa..cd2193bb1 100644 --- a/src/portal/lib/src/config/config.ts +++ b/src/portal/lib/src/config/config.ts @@ -90,13 +90,13 @@ export class Configuration { read_only: BoolValueItem; http_authproxy_endpoint?: StringValueItem; http_authproxy_tokenreview_endpoint?: StringValueItem; - http_authproxy_skip_cert_verify?: BoolValueItem; + http_authproxy_verify_cert?: BoolValueItem; http_authproxy_always_onboard?: BoolValueItem; oidc_name?: StringValueItem; oidc_endpoint?: StringValueItem; oidc_client_id?: StringValueItem; oidc_client_secret?: StringValueItem; - oidc_skip_cert_verify?: BoolValueItem; + oidc_verify_cert?: BoolValueItem; oidc_scope?: StringValueItem; public constructor() { this.auth_mode = new StringValueItem("db_auth", true); @@ -141,13 +141,13 @@ export class Configuration { this.read_only = new BoolValueItem(false, true); this.http_authproxy_endpoint = new StringValueItem("", true); this.http_authproxy_tokenreview_endpoint = new StringValueItem("", true); - this.http_authproxy_skip_cert_verify = new BoolValueItem(false, true); + this.http_authproxy_verify_cert = new BoolValueItem(false, true); this.http_authproxy_always_onboard = new BoolValueItem(false, true); this.oidc_name = new StringValueItem('', true); this.oidc_endpoint = new StringValueItem('', true); this.oidc_client_id = new StringValueItem('', true); this.oidc_client_secret = new StringValueItem('', true); - this.oidc_skip_cert_verify = new BoolValueItem(false, true); + this.oidc_verify_cert = new BoolValueItem(false, true); this.oidc_scope = new StringValueItem('', true); } } 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 42650a334..a835415f2 100644 --- a/src/portal/src/app/config/auth/config-auth.component.html +++ b/src/portal/src/app/config/auth/config-auth.component.html @@ -300,13 +300,13 @@
- - +
@@ -403,16 +403,16 @@
- + - + - {{'TOOLTIP.OIDC_SKIPCERTVERIFY' | translate}} + {{'TOOLTIP.OIDC_VERIFYCERT' | translate}}
@@ -425,4 +425,4 @@ - \ No newline at end of file + diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index d57884320..909337b35 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -78,7 +78,7 @@ "OIDC_NAME": "The name of the OIDC provider.", "OIDC_ENDPOINT": "The URL of an OIDC-complaint server.", "OIDC_SCOPE": "The scope sent to OIDC server during authentication. It has to contain “openid”, and “offline_access”. If you are using google, please remove “offline_access” from this field.", - "OIDC_SKIPCERTVERIFY": "Check this box if your OIDC server is hosted via self-signed certificate." + "OIDC_VERIFYCERT": "Uncheck this box if your OIDC server is hosted via self-signed certificate." }, "PLACEHOLDER": { "CURRENT_PWD": "Enter current password", @@ -673,7 +673,7 @@ "FILTER": "LDAP Filter", "UID": "LDAP UID", "SCOPE": "LDAP Scope", - "VERIFY_CERT": "LDAP Verify Cert", + "VERIFY_CERT": "LDAP Verify Certificate", "LDAP_GROUP_BASE_DN": "LDAP Group Base DN", "LDAP_GROUP_BASE_DN_INFO": "The base DN from which to look up a group in LDAP/AD.", "LDAP_GROUP_FILTER": "LDAP Group Filter", @@ -698,15 +698,15 @@ "ENDPOINT": "Server Endpoint", "TOKEN_REVIEW": "Token Review Endpoint", "ALWAYS_ONBOARD": "Always Onboard", - "VERIFY_CERT": "Authentication Verify Cert" + "VERIFY_CERT": "Verify Certificate" }, "OIDC": { - "OIDC_PROVIDER": "OIDC Provider", + "OIDC_PROVIDER": "OIDC Provider Name", "ENDPOINT": "OIDC Endpoint", "CLIENT_ID": "OIDC Client ID", "CLIENTSECRET": "OIDC Client Secret", "SCOPE": "OIDC Scope", - "OIDCSKIPCERTVERIFY": "OIDC Skip Verifying Certificate", + "OIDC_VERIFYCERT": "Verify Certificate", "OIDC_SETNAME": "Set OIDC Username", "OIDC_SETNAMECONTENT": "You must create a Harbor username the first time when authenticating via a third party(OIDC).This will be used within Harbor to be associated with projects, roles, etc.", "OIDC_USERNAME": "Username" diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index f28be3c17..e257425e7 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -78,7 +78,7 @@ "OIDC_NAME": "El nombre de la OIDC proveedor.", "OIDC_ENDPOINT": "La dirección URL de un servidor OIDC denuncia.", "OIDC_SCOPE": "El ámbito de aplicación enviada a OIDC Server durante la autenticación.Tiene que contener 'Openid', y 'offline_access'.Si usted esta usando Google, por favor quitar 'offline_access' de este campo", - "OIDC_SKIPCERTVERIFY": "Marque esta casilla si tu OIDC servidor está alojado a través de certificado autofirmado." + "OIDC_VERIFYCERT": "Desmarque esta casilla si tu OIDC servidor está alojado a través de certificado autofirmado." }, "PLACEHOLDER": { "CURRENT_PWD": "Introduzca la contraseña actual", @@ -704,7 +704,7 @@ "CLIENT_ID": "ID de cliente OIDC", "CLIENTSECRET": "OIDC Client Secret", "SCOPE": "OIDC Ámbito", - "OIDCSKIPCERTVERIFY": "OIDC Skip Verificar certificado", + "OIDC_VERIFYCERT": "Verificar certificado", "OIDC_SETNAME": "Set OIDC nombre de usuario", "OIDC_SETNAMECONTENT": "Usted debe crear un Harbor nombre de usuario la primera vez cuando la autenticación a través de un tercero (OIDC). Esta será usada en Harbor para ser asociados con proyectos, funciones, etc.", "OIDC_USERNAME": "Usuario" diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index 696283179..38a84ce3b 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -65,7 +65,7 @@ "OIDC_NAME": "le nom du fournisseur de oidc.", "OIDC_ENDPOINT": "l'url d'un serveur oidc plainte.", "OIDC_SCOPE": "le champ envoyés au serveur au cours oidc l'authentification.il doit contenir 'openid', et 'offline_access'.si vous utilisez google, veuillez supprimer 'offline_access' dans ce domaine", - "OIDC_SKIPCERTVERIFY": "cocher cette case si votre oidc serveur est accueilli par auto - certificat signé." + "OIDC_VERIFYCERT": "décocher cette case si votre oidc serveur est accueilli par auto - certificat signé." }, "PLACEHOLDER": { "CURRENT_PWD": "Entrez le mot de passe actuel", @@ -669,7 +669,7 @@ "CLIENT_ID": "no d'identification du client OIDC", "CLIENTSECRET": "OIDC Client Secret", "SCOPE": "OIDC Scope", - "OIDCSKIPCERTVERIFY": "Certificat OIDC skip vérifier", + "OIDC_VERIFYCERT": "Certificat vérifier", "OIDC_SETNAME": "Ensemble OIDC nom d'utilisateur", "OIDC_SETNAMECONTENT": "vous devez créer un Harbor identifiant la première fois lors de la vérification par une tierce partie (oidc). il sera utilisé au sein de port à être associés aux projets, des rôles, etc.", "OIDC_USERNAME": "d'utilisateur" diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index 52f90b1c4..5f82b2ae7 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -76,7 +76,7 @@ "OIDC_NAME": "O Nome do prestador de oidc.", "OIDC_ENDPOINT": "A URL de um servidor oidc denúncia.", "OIDC_SCOPE": "O âmbito de aplicação enviada Ao servidor oidc Durante a autenticação.TEM que conter 'openid' e 'offline_access'.Se você está usando o Google, por favor remova 'offline_access' desse Campo.", - "OIDC_SKIPCERTVERIFY": "Assinale esta opção se o SEU servidor está hospedado oidc via self - signed certificate." + "OIDC_VERIFYCERT": "Desmarque esta opção se o SEU servidor está hospedado oidc via self - signed certificate." }, "PLACEHOLDER": { "CURRENT_PWD": "Insira a senha atual", @@ -698,7 +698,7 @@ "CLIENT_ID": "ID de cliente OIDC", "CLIENTSECRET": "OIDC Client Secret", "SCOPE": "Escopo OIDC", - "OIDCSKIPCERTVERIFY": "OIDC Skip Verificar Certificado", + "OIDC_VERIFYCERT": "Verificar Certificado", "OIDC_SETNAME": "Definir o Utilizador OIDC", "OIDC_SETNAMECONTENT": "Você deve Criar um Nome de usuário do Porto a primeira vez que autenticar através de um terceiro (OIDC). Isto será usado Dentro de Harbor para ser associado a projetos, papéis, etc.", "OIDC_USERNAME": "Utilizador" diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index edbdae512..238d23303 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -77,7 +77,7 @@ "OIDC_NAME": "OIDC提供商的名称.", "OIDC_ENDPOINT": "OIDC服务器的地址.", "OIDC_SCOPE": "在身份验证期间发送到OIDC服务器的scope。它必须包含“openid”和“offline_access”。如果您使用Google，请从此字段中删除“脱机访问”。", - "OIDC_SKIPCERTVERIFY": "如果您的OIDC服务器是通过自签名证书托管的，请选中此框。" + "OIDC_VERIFYCERT": "如果您的OIDC服务器是通过自签名证书托管的，请取消选中此框。" }, "PLACEHOLDER": { "CURRENT_PWD": "输入当前密码", @@ -703,7 +703,7 @@ "CLIENT_ID": "OIDC 客户端标识", "CLIENTSECRET": "OIDC 客户端密码", "SCOPE": "OIDC Scope", - "OIDCSKIPCERTVERIFY": "OIDC 验证证书", + "OIDC_VERIFYCERT": "验证证书", "OIDC_SETNAME": "设置OIDC用户名", "OIDC_SETNAMECONTENT": "在通过第三方（OIDC）进行身份验证时，您必须第一次创建一个Harbor用户名。这将在端口中用于与项目、角色等关联。", "OIDC_USERNAME": "用户名"