-
Notifications
You must be signed in to change notification settings - Fork 334
saml2-web-sso: stop failing signature verification on stdout/stderr noise #5311
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.
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
Open
blackheaven
wants to merge
5
commits into
develop
Choose a base branch
from
gdifolco/fix-flaky-tests-spar
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It makes sense that this causes flakiness, because
hCaptureactually captures stdout/stderr from other threads too.Example failure due to some logging which definitely prints in another thread:
But removing it seems to remove capturing of errors from libxml, we should somehow limit this capture to only capture stdout/stderr limited to the IO action.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@akshaymankar Thanks for flagging this — you're right that the capture wasn't entirely vacuous. I traced where libxml2 actually writes, and the writes that affect verification are already surfaced; the rest is non-fatal diagnostics. Details:
Where libxml2 writes to stderr (library core). Exactly one writer:
xmlGenericErrorDefaultFuncdoesvfprintf((FILE*) xmlGenericErrorContext, …), withxmlGenericErrorContextdefaulting tostderr(same function,error.c:236), wired as the global default inglobals.c:233. Everything else (runsuite.c,runxmlconf.c,shell.c) is test/CLI code, not in our link path.Which of our calls reach it.
xmlReadMemory(parser.c:13449) — yes; recoverable parse diagnostics go to stderr.xmlXPathEval(xpath.c:754, where the error path setschannel = xmlGenericError) — yes; invalid-expression diagnostics go to stderr.xmlC14NDocDumpMemory(c14n.c) — no stderr writes at all; it only signals failure by a negative return value.Already covered. The hard failures from those same calls are caught by hsaml2's
throwErrnoIf*wrappers inSAML2.XML.LibXML2—throwErrnoIfNull "xmlReadMemory",throwErrnoIfNull "xmlXPathEval",throwErrnoIf (< 0) "xmlC14NDocDumpMemory". Those throwIOexceptions, caught bytryinverifyandcatchAllinverifySignatureUnenvelopedSigs. So verification-affecting failures still propagate; the only thing the oldhCaptureadded was catching non-fatal diagnostic output — and sincehCaptureredirects the process-global handles, it mostly swept up unrelated concurrent application logging, which is the flakiness this PR fixes.If you'd prefer a real per-action capture (your "limit to the IO action" suggestion): libxml2 exposes exactly that via
xmlSetGenericErrorFunc(void *ctx, xmlGenericErrorFunc handler)(error.c:272). Thectxis avoid*that the default handler casts to aFILE*andvfprintfs to, soxmlSetGenericErrorFunc((void*) someHandle, NULL)redirects libxml2's output to that handle with nostderrinvolvement at all. The setting is thread-local, so under GHC we'd set it on a bound thread (forkOS) wrappingverifyIO, call into libxml, read the handle, restore. That yields true per-action isolation with zero process-global redirection (no cross-thread contamination). Happy to implement that if you'd rather have it than "remove + document"; otherwise I'll keep the removal with the explanatory note now inDSig.hs.