Use xmlsec for all signing

mdserver.py

 #!/usr/bin/env python
-from utils import read_config, Resource, server
+from utils import read_config, Resource, Server
 from flask import Flask, Response
 
 config = read_config()
 app = Flask(__name__)
-
+server = Server()
 
 @app.route('/<domain>/entities/<path:entity_id>', methods=['GET'])
 def serve(domain, entity_id):

mdsigner.py

@@ -6,8 +6,8 @@ from concurrent.futures import ThreadPoolExecutor
 from lxml import etree as ET
 # import traceback
 
-from utils import hasher, Signers
-
+from utils import hasher
+from signers import Signers
 
 # Find all IdP's in edugain metadata
 idps = []

signers.py

 import xmlsec
-from signxml import XMLSigner
 
-cert = open("meta.crt").read()
-key = open("meta.key").read()
+cert = "meta.crt"
+key = "meta.key"
 
 
 def Signers(signer):
     def _normal_signer(xml):
         print("Normal signer")
-        return XMLSigner().sign(xml, key=key, cert=cert)
+        return xmlsec.sign(xml, key_spec=key, cert_spec=cert)
 
     def _test_signer(xml):
         print("Test signer")
-        return XMLSigner().sign(xml, key=key, cert=cert)
+        return xmlsec.sign(xml, key_spec=key, cert_spec=cert)
 
     def _foobar_signer(xml):
         print("Foobar signer")
-        return XMLSigner().sign(xml, key=key, cert=cert)
+        return xmlsec.sign(xml, key_spec=key, cert_spec=cert)
 
     def _hsm_signer(xml):
         print("HSM signer")

utils.py

@@ -151,6 +151,3 @@ class Server:
 
     def __getitem__(self, domain):
         return self.__dict__[domain]
-
-
-server = Server()