lerela
diff --git a/Collapse file
‎docs/wsse.rst‎
Copy file name to clipboardExpand all lines: docs/wsse.rst
+2Lines changed: 2 additions & 0 deletions
Display the source diff
Display the rich diff b/Collapse file
‎docs/wsse.rst‎
Copy file name to clipboardExpand all lines: docs/wsse.rst
+2Lines changed: 2 additions & 0 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎src/zeep/wsse/__init__.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎src/zeep/wsse/__init__.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎src/zeep/wsse/signature.py‎
Copy file name to clipboardExpand all lines: src/zeep/wsse/signature.py
+35-1Lines changed: 35 additions & 1 deletion b/Collapse file
‎src/zeep/wsse/signature.py‎
Copy file name to clipboardExpand all lines: src/zeep/wsse/signature.py
+35-1Lines changed: 35 additions & 1 deletion
diff --git a/Collapse file
‎tests/test_wsse_signature.py‎
Copy file name to clipboardExpand all lines: tests/test_wsse_signature.py
+23Lines changed: 23 additions & 0 deletions b/Collapse file
‎tests/test_wsse_signature.py‎
Copy file name to clipboardExpand all lines: tests/test_wsse_signature.py
+23Lines changed: 23 additions & 0 deletions
@@ -24,6 +24,8 @@ To use the wsse.Signature() plugin you will need to install the `xmlsec`_
 module. See the `README`_ for xmlsec for the required dependencies on your 
 platform.
 
+To append the security token as `BinarySecurityToken`, you can use wsse.BinarySignature() plugin.
+
 Example usage::
 
     >>> from zeep import Client
 
@@ -1,3 +1,3 @@
 from .compose import Compose  # noqa
-from .signature import Signature  # noqa
+from .signature import BinarySignature, Signature  # noqa
 from .username import UsernameToken  # noqa
@@ -71,6 +71,17 @@ def __init__(self, key_file, certfile, password=None):
             _read_file(key_file), _read_file(certfile), password)
 
 
+class BinarySignature(Signature):
+    """Sign given SOAP envelope with WSSE sig usign given key file and cert file.
+
+    Place the key information into BinarySecurityElement."""
+
+    def apply(self, envelope, headers):
+        key = _make_sign_key(self.key_data, self.cert_data, self.password)
+        _sign_envelope_with_key_binary(envelope, key)
+        return envelope, headers
+
+
 def check_xmlsec_import():
     if xmlsec is None:
         raise ImportError(
@@ -173,7 +184,8 @@ def sign_envelope(envelope, keyfile, certfile, password=None):
     return _sign_envelope_with_key(envelope, key)
 
 
-def _sign_envelope_with_key(envelope, key):
+def _signature_prepare(envelope, key):
+    """Prepare envelope and sign."""
     soap_env = detect_soap_env(envelope)
 
     # Create the Signature node.
@@ -208,9 +220,31 @@ def _sign_envelope_with_key(envelope, key):
     # the X509 data (because it doesn't understand WSSE).
     sec_token_ref = etree.SubElement(
         key_info, QName(ns.WSSE, 'SecurityTokenReference'))
+    return security, sec_token_ref, x509_data
+
+
+def _sign_envelope_with_key(envelope, key):
+    _, sec_token_ref, x509_data = _signature_prepare(envelope, key)
     sec_token_ref.append(x509_data)
 
 
+def _sign_envelope_with_key_binary(envelope, key):
+    security, sec_token_ref, x509_data = _signature_prepare(envelope, key)
+    ref = etree.SubElement(sec_token_ref, QName(ns.WSSE, 'Reference'),
+                           {'ValueType': 'http://docs.oasis-open.org/wss/2004/01/'
+                                         'oasis-200401-wss-x509-token-profile-1.0#X509v3'})
+    ref_id = ensure_id(ref)
+    bintok = etree.Element(QName(ns.WSSE, 'BinarySecurityToken'), {
+        QName(ns.WSU, 'Id'): ref_id,
+        'ValueType': 'http://docs.oasis-open.org/wss/2004/01/'
+                     'oasis-200401-wss-x509-token-profile-1.0#X509v3',
+        'EncodingType': 'http://docs.oasis-open.org/wss/2004/01/'
+                        'oasis-200401-wss-soap-message-security-1.0#Base64Binary'})
+    bintok.text = x509_data.find(QName(ns.DS, 'X509Certificate')).text
+    security.insert(1, bintok)
+    x509_data.getparent().remove(x509_data)
+
+
 def verify_envelope(envelope, certfile):
     """Verify WS-Security signature on given SOAP envelope with given cert.
 
 
@@ -110,3 +110,26 @@ def test_signature():
     plugin = wsse.Signature(KEY_FILE_PW, KEY_FILE_PW, 'geheim')
     envelope, headers = plugin.apply(envelope, {})
     plugin.verify(envelope)
+
+
+@pytest.mark.skipif(sys.platform == 'win32',
+                    reason="does not run on windows")
+def test_signature_binary():
+    envelope = load_xml("""
+        <soapenv:Envelope
+            xmlns:tns="http://tests.python-zeep.org/"
+            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+            xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+            xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+          <soapenv:Header></soapenv:Header>
+          <soapenv:Body>
+            <tns:Function>
+              <tns:Argument>OK</tns:Argument>
+            </tns:Function>
+          </soapenv:Body>
+        </soapenv:Envelope>
+    """)
+
+    plugin = wsse.BinarySignature(KEY_FILE_PW, KEY_FILE_PW, 'geheim')
+    envelope, headers = plugin.apply(envelope, {})
+    plugin.verify(envelope)