|
 |
590d18 |
From f169531c4b4fec3485015a9673e5b0d3b76e30d6 Mon Sep 17 00:00:00 2001
|
|
|
590d18 |
From: Petr Vobornik <pvoborni@redhat.com>
|
|
|
590d18 |
Date: Mon, 10 Aug 2015 12:58:14 +0200
|
|
|
590d18 |
Subject: [PATCH] webui: add LDAP vs Kerberos behavior description to user auth
|
|
|
590d18 |
types
|
|
|
590d18 |
|
|
|
590d18 |
https://fedorahosted.org/freeipa/ticket/4935
|
|
|
590d18 |
|
|
|
590d18 |
Reviewed-By: David Kupka <dkupka@redhat.com>
|
|
|
590d18 |
---
|
|
|
590d18 |
install/ui/src/freeipa/serverconfig.js | 5 ++++-
|
|
|
590d18 |
install/ui/src/freeipa/user.js | 5 ++++-
|
|
|
590d18 |
install/ui/test/data/ipa_init.json | 4 ++--
|
|
|
590d18 |
ipalib/plugins/internal.py | 4 ++--
|
|
|
590d18 |
4 files changed, 12 insertions(+), 6 deletions(-)
|
|
|
590d18 |
|
|
|
590d18 |
diff --git a/install/ui/src/freeipa/serverconfig.js b/install/ui/src/freeipa/serverconfig.js
|
|
|
590d18 |
index efe1805698372b45afae38d1f9dd883034ee03c6..70bb9574b8368d6a294dc171fdea2d03dfe56cab 100644
|
|
|
590d18 |
--- a/install/ui/src/freeipa/serverconfig.js
|
|
|
590d18 |
+++ b/install/ui/src/freeipa/serverconfig.js
|
|
|
590d18 |
@@ -83,7 +83,10 @@ return {
|
|
|
590d18 |
{ label: '@i18n:authtype.type_radius', value: 'radius' },
|
|
|
590d18 |
{ label: '@i18n:authtype.type_otp', value: 'otp' }
|
|
|
590d18 |
],
|
|
|
590d18 |
- tooltip: '@i18n:authtype.config_tooltip'
|
|
|
590d18 |
+ tooltip: {
|
|
|
590d18 |
+ title: '@i18n:authtype.config_tooltip',
|
|
|
590d18 |
+ html: true
|
|
|
590d18 |
+ }
|
|
|
590d18 |
},
|
|
|
590d18 |
{
|
|
|
590d18 |
$type: 'checkbox',
|
|
|
590d18 |
diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js
|
|
|
590d18 |
index 0e828c16b999ffd58504bc4e53d2748bcd16b042..a920e088aacd02585cd131dce725272f47e4cf1c 100644
|
|
|
590d18 |
--- a/install/ui/src/freeipa/user.js
|
|
|
590d18 |
+++ b/install/ui/src/freeipa/user.js
|
|
|
590d18 |
@@ -188,7 +188,10 @@ return {
|
|
|
590d18 |
{ label: '@i18n:authtype.type_radius', value: 'radius' },
|
|
|
590d18 |
{ label: '@i18n:authtype.type_otp', value: 'otp' }
|
|
|
590d18 |
],
|
|
|
590d18 |
- tooltip: '@i18n:authtype.user_tooltip'
|
|
|
590d18 |
+ tooltip: {
|
|
|
590d18 |
+ title: '@i18n:authtype.user_tooltip',
|
|
|
590d18 |
+ html: true
|
|
|
590d18 |
+ }
|
|
|
590d18 |
},
|
|
|
590d18 |
{
|
|
|
590d18 |
$type: 'entity_select',
|
|
|
590d18 |
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
|
|
|
590d18 |
index ef172950527512e71c28916274153036f17212fe..b80e44ffe8ead3d0b29196ca3af18e00d72a9f04 100644
|
|
|
590d18 |
--- a/install/ui/test/data/ipa_init.json
|
|
|
590d18 |
+++ b/install/ui/test/data/ipa_init.json
|
|
|
590d18 |
@@ -49,12 +49,12 @@
|
|
|
590d18 |
"show_results": "Show Results"
|
|
|
590d18 |
},
|
|
|
590d18 |
"authtype": {
|
|
|
590d18 |
- "config_tooltip": "Implicit method (password) will be used if no method is chosen.",
|
|
|
590d18 |
+ "config_tooltip": "Implicit method (password) will be used if no method is chosen. Password + Two-factor: LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache. RADIUS with another type: Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options. ",
|
|
|
590d18 |
"type_otp": "Two factor authentication (password + OTP)",
|
|
|
590d18 |
"type_password": "Password",
|
|
|
590d18 |
"type_radius": "Radius",
|
|
|
590d18 |
"type_disabled": "Disable per-user override",
|
|
|
590d18 |
- "user_tooltip": "Per-user setting, overwrites the global setting if any option is checked."
|
|
|
590d18 |
+ "user_tooltip": "Per-user setting, overwrites the global setting if any option is checked. Password + Two-factor: LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache. RADIUS with another type: Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options. ",
|
|
|
590d18 |
},
|
|
|
590d18 |
"buttons": {
|
|
|
590d18 |
"about": "About",
|
|
|
590d18 |
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
|
|
|
590d18 |
index f97885ceae8f3c0913a16c281c2faa8a918541e7..e1904d2d3d1e1523895554b8d8e58b1dfd070366 100644
|
|
|
590d18 |
--- a/ipalib/plugins/internal.py
|
|
|
590d18 |
+++ b/ipalib/plugins/internal.py
|
|
|
590d18 |
@@ -191,12 +191,12 @@ class i18n_messages(Command):
|
|
|
590d18 |
"show_results": _("Show Results"),
|
|
|
590d18 |
},
|
|
|
590d18 |
"authtype": {
|
|
|
590d18 |
- "config_tooltip": _("Implicit method (password) will be used if no method is chosen."),
|
|
|
590d18 |
+ "config_tooltip": _("Implicit method (password) will be used if no method is chosen. Password + Two-factor: LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache. RADIUS with another type: Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options. "),
|
|
|
590d18 |
"type_otp": _("Two factor authentication (password + OTP)"),
|
|
|
590d18 |
"type_password": _("Password"),
|
|
|
590d18 |
"type_radius": _("Radius"),
|
|
|
590d18 |
"type_disabled": _("Disable per-user override"),
|
|
|
590d18 |
- "user_tooltip": _("Per-user setting, overwrites the global setting if any option is checked."),
|
|
|
590d18 |
+ "user_tooltip": _("Per-user setting, overwrites the global setting if any option is checked. Password + Two-factor: LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache. RADIUS with another type: Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options. "),
|
|
|
590d18 |
},
|
|
|
590d18 |
"buttons": {
|
|
|
590d18 |
"about": _("About"),
|
|
|
590d18 |
--
|
|
|
590d18 |
2.4.3
|
|
|
590d18 |
|