Skip to content

fix: Respect the next link in UIF Entra backend requests#860

Merged
NickLarsenNZ merged 1 commit into
release-26.7from
cherry-pick/uif-entra-pagination
Jul 17, 2026
Merged

fix: Respect the next link in UIF Entra backend requests#860
NickLarsenNZ merged 1 commit into
release-26.7from
cherry-pick/uif-entra-pagination

Conversation

@NickLarsenNZ

Copy link
Copy Markdown
Member

Fixed in main here: #859

* fix: respect next link in uif entra backend requests

* fix: bound Entra group pagination, keep all memberships, add HTTP timeouts

Follow-ups to the @odata.nextLink pagination fix in #859:

- Add a 60s request / 15s connect timeout to every user-info-fetcher
  outbound HTTP backend (Keycloak, Entra, XFSC AAS) via a shared
  utils::http::client_builder(); reqwest otherwise waits indefinitely.
- Keep every directory membership by requesting /memberOf instead of
  restricting to microsoft.graph.group, so directory roles and
  administrative units are still returned.
- Cap @odata.nextLink following at 100 pages as a backstop against a
  cyclic or runaway link, warning if the group list may be truncated.
- Bump the yanked spin 0.9.8 to 0.9.9 (matching #857, which only landed
  on release-26.7) so cargo-deny passes, and regenerate Cargo.nix for
  the new wiremock dev-dependency.

* fix: address review feedback

- Restructure the Entra group pagination loop guard-first: check the page
  cap and warn/break before doing the request, per review.
- Reword the changelog entry for the pagination fix.

---------

Co-authored-by: Lars Francke <jujutsu@lars-francke.de>
@NickLarsenNZ NickLarsenNZ self-assigned this Jul 17, 2026
@NickLarsenNZ NickLarsenNZ changed the title fix: Respect the next link in UIF Entra backend requests (#859) fix: Respect the next link in UIF Entra backend requests Jul 17, 2026
@NickLarsenNZ
NickLarsenNZ merged commit 1c08074 into release-26.7 Jul 17, 2026
6 checks passed
@NickLarsenNZ
NickLarsenNZ deleted the cherry-pick/uif-entra-pagination branch July 17, 2026 11:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants