Merge branch 'master' into dist/risotto/risotto-2.8.0/master

debian/rules

@@ -11,8 +11,6 @@ export PYBUILD_DISABLE_python3 = test
 	# only last version are supported by lemur
 	# but Ubuntu has not last version
 	sed -i "s/==\(\([[:digit:]]\)*\(\.\)*\)*//g" requirements.txt
-	# unecessary dependency
-	sed -i "s/zope.deferredimport/#zope.deferredimport/g" requirements.txt
 	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_install:

lemur/plugins/lemur_openssh/plugin.py

@@ -109,11 +109,10 @@ class OpenSSHIssuerPlugin(CryptographyIssuerPlugin):
         ).decode()
         public_key += ' ' + cert['user']['email']
         # sign it with authority private key
-        if 'root_authority' in cert and cert['root_authority']:
+        if 'root_authority' in cert:
-            authority = cert['root_authority']
+            root_authority = cert['root_authority']
         else:
-            authority = cert['authority']
+            root_authority = get_by_root_authority(cert['authority']['id'])
-        root_authority = get_by_root_authority(authority['id'])
         authority_private_key = root_authority.private_key
         cert['body'] = sign_certificate(
             cert['common_name'],