Skip to content

Commit f24156f

Browse files
committed
disable restoring missing delegation
1 parent 0170c85 commit f24156f

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

endorsement/reconcile_access.py

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ def reconcile_access(commit_changes=False):
107107
except DelegateRightMismatchException as ex:
108108
record = ex.record
109109
logger.info(
110-
f"DELEGATION CHANGE: mailbox {netid} delegate {delegate}"
111-
f" ({record.access_right.name}) to {right}")
110+
f"DELEGATION CHANGE: mailbox {netid} delegate {delegate} "
111+
f"({record.access_right.name}) to {right}")
112112

113113
if commit_changes:
114114
right_record = get_access_right(right)
@@ -118,14 +118,14 @@ def reconcile_access(commit_changes=False):
118118

119119
# access records for which no delegation was reported
120120
for record in AccessRecord.objects.filter(id__in=record_ids):
121-
if commit_changes:
121+
logger.info(f"UNREPORTED DELEGATION: mailbox {accessee.netid} "
122+
f"delegate {record.accessor.name} "
123+
f"({record.access_right.name}) "
124+
f"on {record.datetime_granted} not "
125+
"assigned in Outlook")
126+
# disable until policy is decided
127+
if False and commit_changes:
122128
assign_delegation(accessee, record)
123-
else:
124-
logger.info(f"MISSING DELEGATION: mailbox {accessee.netid} "
125-
f"delegate {record.accessor.name} "
126-
f"({record.access_right.name})"
127-
f" on {record.datetime_granted} not "
128-
"assigned in Outlook")
129129

130130

131131
def clear_record_id(record_ids, record_id):
@@ -171,10 +171,6 @@ def get_access_right(right):
171171

172172

173173
def new_access_record(accessee, delegate, right):
174-
logger.info(
175-
f"CREATE RECORD: mailbox {accessee.netid} "
176-
f"delegate {delegate} ({right.name})")
177-
178174
logger.info("FAILSAFE HIT")
179175
return
180176

@@ -183,11 +179,12 @@ def new_access_record(accessee, delegate, right):
183179
store_access_record(
184180
accessee, accessor, right, is_reconcile=True)
185181

186-
logger.info(f"mailbox {accessee.netid} delegation {delegate} "
187-
f"({right}) record created")
182+
logger.info(
183+
f"CREATEED RECORD: mailbox {accessee.netid} "
184+
f"delegate {delegate} ({right.name})")
188185
except (UnrecognizedUWNetid, UnrecognizedGroupID):
189186
logger.error(
190-
"Unknown netid or group: {}".format(delegate))
187+
"CREATE RECORDE: Unknown netid or group: {}".format(delegate))
191188

192189

193190
def assign_delegation(accessee, record):

0 commit comments

Comments
 (0)