From 23513f2c2f5c234b12def98dc1bbbd933bee2623 Mon Sep 17 00:00:00 2001 From: longzg <553665176@qq.com> Date: Fri, 14 Jul 2023 10:41:40 +0800 Subject: [PATCH 1/2] fix: azure saml2 error "expected element in name space urn:oasis:names:tc:SAML:2.0:assertion but have http://www.w3.org/2000/09/xmldsig#" --- service_provider.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/service_provider.go b/service_provider.go index 927ad6e4..8fcb8bf4 100644 --- a/service_provider.go +++ b/service_provider.go @@ -1665,8 +1665,14 @@ func elementToBytes(el *etree.Element) ([]byte, error) { for _, childEl := range el.FindElements("//*") { ns := childEl.NamespaceURI() if ns != "" { + for _, attr := range el.Attr { + if childEl.Space == attr.Space { + goto RUNCONTINUE + } + } namespaces[childEl.Space] = ns } + RUNCONTINUE: } doc := etree.NewDocument() From f4669e9036cc926912699c40e07c2bcfa0e86cca Mon Sep 17 00:00:00 2001 From: longzg <553665176@qq.com> Date: Fri, 14 Jul 2023 11:02:43 +0800 Subject: [PATCH 2/2] fix: File is not `gofmt`-ed with `-s` (gofmt) --- service_provider.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service_provider.go b/service_provider.go index 8fcb8bf4..105a728c 100644 --- a/service_provider.go +++ b/service_provider.go @@ -1672,7 +1672,7 @@ func elementToBytes(el *etree.Element) ([]byte, error) { } namespaces[childEl.Space] = ns } - RUNCONTINUE: + RUNCONTINUE: } doc := etree.NewDocument()