separate user_attrs into privileged so other methods can run

Author: ja5087

ocflib/account/creation.py

@@ -258,7 +258,7 @@ def validate_calnet_uid(uid):
         raise ValidationError(
             'CalNet UID already has account: ' + str(existing_accounts))
 
-    attrs = search.user_attrs_ucb(uid)
+    attrs = search.user_attrs_ucb_privileged(uid)
 
     if not attrs:
         raise ValidationError("CalNet UID can't be found in university LDAP.")

ocflib/account/search.py

@@ -52,6 +52,11 @@ def user_attrs(uid, connection=ldap.ldap_ocf, base=OCF_LDAP_PEOPLE, dn=None, pas
 
 
 def user_attrs_ucb(uid):
+    return user_attrs(uid, connection=ldap.ldap_ucb,
+                      base=UCB_LDAP_PEOPLE)
+
+
+def user_attrs_ucb_privileged(uid):
     return user_attrs(uid, connection=ldap.ldap_ucb_privileged,
                       base=UCB_LDAP_PEOPLE)
 

ocflib/vhost/web.py

@@ -3,7 +3,7 @@
 import requests
 
 from ocflib.account.search import user_attrs
-from ocflib.account.search import user_attrs_ucb
+from ocflib.account.search import user_attrs_ucb_privileged
 
 VHOST_DB_PATH = '/home/s/st/staff/vhost/vhost.conf'
 VHOST_DB_URL = 'https://www.ocf.berkeley.edu/~staff/vhost.conf'
@@ -86,7 +86,7 @@ def eligible_for_vhost(user):
     if 'callinkOid' in attrs:
         return True
     elif 'calnetUid' in attrs:
-        attrs_ucb = user_attrs_ucb(attrs['calnetUid'])
+        attrs_ucb = user_attrs_ucb_privileged(attrs['calnetUid'])
 
         if attrs_ucb and 'EMPLOYEE-TYPE-ACADEMIC' in attrs_ucb['berkeleyEduAffiliations']:
             return True

tests/account/creation_test.py

@@ -425,7 +425,7 @@ def fake_credentials(mock_rsa_key):
 @pytest.yield_fixture
 def mock_valid_calnet_uid():
     with mock.patch(
-        'ocflib.account.search.user_attrs_ucb',
+        'ocflib.account.search.user_attrs_ucb_privileged',
         return_value={'berkeleyEduAffiliations': ['STUDENT-TYPE-REGISTERED']}
     ):
         yield
@@ -434,7 +434,7 @@ def mock_valid_calnet_uid():
 @pytest.yield_fixture
 def mock_invalid_calnet_uid():
     with mock.patch(
-        'ocflib.account.search.user_attrs_ucb',
+        'ocflib.account.search.user_attrs_ucb_privileged',
         return_value={'berkeleyEduAffiliations': ['STUDENT-STATUS-EXPIRED']},
     ):
         yield