From d60ceb70869148deb9f85751c63460fa245a8c7f Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 9 Mar 2016 12:14:18 +0100 Subject: split moa-id-auth in a final- and an edjucation- version --- id/assembly-auth-edu.xml | 191 +++++++++ id/assembly-auth-final.xml | 191 +++++++++ id/assembly-auth.xml | 190 --------- id/pom.xml | 2 +- id/server/auth-edu/.gitignore | 2 + id/server/auth-edu/pom.xml | 265 ++++++++++++ .../auth-edu/src/main/resources/log4j.properties | 27 ++ .../auth-edu/src/main/webapp/META-INF/MANIFEST.MF | 2 + id/server/auth-edu/src/main/webapp/WEB-INF/web.xml | 47 +++ id/server/auth-edu/src/main/webapp/index.html | 0 id/server/auth-edu/src/main/wsdl/MOA-ID-1.0.wsdl | 40 ++ id/server/auth-edu/src/main/wsdl/MOA-ID-1.x.wsdl | 40 ++ id/server/auth-edu/src/main/wsdl/MOA-SPSS-1.2.xsd | 454 +++++++++++++++++++++ id/server/auth-final/.gitignore | 2 + id/server/auth-final/pom.xml | 250 ++++++++++++ .../auth-final/src/main/resources/log4j.properties | 27 ++ .../src/main/webapp/META-INF/MANIFEST.MF | 2 + .../auth-final/src/main/webapp/WEB-INF/web.xml | 47 +++ id/server/auth-final/src/main/webapp/index.html | 0 id/server/auth-final/src/main/wsdl/MOA-ID-1.0.wsdl | 40 ++ id/server/auth-final/src/main/wsdl/MOA-ID-1.x.wsdl | 40 ++ .../auth-final/src/main/wsdl/MOA-SPSS-1.2.xsd | 454 +++++++++++++++++++++ id/server/auth/.gitignore | 2 - id/server/auth/pom.xml | 264 ------------ id/server/auth/src/main/resources/log4j.properties | 27 -- .../auth/src/main/webapp/META-INF/MANIFEST.MF | 2 - id/server/auth/src/main/webapp/WEB-INF/web.xml | 47 --- id/server/auth/src/main/webapp/index.html | 0 id/server/auth/src/main/wsdl/MOA-ID-1.0.wsdl | 40 -- id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl | 40 -- id/server/auth/src/main/wsdl/MOA-SPSS-1.2.xsd | 454 --------------------- id/server/pom.xml | 4 +- 32 files changed, 2124 insertions(+), 1069 deletions(-) create mode 100644 id/assembly-auth-edu.xml create mode 100644 id/assembly-auth-final.xml delete mode 100644 id/assembly-auth.xml create mode 100644 id/server/auth-edu/.gitignore create mode 100644 id/server/auth-edu/pom.xml create mode 100644 id/server/auth-edu/src/main/resources/log4j.properties create mode 100644 id/server/auth-edu/src/main/webapp/META-INF/MANIFEST.MF create mode 100644 id/server/auth-edu/src/main/webapp/WEB-INF/web.xml create mode 100644 id/server/auth-edu/src/main/webapp/index.html create mode 100644 id/server/auth-edu/src/main/wsdl/MOA-ID-1.0.wsdl create mode 100644 id/server/auth-edu/src/main/wsdl/MOA-ID-1.x.wsdl create mode 100644 id/server/auth-edu/src/main/wsdl/MOA-SPSS-1.2.xsd create mode 100644 id/server/auth-final/.gitignore create mode 100644 id/server/auth-final/pom.xml create mode 100644 id/server/auth-final/src/main/resources/log4j.properties create mode 100644 id/server/auth-final/src/main/webapp/META-INF/MANIFEST.MF create mode 100644 id/server/auth-final/src/main/webapp/WEB-INF/web.xml create mode 100644 id/server/auth-final/src/main/webapp/index.html create mode 100644 id/server/auth-final/src/main/wsdl/MOA-ID-1.0.wsdl create mode 100644 id/server/auth-final/src/main/wsdl/MOA-ID-1.x.wsdl create mode 100644 id/server/auth-final/src/main/wsdl/MOA-SPSS-1.2.xsd delete mode 100644 id/server/auth/.gitignore delete mode 100644 id/server/auth/pom.xml delete mode 100644 id/server/auth/src/main/resources/log4j.properties delete mode 100644 id/server/auth/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 id/server/auth/src/main/webapp/WEB-INF/web.xml delete mode 100644 id/server/auth/src/main/webapp/index.html delete mode 100644 id/server/auth/src/main/wsdl/MOA-ID-1.0.wsdl delete mode 100644 id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl delete mode 100644 id/server/auth/src/main/wsdl/MOA-SPSS-1.2.xsd (limited to 'id') diff --git a/id/assembly-auth-edu.xml b/id/assembly-auth-edu.xml new file mode 100644 index 000000000..c11f790e4 --- /dev/null +++ b/id/assembly-auth-edu.xml @@ -0,0 +1,191 @@ + + id-auth-edu-${moa-id-version} + + + dir + zip + + + + moa-id-auth-edu-${moa-id-version} + + + + ${basedir}/id/server/data/deploy + / + + **/conf/Catalina/** + ${basedir}/id/server/data/deploy/conf/moa-id-proxy/** + + + + ${basedir}/spss/handbook/conf/moa-spss/certstore + /conf/moa-id/certs/certstore + + **/* + + + + ${basedir}/spss/handbook/conf/moa-spss/certstore + /conf/moa-spss/certstore + + **/* + + + + ${basedir}/id/server/doc + /doc + + ${basedir}/id/server/doc/proxy/** + + + + ${basedir}/id/server/data/deploy/conf + /doc/conf + + ${basedir}/id/server/data/deploy/conf/moa-id-proxy/** + + + + ${basedir}/id + / + + history.txt + readme_${moa-id-version}.txt + + + + ${basedir} + / + + LICENSE-2.0.txt + NOTICE.txt + IAIK-LICENSE.txt + EUPL v.1.1 - Licence.pdf + SIC_LICENSE.txt + + + + + + + + MOA.id.server:moa-id-auth-edu + + + true + / + ${artifactId}.${extension} + + + + xalan-bin-dist:xalan + xerces:xercesImpl + xalan-bin-dist:xml-apis + xalan-bin-dist:serializer + + /endorsed + ${artifactId}.${extension} + + + + iaik.prod:iaik_ecc + iaik.prod:iaik_jce_full + iaik.prod:iaik_Pkcs11Provider + iaik.prod:iaik_Pkcs11Wrapper:jar + + /ext + ${artifactId}.${extension} + + + false + + + + + + MOA.id.server:moa-id-lib + + + javadoc + false + api-doc + /doc + true + + + + + + MOA.id:moa-id-configuration + + + false + / + ${artifactId}.${extension} + false + + + + + + MOA.id.server:moa-id-commons + + + false + /migration/ + ${artifactId}.${extension} + false + + + /migration/dependency-jars + ${artifactId}.${extension} + + + + + + + + MOA.id:moa-id-oa + + + true + ../ + true + /source/${artifactId}/src + + **/target/** + **/bin/** + **/.settings/** + .* + + + pom.xml + + + + false + / + ${artifactId}.${extension} + false + + + + iaik:commons-iaik + MOA:moa-common + + /source/repositority + ${artifactId}.${extension} + + + + + + + + + component-pkcs11libs.xml + + + diff --git a/id/assembly-auth-final.xml b/id/assembly-auth-final.xml new file mode 100644 index 000000000..504f5620a --- /dev/null +++ b/id/assembly-auth-final.xml @@ -0,0 +1,191 @@ + + id-auth-final-${moa-id-version} + + + dir + zip + + + + moa-id-auth-final-${moa-id-version} + + + + ${basedir}/id/server/data/deploy + / + + **/conf/Catalina/** + ${basedir}/id/server/data/deploy/conf/moa-id-proxy/** + + + + ${basedir}/spss/handbook/conf/moa-spss/certstore + /conf/moa-id/certs/certstore + + **/* + + + + ${basedir}/spss/handbook/conf/moa-spss/certstore + /conf/moa-spss/certstore + + **/* + + + + ${basedir}/id/server/doc + /doc + + ${basedir}/id/server/doc/proxy/** + + + + ${basedir}/id/server/data/deploy/conf + /doc/conf + + ${basedir}/id/server/data/deploy/conf/moa-id-proxy/** + + + + ${basedir}/id + / + + history.txt + readme_${moa-id-version}.txt + + + + ${basedir} + / + + LICENSE-2.0.txt + NOTICE.txt + IAIK-LICENSE.txt + EUPL v.1.1 - Licence.pdf + SIC_LICENSE.txt + + + + + + + + MOA.id.server:moa-id-auth-final + + + true + / + ${artifactId}.${extension} + + + + xalan-bin-dist:xalan + xerces:xercesImpl + xalan-bin-dist:xml-apis + xalan-bin-dist:serializer + + /endorsed + ${artifactId}.${extension} + + + + iaik.prod:iaik_ecc + iaik.prod:iaik_jce_full + iaik.prod:iaik_Pkcs11Provider + iaik.prod:iaik_Pkcs11Wrapper:jar + + /ext + ${artifactId}.${extension} + + + false + + + + + + MOA.id.server:moa-id-lib + + + javadoc + false + api-doc + /doc + true + + + + + + MOA.id:moa-id-configuration + + + false + / + ${artifactId}.${extension} + false + + + + + + MOA.id.server:moa-id-commons + + + false + /migration/ + ${artifactId}.${extension} + false + + + /migration/dependency-jars + ${artifactId}.${extension} + + + + + + + + MOA.id:moa-id-oa + + + true + ../ + true + /source/${artifactId}/src + + **/target/** + **/bin/** + **/.settings/** + .* + + + pom.xml + + + + false + / + ${artifactId}.${extension} + false + + + + iaik:commons-iaik + MOA:moa-common + + /source/repositority + ${artifactId}.${extension} + + + + + + + + + component-pkcs11libs.xml + + + diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml deleted file mode 100644 index 5e0ca564a..000000000 --- a/id/assembly-auth.xml +++ /dev/null @@ -1,190 +0,0 @@ - - id-auth-${moa-id-version} - - - dir - zip - - - - moa-id-auth-${moa-id-version} - - - - ${basedir}/id/server/data/deploy - / - - **/conf/Catalina/** - ${basedir}/id/server/data/deploy/conf/moa-id-proxy/** - - - - ${basedir}/spss/handbook/conf/moa-spss/certstore - /conf/moa-id/certs/certstore - - **/* - - - - ${basedir}/spss/handbook/conf/moa-spss/certstore - /conf/moa-spss/certstore - - **/* - - - - ${basedir}/id/server/doc - /doc - - ${basedir}/id/server/doc/proxy/** - - - - ${basedir}/id/server/data/deploy/conf - /doc/conf - - ${basedir}/id/server/data/deploy/conf/moa-id-proxy/** - - - - ${basedir}/id - / - - history.txt - readme_${moa-id-version}.txt - - - - ${basedir} - / - - LICENSE-2.0.txt - NOTICE.txt - IAIK-LICENSE.txt - EUPL v.1.1 - Licence.pdf - SIC_LICENSE.txt - - - - - - - - MOA.id.server:moa-id-auth - - - true - / - ${artifactId}.${extension} - - - - xalan-bin-dist:xalan - xerces:xercesImpl - xalan-bin-dist:xml-apis - xalan-bin-dist:serializer - - /endorsed - ${artifactId}.${extension} - - - - iaik.prod:iaik_ecc - iaik.prod:iaik_jce_full - iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper:jar - - /ext - ${artifactId}.${extension} - - - false - - - - - MOA.id.server:moa-id-lib - - - javadoc - false - api-doc - /doc - true - - - - - - MOA.id:moa-id-configuration - - - false - / - ${artifactId}.${extension} - false - - - - - - MOA.id.server:moa-id-commons - - - false - /migration/ - ${artifactId}.${extension} - false - - - /migration/dependency-jars - ${artifactId}.${extension} - - - - - - - - MOA.id:moa-id-oa - - - true - ../ - true - /source/${artifactId}/src - - **/target/** - **/bin/** - **/.settings/** - .* - - - pom.xml - - - - false - / - ${artifactId}.${extension} - false - - - - iaik:commons-iaik - MOA:moa-common - - /source/repositority - ${artifactId}.${extension} - - - - - - - - - component-pkcs11libs.xml - - - diff --git a/id/pom.xml b/id/pom.xml index 49dd99a1c..0aa9740ac 100644 --- a/id/pom.xml +++ b/id/pom.xml @@ -17,7 +17,7 @@ server ConfigWebTool - moa-id-webgui + moa-id-webgui diff --git a/id/server/auth-edu/.gitignore b/id/server/auth-edu/.gitignore new file mode 100644 index 000000000..4dc009173 --- /dev/null +++ b/id/server/auth-edu/.gitignore @@ -0,0 +1,2 @@ +/target +/bin diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml new file mode 100644 index 000000000..3d7f0b94a --- /dev/null +++ b/id/server/auth-edu/pom.xml @@ -0,0 +1,265 @@ + + + MOA.id + moa-id + 3.x + + + 4.0.0 + MOA.id.server + moa-id-auth-edu + ${moa-id-version-edu} + war + MOA ID-Auth-Edjucation + Education release-version of MOA-ID-Auth which includes all development functionality + + + ${basedir}/../../../repository + + + + + shibboleth.internet2.edu + Internet2 + https://build.shibboleth.net/nexus/content/groups/public/ + + + + + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.1 + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + + + false + true + + false + + + + + + + ${basedir}/src/main/wsdl + WEB-INF/classes/resources/wsdl + + + + + + + + + + + + + + MOA.spss.server + moa-spss-lib + + + iaik_pki_module + iaik + + + commons-logging + commons-logging + + + axis-wsdl4j + axis + + + + + MOA.id.server + moa-id-lib + + + commons-logging + commons-logging + + + ch.qos.logback + logback-classic + + + axis + axis + + + + + + MOA.id.server + moa-id-spring-initializer + + + MOA.id.server + moa-id-frontend-resources + + + + + + MOA.id.server.modules + moa-id-module-eIDAS + + + + + + MOA.id.server.modules + moa-id-module-monitoring + + + + + MOA.id.server.modules + moa-id-module-saml1 + + + + MOA.id.server.modules + moa-id-module-openID + + + + MOA.id.server.modules + moa-id-module-elga_mandate_service + + + + + + MOA.id.server.modules + moa-id-modul-citizencard_authentication + + + + MOA.id.server.modules + moa-id-modules-federated_authentication + + + + MOA.id.server.modules + moa-id-module-ssoTransfer + ${moa-id-version} + + + + + iaik.prod + iaik_jce_full + + provided + + + iaik.prod + iaik_ecc + + provided + + + iaik.prod + iaik_Pkcs11Provider + + provided + + + iaik.prod + iaik_Pkcs11Wrapper + + provided + + + xalan-bin-dist + xalan + + provided + + + xalan + serializer + + + + + xerces + xercesImpl + + provided + + + xalan-bin-dist + xml-apis + + provided + + + xalan-bin-dist + serializer + + provided + + + + org.springframework + spring-webmvc + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j + + + + + diff --git a/id/server/auth-edu/src/main/resources/log4j.properties b/id/server/auth-edu/src/main/resources/log4j.properties new file mode 100644 index 000000000..ecdfad165 --- /dev/null +++ b/id/server/auth-edu/src/main/resources/log4j.properties @@ -0,0 +1,27 @@ +# commons-logging setup +org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory + +# define log4j root loggers +log4j.rootLogger=info, stdout, R +log4j.logger.at.gv.egovernment.moa=info, R +log4j.logger.at.gv.egovernment.moa.spss=info, R +log4j.logger.iaik.server=info, R +log4j.logger.at.gv.egovernment.moa.id=info, R +log4j.logger.at.gv.egovernment.moa.id.proxy=info, R +log4j.logger.eu.stork=info, R +log4j.logger.org.hibernate=warn, R + +# configure the stdout appender +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +#log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20c | %10t | %m%n +log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20.20c | %10t | %m%n + +# configure the rolling file appender (R) +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.File=${catalina.base}/logs/moa-id.log +log4j.appender.R.MaxFileSize=10000KB +log4j.appender.R.MaxBackupIndex=1 +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n + diff --git a/id/server/auth-edu/src/main/webapp/META-INF/MANIFEST.MF b/id/server/auth-edu/src/main/webapp/META-INF/MANIFEST.MF new file mode 100644 index 000000000..59499bce4 --- /dev/null +++ b/id/server/auth-edu/src/main/webapp/META-INF/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/id/server/auth-edu/src/main/webapp/WEB-INF/web.xml b/id/server/auth-edu/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 000000000..9ad651d42 --- /dev/null +++ b/id/server/auth-edu/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,47 @@ + + + MOA ID Auth + MOA ID Authentication Service + + + characterEncodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + characterEncodingFilter + /* + + + + index.html + + + + 5 + + + + 500 + /errorpage.jsp + + + + BASIC + UserDatabase + + + The role that is required to log in to the moa Application + moa-admin + + + diff --git a/id/server/auth-edu/src/main/webapp/index.html b/id/server/auth-edu/src/main/webapp/index.html new file mode 100644 index 000000000..e69de29bb diff --git a/id/server/auth-edu/src/main/wsdl/MOA-ID-1.0.wsdl b/id/server/auth-edu/src/main/wsdl/MOA-ID-1.0.wsdl new file mode 100644 index 000000000..ce24e83c9 --- /dev/null +++ b/id/server/auth-edu/src/main/wsdl/MOA-ID-1.0.wsdl @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/auth-edu/src/main/wsdl/MOA-ID-1.x.wsdl b/id/server/auth-edu/src/main/wsdl/MOA-ID-1.x.wsdl new file mode 100644 index 000000000..218f0f013 --- /dev/null +++ b/id/server/auth-edu/src/main/wsdl/MOA-ID-1.x.wsdl @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/auth-edu/src/main/wsdl/MOA-SPSS-1.2.xsd b/id/server/auth-edu/src/main/wsdl/MOA-SPSS-1.2.xsd new file mode 100644 index 000000000..8c994f079 --- /dev/null +++ b/id/server/auth-edu/src/main/wsdl/MOA-SPSS-1.2.xsd @@ -0,0 +1,454 @@ + + + + + + + + + + + + + + + + + + + + Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements + + + + + + + + + + + + + + + + + + + Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil + + + + + + + + + + + + + + + + + + Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage + + + + Resultat, falls die Signaturerstellung erfolgreich war + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert + + + + + + + + + + + only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur. + + + + + + + + + + mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert + + + + + + + + + + + only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Resultat, falls die Signaturerstellung gescheitert ist + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen. + + + + + Profilbezeichner für einen Transformationsweg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Die Angabe des Transformationsparameters (explizit oder als Hashwert) kann unterlassen werden, wenn die Applikation von der Unveränderlichkeit des Inhalts der in "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen kann. + + + + Der Transformationsparameter explizit angegeben. + + + + + Der Hashwert des Transformationsparameters. + + + + + + + + + + + + + + + + + + + + + + Explizite Angabe des Transformationswegs + + + + + + + Alle impliziten Transformationsparameter, die zum Durchlaufen der oben angeführten Transformationskette bekannt sein müssen, müssen hier angeführt werden. Das Attribut "URI" bezeichnet den Transformationsparameter in exakt jener Weise, wie er in der zu überprüfenden Signatur gebraucht wird. + + + + + + + + + + + + + + + + diff --git a/id/server/auth-final/.gitignore b/id/server/auth-final/.gitignore new file mode 100644 index 000000000..4dc009173 --- /dev/null +++ b/id/server/auth-final/.gitignore @@ -0,0 +1,2 @@ +/target +/bin diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml new file mode 100644 index 000000000..b6b153ec3 --- /dev/null +++ b/id/server/auth-final/pom.xml @@ -0,0 +1,250 @@ + + + MOA.id + moa-id + 3.x + + + 4.0.0 + MOA.id.server + moa-id-auth-final + ${moa-id-version-final} + war + MOA ID-Auth-Final + Final release-version of MOA-ID-Auth without education and development functionality + + + ${basedir}/../../../repository + + + + + shibboleth.internet2.edu + Internet2 + https://build.shibboleth.net/nexus/content/groups/public/ + + + + + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.1 + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + + + false + true + + false + + + + + + + + + + + + MOA.spss.server + moa-spss-lib + + + iaik_pki_module + iaik + + + commons-logging + commons-logging + + + axis-wsdl4j + axis + + + + + MOA.id.server + moa-id-lib + + + commons-logging + commons-logging + + + ch.qos.logback + logback-classic + + + axis + axis + + + + + + MOA.id.server + moa-id-spring-initializer + + + MOA.id.server + moa-id-frontend-resources + + + + + + + + + + MOA.id.server.modules + moa-id-module-monitoring + + + + + MOA.id.server.modules + moa-id-module-saml1 + + + + MOA.id.server.modules + moa-id-module-openID + + + + MOA.id.server.modules + moa-id-module-elga_mandate_service + + + + + + MOA.id.server.modules + moa-id-modul-citizencard_authentication + + + + + + + + + iaik.prod + iaik_jce_full + + provided + + + iaik.prod + iaik_ecc + + provided + + + iaik.prod + iaik_Pkcs11Provider + + provided + + + iaik.prod + iaik_Pkcs11Wrapper + + provided + + + xalan-bin-dist + xalan + + provided + + + xalan + serializer + + + + + xerces + xercesImpl + + provided + + + xalan-bin-dist + xml-apis + + provided + + + xalan-bin-dist + serializer + + provided + + + + org.springframework + spring-webmvc + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j + + + + + diff --git a/id/server/auth-final/src/main/resources/log4j.properties b/id/server/auth-final/src/main/resources/log4j.properties new file mode 100644 index 000000000..ecdfad165 --- /dev/null +++ b/id/server/auth-final/src/main/resources/log4j.properties @@ -0,0 +1,27 @@ +# commons-logging setup +org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory + +# define log4j root loggers +log4j.rootLogger=info, stdout, R +log4j.logger.at.gv.egovernment.moa=info, R +log4j.logger.at.gv.egovernment.moa.spss=info, R +log4j.logger.iaik.server=info, R +log4j.logger.at.gv.egovernment.moa.id=info, R +log4j.logger.at.gv.egovernment.moa.id.proxy=info, R +log4j.logger.eu.stork=info, R +log4j.logger.org.hibernate=warn, R + +# configure the stdout appender +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +#log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20c | %10t | %m%n +log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20.20c | %10t | %m%n + +# configure the rolling file appender (R) +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.File=${catalina.base}/logs/moa-id.log +log4j.appender.R.MaxFileSize=10000KB +log4j.appender.R.MaxBackupIndex=1 +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n + diff --git a/id/server/auth-final/src/main/webapp/META-INF/MANIFEST.MF b/id/server/auth-final/src/main/webapp/META-INF/MANIFEST.MF new file mode 100644 index 000000000..58630c02e --- /dev/null +++ b/id/server/auth-final/src/main/webapp/META-INF/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/id/server/auth-final/src/main/webapp/WEB-INF/web.xml b/id/server/auth-final/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 000000000..9ad651d42 --- /dev/null +++ b/id/server/auth-final/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,47 @@ + + + MOA ID Auth + MOA ID Authentication Service + + + characterEncodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + characterEncodingFilter + /* + + + + index.html + + + + 5 + + + + 500 + /errorpage.jsp + + + + BASIC + UserDatabase + + + The role that is required to log in to the moa Application + moa-admin + + + diff --git a/id/server/auth-final/src/main/webapp/index.html b/id/server/auth-final/src/main/webapp/index.html new file mode 100644 index 000000000..e69de29bb diff --git a/id/server/auth-final/src/main/wsdl/MOA-ID-1.0.wsdl b/id/server/auth-final/src/main/wsdl/MOA-ID-1.0.wsdl new file mode 100644 index 000000000..5751b3e58 --- /dev/null +++ b/id/server/auth-final/src/main/wsdl/MOA-ID-1.0.wsdl @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/auth-final/src/main/wsdl/MOA-ID-1.x.wsdl b/id/server/auth-final/src/main/wsdl/MOA-ID-1.x.wsdl new file mode 100644 index 000000000..37f86aad5 --- /dev/null +++ b/id/server/auth-final/src/main/wsdl/MOA-ID-1.x.wsdl @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/auth-final/src/main/wsdl/MOA-SPSS-1.2.xsd b/id/server/auth-final/src/main/wsdl/MOA-SPSS-1.2.xsd new file mode 100644 index 000000000..d7a06d6e7 --- /dev/null +++ b/id/server/auth-final/src/main/wsdl/MOA-SPSS-1.2.xsd @@ -0,0 +1,454 @@ + + + + + + + + + + + + + + + + + + + + Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements + + + + + + + + + + + + + + + + + + + Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil + + + + + + + + + + + + + + + + + + Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage + + + + Resultat, falls die Signaturerstellung erfolgreich war + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert + + + + + + + + + + + only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur. + + + + + + + + + + mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert + + + + + + + + + + + only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Resultat, falls die Signaturerstellung gescheitert ist + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen. + + + + + Profilbezeichner für einen Transformationsweg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Die Angabe des Transformationsparameters (explizit oder als Hashwert) kann unterlassen werden, wenn die Applikation von der Unveränderlichkeit des Inhalts der in "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen kann. + + + + Der Transformationsparameter explizit angegeben. + + + + + Der Hashwert des Transformationsparameters. + + + + + + + + + + + + + + + + + + + + + + Explizite Angabe des Transformationswegs + + + + + + + Alle impliziten Transformationsparameter, die zum Durchlaufen der oben angeführten Transformationskette bekannt sein müssen, müssen hier angeführt werden. Das Attribut "URI" bezeichnet den Transformationsparameter in exakt jener Weise, wie er in der zu überprüfenden Signatur gebraucht wird. + + + + + + + + + + + + + + + + diff --git a/id/server/auth/.gitignore b/id/server/auth/.gitignore deleted file mode 100644 index 4dc009173..000000000 --- a/id/server/auth/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/bin diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml deleted file mode 100644 index 41dbe0bb4..000000000 --- a/id/server/auth/pom.xml +++ /dev/null @@ -1,264 +0,0 @@ - - - MOA.id - moa-id - 3.x - - - 4.0.0 - MOA.id.server - moa-id-auth - ${moa-id-version} - war - MOA ID-Auth WebService - - - ${basedir}/../../../repository - - - - - shibboleth.internet2.edu - Internet2 - https://build.shibboleth.net/nexus/content/groups/public/ - - - - - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.1 - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.1.1 - - - - - false - true - - false - - - - - - - ${basedir}/src/main/wsdl - WEB-INF/classes/resources/wsdl - - - - - - - - - - - - - - MOA.spss.server - moa-spss-lib - - - iaik_pki_module - iaik - - - commons-logging - commons-logging - - - axis-wsdl4j - axis - - - - - MOA.id.server - moa-id-lib - - - commons-logging - commons-logging - - - ch.qos.logback - logback-classic - - - axis - axis - - - - - - MOA.id.server - moa-id-spring-initializer - - - MOA.id.server - moa-id-frontend-resources - - - - - - MOA.id.server.modules - moa-id-module-eIDAS - - - - - - MOA.id.server.modules - moa-id-module-monitoring - - - - - MOA.id.server.modules - moa-id-module-saml1 - - - - MOA.id.server.modules - moa-id-module-openID - - - - MOA.id.server.modules - moa-id-module-elga_mandate_service - - - - - - MOA.id.server.modules - moa-id-modul-citizencard_authentication - - - - MOA.id.server.modules - moa-id-modules-federated_authentication - - - - MOA.id.server.modules - moa-id-module-ssoTransfer - ${moa-id-version} - - - - - iaik.prod - iaik_jce_full - - provided - - - iaik.prod - iaik_ecc - - provided - - - iaik.prod - iaik_Pkcs11Provider - - provided - - - iaik.prod - iaik_Pkcs11Wrapper - - provided - - - xalan-bin-dist - xalan - - provided - - - xalan - serializer - - - - - xerces - xercesImpl - - provided - - - xalan-bin-dist - xml-apis - - provided - - - xalan-bin-dist - serializer - - provided - - - - org.springframework - spring-webmvc - - - commons-logging - commons-logging - - - - - org.slf4j - jcl-over-slf4j - - - - - diff --git a/id/server/auth/src/main/resources/log4j.properties b/id/server/auth/src/main/resources/log4j.properties deleted file mode 100644 index ecdfad165..000000000 --- a/id/server/auth/src/main/resources/log4j.properties +++ /dev/null @@ -1,27 +0,0 @@ -# commons-logging setup -org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory - -# define log4j root loggers -log4j.rootLogger=info, stdout, R -log4j.logger.at.gv.egovernment.moa=info, R -log4j.logger.at.gv.egovernment.moa.spss=info, R -log4j.logger.iaik.server=info, R -log4j.logger.at.gv.egovernment.moa.id=info, R -log4j.logger.at.gv.egovernment.moa.id.proxy=info, R -log4j.logger.eu.stork=info, R -log4j.logger.org.hibernate=warn, R - -# configure the stdout appender -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -#log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20c | %10t | %m%n -log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20.20c | %10t | %m%n - -# configure the rolling file appender (R) -log4j.appender.R=org.apache.log4j.RollingFileAppender -log4j.appender.R.File=${catalina.base}/logs/moa-id.log -log4j.appender.R.MaxFileSize=10000KB -log4j.appender.R.MaxBackupIndex=1 -log4j.appender.R.layout=org.apache.log4j.PatternLayout -log4j.appender.R.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n - diff --git a/id/server/auth/src/main/webapp/META-INF/MANIFEST.MF b/id/server/auth/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02e..000000000 --- a/id/server/auth/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 9ad651d42..000000000 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - MOA ID Auth - MOA ID Authentication Service - - - characterEncodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - forceEncoding - true - - - - characterEncodingFilter - /* - - - - index.html - - - - 5 - - - - 500 - /errorpage.jsp - - - - BASIC - UserDatabase - - - The role that is required to log in to the moa Application - moa-admin - - - diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/id/server/auth/src/main/wsdl/MOA-ID-1.0.wsdl b/id/server/auth/src/main/wsdl/MOA-ID-1.0.wsdl deleted file mode 100644 index 5751b3e58..000000000 --- a/id/server/auth/src/main/wsdl/MOA-ID-1.0.wsdl +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl b/id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl deleted file mode 100644 index 37f86aad5..000000000 --- a/id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/auth/src/main/wsdl/MOA-SPSS-1.2.xsd b/id/server/auth/src/main/wsdl/MOA-SPSS-1.2.xsd deleted file mode 100644 index d7a06d6e7..000000000 --- a/id/server/auth/src/main/wsdl/MOA-SPSS-1.2.xsd +++ /dev/null @@ -1,454 +0,0 @@ - - - - - - - - - - - - - - - - - - - - Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements - - - - - - - - - - - - - - - - - - - Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil - - - - - - - - - - - - - - - - - - Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage - - - - Resultat, falls die Signaturerstellung erfolgreich war - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert - - - - - - - - - - - only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur. - - - - - - - - - - mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert - - - - - - - - - - - only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Resultat, falls die Signaturerstellung gescheitert ist - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen. - - - - - Profilbezeichner für einen Transformationsweg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Die Angabe des Transformationsparameters (explizit oder als Hashwert) kann unterlassen werden, wenn die Applikation von der Unveränderlichkeit des Inhalts der in "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen kann. - - - - Der Transformationsparameter explizit angegeben. - - - - - Der Hashwert des Transformationsparameters. - - - - - - - - - - - - - - - - - - - - - - Explizite Angabe des Transformationswegs - - - - - - - Alle impliziten Transformationsparameter, die zum Durchlaufen der oben angeführten Transformationskette bekannt sein müssen, müssen hier angeführt werden. Das Attribut "URI" bezeichnet den Transformationsparameter in exakt jener Weise, wie er in der zu überprüfenden Signatur gebraucht wird. - - - - - - - - - - - - - - - - diff --git a/id/server/pom.xml b/id/server/pom.xml index dd1d88e76..2fbd3dd06 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -23,8 +23,8 @@ modules moa-id-spring-initializer moa-id-frontend-resources - auth - + auth-final + auth-edu -- cgit v1.2.3