Fix signature

.gitignore

@@ -33,3 +33,6 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+
+# vscode settings
+.vscode

Makefile

@@ -12,6 +12,24 @@ test:
 	.venv/bin/py.test tests
 
 clean:
-	rm -Rf .venv 
+	rm -Rf .venv
+
+# Works with bash and linux
+load-tests:
+	cp conf/*.ini .
+	curl -o reingart.zip https://www.sistemasagiles.com.ar/soft/pyafipws/reingart.zip
+	python -m zipfile -e reingart.zip .
+
+sign-tra:
+	python -m pyafipws.wsaa
+
+sign-cert:
+	python -m pyafipws.wsfev1 --prueba
+
+# Use this command wisely as it might wipe out some files
+# Use "git clean -n" to see the files to be cleaned
+# Use only when only the config files are untracked 
+clean-tests: 
+	git clean -f
 
 .PHONY: install test

get_dep.py

@@ -0,0 +1,24 @@
+import os
+
+
+def get_dependecies():
+    blob = "git+https://github.com"
+    requirements_path = os.path.join(
+        os.path.abspath(os.getcwd()),
+        "requirements.txt"
+    )
+    if os.path.isfile(requirements_path):
+        with open(requirements_path) as f:
+            dependencies = [
+                ">=".join(x.split("==")) for x in f.read().splitlines()
+            ]
+            for x in dependencies:
+                if x.startswith(blob):
+                    # split the text and join them with the @ command
+                    # index 3 holds the name of the module
+                    chunks = x.split("/")
+                    dependencies[dependencies.index(x)] = x.replace(
+                        blob, chunks[3] + " @ " + blob
+                    )
+                    break
+        return dependencies

requirements.txt

@@ -1,9 +1,9 @@
 httplib2==0.9.2; python_version <= '2.7'
 httplib2==0.20.4; python_version > '3'
 pysimplesoap==1.08.14; python_version <= '2.7'
-git+https://github.com/pysimplesoap/pysimplesoap.git@py311#pysimplesoap; python_version > '3'
+git+https://github.com/pysimplesoap/pysimplesoap.git@py311#pysimplesoap ; python_version > '3'
 cryptography==3.3.2; python_version <= '2.7'
-cryptography==3.4.7; python_version > '3'
+cryptography==39.0.2; python_version > '3'
 fpdf>=1.7.2
 dbf>=0.88.019
 Pillow>=2.0.0

setup.py

@@ -13,6 +13,7 @@
 __copyright__ = "Copyright (C) 2008-2021 Mariano Reingart"
 
 from distutils.core import setup
+from get_dep import get_dependecies
 import glob
 import os
 import subprocess
@@ -70,6 +71,7 @@
     author_email="[email protected]",
     url="https://github.com/reingart/pyafipws",
     license="LGPL-3.0-or-later",
+    install_requires=get_dependecies(),
     options=opts,
     data_files=data_files,
     classifiers=[

wsaa.py

@@ -54,6 +54,7 @@
     from cryptography.hazmat.primitives import serialization
     from cryptography.hazmat.primitives.asymmetric import rsa
     from cryptography.hazmat.bindings.openssl.binding import Binding
+    from cryptography.hazmat.primitives.serialization import pkcs7
 
 except ImportError:
     ex = exception_info()
@@ -116,6 +117,7 @@ def sign_tra(tra, cert=CERT, privatekey=PRIVATEKEY, passphrase=""):
         _lib = Binding.lib
         _ffi = Binding.ffi
         # Crear un buffer desde el texto
+        # Se crea un buffer nuevo porque la firma lo consume
         bio_in = _lib.BIO_new_mem_buf(tra, len(tra))
 
         # Leer privatekey y cert
@@ -136,42 +138,60 @@ def sign_tra(tra, cert=CERT, privatekey=PRIVATEKEY, passphrase=""):
             cert = open(cert).read()
             if isinstance(cert, str):
                 cert = cert.encode("utf-8")
-        cert = x509.load_pem_x509_certificate(cert, default_backend())
+        cert = x509.load_pem_x509_certificate(cert)
 
-        try:
-            # Firmar el texto (tra) usando cryptography (openssl bindings para python)
-            p7 = _lib.PKCS7_sign(
-                cert._x509, private_key._evp_pkey, _ffi.NULL, bio_in, 0
-            )
-        finally:
-            # Liberar memoria asignada
-            _lib.BIO_free(bio_in)
-        # Se crea un buffer nuevo porque la firma lo consume
-        bio_in = _lib.BIO_new_mem_buf(tra, len(tra))
-        try:
-            # Crear buffer de salida
-            bio_out = _lib.BIO_new(_lib.BIO_s_mem())
+        if sys.version.split(" ")[0][0:3] == "2.7":
             try:
-                # Instanciar un SMIME
-                _lib.SMIME_write_PKCS7(bio_out, p7, bio_in, 0)
-
-                # Tomar datos para la salida
-                result_buffer = _ffi.new("char**")
-                buffer_length = _lib.BIO_get_mem_data(bio_out, result_buffer)
-                output = _ffi.buffer(result_buffer[0], buffer_length)[:]
+                # Firmar el texto (tra) usando cryptography (openssl bindings para python)
+                p7 = _lib.PKCS7_sign(
+                    cert._x509, private_key._evp_pkey, _ffi.NULL, bio_in, 0
+                )
+            finally:
+                # Liberar memoria asignada
+                _lib.BIO_free(bio_in)
+            try:
+                # Crear buffer de salida
+                bio_out = _lib.BIO_new(_lib.BIO_s_mem())
+                try:
+                    # Instanciar un SMIME
+                    _lib.SMIME_write_PKCS7(bio_out, p7, bio_in, 0)
+
+                    # Tomar datos para la salida
+                    result_buffer = _ffi.new("char**")
+                    buffer_length = _lib.BIO_get_mem_data(bio_out, result_buffer)
+                    output = _ffi.buffer(result_buffer[0], buffer_length)[:]
+                finally:
+                    _lib.BIO_free(bio_out)
             finally:
-                _lib.BIO_free(bio_out)
-        finally:
-            _lib.BIO_free(bio_in)
+                _lib.BIO_free(bio_in)
+
+            # Generar p7 en formato mail y recortar headers
+            msg = email.message_from_string(output.decode("utf8"))
+            for part in msg.walk():
+                filename = part.get_filename()
+                if filename == "smime.p7m":
+                    # Es la parte firmada?
+                    # Devolver CMS
+                    return part.get_payload(decode=False)
+
+        p7 = pkcs7.PKCS7SignatureBuilder().set_data(
+            tra
+        ).add_signer(
+            cert, private_key, hashes.SHA256()
+        ).sign(
+            serialization.Encoding.SMIME, [pkcs7.PKCS7Options.Binary]
+        )
 
         # Generar p7 en formato mail y recortar headers
-        msg = email.message_from_string(output.decode("utf8"))
+        msg = email.message_from_string(p7.decode("utf8"))
         for part in msg.walk():
             filename = part.get_filename()
-            if filename == "smime.p7m":
+            if filename == "smime.p7s":
                 # Es la parte firmada?
                 # Devolver CMS
                 return part.get_payload(decode=False)
+        else:
+            raise RuntimeError("Part not found")
     else:
         # Firmar el texto (tra) usando OPENSSL directamente
         try: