On 05/27/2016 05:58 PM, Pavel Vomacka wrote:
On 05/27/2016 05:44 PM, Nathaniel McCallum wrote:
On Fri, 2016-05-27 at 17:43 +0200, Pavel Vomacka wrote:
On 05/12/2016 11:13 PM, Nathaniel McCallum wrote:
On Wed, 2016-05-11 at 13:08 +0200, Pavel Vomacka wrote:
Hi,
the patch adds webui part for authentication indicators.
Ticket: https://fedorahosted.org/freeipa/ticket/5872
The otp option displays as: OTP.
The radius option displays as: Radius.
However, both are acronyms. The capitalization should be
consistent.
I'm sorry for late answer. They are displayed this way: 'OTP' and
'Radius'. So it should not require any change.
That is incorrect. It should be: OTP and RADIUS.
I'm sorry, I didn't understand correctly. Fixed patch attached.
The last patch changes the 'Radius' to 'RADIUS' in whole WebUI.
From 2a2accafb1ec23a064d620628d11eff87e4949b9 Mon Sep 17 00:00:00 2001
From: Pavel Vomacka <pvoma...@redhat.com>
Date: Wed, 11 May 2016 12:54:43 +0200
Subject: [PATCH] Add authentication indicators to webui
Add checkboxes for choosing authentication indicators to the service details page.
Also change 'Radius' string to capitalized 'RADIUS'.
https://fedorahosted.org/freeipa/ticket/5872
---
install/ui/src/freeipa/service.js | 18 ++++++++++++++++++
install/ui/test/data/ipa_init.json | 4 +++-
ipalib/plugins/internal.py | 4 +++-
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js
index f1f8d951e415e9768aab433e28da852a732bc8ba..112c9dbf952a859519446bd249f0f148d84b6924 100644
--- a/install/ui/src/freeipa/service.js
+++ b/install/ui/src/freeipa/service.js
@@ -109,6 +109,24 @@ return {
]
},
{
+ $type: 'checkboxes',
+ label: '@i18n:objects.service.auth_indicators',
+ name: 'krbprincipalauthind',
+ options: [
+ {
+ label: '@i18n:authtype.otp',
+ value: 'otp'
+ },
+ {
+ label: '@i18n:authtype.type_radius',
+ value: 'radius'
+ }
+ ],
+ tooltip: {
+ title: '@mc-opt:service_add:krbprincipalauthind:doc'
+ }
+ },
+ {
name: 'ipakrbokasdelegate',
$type: 'checkbox',
acl_param: 'krbticketflags'
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 1b9b69ff909a9668c1e1867008459d25d5e062a9..0d18edded6ab38d7f9637ee3fb78ae1e1f8940ce 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -50,9 +50,10 @@
},
"authtype": {
"config_tooltip": "<p>Implicit method (password) will be used if no method is chosen.</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>",
+ "otp": "OTP",
"type_otp": "Two factor authentication (password + OTP)",
"type_password": "Password",
- "type_radius": "Radius",
+ "type_radius": "RADIUS",
"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>",
},
@@ -512,6 +513,7 @@
"user": "User"
},
"service": {
+ "auth_indicators": "Authentication indicators",
"certificate": "Service Certificate",
"delete_key_unprovision": "Delete Key, Unprovision",
"details": "Service Settings",
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index c28693a4669805df01c2a7ac0b1384be0c1e3858..1d2ef5e92622863e1b1bc5952119cfbd5e6f07b1 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -192,9 +192,10 @@ class i18n_messages(Command):
},
"authtype": {
"config_tooltip": _("<p>Implicit method (password) will be used if no method is chosen.</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>"),
+ "otp": _("OTP"),
"type_otp": _("Two factor authentication (password + OTP)"),
"type_password": _("Password"),
- "type_radius": _("Radius"),
+ "type_radius": _("RADIUS"),
"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>"),
},
@@ -658,6 +659,7 @@ class i18n_messages(Command):
"user": _("User"),
},
"service": {
+ "auth_indicators": _("Authentication indicators"),
"certificate": _("Service Certificate"),
"delete_key_unprovision": _("Delete Key, Unprovision"),
"details": _("Service Settings"),
--
2.5.5
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
