Skip to content

Repository navigation

fix(directory): allow first-time Org/Role membership projection #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
servicememeai merged 2 commits into from
Oct 25, 2026
Merged

fix(directory): allow first-time Org/Role membership projection #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd432db
fix(directory): include newly assigned groups in GroupUser readback v…
servicememeai Oct 25, 2026
f86bd65
test(directory): cover new and partially assigned memberships on login
servicememeai Oct 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloudfile_ext/v2/memberships.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def _project(self, uid, username, desired):
cursor.execute('INSERT INTO ' + self.members + '(group_id,user_name,is_staff) VALUES(%s,%s,0)', (group, username))
cursor.execute('SELECT group_id,is_staff FROM ' + self.members + ' WHERE user_name=%s ORDER BY group_id FOR UPDATE', (username,))
actual = cursor.fetchall()
if ({group for group, _ in actual} & owned) != required or any(group in owned and staff != 0 for group, staff in actual):
if ({group for group, _ in actual} & (owned | required)) != required or any(group in (owned | required) and staff != 0 for group, staff in actual):
raise IdentityUnavailable('native membership readback failed')
self.connection.commit()
finally:
Expand Down
12 changes: 12 additions & 0 deletions cloudfile_ext/v2/tests/test_direct_groupuser_sql_mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,18 @@ def test_ancestor_is_revoked_direct_role_and_manual_group_preserved(self):
self.assertEqual(conn.members, {10: 0, 12: 0, 99: 0})
self.assertEqual(conn.commits, 2)

def test_new_user_memberships_are_added_and_verified(self):
# The old readback checked only groups already owned before INSERT,
# rejecting a perfectly valid first login with new Org/Role rows.
for original in ({99: 0}, {10: 0, 99: 0}):
with self.subTest(original=original):
conn = Connection(original)
projector, identity = self.projector(conn)
projector._project(UID, USERNAME, {DIRECT, ROLE})
self.assertEqual(conn.members, {10: 0, 12: 0, 99: 0})
self.assertEqual((conn.commits, conn.rollbacks), (1, 0))
identity.active.assert_called_once_with(USERNAME, UID, locked=True)

def test_failure_rolls_back_ancestor_revocation(self):
conn = Connection({10: 0, 11: 0, 12: 0, 99: 0}, fail_delete=True)
projector, _ = self.projector(conn)
Expand Down
Loading