diff --git a/app.py b/app.py index 366e516e8d2de6e41f301b4aaeee5c5aca7ebf88..fa54bed7ffe51a3931e528d31fb8c8168df1d3c2 100644 --- a/app.py +++ b/app.py @@ -30,7 +30,6 @@ def create_app(test_config=None): user_name = session['user_name'] user_nickname = session['user_nickname'] user_email = session['user_email'] - user_ldap_dn = session['user_ldap_dn'] user_groups = session['user_groups'] except (KeyError, OverflowError): session.clear() @@ -44,7 +43,6 @@ def create_app(test_config=None): resp.headers['OAUTH-USER-NAME'] = user_name resp.headers['OAUTH-USER-NICKNAME'] = user_nickname resp.headers['OAUTH-USER-EMAIL'] = user_email - resp.headers['OAUTH-USER-LDAP-DN'] = user_ldap_dn resp.headers['OAUTH-USER-GROUPS'] = ','.join(user_groups) return resp @@ -97,7 +95,6 @@ def create_app(test_config=None): session['user_name'] = userinfo['name'] session['user_nickname'] = userinfo['nickname'] session['user_email'] = userinfo['email'] - session['user_ldap_dn'] = userinfo['ldap_dn'] session['user_groups'] = userinfo['groups'] return redirect(redirect_url) diff --git a/test_app.py b/test_app.py index 506568f08fcf228fb0a74adf41a8bd0e7cc4b0f6..c1cd3faf78c3f9f9b1337db22294931889d42393 100644 --- a/test_app.py +++ b/test_app.py @@ -44,7 +44,6 @@ def mock_request(self, method, url, **kwargs): 'name': 'Test User', 'nickname': 'testuser', 'email': 'test@example.com', - 'ldap_dn': 'uid=testuser,ou=users,dc=example,dc=com', 'groups': ['uffd_access', 'users']}) print(repr(method), repr(url), repr(kwargs)) raise Exception() @@ -111,7 +110,6 @@ class TestCases(unittest.TestCase): self.assertEqual(session['user_name'], 'Test User') self.assertEqual(session['user_nickname'], 'testuser') self.assertEqual(session['user_email'], 'test@example.com') - self.assertEqual(session['user_ldap_dn'], 'uid=testuser,ou=users,dc=example,dc=com') self.assertEqual(set(session['user_groups']), set(['uffd_access', 'users'])) self.assertNotIn('state', session) self.assertNotIn('url', session) @@ -148,7 +146,6 @@ class TestCases(unittest.TestCase): session['user_name'] = 'Test User' session['user_nickname'] = 'testuser' session['user_email'] = 'test@example.com' - session['user_ldap_dn'] = 'uid=testuser,ou=users,dc=example,dc=com' session['user_groups'] = ['uffd_access', 'users'] r = self.client.get(path='/auth', headers=headers) self.assertEqual(r.status_code, 200) @@ -156,7 +153,6 @@ class TestCases(unittest.TestCase): self.assertEqual(r.headers['OAUTH-USER-NAME'], 'Test User') self.assertEqual(r.headers['OAUTH-USER-NICKNAME'], 'testuser') self.assertEqual(r.headers['OAUTH-USER-EMAIL'], 'test@example.com') - self.assertEqual(r.headers['OAUTH-USER-LDAP-DN'], 'uid=testuser,ou=users,dc=example,dc=com') self.assertIn(r.headers['OAUTH-USER-GROUPS'], ['uffd_access,users', 'users,uffd_access']) def test_auth_session_timeout(self): @@ -167,7 +163,6 @@ class TestCases(unittest.TestCase): session['user_name'] = 'Test User' session['user_nickname'] = 'testuser' session['user_email'] = 'test@example.com' - session['user_ldap_dn'] = 'uid=testuser,ou=users,dc=example,dc=com' session['user_groups'] = ['uffd_access', 'users'] r = self.client.get(path='/auth', headers=headers) self.assertEqual(r.status_code, 401) @@ -180,7 +175,6 @@ class TestCases(unittest.TestCase): session['user_name'] = 'Test User' session['user_nickname'] = 'testuser' session['user_email'] = 'test@example.com' - session['user_ldap_dn'] = 'uid=testuser,ou=users,dc=example,dc=com' session['user_groups'] = ['uffd_access', 'users'] r = self.client.get(path='/auth', headers=headers) self.assertEqual(r.status_code, 401) @@ -193,7 +187,6 @@ class TestCases(unittest.TestCase): session['user_name'] = 'Test User' session['user_nickname'] = 'testuser' session['user_email'] = 'test@example.com' - session['user_ldap_dn'] = 'uid=testuser,ou=users,dc=example,dc=com' session['user_groups'] = ['uffd_access', 'users'] r = self.client.get(path='/logout', headers=headers) self.assertEqual(r.status_code, 200) @@ -214,7 +207,6 @@ class TestCases(unittest.TestCase): session['user_name'] = 'Test User' session['user_nickname'] = 'testuser' session['user_email'] = 'test@example.com' - session['user_ldap_dn'] = 'uid=testuser,ou=users,dc=example,dc=com' session['user_groups'] = ['uffd_access', 'users'] r = self.client.get(path='/logout', headers=headers, query_string={'redirect_url': 'https://127.0.0.123:7654/app/logout'}) self.assertEqual(r.status_code, 302)