OneTeam/oc-facho
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

facho/cli.py: se elimina print que genera basura

Browse Source 
FossilOrigin-Name: f375ae38ebe1191ef47709762e8299774e1346226a86a379065a866e5a0d6e47
This commit is contained in:
bit4bit@riseup.net
2020-09-22 01:44:25 +00:00
parent e369ad2069
commit 59d57119ff
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
facho/cli.py
View File

@@ -222,7 +222,7 @@ def sign_xml(private_key, passphrase, xmlfile, ssl=True, use_cache_policy=False)
from facho import fe from facho import fe
if use_cache_policy: if use_cache_policy:
warnings.warn("xades using cache policy") warnings.warn("xades using cache policy")
print(use_cache_policy)
signer = fe.DianXMLExtensionSigner(private_key, passphrase=passphrase, mockpolicy=use_cache_policy) signer = fe.DianXMLExtensionSigner(private_key, passphrase=passphrase, mockpolicy=use_cache_policy)
document = open(xmlfile, 'r').read().encode('utf-8') document = open(xmlfile, 'r').read().encode('utf-8')
print(signer.sign_xml_string(document)) print(signer.sign_xml_string(document))

16
facho/fe/fe.py
View File

@@ -219,7 +219,7 @@ class DianXMLExtensionSigner(FachoXMLExtension):
id_keyinfo = "xmldsig-%s-KeyInfo" % (id_uuid) id_keyinfo = "xmldsig-%s-KeyInfo" % (id_uuid)
xmlsig.template.add_reference( xmlsig.template.add_reference(
signature, xmlsig.constants.TransformSha256, uri="#%s" % (id_keyinfo), signature, xmlsig.constants.TransformSha256, uri="#%s" % (id_keyinfo), name="xmldsig-%s-ref1" % (id_uuid),
) )
ki = xmlsig.template.ensure_key_info(signature, name=id_keyinfo) ki = xmlsig.template.ensure_key_info(signature, name=id_keyinfo)
data = xmlsig.template.add_x509_data(ki) data = xmlsig.template.add_x509_data(ki)
@@ -232,7 +232,7 @@ class DianXMLExtensionSigner(FachoXMLExtension):
xmlsig.template.add_key_value(ki) xmlsig.template.add_key_value(ki)
qualifying = xades.template.create_qualifying_properties(signature) qualifying = xades.template.create_qualifying_properties(signature)
xades.utils.ensure_id(qualifying) xades.utils.ensure_id(qualifying)
# TODO assert with http://www.sic.gov.co/hora-legal-colombiana # TODO assert with http://www.sic.gov.co/hora-legal-colombiana
id_props = "xmldsig-%s-signedprops" % (id_uuid) id_props = "xmldsig-%s-signedprops" % (id_uuid)
props = xades.template.create_signed_properties(qualifying, datetime=datetime.now()) props = xades.template.create_signed_properties(qualifying, datetime=datetime.now())
@@ -240,11 +240,11 @@ class DianXMLExtensionSigner(FachoXMLExtension):
xades.template.add_claimed_role(props, "supplier") xades.template.add_claimed_role(props, "supplier")
props_ref = xmlsig.template.add_reference( #props_ref = xmlsig.template.add_reference(
props, xmlsig.constants.TransformSha256, uri="#%s" % (id_props), # props, xmlsig.constants.TransformSha256, uri="#%s" % (id_props),
) #)
props_ref.set('Type', "http://uri.etsi.org/01903#SignedProperties") #props_ref.set('Type', "http://uri.etsi.org/01903#SignedProperties")
xmlsig.template.add_transform(props_ref, xmlsig.constants.TransformEnveloped) #xmlsig.template.add_transform(props_ref, xmlsig.constants.TransformSha256)
xml.append(signature) xml.append(signature)
@@ -267,7 +267,7 @@ class DianXMLExtensionSigner(FachoXMLExtension):
policy_file = os.path.join(data_dir, 'politicadefirmav2.pdf') policy_file = os.path.join(data_dir, 'politicadefirmav2.pdf')
with open(policy_file, 'rb') as f: with open(policy_file, 'rb') as f:
return f.read() return f.read()
mock.return_value = UrllibPolicyMock() mock.return_value = UrllibPolicyMock()
ctx.sign(signature) ctx.sign(signature)
ctx.verify(signature) ctx.verify(signature)