From 36c4fa60c8f246f4c1f015e47847aeb01b1100c6 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 28 Nov 2019 18:28:05 +0100 Subject: close MOA-Sig transaction context --- .../sigverify/moasig/impl/MoaSigInitializer.java | 67 +++++++++++----------- 1 file changed, 32 insertions(+), 35 deletions(-) (limited to 'eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/MoaSigInitializer.java') diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/MoaSigInitializer.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/MoaSigInitializer.java index b287357c..05e17aa0 100644 --- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/MoaSigInitializer.java +++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/MoaSigInitializer.java @@ -6,13 +6,7 @@ import java.security.Provider; import java.security.Security; import java.util.Iterator; import java.util.Map.Entry; - import javax.annotation.PostConstruct; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; - import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.data.ISchemaRessourceProvider; import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MOASigServiceConfigurationException; import at.gv.egovernment.moa.spss.MOAException; @@ -20,54 +14,57 @@ import at.gv.egovernment.moa.spss.api.Configurator; import at.gv.egovernment.moaspss.logging.LoggingContext; import at.gv.egovernment.moaspss.logging.LoggingContextManager; import at.gv.egovernment.moaspss.util.DOMUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import iaik.asn1.structures.AlgorithmID; import iaik.security.ec.provider.ECCelerate; import iaik.security.provider.IAIK; public class MoaSigInitializer { private static final Logger log = LoggerFactory.getLogger(MoaSigInitializer.class); - + @Autowired(required=false) ISchemaRessourceProvider[] schemas; - + @PostConstruct - private synchronized void initialize() throws MOASigServiceConfigurationException { + private synchronized void initialize() throws MOASigServiceConfigurationException { log.info("Initializing MOA-Sig signature-verification service ... "); - + log.info("Loading Java security providers."); - IAIK.addAsProvider(); + IAIK.addAsProvider(); ECCelerate.addAsProvider(); - + try { LoggingContextManager.getInstance().setLoggingContext( new LoggingContext("startup")); log.debug("MOA-Sig library initialization process ... "); - Configurator.getInstance().init(); + Configurator.getInstance().init(); log.info("MOA-Sig library initialization complete "); - + } catch (final MOAException e) { - log.error("MOA-SP initialization FAILED!", e.getWrapped()); + log.error("MOA-SP initialization FAILED!", e.getWrapped()); throw new MOASigServiceConfigurationException("service.moasig.04", new Object[] { e .toString() }, e); } - + Security.insertProviderAt(IAIK.getInstance(), 0); - + final ECCelerate eccProvider = ECCelerate.getInstance(); if (Security.getProvider(eccProvider.getName()) != null) - Security.removeProvider(eccProvider.getName()); + Security.removeProvider(eccProvider.getName()); Security.addProvider(new ECCelerate()); - + fixJava8_141ProblemWithSSLAlgorithms(); - + if (log.isDebugEnabled()) { log.debug("Loaded Security Provider:"); final Provider[] providerList = Security.getProviders(); for (int i=0; i 0) { log.debug("Infjecting additional XML schemes ... "); @@ -78,31 +75,31 @@ public class MoaSigInitializer { try { DOMUtils.addSchemaToPool(xmlDef.getValue(), xmlDef.getKey()); log.info("Inject XML scheme: {}", xmlDef.getKey()); - + } catch (final IOException e) { log.warn("Can NOT inject XML scheme: " + xmlDef.getKey(), e); - + } - - } + + } } } } - + private static void fixJava8_141ProblemWithSSLAlgorithms() { log.info("Change AlgorithmIDs to fix problems with Java8 >= 141 ..."); //new AlgorithmID("1.2.840.113549.1.1.4", "md5WithRSAEncryption", new String[] { "MD5withRSA", "MD5/RSA", }, null, true); - new AlgorithmID("1.2.840.113549.1.1.5", "sha1WithRSAEncryption", + new AlgorithmID("1.2.840.113549.1.1.5", "sha1WithRSAEncryption", new String[] { "SHA1withRSA" , "SHA1/RSA", "SHA-1/RSA", "SHA/RSA", }, null, true); - new AlgorithmID("1.2.840.113549.1.1.14", "sha224WithRSAEncryption", + new AlgorithmID("1.2.840.113549.1.1.14", "sha224WithRSAEncryption", new String[] { "SHA224withRSA", "SHA224/RSA", "SHA-224/RSA", }, null, true); - new AlgorithmID("1.2.840.113549.1.1.11", "sha256WithRSAEncryption", + new AlgorithmID("1.2.840.113549.1.1.11", "sha256WithRSAEncryption", new String[] { "SHA256withRSA", "SHA256/RSA", "SHA-256/RSA", }, null, true); - new AlgorithmID("1.2.840.113549.1.1.12", "sha384WithRSAEncryption", + new AlgorithmID("1.2.840.113549.1.1.12", "sha384WithRSAEncryption", new String[] { "SHA384withRSA", "SHA384/RSA", "SHA-384/RSA", }, null, true); - new AlgorithmID("1.2.840.113549.1.1.13", "sha512WithRSAEncryption", + new AlgorithmID("1.2.840.113549.1.1.13", "sha512WithRSAEncryption", new String[] { "SHA512withRSA", "SHA512/RSA", "SHA-512/RSA" }, null, true); - + log.info("Change AlgorithmIDs finished"); } } -- cgit v1.2.3