Skip to content

Commit ab25715

Browse files
committed
Revert to having access_blob as a string
1 parent 3c43b09 commit ab25715

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

policy/diamond/policy/session/session.rego

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ write_to_beamline_visit if {
5656
matches_beamline
5757
}
5858

59-
user_sessions contains session if {
60-
subject := token.claims.fedid
59+
user_sessions contains user_session if {
6160
some session in data.diamond.data.sessions
62-
access_session(subject, session.proposal_number, session.visit_number)
61+
access_session(token.claims.fedid, session.proposal_number, session.visit_number)
62+
user_session := sprintf(
63+
"{\"proposal_number\": %d, \"visit_number\": %d, \"beamline\": \"%s\"}",
64+
[session.proposal_number, session.visit_number, session.beamline],
65+
)
6366
}

policy/diamond/policy/session/session_test.rego

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,18 +186,18 @@ test_user_session_tags if {
186186
session.user_sessions == set() with data.diamond.data as diamond_data
187187
with data.diamond.policy.token.claims as {"fedid": "oscar"}
188188
session.user_sessions == {
189-
{"proposal_number": 1, "visit_number": 2, "beamline": "b07"},
190-
{"proposal_number": 1, "visit_number": 1, "beamline": "i03"},
189+
"{\"proposal_number\": 1, \"visit_number\": 2, \"beamline\": \"b07\"}",
190+
"{\"proposal_number\": 1, \"visit_number\": 1, \"beamline\": \"i03\"}",
191191
} with data.diamond.data as diamond_data
192192
with data.diamond.policy.token.claims as {"fedid": "alice"}
193193
session.user_sessions == {
194-
{"proposal_number": 1, "visit_number": 2, "beamline": "b07"},
195-
{"proposal_number": 1, "visit_number": 1, "beamline": "i03"},
194+
"{\"proposal_number\": 1, \"visit_number\": 2, \"beamline\": \"b07\"}",
195+
"{\"proposal_number\": 1, \"visit_number\": 1, \"beamline\": \"i03\"}",
196196
} with data.diamond.data as diamond_data
197197
with data.diamond.policy.token.claims as {"fedid": "bob"}
198198
session.user_sessions == {
199-
{"proposal_number": 1, "visit_number": 2, "beamline": "b07"},
200-
{"proposal_number": 1, "visit_number": 1, "beamline": "i03"},
199+
"{\"proposal_number\": 1, \"visit_number\": 2, \"beamline\": \"b07\"}",
200+
"{\"proposal_number\": 1, \"visit_number\": 1, \"beamline\": \"i03\"}",
201201
} with data.diamond.data as diamond_data
202202
with data.diamond.policy.token.claims as {"fedid": "carol"}
203203
}

0 commit comments

Comments
 (0)