Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-27 04:35:16 +01:00
Code Issues Projects Releases Wiki Activity

"add insecure checkbox to configure #3363"

Browse Source
This commit is contained in:
Fuhui Peng (c) 2017-10-30 10:29:01 +08:00
parent 5b2ececae8
commit a0172bc0c4
5 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui_ng/lib/src/config/config.ts
View File

@ -71,6 +71,7 @@ export class Configuration {
email_ssl: BoolValueItem; email_ssl: BoolValueItem;
email_username?: StringValueItem; email_username?: StringValueItem;
email_password?: StringValueItem; email_password?: StringValueItem;
email_insecure: BoolValueItem;
verify_remote_cert: BoolValueItem; verify_remote_cert: BoolValueItem;
token_expiration: NumberValueItem; token_expiration: NumberValueItem;
cfg_expiration: NumberValueItem; cfg_expiration: NumberValueItem;
@ -95,6 +96,7 @@ export class Configuration {
this.email_ssl = new BoolValueItem(false, true); this.email_ssl = new BoolValueItem(false, true);
this.email_username = new StringValueItem("", true); this.email_username = new StringValueItem("", true);
this.email_password = new StringValueItem("", true); this.email_password = new StringValueItem("", true);
this.email_insecure = new BoolValueItem(false, true);
this.token_expiration = new NumberValueItem(30, true); this.token_expiration = new NumberValueItem(30, true);
this.cfg_expiration = new NumberValueItem(30, true); this.cfg_expiration = new NumberValueItem(30, true);
this.verify_remote_cert = new BoolValueItem(false, true); this.verify_remote_cert = new BoolValueItem(false, true);

9
src/ui_ng/src/app/config/email/config-email.component.html
View File

@ -68,5 +68,14 @@
</a> </a>
</clr-checkbox> </clr-checkbox>
</div> </div>
<div class="form-group">
<label for="insecure">{{'CONFIG.MAIL_INSECURE' | translate}}</label>
<clr-checkbox name="emaiInsecure" id="emailInsecure" [(ngModel)]="currentConfig.email_insecure.value" [disabled]="disabled(currentConfig.email_insecure)">
<a href="javascript:void(0)" role="tooltip" aria-haspopup="true" class="tooltip tooltip-top-right" style="top:-7px;">
<clr-icon shape="info-circle" class="info-tips-icon" size="24"></clr-icon>
<span class="tooltip-content">{{'CONFIG.INSECURE_TOOLTIP' | translate}}</span>
</a>
</clr-checkbox>
</div>
</section> </section>
</form> </form>

2
src/ui_ng/src/i18n/lang/en-us-lang.json
View File

@ -395,6 +395,8 @@
"MAIL_PASSWORD": "Email Password", "MAIL_PASSWORD": "Email Password",
"MAIL_FROM": "Email From", "MAIL_FROM": "Email From",
"MAIL_SSL": "Email SSL", "MAIL_SSL": "Email SSL",
"MAIL_INSECURE": "Verify Certificate",
"INSECURE_TOOLTIP": "Determine whether should verify the certificate of a remote Harbor registry. Uncheck this box when the remote registry uses a self-signed or untrusted certificate.",
"SSL_TOOLTIP": "Enable SSL for email server connection", "SSL_TOOLTIP": "Enable SSL for email server connection",
"VERIFY_REMOTE_CERT": "Verify Remote Cert", "VERIFY_REMOTE_CERT": "Verify Remote Cert",
"TOKEN_EXPIRATION": "Token Expiration (Minutes)", "TOKEN_EXPIRATION": "Token Expiration (Minutes)",

2
src/ui_ng/src/i18n/lang/es-es-lang.json
View File

@ -396,6 +396,8 @@
"MAIL_PASSWORD": "Contraseña del servidor de email", "MAIL_PASSWORD": "Contraseña del servidor de email",
"MAIL_FROM": "Email De", "MAIL_FROM": "Email De",
"MAIL_SSL": "Email SSL", "MAIL_SSL": "Email SSL",
"MAIL_INSECURE": "Verify Certificate",
"INSECURE_TOOLTIP": "Determina si la verificar el certificado de un registro Harbor remoto. Desmarque esta opción cuando el registro remoto use un certificado de confianza o autofirmado.",
"SSL_TOOLTIP": "Activar SSL en conexiones al servidor de correo", "SSL_TOOLTIP": "Activar SSL en conexiones al servidor de correo",
"VERIFY_REMOTE_CERT": "Verificar Certificado Remoto", "VERIFY_REMOTE_CERT": "Verificar Certificado Remoto",
"TOKEN_EXPIRATION": "Expiración del Token (Minutos)", "TOKEN_EXPIRATION": "Expiración del Token (Minutos)",

2
src/ui_ng/src/i18n/lang/zh-cn-lang.json
View File

@ -395,6 +395,8 @@
"MAIL_PASSWORD": "密码", "MAIL_PASSWORD": "密码",
"MAIL_FROM": "邮件来源", "MAIL_FROM": "邮件来源",
"MAIL_SSL": "邮件 SSL", "MAIL_SSL": "邮件 SSL",
"MAIL_INSECURE": "验证证书",
"INSECURE_TOOLTIP": "确定是否要验证远程Harbor实例的证书。如果远程实例使用的是自签或者非信任证书，不要勾选此项。",
"SSL_TOOLTIP": "启用SSL到邮件服务器连接。", "SSL_TOOLTIP": "启用SSL到邮件服务器连接。",
"VERIFY_REMOTE_CERT": "验证远程证书", "VERIFY_REMOTE_CERT": "验证远程证书",
"TOKEN_EXPIRATION": "令牌过期时间（分钟）", "TOKEN_EXPIRATION": "令牌过期时间（分钟）",