Skip to content
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

Pass digest method when signing timestamp node #1201

Merged
merged 2 commits into from
Aug 15, 2021
Merged

Pass digest method when signing timestamp node #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b40d06
Pass digest method when signing timestamp node
colm29 Mar 22, 2021
671b368
Expand sign timestamp test for different signature digest methods
colm29 Mar 25, 2021
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
2 changes: 1 addition & 1 deletion src/zeep/wsse/signature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def _signature_prepare(envelope, key, signature_method, digest_method):
_sign_node(ctx, signature, envelope.find(QName(soap_env, "Body")), digest_method)
timestamp = security.find(QName(ns.WSU, "Timestamp"))
if timestamp != None:
_sign_node(ctx, signature, timestamp)
_sign_node(ctx, signature, timestamp, digest_method)
ctx.sign(signature)

# Place the X509 data inside a WSSE SecurityTokenReference within
Expand Down
28 changes: 26 additions & 2 deletions tests/test_wsse_signature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,16 @@


@skip_if_no_xmlsec
def test_sign_timestamp_if_present():
@pytest.mark.parametrize("digest_method,expected_digest_href", DIGEST_METHODS_TESTDATA)
@pytest.mark.parametrize(
"signature_method,expected_signature_href", SIGNATURE_METHODS_TESTDATA
)
def test_sign_timestamp_if_present(
digest_method,
signature_method,
expected_digest_href,
expected_signature_href,
):
envelope = load_xml(
"""
<soap-env:Envelope
Expand Down Expand Up @@ -63,8 +72,23 @@ def test_sign_timestamp_if_present():
"""
)

signature.sign_envelope(envelope, KEY_FILE, KEY_FILE)
signature.sign_envelope(
envelope,
KEY_FILE,
KEY_FILE,
None,
signature_method=getattr(xmlsec_installed.Transform, signature_method),
digest_method=getattr(xmlsec_installed.Transform, digest_method),
)
signature.verify_envelope(envelope, KEY_FILE)
digests = envelope.xpath("//ds:DigestMethod", namespaces={"ds": ns.DS})
assert len(digests)
for digest in digests:
assert digest.get("Algorithm") == expected_digest_href
signatures = envelope.xpath("//ds:SignatureMethod", namespaces={"ds": ns.DS})
assert len(signatures)
for sig in signatures:
assert sig.get("Algorithm") == expected_signature_href


@skip_if_no_xmlsec
Expand Down