perf: 优化 saml2 配置

This commit is contained in:
ibuler 2021-12-15 20:53:11 +08:00 committed by Jiangjie.Bai
parent f11dc2f7a3
commit 66ecf89d35
3 changed files with 24 additions and 9 deletions

View File

@ -918,6 +918,9 @@
"authSAML2MetadataUrl": "IDP metadata URL", "authSAML2MetadataUrl": "IDP metadata URL",
"authSAML2AdvancedSettings": "高级配置", "authSAML2AdvancedSettings": "高级配置",
"IdpMetadataHelpText": "IDP metadata URL 和 IDP metadata XML参数二选一即可IDP metadata URL的优先级高", "IdpMetadataHelpText": "IDP metadata URL 和 IDP metadata XML参数二选一即可IDP metadata URL的优先级高",
"IdpMetadataUrlHelpText": "从远端地址中加载 IDP Metadata",
"authSAMLKeyHelpText": "SP 证书和密钥 是用来和 IDP 加密通信的",
"authSAMLCertHelpText": "上传证书密钥后保存, 然后查看 SP Metadata",
"authCASAttrMap": "用户属性映射", "authCASAttrMap": "用户属性映射",
"SignaturesAndTemplates": "Signatures and Templates", "SignaturesAndTemplates": "Signatures and Templates",
"unselectedUser": "没有选择用户", "unselectedUser": "没有选择用户",

View File

@ -895,6 +895,9 @@
"authSAML2Xml": "IDP metadata XML", "authSAML2Xml": "IDP metadata XML",
"authSAML2MetadataUrl": "IDP metadata URL", "authSAML2MetadataUrl": "IDP metadata URL",
"IdpMetadataHelpText": "Choose one of IDP metadata URL and IDP metadata XML parameters. IDP metadata URL has high priority", "IdpMetadataHelpText": "Choose one of IDP metadata URL and IDP metadata XML parameters. IDP metadata URL has high priority",
"IdpMetadataUrlHelpText": "Load IDP Metadata from remote url",
"authSAMLKeyHelpText": "SP cert and private key, using communicate with IDP",
"authSAMLCertHelpText": "After upload cert and private key, View SP Metadata",
"authSAML2AdvancedSettings": "Advanced Settings", "authSAML2AdvancedSettings": "Advanced Settings",
"unselectedUser": "Unselected user", "unselectedUser": "Unselected user",
"auto": "Auto", "auto": "Auto",

View File

@ -31,8 +31,14 @@ export default {
url: '/api/v1/settings/setting/?category=saml2', url: '/api/v1/settings/setting/?category=saml2',
fields: [ fields: [
[this.$t('common.Basic'), ['AUTH_SAML2']], [this.$t('common.Basic'), ['AUTH_SAML2']],
[this.$t('common.Params'), ['SAML2_IDP_METADATA_URL', 'SAML2_IDP_METADATA_XML', 'SAML2_SP_ADVANCED_SETTINGS']], [this.$t('common.Certificate'), [
[this.$t('common.Certificate'), ['SAML2_SP_CERT_CONTENT', 'SAML2_SP_KEY_CONTENT']], 'SAML2_SP_KEY_CONTENT',
'SAML2_SP_CERT_CONTENT'
]],
[this.$t('common.Params'), [
'SAML2_IDP_METADATA_URL', 'SAML2_IDP_METADATA_XML',
'SAML2_SP_ADVANCED_SETTINGS'
]],
[this.$t('common.Other'), [ [this.$t('common.Other'), [
'SAML2_LOGOUT_COMPLETELY', 'AUTH_SAML2_ALWAYS_UPDATE_USER', 'SAML2_LOGOUT_COMPLETELY', 'AUTH_SAML2_ALWAYS_UPDATE_USER',
'SAML2_RENAME_ATTRIBUTES' 'SAML2_RENAME_ATTRIBUTES'
@ -45,26 +51,29 @@ export default {
SAML2_IDP_METADATA_URL: { SAML2_IDP_METADATA_URL: {
component: 'el-input', component: 'el-input',
label: this.$t('setting.authSAML2MetadataUrl'), label: this.$t('setting.authSAML2MetadataUrl'),
helpText: this.$t('setting.IdpMetadataHelpText') helpText: this.$t('setting.IdpMetadataUrlHelpText')
}, },
SAML2_IDP_METADATA_XML: { SAML2_IDP_METADATA_XML: {
component: 'el-input', component: 'el-input',
el: { el: {
type: 'textarea', type: 'textarea',
rows: 8 rows: 4
}, },
label: this.$t('setting.authSAML2Xml') label: this.$t('setting.authSAML2Xml'),
helpText: this.$t('setting.IdpMetadataHelpText')
}, },
SAML2_SP_ADVANCED_SETTINGS: { SAML2_SP_ADVANCED_SETTINGS: {
component: JsonEditor, component: JsonEditor,
label: this.$t('setting.authSAML2AdvancedSettings'), label: this.$t('setting.authSAML2AdvancedSettings'),
rules: [JsonRequired] rules: [JsonRequired]
}, },
SAML2_SP_CERT_CONTENT: {
component: UploadKey
},
SAML2_SP_KEY_CONTENT: { SAML2_SP_KEY_CONTENT: {
component: UploadKey component: UploadKey,
helpText: this.$t('setting.authSAMLKeyHelpText')
},
SAML2_SP_CERT_CONTENT: {
component: UploadKey,
helpText: this.$t('setting.authSAMLCertHelpText') + ' <a href="/core/auth/saml2/metadata/" target="_blank">查看</a>'
}, },
SAML2_RENAME_ATTRIBUTES: { SAML2_RENAME_ATTRIBUTES: {
component: JsonEditor, component: JsonEditor,