On 14.1.2014 15:20, Petr Viktorin wrote:
On 01/14/2014 09:33 AM, Jan Cholasta wrote:
On 9.1.2014 16:32, Tomas Babej wrote:
Hi,
For ipatokennotbefore and ipatokennotafter attributes use DateTime
parameter class instead of Str, since these are represented as
LDAP Generalized Time in LDAP.
Tomas
ACK.
This apparently depends on tbabej-0137, so let's not push it yet.
I've rebased the patch and wanted to push it but I found out, that in
patch 138 - expose krbPrincipalExpiration we removed the "(UTC)" from
labels [1].
We should do the same here.
[1] http://www.redhat.com/archives/freeipa-devel/2014-April/msg00442.html
--
Petr Vobornik
From 842fee3911d2fc130444d68bc9974e92a6b9deab Mon Sep 17 00:00:00 2001
From: Tomas Babej <tba...@redhat.com>
Date: Thu, 9 Jan 2014 11:29:39 +0100
Subject: [PATCH] ipalib: Use DateTime parameter class for OTP token timestamp
attributes
For ipatokennotbefore and ipatokennotafter attributes use DateTime
parameter class instead of Str, since these are represented as
LDAP Generalized Time in LDAP.
---
API.txt | 12 ++++++------
VERSION | 4 ++--
ipalib/plugins/otptoken.py | 10 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/API.txt b/API.txt
index caee61a22fcbf1395fcec55e9d5f5b23c4269523..b122b277245e44eeb3ca367acf748da50b5391c1 100644
--- a/API.txt
+++ b/API.txt
@@ -2234,8 +2234,8 @@ option: Str('description', attribute=True, cli_name='desc', multivalue=False, re
option: Bool('ipatokendisabled', attribute=True, cli_name='disabled', multivalue=False, required=False)
option: Int('ipatokenhotpcounter', attribute=True, autofill=True, cli_name='counter', default=0, minvalue=0, multivalue=False, required=False)
option: Str('ipatokenmodel', attribute=True, autofill=True, cli_name='model', multivalue=False, required=False)
-option: Str('ipatokennotafter', attribute=True, cli_name='not_after', multivalue=False, required=False)
-option: Str('ipatokennotbefore', attribute=True, cli_name='not_before', multivalue=False, required=False)
+option: DateTime('ipatokennotafter', attribute=True, cli_name='not_after', multivalue=False, required=False)
+option: DateTime('ipatokennotbefore', attribute=True, cli_name='not_before', multivalue=False, required=False)
option: StrEnum('ipatokenotpalgorithm', attribute=True, autofill=True, cli_name='algo', default=u'sha1', multivalue=False, required=False, values=(u'sha1', u'sha256', u'sha384', u'sha512'))
option: IntEnum('ipatokenotpdigits', attribute=True, autofill=True, cli_name='digits', default=6, multivalue=False, required=False, values=(6, 8))
option: OTPTokenKey('ipatokenotpkey', attribute=True, autofill=True, cli_name='key', multivalue=False, required=False)
@@ -2268,8 +2268,8 @@ option: Str('description', attribute=True, autofill=False, cli_name='desc', mult
option: Bool('ipatokendisabled', attribute=True, autofill=False, cli_name='disabled', multivalue=False, query=True, required=False)
option: Int('ipatokenhotpcounter', attribute=True, autofill=False, cli_name='counter', default=0, minvalue=0, multivalue=False, query=True, required=False)
option: Str('ipatokenmodel', attribute=True, autofill=False, cli_name='model', multivalue=False, query=True, required=False)
-option: Str('ipatokennotafter', attribute=True, autofill=False, cli_name='not_after', multivalue=False, query=True, required=False)
-option: Str('ipatokennotbefore', attribute=True, autofill=False, cli_name='not_before', multivalue=False, query=True, required=False)
+option: DateTime('ipatokennotafter', attribute=True, autofill=False, cli_name='not_after', multivalue=False, query=True, required=False)
+option: DateTime('ipatokennotbefore', attribute=True, autofill=False, cli_name='not_before', multivalue=False, query=True, required=False)
option: StrEnum('ipatokenotpalgorithm', attribute=True, autofill=False, cli_name='algo', default=u'sha1', multivalue=False, query=True, required=False, values=(u'sha1', u'sha256', u'sha384', u'sha512'))
option: IntEnum('ipatokenotpdigits', attribute=True, autofill=False, cli_name='digits', default=6, multivalue=False, query=True, required=False, values=(6, 8))
option: Str('ipatokenowner', attribute=True, autofill=False, cli_name='owner', multivalue=False, query=True, required=False)
@@ -2297,8 +2297,8 @@ option: Str('delattr*', cli_name='delattr', exclude='webui')
option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
option: Bool('ipatokendisabled', attribute=True, autofill=False, cli_name='disabled', multivalue=False, required=False)
option: Str('ipatokenmodel', attribute=True, autofill=False, cli_name='model', multivalue=False, required=False)
-option: Str('ipatokennotafter', attribute=True, autofill=False, cli_name='not_after', multivalue=False, required=False)
-option: Str('ipatokennotbefore', attribute=True, autofill=False, cli_name='not_before', multivalue=False, required=False)
+option: DateTime('ipatokennotafter', attribute=True, autofill=False, cli_name='not_after', multivalue=False, required=False)
+option: DateTime('ipatokennotbefore', attribute=True, autofill=False, cli_name='not_before', multivalue=False, required=False)
option: Str('ipatokenowner', attribute=True, autofill=False, cli_name='owner', multivalue=False, required=False)
option: Str('ipatokenserial', attribute=True, autofill=False, cli_name='serial', multivalue=False, required=False)
option: Str('ipatokenvendor', attribute=True, autofill=False, cli_name='vendor', default=u'FreeIPA', multivalue=False, required=False)
diff --git a/VERSION b/VERSION
index e11c9cc3b6c8fc25e9aed5a65604e48d518e159b..cdd2bf73657382d04bd174a45f523bab2278421b 100644
--- a/VERSION
+++ b/VERSION
@@ -89,5 +89,5 @@ IPA_DATA_VERSION=20100614120000
# #
########################################################
IPA_API_VERSION_MAJOR=2
-IPA_API_VERSION_MINOR=87
-# Last change: pviktori - --dnssec option for dnszone
+IPA_API_VERSION_MINOR=88
+# Last change: tbabej - Fix IPA OTP DateTime params
diff --git a/ipalib/plugins/otptoken.py b/ipalib/plugins/otptoken.py
index b264287c322381fb99c8823f7b1505ec537973ad..547269c16bdb7ff1d85840a9cccef3771e8d603f 100644
--- a/ipalib/plugins/otptoken.py
+++ b/ipalib/plugins/otptoken.py
@@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from ipalib.plugins.baseldap import DN, LDAPObject, LDAPCreate, LDAPDelete, LDAPUpdate, LDAPSearch, LDAPRetrieve
-from ipalib import api, Int, Str, Bool, Flag, Bytes, IntEnum, StrEnum, _, ngettext
+from ipalib import api, Int, Str, Bool, DateTime, Flag, Bytes, IntEnum, StrEnum, _, ngettext
from ipalib.plugable import Registry
from ipalib.errors import PasswordMismatch, ConversionError, LastMemberError, NotFound
from ipalib.request import context
@@ -142,13 +142,13 @@ class otptoken(LDAPObject):
cli_name='disabled',
label=_('Disabled state')
),
- Str('ipatokennotbefore?',
+ DateTime('ipatokennotbefore?',
cli_name='not_before',
- label=_('Validity start'),
+ label=_('Validity start (UTC)'),
),
- Str('ipatokennotafter?',
+ DateTime('ipatokennotafter?',
cli_name='not_after',
- label=_('Validity end'),
+ label=_('Validity end (UTC)'),
),
Str('ipatokenvendor?',
cli_name='vendor',
--
1.9.0
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
