Browse Source

.local email

Bastien Sevajol (Algoo) 9 years ago
parent
commit
e5fbebbcb8

+ 3 - 3
tracim/tracim/fixtures/ldap.py View File

46
         },
46
         },
47
         {
47
         {
48
             'objectclass': ['account', 'top'],
48
             'objectclass': ['account', 'top'],
49
-            'dn': 'cn=lawrence-not-real-email@fsf.org,ou=people,dc=directory,dc=fsf,dc=org',
49
+            'dn': 'cn=lawrence-not-real-email@fsf.local,ou=people,dc=directory,dc=fsf,dc=org',
50
             'attributes': {
50
             'attributes': {
51
-                'uid': 'lawrence-not-real-email@fsf.org',
51
+                'uid': 'lawrence-not-real-email@fsf.local',
52
                 'userPassword': 'foobarbaz',
52
                 'userPassword': 'foobarbaz',
53
-                'mail': 'lawrence-not-real-email@fsf.org',
53
+                'mail': 'lawrence-not-real-email@fsf.local',
54
                 'pubname': 'Lawrence Lessig',
54
                 'pubname': 'Lawrence Lessig',
55
             }
55
             }
56
         },
56
         },

+ 1 - 1
tracim/tracim/fixtures/users_and_groups.py View File

43
 
43
 
44
         lawrence = model.User()
44
         lawrence = model.User()
45
         lawrence.display_name = 'Lawrence L.'
45
         lawrence.display_name = 'Lawrence L.'
46
-        lawrence.email = 'lawrence-not-real-email@fsf.org'
46
+        lawrence.email = 'lawrence-not-real-email@fsf.local'
47
         lawrence.password = 'foobarbaz'
47
         lawrence.password = 'foobarbaz'
48
         self._session.add(lawrence)
48
         self._session.add(lawrence)
49
         g2.users.append(lawrence)
49
         g2.users.append(lawrence)

+ 4 - 4
tracim/tracim/tests/functional/test_ldap_authentication.py View File

44
 
44
 
45
     def test_ldap_attributes_sync(self):
45
     def test_ldap_attributes_sync(self):
46
         # User is already know in database
46
         # User is already know in database
47
-        eq_(1, DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').count())
47
+        eq_(1, DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').count())
48
 
48
 
49
         # His display name is Lawrence L.
49
         # His display name is Lawrence L.
50
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
50
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
51
         eq_('Lawrence L.', lawrence.display_name)
51
         eq_('Lawrence L.', lawrence.display_name)
52
 
52
 
53
         # After connexion with LDAP, his display_name is updated (see ldap fixtures)
53
         # After connexion with LDAP, his display_name is updated (see ldap fixtures)
54
-        self._connect_user('lawrence-not-real-email@fsf.org', 'foobarbaz')
55
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
54
+        self._connect_user('lawrence-not-real-email@fsf.local', 'foobarbaz')
55
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
56
         eq_('Lawrence Lessig', lawrence.display_name)
56
         eq_('Lawrence Lessig', lawrence.display_name)

+ 7 - 7
tracim/tracim/tests/functional/test_ldap_restrictions.py View File

21
         Password change is disabled
21
         Password change is disabled
22
         :return:
22
         :return:
23
         """
23
         """
24
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
25
-        self._connect_user('lawrence-not-real-email@fsf.org', 'foobarbaz')
24
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
25
+        self._connect_user('lawrence-not-real-email@fsf.local', 'foobarbaz')
26
         home = self.app.get('/home/',)
26
         home = self.app.get('/home/',)
27
 
27
 
28
         # HTML button is not here
28
         # HTML button is not here
45
         Some fields (email) are not editable on user interface: they are managed by LDAP
45
         Some fields (email) are not editable on user interface: they are managed by LDAP
46
         :return:
46
         :return:
47
         """
47
         """
48
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
49
-        self._connect_user('lawrence-not-real-email@fsf.org', 'foobarbaz')
48
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
49
+        self._connect_user('lawrence-not-real-email@fsf.local', 'foobarbaz')
50
 
50
 
51
         edit = self.app.get('/user/5/edit')
51
         edit = self.app.get('/user/5/edit')
52
 
52
 
60
         ok_('readonly' not in name_input.attrs)
60
         ok_('readonly' not in name_input.attrs)
61
 
61
 
62
         # If we force edit of user, "email" field will be not updated
62
         # If we force edit of user, "email" field will be not updated
63
-        eq_(lawrence.email, 'lawrence-not-real-email@fsf.org')
63
+        eq_(lawrence.email, 'lawrence-not-real-email@fsf.local')
64
         eq_(lawrence.display_name, 'Lawrence L.')
64
         eq_(lawrence.display_name, 'Lawrence L.')
65
 
65
 
66
         try_post_user = self.app.post(
66
         try_post_user = self.app.post(
73
 
73
 
74
         eq_(try_post_user.status_code, 302, "Code should be 302, but is %d" % try_post_user.status_code)
74
         eq_(try_post_user.status_code, 302, "Code should be 302, but is %d" % try_post_user.status_code)
75
 
75
 
76
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
77
-        eq_(lawrence.email, 'lawrence-not-real-email@fsf.org', "email should be unmodified")
76
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
77
+        eq_(lawrence.email, 'lawrence-not-real-email@fsf.local', "email should be unmodified")
78
         eq_(lawrence.display_name, 'Lawrence Lessig YEAH', "Name should be updated")
78
         eq_(lawrence.display_name, 'Lawrence Lessig YEAH', "Name should be updated")

+ 4 - 4
tracim/tracim/tests/library/test_ldap_without_ldap_groups.py View File

68
         LDAP don't manage groups here: We must retrieve internal groups of tested user
68
         LDAP don't manage groups here: We must retrieve internal groups of tested user
69
         :return:
69
         :return:
70
         """
70
         """
71
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
71
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
72
         managers = DBSession.query(Group).filter(Group.group_name == 'managers').one()
72
         managers = DBSession.query(Group).filter(Group.group_name == 'managers').one()
73
         lawrence_identity = {'user': lawrence}
73
         lawrence_identity = {'user': lawrence}
74
 
74
 
75
         # Lawrence is in fixtures: he is in managers group
75
         # Lawrence is in fixtures: he is in managers group
76
-        self._check_db_user('lawrence-not-real-email@fsf.org', 1)
76
+        self._check_db_user('lawrence-not-real-email@fsf.local', 1)
77
         assert lawrence in managers.users
77
         assert lawrence in managers.users
78
         assert False is ini_conf_to_bool(config.get('ldap_group_enabled', False))
78
         assert False is ini_conf_to_bool(config.get('ldap_group_enabled', False))
79
         assert ['managers'] == config.get('sa_auth').authmetadata.get_groups(
79
         assert ['managers'] == config.get('sa_auth').authmetadata.get_groups(
95
         LDAP don't manage groups here: We must retrieve internal groups permission of tested user
95
         LDAP don't manage groups here: We must retrieve internal groups permission of tested user
96
         :return:
96
         :return:
97
         """
97
         """
98
-        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.org').one()
98
+        lawrence = DBSession.query(User).filter(User.email == 'lawrence-not-real-email@fsf.local').one()
99
         managers = DBSession.query(Group).filter(Group.group_name == 'managers').one()
99
         managers = DBSession.query(Group).filter(Group.group_name == 'managers').one()
100
         lawrence_identity = {'user': lawrence}
100
         lawrence_identity = {'user': lawrence}
101
 
101
 
102
         # Lawrence is in fixtures: he is in managers group
102
         # Lawrence is in fixtures: he is in managers group
103
-        self._check_db_user('lawrence-not-real-email@fsf.org', 1)
103
+        self._check_db_user('lawrence-not-real-email@fsf.local', 1)
104
         assert lawrence in managers.users
104
         assert lawrence in managers.users
105
         assert False is ini_conf_to_bool(config.get('ldap_group_enabled', False))
105
         assert False is ini_conf_to_bool(config.get('ldap_group_enabled', False))
106
 
106