From 989f5cfa9c9c6f60ce6e161983be8434ca87a698 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 9 Mar 2016 16:01:38 +0100 Subject: remove MOA-SPSS from buildpath and add MOA-SPSS container-modul --- id/moa-spss-container/.gitignore | 1 + id/moa-spss-container/pom.xml | 235 +++++++++++++++++++++ id/oa/pom.xml | 9 +- .../moa/id/demoOA/servlet/pvp2/BuildMetadata.java | 30 ++- .../id/demoOA/servlet/pvp2/DemoApplication.java | 26 ++- id/pom.xml | 4 +- id/server/auth-edu/pom.xml | 37 ++-- id/server/auth-final/pom.xml | 36 ++-- id/server/idserverlib/pom.xml | 230 +++++--------------- id/server/moa-id-commons/pom.xml | 23 +- .../pom.xml | 23 +- 11 files changed, 374 insertions(+), 280 deletions(-) create mode 100644 id/moa-spss-container/.gitignore create mode 100644 id/moa-spss-container/pom.xml (limited to 'id') diff --git a/id/moa-spss-container/.gitignore b/id/moa-spss-container/.gitignore new file mode 100644 index 000000000..b83d22266 --- /dev/null +++ b/id/moa-spss-container/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml new file mode 100644 index 000000000..7f13593a8 --- /dev/null +++ b/id/moa-spss-container/pom.xml @@ -0,0 +1,235 @@ + + 4.0.0 + + MOA + id + 3.x + + MOA.id + moa-spss-container + ${moa-id-version} + MOA-SPSS-Container-for-MOA-ID + This module holds MOA-SPSS and all required library + + + ${basedir}/../../../repository + + + + + + MOA.spss.server + moa-spss-lib + + + iaik_pki_module + iaik + + + commons-logging + commons-logging + + + axis-wsdl4j + axis + + + + + + iaik.prod + iaik_ixsil + + + iaik.prod + iaik_X509TrustManager + + + + axis + axis + + + + axis + axis + + + org.apache.axis + axis-jaxrpc + + + org.apache.axis + axis-saaj + + + commons-discovery + commons-discovery + + + commons-logging + commons-logging + + + javax.activation + activation + + + javax.mail + mail + + + junit + junit + + + log4j + log4j + + + org.postgresql + postgresql + + + javax.servlet + servlet-api + provided + + + xalan-bin-dist + xalan + + + + xerces + xercesImpl + + + + xalan-bin-dist + xml-apis + + + xalan-bin-dist + serializer + + + + iaik.prod + iaik_moa + + + iaik.prod + iaik_ixsil + + + iaik.prod + iaik_jce_full + compile + + + iaik.prod + iaik_ecc + compile + + + iaik.prod + iaik_cms + runtime + + + iaik.prod + iaik_Pkcs11Provider + runtime + + + iaik.prod + iaik_Pkcs11Wrapper + runtime + + + iaik.prod + iaik_Pkcs11Wrapper + win32 + dll + runtime + true + + + + com.sun.xml.bind + jaxb-impl + 2.2.11 + + + + com.sun.xml.bind + jaxb-core + 2.2.11 + + + + xalan-bin-dist + xalan + + provided + + + serializer + xalan + + + + + xerces + xercesImpl + + provided + + + xalan-bin-dist + xml-apis + + provided + + + xalan-bin-dist + serializer + + provided + + + iaik.prod + iaik_jce_full + + provided + + + iaik.prod + iaik_ecc + + provided + + + + iaik + iaik_tsl + + + iaik_pki_module + iaik + + + iaik_ecc_signed + iaik + + + iaik_jce_eval_signed + iaik + + + + + + + \ No newline at end of file diff --git a/id/oa/pom.xml b/id/oa/pom.xml index 981443ef6..8abd75461 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -122,11 +122,10 @@ 0.7.1 - + + MOA.id.server + moa-id-commons + diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java index 65a4ab2a7..67321ca7e 100644 --- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java +++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java @@ -42,13 +42,13 @@ import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.apache.log4j.Logger; import org.joda.time.DateTime; import org.opensaml.common.impl.SecureRandomIdentifierGenerator; import org.opensaml.common.xml.SAMLConstants; import org.opensaml.saml2.core.NameIDType; import org.opensaml.saml2.metadata.AssertionConsumerService; import org.opensaml.saml2.metadata.AttributeConsumingService; -import org.opensaml.saml2.metadata.EncryptionMethod; import org.opensaml.saml2.metadata.EntitiesDescriptor; import org.opensaml.saml2.metadata.EntityDescriptor; import org.opensaml.saml2.metadata.KeyDescriptor; @@ -57,9 +57,6 @@ import org.opensaml.saml2.metadata.NameIDFormat; import org.opensaml.saml2.metadata.SPSSODescriptor; import org.opensaml.saml2.metadata.ServiceName; import org.opensaml.saml2.metadata.SingleLogoutService; -import org.opensaml.saml2.metadata.impl.EncryptionMethodBuilder; -import org.opensaml.xml.encryption.EncryptionConstants; -import org.opensaml.xml.encryption.OAEPparams; import org.opensaml.xml.io.Marshaller; import org.opensaml.xml.security.credential.Credential; import org.opensaml.xml.security.credential.UsageType; @@ -77,10 +74,11 @@ import at.gv.egovernment.moa.id.demoOA.Constants; import at.gv.egovernment.moa.id.demoOA.exception.ConfigurationException; import at.gv.egovernment.moa.id.demoOA.utils.AttributeListBuilder; import at.gv.egovernment.moa.id.demoOA.utils.SAML2Utils; -import at.gv.egovernment.moa.logging.Logger; import at.iaik.commons.util.MiscUtil; public class BuildMetadata extends HttpServlet { + Logger log = Logger.getLogger(BuildMetadata.class); + private static final long serialVersionUID = 1L; private static final int VALIDUNTIL_IN_HOURS = 24; @@ -119,7 +117,7 @@ public class BuildMetadata extends HttpServlet { String name = config.getPVP2MetadataEntitiesName(); if (MiscUtil.isEmpty(name)) { - Logger.info("NO Metadata EntitiesName configurated"); + log.info("NO Metadata EntitiesName configurated"); throw new ConfigurationException("NO Metadata EntitiesName configurated"); } @@ -143,7 +141,7 @@ public class BuildMetadata extends HttpServlet { if (!serviceURL.endsWith("/")) serviceURL = serviceURL + "/"; - Logger.debug("Set OnlineApplicationURL to " + serviceURL); + log.debug("Set OnlineApplicationURL to " + serviceURL); spEntityDescriptor.setEntityID(serviceURL); SPSSODescriptor spSSODescriptor = SAML2Utils @@ -165,7 +163,7 @@ public class BuildMetadata extends HttpServlet { config.getPVP2KeystoreMetadataKeyPassword().toCharArray()); - Logger.debug("Set Metadata key information"); + log.debug("Set Metadata key information"); //Set MetaData Signing key KeyDescriptor entitiesSignKeyDescriptor = SAML2Utils .createSAMLObject(KeyDescriptor.class); @@ -213,7 +211,7 @@ public class BuildMetadata extends HttpServlet { spSSODescriptor.getKeyDescriptors().add(encryKeyDescriptor); } else { - Logger.warn("No Assertion Encryption-Key defined. This setting is not recommended!"); + log.warn("No Assertion Encryption-Key defined. This setting is not recommended!"); } @@ -293,32 +291,32 @@ public class BuildMetadata extends HttpServlet { response.getOutputStream().close(); } catch (ConfigurationException e) { - Logger.warn("Configuration can not be loaded.", e); + log.warn("Configuration can not be loaded.", e); throw new ServletException("MetaData can not be created. Look into LogFiles for more details."); } catch (NoSuchAlgorithmException e) { - Logger.warn("Requested Algorithm could not found.", e); + log.warn("Requested Algorithm could not found.", e); throw new ServletException("MetaData can not be created. Look into LogFiles for more details."); } catch (ParserConfigurationException e) { - Logger.warn("PVP2 Metadata createn error", e); + log.warn("PVP2 Metadata createn error", e); throw new ServletException("MetaData can not be created. Look into LogFiles for more details."); } catch (TransformerConfigurationException e) { - Logger.warn("PVP2 Metadata createn error", e); + log.warn("PVP2 Metadata createn error", e); throw new ServletException("MetaData can not be created. Look into LogFiles for more details."); } catch (TransformerFactoryConfigurationError e) { - Logger.warn("PVP2 Metadata createn error", e); + log.warn("PVP2 Metadata createn error", e); throw new ServletException("MetaData can not be created. Look into LogFiles for more details."); } catch (TransformerException e) { - Logger.warn("PVP2 Metadata createn error", e); + log.warn("PVP2 Metadata createn error", e); throw new ServletException("MetaData can not be created. Look into LogFiles for more details."); } catch (Exception e) { - Logger.warn("Unspecific PVP2 Metadata createn error", e); + log.warn("Unspecific PVP2 Metadata createn error", e); throw new ServletException("MetaData can not be created. Look into LogFiles for more details."); } diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/DemoApplication.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/DemoApplication.java index cde9451a4..b0653085b 100644 --- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/DemoApplication.java +++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/DemoApplication.java @@ -23,7 +23,6 @@ package at.gv.egovernment.moa.id.demoOA.servlet.pvp2; import java.io.IOException; -import java.security.Key; import java.security.KeyStore; import java.util.ArrayList; import java.util.List; @@ -34,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.log4j.Logger; import org.opensaml.common.SAMLObject; import org.opensaml.common.binding.BasicSAMLMessageContext; import org.opensaml.common.xml.SAMLConstants; @@ -56,7 +56,6 @@ import org.opensaml.xml.encryption.InlineEncryptedKeyResolver; import org.opensaml.xml.encryption.SimpleRetrievalMethodEncryptedKeyResolver; import org.opensaml.xml.parse.BasicParserPool; import org.opensaml.xml.security.CriteriaSet; -import org.opensaml.xml.security.SecurityHelper; import org.opensaml.xml.security.credential.UsageType; import org.opensaml.xml.security.criteria.EntityIDCriteria; import org.opensaml.xml.security.criteria.UsageCriteria; @@ -77,12 +76,11 @@ import at.gv.egovernment.moa.id.demoOA.Constants; import at.gv.egovernment.moa.id.demoOA.PVPConstants; import at.gv.egovernment.moa.id.demoOA.utils.ApplicationBean; import at.gv.egovernment.moa.id.demoOA.utils.SAML2Utils; -import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.DOMUtils; - public class DemoApplication extends HttpServlet { - + Logger log = Logger.getLogger(DemoApplication.class); + private static final long serialVersionUID = -2129228304760706063L; @@ -97,7 +95,7 @@ public class DemoApplication extends HttpServlet { String method = request.getMethod(); HttpSession session = request.getSession(); if (session == null) { - Logger.info("NO HTTP Session"); + log.info("NO HTTP Session"); bean.setErrorMessage("NO HTTP session"); setAnser(request, response, bean); return; @@ -120,7 +118,7 @@ public class DemoApplication extends HttpServlet { Signature sign = samlResponse.getSignature(); if (sign == null) { - Logger.info("Only http POST Requests can be used"); + log.info("Only http POST Requests can be used"); bean.setErrorMessage("Only http POST Requests can be used"); setAnser(request, response, bean); return; @@ -150,7 +148,7 @@ public class DemoApplication extends HttpServlet { ExplicitKeySignatureTrustEngine trustEngine = new ExplicitKeySignatureTrustEngine(credentialResolver, keyInfoResolver); trustEngine.validate(sign, criteriaSet); - Logger.info("PVP2 Assertion is valid"); + log.info("PVP2 Assertion is valid"); //set assertion org.w3c.dom.Document doc = SAML2Utils.asDOMDocument(samlResponse); @@ -166,7 +164,7 @@ public class DemoApplication extends HttpServlet { if (encryAssertionList != null && encryAssertionList.size() > 0) { //decrypt assertions - Logger.debug("Found encryped assertion. Start decryption ..."); + log.debug("Found encryped assertion. Start decryption ..."); KeyStore keyStore = config.getPVP2KeyStore(); @@ -192,7 +190,7 @@ public class DemoApplication extends HttpServlet { } - Logger.debug("Assertion decryption finished. "); + log.debug("Assertion decryption finished. "); } else { saml2assertions = samlResponse.getAssertions(); @@ -215,13 +213,13 @@ public class DemoApplication extends HttpServlet { String strAttributeName = attributes.get(x).getDOM().getAttribute("Name"); if (strAttributeName.equals(PVPConstants.PRINCIPAL_NAME_NAME)) - familyName = attributes.get(x).getAttributeValues().get(0).getDOM().getTextContent(); + familyName = attributes.get(x).getAttributeValues().get(0).getDOM().getNodeValue(); if (strAttributeName.equals(PVPConstants.GIVEN_NAME_NAME)) - givenName = attributes.get(x).getAttributeValues().get(0).getDOM().getTextContent(); + givenName = attributes.get(x).getAttributeValues().get(0).getDOM().getNodeValue(); if (strAttributeName.equals(PVPConstants.BIRTHDATE_NAME)) { - birthday = attributes.get(x).getAttributeValues().get(0).getDOM().getTextContent(); + birthday = attributes.get(x).getAttributeValues().get(0).getDOM().getNodeValue(); } } } @@ -249,7 +247,7 @@ public class DemoApplication extends HttpServlet { } } catch (Exception e) { - Logger.warn(e); + log.warn(e); bean.setErrorMessage("Internal Error: " + e.getMessage()); setAnser(request, response, bean); return; diff --git a/id/pom.xml b/id/pom.xml index 0aa9740ac..4aff9f373 100644 --- a/id/pom.xml +++ b/id/pom.xml @@ -14,10 +14,10 @@ oa - + moa-spss-container server ConfigWebTool - moa-id-webgui + moa-id-webgui diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml index 3d7f0b94a..0812745b6 100644 --- a/id/server/auth-edu/pom.xml +++ b/id/server/auth-edu/pom.xml @@ -89,27 +89,26 @@ - - - + - MOA.spss.server - moa-spss-lib - - - iaik_pki_module - iaik - - - commons-logging - commons-logging - - - axis-wsdl4j - axis - - + MOA.id + moa-spss-container + + + iaik_pki_module + iaik + + + commons-logging + commons-logging + + + axis-wsdl4j + axis + + + MOA.id.server moa-id-lib diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml index b6b153ec3..a0f20ba1f 100644 --- a/id/server/auth-final/pom.xml +++ b/id/server/auth-final/pom.xml @@ -74,27 +74,25 @@ - - - - MOA.spss.server - moa-spss-lib - - - iaik_pki_module - iaik - - - commons-logging - commons-logging - - - axis-wsdl4j - axis - - + MOA.id + moa-spss-container + + + iaik_pki_module + iaik + + + commons-logging + commons-logging + + + axis-wsdl4j + axis + + + MOA.id.server moa-id-lib diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 445de36ee..9975fee54 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -61,18 +61,25 @@ MOA.id.server moa-id-commons - + + + + MOA.id.server + moa-id-commons + test-jar + test org.hibernate hibernate-core ${hibernate.version} + + + xml-apis + xml-apis + + org.hibernate @@ -84,60 +91,32 @@ hibernate-entitymanager ${hibernate.version} - - - - - - - - - MOA.spss.server - moa-spss-lib - - - iaik_pki_module - iaik - - - javax.servlet - servlet-api - - - axis-wsdl4j - axis - - - jaxb-impl - com.sun.xml.bind - - - - - axis - axis - - - + + + MOA.id + moa-spss-container + + + iaik_pki_module + iaik + + + commons-logging + commons-logging + + + axis-wsdl4j + axis + + + + + + jakarta-regexp + jakarta-regexp + 1.4 + + at.gv.util egovutils @@ -166,6 +145,10 @@ jaxb-core com.sun.xml.bind + + xml-apis + xml-apis + @@ -183,6 +166,11 @@ cxf-rt-transports-http + + xalan-bin-dist + xml-apis + + javax.xml.bind @@ -201,83 +189,6 @@ javax.mail mail - - - - xalan-bin-dist - xalan - - provided - - - serializer - xalan - - - - - xerces - xercesImpl - - provided - - - xalan-bin-dist - xml-apis - - provided - - - xalan-bin-dist - serializer - - provided - - - iaik.prod - iaik_jce_full - - provided - - - iaik.prod - iaik_ecc - - provided - - - - - - - - org.easymock @@ -318,33 +229,7 @@ httpsclient httpsclient - - - iaik.prod - iaik_moa - - - iaik.prod - iaik_ixsil - - - iaik.prod - iaik_X509TrustManager - - - - + org.opensaml opensaml @@ -390,23 +275,6 @@ - - - - - - com.fasterxml.jackson.core diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index 90b391b42..bbaba6a50 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -249,11 +249,11 @@ - - install - + + org.apache.maven.plugins maven-compiler-plugin + 2.0.2 1.7 1.7 @@ -263,9 +263,6 @@ org.apache.maven.plugins maven-jar-plugin - true - true - true false @@ -279,18 +276,8 @@ - - true - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - - - - + org.apache.maven.plugins maven-dependency-plugin diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml index 11e0c764c..f2403a62e 100644 --- a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml +++ b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml @@ -20,15 +20,14 @@ moa-id-lib test test-jar - 3.0.3-Snapshot - + MOA.id.server @@ -39,7 +38,19 @@ xalan-bin-dist xalan provided - + + + xml-apis + xml-apis + + + + + + xalan-bin-dist + xml-apis + provided + org.springframework -- cgit v1.2.3