Modify webUI to adhere to new IPA server API

Given the changes in IPA server API changes, whebUI is modified to
utilize new authentication indicators, and disabled custom indicators
for services' white list.

Resolves: https://pagure.io/freeipa/issue/8001
Signed-off-by: Changmin Teng <cteng@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Simo Sorce <ssorce@redhat.com>
Reviewed-By: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Changmin Teng 2019-07-29 11:10:31 -04:00 committed by Alexander Bokovoy
parent 15ff9c8fec
commit b66e8a1ee2
7 changed files with 36 additions and 14 deletions

View File

@ -117,19 +117,25 @@ return {
flags: ['w_if_no_aci']
},
{
$type: 'custom_checkboxes',
$type: 'checkboxes',
label: '@i18n:authtype.auth_indicators',
name: 'krbprincipalauthind',
add_dialog_title: '@i18n:authtype.custom_auth_ind_title',
add_field_label: '@i18n:authtype.auth_indicator',
options: [
{
label: 'otp',
label: '@i18n:authtype.type_otp',
value: 'otp'
},
{
label: 'radius',
label: '@i18n:authtype.type_radius',
value: 'radius'
},
{
label: '@i18n:authtype.type_pkinit',
value: 'pkinit'
},
{
label: '@i18n:authtype.type_hardened',
value: 'hardened'
}
],
tooltip: {

View File

@ -103,7 +103,9 @@ return {
{ label: '@i18n:authtype.type_disabled', value: 'disabled' },
{ label: '@i18n:authtype.type_password', value: 'password' },
{ label: '@i18n:authtype.type_radius', value: 'radius' },
{ label: '@i18n:authtype.type_otp', value: 'otp' }
{ label: '@i18n:authtype.type_otp', value: 'otp' },
{ label: '@i18n:authtype.type_pkinit', value: 'pkinit' },
{ label: '@i18n:authtype.type_hardened', value: 'hardened' }
],
tooltip: {
title: '@i18n:authtype.config_tooltip',

View File

@ -127,19 +127,25 @@ return {
]
},
{
$type: 'custom_checkboxes',
$type: 'checkboxes',
label: '@i18n:authtype.auth_indicators',
name: 'krbprincipalauthind',
add_dialog_title: '@i18n:authtype.custom_auth_ind_title',
add_field_label: '@i18n:authtype.auth_indicator',
options: [
{
label: 'otp',
label: '@i18n:authtype.type_otp',
value: 'otp'
},
{
label: 'radius',
label: '@i18n:authtype.type_radius',
value: 'radius'
},
{
label: '@i18n:authtype.type_pkinit',
value: 'pkinit'
},
{
label: '@i18n:authtype.type_hardened',
value: 'hardened'
}
],
tooltip: {

View File

@ -169,7 +169,9 @@ return {
options: [
{ label: '@i18n:authtype.type_password', value: 'password' },
{ label: '@i18n:authtype.type_radius', value: 'radius' },
{ label: '@i18n:authtype.type_otp', value: 'otp' }
{ label: '@i18n:authtype.type_otp', value: 'otp' },
{ label: '@i18n:authtype.type_pkinit', value: 'pkinit' },
{ label: '@i18n:authtype.type_hardened', value: 'hardened' }
],
tooltip: '@i18n:authtype.user_tooltip'
},

View File

@ -237,7 +237,9 @@ return {
options: [
{ label: '@i18n:authtype.type_password', value: 'password' },
{ label: '@i18n:authtype.type_radius', value: 'radius' },
{ label: '@i18n:authtype.type_otp', value: 'otp' }
{ label: '@i18n:authtype.type_otp', value: 'otp' },
{ label: '@i18n:authtype.type_pkinit', value: 'pkinit' },
{ label: '@i18n:authtype.type_hardened', value: 'hardened' }
],
tooltip: {
title: '@i18n:authtype.user_tooltip',

View File

@ -58,6 +58,8 @@
"type_otp": "Two factor authentication (password + OTP)",
"type_password": "Password",
"type_radius": "RADIUS",
"type_pkinit": "PKINIT",
"type_hardened": "Hardened Password (by SPAKE or FAST)",
"user_tooltip": "<p>Per-user setting, overwrites the global setting if any option is checked.</p><p><strong>Password + Two-factor:</strong> LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache.</p><p><strong>RADIUS with another type:</strong> Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options.</p>"
},
"buttons": {
@ -842,4 +844,4 @@
}
},
"version": "4.6.90.pre2"
}
}

View File

@ -189,6 +189,8 @@ class i18n_messages(Command):
"type_otp": _("Two factor authentication (password + OTP)"),
"type_password": _("Password"),
"type_radius": _("RADIUS"),
"type_pkinit": _("PKINIT"),
"type_hardened": _("Hardened Password (by SPAKE or FAST)"),
"type_disabled": _("Disable per-user override"),
"user_tooltip": _("<p>Per-user setting, overwrites the global setting if any option is checked.</p><p><strong>Password + Two-factor:</strong> LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache.</p><p><strong>RADIUS with another type:</strong> Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options.</p>"),
},