Merge pull request #30 from bmsiegel/BinarySecurityToken_NS_Fix

Fix WSTEP BinarySecurityToken attribute namespaces
openSUSE · Feb 15, 2023 · 2135199 · 2135199
2 parents 86bc2bb + cb7a9ca
commit 2135199
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/cepces/wstep/__init__.py b/cepces/wstep/__init__.py
@@ -20,6 +20,8 @@
 NS_WST = 'http://docs.oasis-open.org/ws-sx/ws-trust/200512'
 NS_WST_SECEXT = 'http://docs.oasis-open.org/wss/2004/01/' \
                 'oasis-200401-wss-wssecurity-secext-1.0.xsd'
+NS_WST_UTILITY = 'http://docs.oasis-open.org/wss/2004/01/' \
+                'oasis-200401-wss-wssecurity-utility-1.0.xsd'
 NS_ENROLLMENT = 'http://schemas.microsoft.com/windows/pki/2009/01/enrollment'
 
 TOKEN_TYPE = 'http://docs.oasis-open.org/wss/2004/01/' \

diff --git a/cepces/wstep/types.py b/cepces/wstep/types.py
@@ -18,7 +18,7 @@
 """WSTEP Types."""
 from xml.etree.ElementTree import Element, QName
 from cepces.soap import NS_ADDRESSING
-from cepces.wstep import NS_WST, NS_WST_SECEXT, NS_ENROLLMENT
+from cepces.wstep import NS_WST, NS_WST_SECEXT, NS_WST_UTILITY, NS_ENROLLMENT
 from cepces.wstep import TOKEN_TYPE, VALUE_TYPE, ENCODING_TYPE
 from cepces.wstep import ISSUE_REQUEST_TYPE
 from cepces.xml.binding import XMLAttribute
@@ -61,9 +61,9 @@ def create():
         element.append(request_type)
 
         token = Element(QName(NS_WST_SECEXT, 'BinarySecurityToken'))
-        token.set(QName(NS_WST_SECEXT, 'ValueType'), VALUE_TYPE)
-        token.set(QName(NS_WST_SECEXT, 'EncodingType'), ENCODING_TYPE)
-        token.set(QName(NS_ADDRESSING, 'Id'), '')
+        token.set(QName('ValueType'), VALUE_TYPE)
+        token.set(QName('EncodingType'), ENCODING_TYPE)
+        token.set(QName(NS_WST_UTILITY, 'Id'), '')
         element.append(token)
 
         return element