Skip to content

Allowing empty nodes for Company, GivenName, SurName and Telephone elements of ContactPerson in Metadata #5

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
kubek2k merged 2 commits into from
Jun 17, 2026
Merged

Allowing empty nodes for Company, GivenName, SurName and Telephone elements of ContactPerson in Metadata #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d85eae1
Allow empty TelephoneNumber element in ContactPerson metadata
kubek2k Jun 17, 2026
9315c16
Tolerate empty Company/GivenName/SurName in ContactPerson
kubek2k Jun 17, 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
8 changes: 4 additions & 4 deletions SAML2/Metadata/Metadata.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,11 @@
XP.>$< (XP.xpAttr "contactType" XP.xpickle
XP.>*< XP.xpAnyAttrs
XP.>*< XP.xpickle
XP.>*< XP.xpOption (xpElem "Company" XS.xpString)
XP.>*< XP.xpOption (xpElem "GivenName" XS.xpString)
XP.>*< XP.xpOption (xpElem "SurName" XS.xpString)
XP.>*< XP.xpOption (xpElem "Company" XP.xpText0)
XP.>*< XP.xpOption (xpElem "GivenName" XP.xpText0)
XP.>*< XP.xpOption (xpElem "SurName" XP.xpText0)
XP.>*< XP.xpList (xpElem "EmailAddress" XS.xpAnyURI)
XP.>*< XP.xpList (xpElem "TelephoneNumber" XS.xpString))
XP.>*< XP.xpList (xpElem "TelephoneNumber" XP.xpText0))

data ContactType
= ContactTypeTechnical
Expand Down Expand Up @@ -400,7 +400,7 @@
where
xpAnyURIList = XP.xpWrapEither
( mapM (maybe (Left "invalid anyURI") Right . URI.parseURIReference) . words
, tail . foldr ((.) (' ':) . URI.uriToString id) ""

Check warning on line 403 in SAML2/Metadata/Metadata.hs

View workflow job for this annotation

GitHub Actions / stack build 

In the use of ‘tail’

Check warning on line 403 in SAML2/Metadata/Metadata.hs

View workflow job for this annotation

GitHub Actions / stack build 

In the use of ‘tail’
) $ XP.xpTextDT $ XPS.scDT (namespaceURIString ns) "anyURIListType" []

instance DS.Signable RoleDescriptor where
Expand Down
Loading