Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-idspssHEADmaster

9 files changed, 98 insertions, 181 deletions

diff --git a/id/server/data/deploy/conf/moa-id-configuration/logback.xml b/id/server/data/deploy/conf/moa-id-configuration/logback.xml
new file mode 100644
index 000000000..fc7508598
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id-configuration/logback.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <appender name="CONFIGTOOL" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
+    <File>${catalina.base}/logs/moa-id-webgui.log</File>
+    <encoder>
+      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} | %t | %m%n</pattern>
+    </encoder>
+    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <maxIndex>1</maxIndex>
+      <FileNamePattern>${catalina.base}/logs/moa-id-webgui.log.%i.gz</FileNamePattern>
+    </rollingPolicy>
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <MaxFileSize>10000KB</MaxFileSize>
+    </triggeringPolicy>
+  </appender>
+  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} |%20.20c | %10t | %m%n</pattern>
+    </encoder>
+  </appender> 
+
+  <logger name="at.gv.egovernment.moa.id.configuration" level="info">
+    <appender-ref ref="CONFIGTOOL"/>
+  </logger>
+  <logger name="at.gv.egovernment.moa.id.config.webgui" level="info">
+    <appender-ref ref="CONFIGTOOL"/>
+  </logger>
+  
+  <logger name="at.gv.egiz.eaaf" level="info">
+    <appender-ref ref="moaid"/>
+  </logger>
+  <logger name="at.gv.egiz.components.configuration" level="info">
+    <appender-ref ref="CONFIGTOOL"/>
+  </logger>
+  
+  <root level="warn">
+    <appender-ref ref="stdout"/>
+  </root>
+</configuration>
diff --git a/id/server/data/deploy/conf/moa-id-configuration/logback_config.xml b/id/server/data/deploy/conf/moa-id-configuration/logback_config.xml
deleted file mode 100644
index c00e62e52..000000000
--- a/id/server/data/deploy/conf/moa-id-configuration/logback_config.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-<configuration>
-  <!-- Errors were reported during translation. -->
-  <!-- No class found for appender CONFIGTOOL R -->
-  <!-- Could not find transformer for null -->
-  <appender name="R" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/moa-id.log</File>
-    <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <maxIndex>1</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/moa-id.log.%i</FileNamePattern>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>10000KB</MaxFileSize>
-    </triggeringPolicy>
-  </appender>
-  <appender name="CONFIGTOOL R">
-    <!--No layout specified for appender named [CONFIGTOOL R] of class [null]-->
-  </appender>
-  <appender name="CONFIGTOOL" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/moa-id-webgui.log</File>
-    <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <maxIndex>1</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/moa-id-webgui.log.%i</FileNamePattern>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>10000KB</MaxFileSize>
-    </triggeringPolicy>
-  </appender>
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} |%20.20c | %10t | %m%n</pattern>
-    </encoder>
-  </appender>
-  <logger name="eu.stork" level="info"/>
-  <logger name="iaik.server" level="info"/>
-  <logger name="at.gv.egovernment.moa.id" level="info">
-    <appender-ref ref="R"/>
-  </logger>
-  <logger name="at.gv.egovernment.moa.id.commons" level="info">
-    <appender-ref ref="CONFIGTOOL R"/>
-  </logger>
-  <logger name="org.hibernate" level="warn"/>
-  <logger name="at.gv.egiz.components.configuration" level="info">
-    <appender-ref ref="CONFIGTOOL"/>
-  </logger>
-  <logger name="at.gv.egovernment.moa.id.proxy" level="info"/>
-  <logger name="at.gv.egovernment.moa.id.config.webgui" level="info">
-    <appender-ref ref="CONFIGTOOL"/>
-  </logger>
-  <logger name="at.gv.egovernment.moa.spss" level="info"/>
-  <logger name="at.gv.egovernment.moa" level="info"/>
-  <root level="info">
-    <appender-ref ref="stdout"/>
-  </root>
-</configuration>
diff --git a/id/server/data/deploy/conf/moa-id-oa/logback.xml b/id/server/data/deploy/conf/moa-id-oa/logback.xml
new file mode 100644
index 000000000..b94b7476a
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id-oa/logback.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <appender name="DEMO_SP" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
+    <File>${catalina.base}/logs/moa-demo-sp.log</File>
+    <encoder>
+      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} | %t | %m%n</pattern>
+    </encoder>
+    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <maxIndex>1</maxIndex>
+      <FileNamePattern>${catalina.base}/logs/moa-demo-sp.%i.gz</FileNamePattern>
+    </rollingPolicy>
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTrimoa-demo-spggeringPolicy">
+      <MaxFileSize>10000KB</MaxFileSize>
+    </triggeringPolicy>
+  </appender>
+  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} |%20.20c | %10t | %m%n</pattern>
+    </encoder>
+  </appender> 
+
+  <logger name="at.gv.egovernment.moa.id.demoOA" level="info">
+    <appender-ref ref="DEMO_SP"/>
+  </logger>
+  
+  <root level="warn">
+    <appender-ref ref="stdout"/>
+  </root>
+</configuration>
diff --git a/id/server/data/deploy/conf/moa-id/log4j.properties b/id/server/data/deploy/conf/moa-id/log4j.properties
deleted file mode 100644
index 2914fcff1..000000000
--- a/id/server/data/deploy/conf/moa-id/log4j.properties
+++ /dev/null
@@ -1,62 +0,0 @@
-# commons-logging setup
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
-
-# define log4j root loggers
-log4j.rootLogger=warn,stdout
-
-### MOA-ID process log ###
-log4j.logger.at.gv.egiz.eaaf=info,moaid
-log4j.logger.at.gv.egovernment.moa.id=info,moaid
-log4j.logger.at.gv.egovernment.moa.spss=info,moaid
-
-### process revision log with event-codes ###
-log4j.logger.at.gv.egiz.eventlog.plain.all=info,reversion
-
-### Signature verification and certificate proofing ####
-log4j.logger.at.gv.egovernment.moa.spss=info,moaspss
-log4j.logger.iaik.server=info,moaspss
-log4j.logger.pki=info,moaspss
-
-### ConfigTool Logs ####
-log4j.logger.at.gv.egiz.components.configuration=info,CONFIGTOOL
-log4j.logger.at.gv.egovernment.moa.id.commons=info,CONFIGTOOL
-log4j.logger.at.gv.egovernment.moa.id.config.webgui=info,CONFIGTOOL
-log4j.logger.at.gv.egovernment.moa.id.configuration=info,CONFIGTOOL
-
-
-### Log Appender ####
-# 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} | %X{sessionId} | %X{transactionId} | %X{oaId} |%20.20c | %10t | %m%n
-
-# configure the rolling file appender (moaid)
-log4j.appender.moaid=org.apache.log4j.RollingFileAppender
-log4j.appender.moaid.File=${catalina.base}/logs/moa-id.log
-log4j.appender.moaid.MaxFileSize=10000KB
-log4j.appender.moaid.MaxBackupIndex=1
-log4j.appender.moaid.layout=org.apache.log4j.PatternLayout
-log4j.appender.moaid.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} | %t | %m%n
-
-# configure the rolling file appender (moaid)
-log4j.appender.moaspss=org.apache.log4j.RollingFileAppender
-log4j.appender.moaspss.File=${catalina.base}/logs/moa-spss.log
-log4j.appender.moaspss.MaxFileSize=10000KB
-log4j.appender.moaspss.MaxBackupIndex=1
-log4j.appender.moaspss.layout=org.apache.log4j.PatternLayout
-log4j.appender.moaspss.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} | %t | %m%n
-
-log4j.appender.reversion=org.apache.log4j.RollingFileAppender
-log4j.appender.reversion.File=${catalina.base}/moa-id-reversion.log
-log4j.appender.reversion.MaxFileSize=10000KB
-log4j.appender.reversion.MaxBackupIndex=9999
-log4j.appender.reversion.layout=org.apache.log4j.PatternLayout
-log4j.appender.reversion.layout.ConversionPattern=%5p | %d{ISO8601} | %t | %m%n
-
-# configure the rolling file appender (configtool)
-log4j.appender.CONFIGTOOL=org.apache.log4j.RollingFileAppender
-log4j.appender.CONFIGTOOL.File=${catalina.base}/logs/moa-id-webgui.log
-log4j.appender.CONFIGTOOL.MaxFileSize=10000KB
-log4j.appender.CONFIGTOOL.MaxBackupIndex=1
-log4j.appender.CONFIGTOOL.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONFIGTOOL.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} | %t | %m%n
\ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id/logback_config.xml b/id/server/data/deploy/conf/moa-id/logback.xml
index fa221fbc2..3f0d54fe5 100644
--- a/id/server/data/deploy/conf/moa-id/logback_config.xml
+++ b/id/server/data/deploy/conf/moa-id/logback.xml
@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
 <configuration>
   <appender name="moaid" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
@@ -16,7 +8,7 @@
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <maxIndex>1</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/moa-id.log.%i</FileNamePattern>
+      <FileNamePattern>${catalina.base}/logs/moa-id.log.%i.gz</FileNamePattern>
     </rollingPolicy>
     <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
       <MaxFileSize>10000KB</MaxFileSize>
@@ -30,21 +22,7 @@
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <maxIndex>1</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/moa-spss.log.%i</FileNamePattern>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>10000KB</MaxFileSize>
-    </triggeringPolicy>
-  </appender>
-  <appender name="CONFIGTOOL" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/moa-id-webgui.log</File>
-    <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} | %t | %m%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <maxIndex>1</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/moa-id-webgui.log.%i</FileNamePattern>
+      <FileNamePattern>${catalina.base}/logs/moa-spss.log.%i.gz</FileNamePattern>
     </rollingPolicy>
     <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
       <MaxFileSize>10000KB</MaxFileSize>
@@ -58,7 +36,7 @@
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/moa-id-reversion.log.%i</FileNamePattern>
+      <FileNamePattern>${catalina.base}/moa-id-reversion.log.%i.gz</FileNamePattern>
     </rollingPolicy>
     <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
       <MaxFileSize>10000KB</MaxFileSize>
@@ -68,37 +46,33 @@
     <encoder>
       <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} |%20.20c | %10t | %m%n</pattern>
     </encoder>
-  </appender>
-  <logger name="at.gv.egiz.eaaf" level="info">
+  </appender> 
+
+  <logger name="at.gv.egovernment.moa.id" level="info">
     <appender-ref ref="moaid"/>
   </logger>
-  <logger name="at.gv.egovernment.moa.spss" level="info">
-    <appender-ref ref="moaspss"/>
-  </logger>
-  <logger name="pki" level="info">
-    <appender-ref ref="moaspss"/>
-  </logger>
-  <logger name="at.gv.egovernment.moa.id.commons" level="info">
-    <appender-ref ref="CONFIGTOOL"/>
-  </logger>
-  <logger name="at.gv.egovernment.moa.id.configuration" level="info">
-    <appender-ref ref="CONFIGTOOL"/>
-  </logger>
+
   <logger name="at.gv.egiz.eventlog.plain.all" level="info">
     <appender-ref ref="reversion"/>
   </logger>
-  <logger name="at.gv.egovernment.moa.id.config.webgui" level="info">
-    <appender-ref ref="CONFIGTOOL"/>
+    
+  <logger name="at.gv.egiz.eaaf" level="info">
+    <appender-ref ref="moaid"/>
   </logger>
   <logger name="at.gv.egiz.components.configuration" level="info">
     <appender-ref ref="CONFIGTOOL"/>
   </logger>
-  <logger name="at.gv.egovernment.moa.id" level="info">
-    <appender-ref ref="moaid"/>
+  
+  <logger name="at.gv.egovernment.moa.spss" level="info">
+    <appender-ref ref="moaspss"/>
   </logger>
+  <logger name="pki" level="info">
+    <appender-ref ref="moaspss"/>
+  </logger>  
   <logger name="iaik.server" level="info">
     <appender-ref ref="moaspss"/>
   </logger>
+
   <root level="warn">
     <appender-ref ref="stdout"/>
   </root>
diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties
index 0a579a53d..03640b252 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -226,6 +226,14 @@ modules.elga_mandate.request.sign.password=password
 modules.elga_mandate.response.encryption.alias=pvp_assertion
 modules.elga_mandate.response.encryption.password=password
 
+######## EHVD Service module
+modules.ehvd.enabled=false
+#modules.ehvd.sp.1=
+#modules.ehvd.sp.2=
+modules.ehvd.service.url=
+modules.ehvd.service.role.regex=^1\.2\.40\.0\.34\.5\.2\:(100|101|158)$
+modules.ehvd.role.pvp=EPI-GDA()
+
 ######## SSO Interfederation client module ########
 modules.federatedAuth.keystore.path=keys/moa_idp[password].p12
 modules.federatedAuth.keystore.password=password
@@ -280,4 +288,4 @@ service.egovutil.szr.ssl.laxhostnameverification=false
 ##  Additonal encryption keys can be added by add a ney configuration line, like
 ##    configuration.foreignsectors.pubkey.BMI+T1=MIICuTCCAaG   (VKZ='BMI', Public Target='T1')    
 ########
-#configuration.foreignsectors.pubkey.wbpk+FN+195755b=MIIF2TCCA8GgAw...
\ No newline at end of file
+#configuration.foreignsectors.pubkey.wbpk+FN+195755b=MIIF2TCCA8GgAw...
diff --git a/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Test-Premium-Sig-05.20141215-20141209.SerNo165fb8.crt b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Test-Premium-Sig-05.20141215-20241209.SerNo165fb8.crt
index ee17cdb80..ee17cdb80 100644
--- a/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Test-Premium-Sig-05.20141215-20141209.SerNo165fb8.crt
+++ b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Test-Premium-Sig-05.20141215-20241209.SerNo165fb8.crt
diff --git a/id/server/data/deploy/tomcat/unix/tomcat-start.sh b/id/server/data/deploy/tomcat/unix/tomcat-start.sh
index d717ecd25..0ad50ff0e 100644
--- a/id/server/data/deploy/tomcat/unix/tomcat-start.sh
+++ b/id/server/data/deploy/tomcat/unix/tomcat-start.sh
@@ -7,8 +7,7 @@ export CATALINA_BASE=$CATALINA_HOME
 FILE_ENCODING=-Dfile.encoding=UTF-8

 RAND_FILE=-Djava.security.egd=file:///dev/urandom

 

-LOGGING_OPT=-Dlog4j.configuration=file:$CATALINA_BASE/conf/moa-id/log4j.properties

-LOGGING_LOGBACK_OPT=-Dlogback.configurationFile=$CATALINA_BASE/conf/moa-id/logback_config.xml

+LOGGING_LOGBACK_OPT=-Dlogback.configurationFile=$CATALINA_BASE/conf/moa-id/logback.xml

 

 CONFIG_OPT=-Dmoa.id.configuration=file:$CATALINA_BASE/conf/moa-id/moa-id.properties

 SPSS_OPT=-Dmoa.spss.server.configuration=$CATALINA_BASE/conf/moa-spss/SampleMOASPSSConfiguration.xml

diff --git a/id/server/data/deploy/tomcat/win32/startTomcat.bat b/id/server/data/deploy/tomcat/win32/startTomcat.bat
index afdd907c8..93eb3ea80 100644
--- a/id/server/data/deploy/tomcat/win32/startTomcat.bat
+++ b/id/server/data/deploy/tomcat/win32/startTomcat.bat
@@ -12,8 +12,7 @@ rem ----------------------------------------------------------------------------
 set FILE_ENCODING=-Dfile.encoding=UTF-8

 set RAND_FILE=-Djava.security.egd=file:///dev/urandom

 

-set LOGGING_OPT=-Dlog4j.configuration=file:%CATALINA_HOME%/conf/moa-id/log4j.properties

-set LOGGING_LOGBACK_OPT=-Dlogback.configurationFile=%CATALINA_HOME%/conf/moa-id/logback_config.xml

+set LOGGING_LOGBACK_OPT=-Dlogback.configurationFile=%CATALINA_HOME%/conf/moa-id/logback.xml

 

 set CONFIG_OPT_SPSS=-Dmoa.spss.server.configuration=%CATALINA_HOME%/conf/moa-spss/SampleMOASPSSConfiguration.xml

 set CONFIG_OPT_ID=-Dmoa.id.configuration=file:%CATALINA_HOME%/conf/moa-id/moa-id.properties