mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Add UID, GID and e-mail to the user default attributes.
ticket https://fedorahosted.org/freeipa/ticket/1265
This commit is contained in:
committed by
Endi Sukma Dewata
parent
ab098ada04
commit
4ef8b58c26
@@ -88,7 +88,8 @@ class user(LDAPObject):
|
||||
disallow_object_classes = ['krbticketpolicyaux']
|
||||
search_attributes_config = 'ipausersearchfields'
|
||||
default_attributes = [
|
||||
'uid', 'givenname', 'sn', 'homedirectory', 'loginshell', 'ou',
|
||||
'uid', 'givenname', 'sn', 'homedirectory', 'loginshell',
|
||||
'uidnumber', 'gidnumber', 'mail', 'ou',
|
||||
'telephonenumber', 'title', 'memberof', 'nsaccountlock',
|
||||
'memberofindirect',
|
||||
]
|
||||
|
@@ -56,6 +56,7 @@ class test_attr(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
@@ -78,6 +79,8 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'test@example.com'],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
@@ -100,6 +103,8 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'test@example.com', u'test2@example.com'],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
@@ -122,6 +127,9 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'test@example.com', u'test2@example.com'],
|
||||
memberof_group=[u'ipausers'],
|
||||
telephonenumber=[u'410-555-1212', u'301-555-1212'],
|
||||
nsaccountlock=[u'False'],
|
||||
@@ -144,6 +152,9 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'test@example.com', u'test2@example.com'],
|
||||
memberof_group=[u'ipausers'],
|
||||
telephonenumber=[u'301-555-1212'],
|
||||
nsaccountlock=[u'False'],
|
||||
@@ -166,6 +177,9 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'test@example.com', u'test2@example.com'],
|
||||
memberof_group=[u'ipausers'],
|
||||
telephonenumber=[u'301-555-1212', u'202-888-9833', u'703-555-1212'],
|
||||
nsaccountlock=[u'False'],
|
||||
@@ -206,6 +220,9 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'test@example.com', u'test2@example.com'],
|
||||
memberof_group=[u'ipausers'],
|
||||
telephonenumber=[u'301-555-1212', u'202-888-9833', u'703-555-1212'],
|
||||
nsaccountlock=[u'False'],
|
||||
@@ -228,6 +245,9 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'test@example.com', u'test2@example.com'],
|
||||
memberof_group=[u'ipausers'],
|
||||
telephonenumber=[u'301-555-1212', u'202-888-9833', u'703-555-1212'],
|
||||
nsaccountlock=[u'False'],
|
||||
|
@@ -585,6 +585,7 @@ class test_group(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
@@ -694,6 +695,7 @@ class test_group(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
|
@@ -101,6 +101,7 @@ class test_krbtpolicy(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
|
@@ -39,7 +39,7 @@ fqdn1 = u'testhost1.%s' % api.env.domain
|
||||
host_dn1 = u'fqdn=%s,cn=computers,cn=accounts,%s' % (fqdn1, api.env.basedn)
|
||||
|
||||
|
||||
class test_group(Declarative):
|
||||
class test_nesting(Declarative):
|
||||
cleanup_commands = [
|
||||
('group_del', [group1], {}),
|
||||
('group_del', [group2], {}),
|
||||
@@ -136,6 +136,7 @@ class test_group(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
@@ -164,6 +165,7 @@ class test_group(Declarative):
|
||||
sn=[u'User2'],
|
||||
uid=[user2],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User2'],
|
||||
cn=[u'Test User2'],
|
||||
initials=[u'TU'],
|
||||
|
@@ -207,6 +207,7 @@ class test_netgroup(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
@@ -234,6 +235,7 @@ class test_netgroup(Declarative):
|
||||
sn=[u'User2'],
|
||||
uid=[user2],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User2'],
|
||||
cn=[u'Test User2'],
|
||||
initials=[u'TU'],
|
||||
|
@@ -34,7 +34,7 @@ user_memberof = (u'cn=ipausers,cn=groups,cn=accounts,%s' % api.env.basedn,)
|
||||
user1=u'tuser1'
|
||||
|
||||
|
||||
class test_attr(Declarative):
|
||||
class test_replace(Declarative):
|
||||
|
||||
cleanup_commands = [
|
||||
('user_del', [user1], {}),
|
||||
@@ -61,6 +61,7 @@ class test_attr(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
@@ -84,6 +85,8 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'test1@example.com', u'test3@example.com'],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
@@ -106,6 +109,8 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'test4@example.com'],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
@@ -128,6 +133,8 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
mail=[u'test6@example.com', u'test7@example.com', u'test5@example.com'],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
@@ -150,6 +157,8 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
),
|
||||
@@ -171,6 +180,8 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
initials=[u'ABC'],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
@@ -193,6 +204,8 @@ class test_attr(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
),
|
||||
|
@@ -93,6 +93,7 @@ class test_user(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
@@ -125,6 +126,8 @@ class test_user(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
),
|
||||
@@ -295,6 +298,8 @@ class test_user(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
),
|
||||
@@ -324,6 +329,8 @@ class test_user(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
),
|
||||
@@ -344,6 +351,8 @@ class test_user(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[renameduser1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
),
|
||||
@@ -370,6 +379,8 @@ class test_user(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
),
|
||||
@@ -426,6 +437,7 @@ class test_user(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
@@ -454,6 +466,7 @@ class test_user(Declarative):
|
||||
sn=[u'User2'],
|
||||
uid=[user2],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User2'],
|
||||
cn=[u'Test User2'],
|
||||
initials=[u'TU'],
|
||||
@@ -481,6 +494,8 @@ class test_user(Declarative):
|
||||
loginshell=[u'/bin/sh'],
|
||||
sn=[u'User2'],
|
||||
uid=[user2],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
memberof_group=[u'ipausers'],
|
||||
nsaccountlock=[u'False'],
|
||||
manager=[user1],
|
||||
@@ -577,6 +592,7 @@ class test_user(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
gidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
|
Reference in New Issue
Block a user