access reconcile

Author: mikeseibel

docker/test-values.yml

@@ -34,6 +34,8 @@ externalService:
   servicePort: 5432
 repo: prt
 instance: test
+namespace:
+  enabled: true
 targetAverageUtilization: 95
 resources:
   limits:

endorsement/management/commands/reconcile_access.py

@@ -25,4 +25,5 @@ def handle(self, *args, **options):
         try:
             reconcile_access(commit_changes=commit_changes)
         except Exception as ex:
-            logger.error("reconcile_access: Exception: {}".format(ex))
+            logger.exception(
+                "reconcile_access: Exception: {}".format(ex), stack_info=True)

endorsement/reconcile_access.py

@@ -43,17 +43,17 @@ def reconcile_access(commit_changes=False):
         netid = strip_domain(row[0])
         accessee = get_accessee_model(netid)
 
-        for delegate, rights in get_delegations(row[1]).items():
+        for delegate, right in mailbox_delegations(row[1]):
             try:
-                record = reconcile_delegation(accessee, delegate, rights)
+                record = reconcile_delegation(accessee, delegate, right)
                 clear_record_id(record_ids, record.id)
             except NullDelegateException:
                 logger.info(
                     f"NULL DELEGATE: mailbox {netid} delegate null "
-                    f"with rights: {rights}")
+                    f"with right: {right}")
             except NoAccessRecordException:
                 logger.info(f"NO ACCESS RECORD FOR: mailbox {netid} "
-                            f"delegate {delegate} rights: {rights}")
+                            f"delegate {delegate} right: {right}")
                 if commit_changes:
                     new_access_record(accessee, delegate, right_record)
             except DeletedAccessRecordException as ex:
@@ -71,9 +71,23 @@ def reconcile_access(commit_changes=False):
                                 f"{record.datetime_expired}")
 
                     if commit_changes:
-                        right = next(iter(rights))
-                        right_record = get_access_right(right)
-                        assign_access_right(record, right_record)
+                        # right still match? update
+                        if record.access_right.name != right:
+                            logger.info(
+                                "UPDATE DELETED ACCESS RECORD: "
+                                f"mailbox {netid} "
+                                f"delegate {delegate} "
+                                f"({record.access_right.name}) to {right}")
+                            right_record = get_access_right(right)
+                            assign_access_right(record, right_record)
+
+                        logger.info(
+                            f"UNDELETED ACCESS RECORD: mailbox {netid} "
+                            f"delegate {delegate} "
+                            f"({record.access_right.name})")
+                        undelete_access_record(record)
+
+                clear_record_id(record_ids, record.id)
             except EmptyDelegateRightsException as ex:
                 record = ex.record
                 logger.info(f"NO RIGHTS FOR DELEGATION: "
@@ -83,17 +97,15 @@ def reconcile_access(commit_changes=False):
             except TooManyRightsException as ex:
                 logger.info(
                     f"CONFLICT: mailbox {netid} delegate {delegate} "
-                    f"rights: {rights}")
+                    f"right: {right}")
                 record = ex.record
                 if commit_changes:
                     revoke_record(record)
-                    save_conflict_record(accessee, record, delegate, rights)
+                    save_conflict_record(accessee, record, delegate, right)
 
                 clear_record_id(record_ids, record.id)
             except DelegateRightMismatchException as ex:
                 record = ex.record
-                right = next(iter(rights))
-
                 logger.info(
                     f"DELEGATION CHANGE: mailbox {netid} delegate {delegate}"
                     f" ({record.access_right.name}) to {right}")
@@ -103,10 +115,6 @@ def reconcile_access(commit_changes=False):
                     assign_access_right(record, right_record)
 
                 clear_record_id(record_ids, record.id)
-            except Exception as ex:
-                logger.error(
-                    f"UNEXPECTED ERROR: mailbox {netid} delegate {delegate} "
-                    f"rights: {rights} error: {ex}")
 
     # access records for which no delegation was reported
     for record in AccessRecord.objects.filter(id__in=record_ids):
@@ -127,7 +135,7 @@ def clear_record_id(record_ids, record_id):
         pass
 
 
-def reconcile_delegation(accessee, delegate, rights):
+def reconcile_delegation(accessee, delegate, right):
     if not delegate or delegate.lower() == 'null':
         raise NullDelegateException()
 
@@ -137,16 +145,20 @@ def reconcile_delegation(accessee, delegate, rights):
     except AccessRecord.DoesNotExist:
         raise NoAccessRecordException()
 
-    if len(rights) > 1:
-        raise TooManyRightsException(record=record)
-
     if record.is_deleted:
         raise DeletedAccessRecordException(record=record)
 
-    if len(rights) < 1:
-        raise EmptyDelegateRightsException(record=record)
+    if isinstance(right, str):
+        if not right:
+            raise EmptyDelegateRightsException(record=record)
+    elif isinstance(right, list):
+        if len(right) == 0:
+            raise EmptyDelegateRightsException(record=record)
+        elif len(rights) > 1:
+            raise TooManyRightsException(record=record)
+
+        right = right[0]
 
-    right = next(iter(rights))
     if record.access_right.name != right:
         raise DelegateRightMismatchException(record=record)
 
@@ -206,6 +218,14 @@ def revoke_record(record):
     record.revoke()
 
 
+def undelete_access_record(record):
+    logger.info("FAILSAFE HIT")
+    return
+
+    record.is_deleted = False
+    record.save()
+
+
 def assign_access_right(record, right):
     logger.info(f"UPDATE CHANGE: mailbox {record.accessee.netid} "
                 f"delegate {record.accessor.name} "
@@ -236,18 +256,16 @@ def save_conflict_record(accessee, record, delegate, rights):
     conflict.save()
 
 
-def get_delegations(raw):
-    delegates = {}
-    cooked = json.loads(raw)
-    for right in [cooked] if isinstance(cooked, dict) else cooked:
+def mailbox_delegations(column):
+    rights = json.loads(column)
+    for right in [rights] if isinstance(rights, dict) else rights:
         user = right["User"]
         if user and user.lower() != 'null':
-            try:
-                delegates[user].append(right['AccessRights'])
-            except KeyError:
-                delegates[user] = [right['AccessRights']]
-
-    return delegates
+            yield user, right['AccessRights']
+        else:
+            logger.debug(
+                f"NULL RIGHT: mailbox {netid} delegate {delegate}"
+                f" right: {right}")
 
 
 def access_user(a):

setup.py

@@ -45,7 +45,7 @@
         'UW-RestClients-UWNetID~=1.1.2',
         'UW-RestClients-Django-Utils~=2.1.5',
         'UW-RestClients-ITBill~=0.1',
-        'UW-RestClients-MSCA~=0.1.3',
+        'UW-RestClients-MSCA~=0.1',
         'Django-Safe-EmailBackend~=1.2',
         'UW-Django-SAML2>=1.3.8,<2.0',
         'django-pyscss',