Monkeypatch out checking for affiliation, as berkeleyEduAffiliations is being removed from anonymous LDAP searches.

Author: bzh-bzh

ocflib/account/creation.py

@@ -261,10 +261,10 @@ def validate_calnet_uid(uid):
         raise ValidationError("CalNet UID can't be found in university LDAP.")
 
     # check if user is eligible for an account
-    affiliations = attrs['berkeleyEduAffiliations']
-    if not eligible_for_account(affiliations):
-        raise ValidationWarning(
-            'Affiliate type not eligible for account: ' + str(affiliations))
+    # affiliations = attrs['berkeleyEduAffiliations']
+    # if not eligible_for_account(affiliations):
+    #    raise ValidationWarning(
+    #        'Affiliate type not eligible for account: ' + str(affiliations))
 
 
 def eligible_for_account(affiliations):

ocflib/vhost/web.py

@@ -87,7 +87,7 @@ def eligible_for_vhost(user):
         return True
     elif 'calnetUid' in attrs:
         attrs_ucb = user_attrs_ucb(attrs['calnetUid'])
-        if attrs_ucb and 'EMPLOYEE-TYPE-ACADEMIC' in attrs_ucb['berkeleyEduAffiliations']:
+        if attrs_ucb:  # and 'EMPLOYEE-TYPE-ACADEMIC' in attrs_ucb['berkeleyEduAffiliations']:
             return True
 
     return False