fix: Respect the next link in UIF Entra backend requests#859
Merged
Conversation
…eouts 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.
Member
|
I added release notes to the issue: #858 (comment) |
Techassi
reviewed
Jul 17, 2026
Techassi
left a comment
Member
There was a problem hiding this comment.
Mostly lgtm, just two minor comments.
- 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.
Techassi
approved these changes
Jul 17, 2026
NickLarsenNZ
added a commit
that referenced
this pull request
Jul 17, 2026
* 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: maltesander <contact@maltesander.com> Co-authored-by: Lars Francke <jujutsu@lars-francke.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
fixes #858
Cherry-picked into release-26.7 here: #860
#[serde(rename = "@odata.nextLink")] next_link: Option<String>, so the link is no longer silently discarded./memberOf/microsoft.graph.group?$select=displayName&$top=999, filtering to actual groups, and cutting round-trips by taking the largest page size Graph accepts.Definition of Done Checklist
Author
Reviewer
Acceptance
type/deprecationlabel & add to the deprecation scheduletype/experimentallabel & add to the experimental features tracker