Skip to content

fix xml utf8 parsing #4587

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
merged 40 commits into from
May 21, 2025
Merged

fix xml utf8 parsing #4587

Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
cd677bc
Use patched HXT
supersven May 19, 2025
aed628b
Reproduce problem with hxt patch (unit test case in saml2-web-sso).
fisx May 19, 2025
56ee2a2
drive-by thingy (pls ignore).
fisx May 19, 2025
8595896
wip
fisx May 19, 2025
5fc02b6
Add reproducer (integration test)
supersven May 19, 2025
d285087
Use fixed HXT fork
supersven May 19, 2025
ceb0d61
drill down in the failing decodeElem unit test.
fisx May 19, 2025
ada314b
clean up code.
fisx May 20, 2025
179ad72
wip
fisx May 20, 2025
434b5b9
Fix excoding issue by using public (outer level) decoding function
supersven May 20, 2025
fb1decc
fix keyclock counterexample data.
fisx May 20, 2025
6b1b88e
fix test case.
fisx May 20, 2025
8c05238
Call ourSamlToXML consistently everywhere.
fisx May 20, 2025
8e537c3
Fix type error
supersven May 20, 2025
25d9372
Solve TODO
supersven May 20, 2025
a7cb3b6
Remove the foci
supersven May 20, 2025
19fba1d
make sanitize-pr
supersven May 20, 2025
e944564
Remove harmful HXT pin
supersven May 20, 2025
a736206
Cleanup
supersven May 20, 2025
48a024a
Cleanup
supersven May 20, 2025
94f0a4a
Introduce ourDocToXMLWithRoot
supersven May 20, 2025
ff82f12
Cleanup, remove temporary tests.
fisx May 20, 2025
53425f1
Cleanup
supersven May 20, 2025
eecab7c
XmlText and escapeXmlText are misguided and now removed.
fisx May 20, 2025
aabb410
Cleanup saml2-web-sso imports.
fisx May 20, 2025
f76010b
Delete last XmlText occurences
supersven May 20, 2025
5734559
Another xshowBlob broke encoding
supersven May 21, 2025
89f7326
Add TODO
supersven May 21, 2025
ad95e37
Replace last occurence of xshowBlob
supersven May 21, 2025
37053cd
fix collateral damage.
fisx May 21, 2025
73ad811
Changelog.
fisx May 21, 2025
5d468c7
Clean up tests.
fisx May 21, 2025
a1f4351
More helpful test name and haddocks.
fisx May 21, 2025
8536b7a
Make SetupHelpers in integration more flexible.
fisx May 21, 2025
76e529a
Fix utf8 test.
fisx May 21, 2025
8d617b7
more unicode!!!
fisx May 21, 2025
1364ddb
Correct integration test assertion
supersven May 21, 2025
c58ecac
Update libs/saml2-web-sso/test/Test/SAML2/WebSSO/APISpec.hs
fisx May 21, 2025
63277c3
Update libs/saml2-web-sso/test/Test/SAML2/WebSSO/APISpec.hs
fisx May 21, 2025
dd36708
rm bogus "smart" constructor.
fisx May 21, 2025
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
Prev Previous commit
Next Next commit
fix collateral damage.
  • Loading branch information
@fisx
fisx committed May 21, 2025
commit 37053cd1fc0ce51e5b4c3ab6519fbfa292a7f07b
2 changes: 1 addition & 1 deletion services/spar/test/Test/Spar/Intra/BrigSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ spec = do
)
ssoId = UserSSOId (SAML.UserRef iss nam)
iss :: SAML.Issuer = fromRight undefined $ SAML.decodeElem "<Issuer xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" xmlns:samla=\"urn:oasis:names:tc:SAML:2.0:assertion\" xmlns:samlm=\"urn:oasis:names:tc:SAML:2.0:metadata\" xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\" xmlns=\"urn:oasis:names:tc:SAML:2.0:assertion\">http://wire.com/</Issuer>"
nam :: SAML.NameID = fromRight undefined $ SAML.decodeElem "<NameID xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" xmlns:samla=\"urn:oasis:names:tc:SAML:2.0:assertion\" xmlns:samlm=\"urn:oasis:names:tc:SAML:2.0:metadata\" xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\" Format=\"urn:oasis:names:tc:SAML:2.0:nameid-format:persistent\" NameQualifier=\"hendrik\" SPProvidedID=\"marye\" xmlns=\"urn:oasis:names:tc:SAML:2.0:assertion\">PWkS</NameID>"
nam :: SAML.NameID = fromRight undefined $ SAML.decodeElem "<NameID xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" xmlns:samla=\"urn:oasis:names:tc:SAML:2.0:assertion\" xmlns:samlm=\"urn:oasis:names:tc:SAML:2.0:metadata\" xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\" Format=\"urn:oasis:names:tc:SAML:2.0:nameid-format:persistent\" NameQualifier=\"hăendrik\" SPProvidedID=\"marye\" xmlns=\"urn:oasis:names:tc:SAML:2.0:assertion\">PWkS</NameID>"
veidToUserSSOId veid `shouldBe` ssoId
veidFromUserSSOId ssoId Nothing `shouldBe` Right veid

Expand Down