From 495403c917a39fdeb3906f10ac8b997f68eb3875 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 28 Dec 2020 15:51:42 +0100
Subject: update to HSM-Facade v0.6.0 and add HealthCheck functionality

---
 .../src/test/resources/config/config1.properties   | 15 ++++++++++++
 .../resources/config/hsm_facade_trust_root.crt     | 10 ++++++++
 .../resources/config/jUnit_application.properties  | 19 +++++++++++++++
 .../test/resources/jUnit_application.properties    | 19 ---------------
 .../test/resources/spring/test_spring_actuator.xml | 28 ++++++++++++++++++++++
 5 files changed, 72 insertions(+), 19 deletions(-)
 create mode 100644 eaaf-springboot-utils/src/test/resources/config/config1.properties
 create mode 100644 eaaf-springboot-utils/src/test/resources/config/hsm_facade_trust_root.crt
 create mode 100644 eaaf-springboot-utils/src/test/resources/config/jUnit_application.properties
 delete mode 100644 eaaf-springboot-utils/src/test/resources/jUnit_application.properties
 create mode 100644 eaaf-springboot-utils/src/test/resources/spring/test_spring_actuator.xml

(limited to 'eaaf-springboot-utils/src/test/resources')

diff --git a/eaaf-springboot-utils/src/test/resources/config/config1.properties b/eaaf-springboot-utils/src/test/resources/config/config1.properties
new file mode 100644
index 00000000..ca134cf4
--- /dev/null
+++ b/eaaf-springboot-utils/src/test/resources/config/config1.properties
@@ -0,0 +1,15 @@
+security.hsmfacade.host=eid.a-sit.at
+security.hsmfacade.port=9050
+security.hsmfacade.trustedsslcert=src/test/resources/config/hsm_facade_trust_root.crt
+security.hsmfacade.username=authhandler-junit
+security.hsmfacade.password=supersecret123
+
+client.http.connection.timeout.socket=2
+client.http.connection.timeout.connection=2
+client.http.connection.timeout.request=2
+
+core.pendingrequestid.maxlifetime=180
+core.pendingrequestid.digist.type=passphrase
+core.pendingrequestid.digist.secret=pendingReqIdSecret
+core.pendingrequestid.digist.keystore.name=
+core.pendingrequestid.digist.key.alias=
\ No newline at end of file
diff --git a/eaaf-springboot-utils/src/test/resources/config/hsm_facade_trust_root.crt b/eaaf-springboot-utils/src/test/resources/config/hsm_facade_trust_root.crt
new file mode 100644
index 00000000..01be3821
--- /dev/null
+++ b/eaaf-springboot-utils/src/test/resources/config/hsm_facade_trust_root.crt
@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE-----
+MIIBdDCCARqgAwIBAgIEXkz1yjAKBggqhkjOPQQDAjARMQ8wDQYDVQQDDAZlY3Jv
+b3QwHhcNMjAwMjE5MDg0NjAyWhcNMjEwMjE4MDg0NjAyWjARMQ8wDQYDVQQDDAZl
+Y3Jvb3QwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS8yvpVIWbPj4E7Lr87hwQR
+T9DZf9WY5LMV7gF6NKpnJ5JkEql/s7fqBVbrh8aSNo6gmfmSk4VYGhPJ+DCMzzQj
+o2AwXjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFOXafzYpIOlu6BgNU+Ee
+JWuJobgWMB0GA1UdDgQWBBTl2n82KSDpbugYDVPhHiVriaG4FjALBgNVHQ8EBAMC
+AQYwCgYIKoZIzj0EAwIDSAAwRQIgRt/51PKL/bATuLCdib95Ika+h845Jo0G+Sbn
+bzNwJAcCIQCVD1cxEBuUkKaiaLbTiNVsEjvQb6ti0TFbbQUH66jCGA==
+-----END CERTIFICATE-----
diff --git a/eaaf-springboot-utils/src/test/resources/config/jUnit_application.properties b/eaaf-springboot-utils/src/test/resources/config/jUnit_application.properties
new file mode 100644
index 00000000..dd7a77c1
--- /dev/null
+++ b/eaaf-springboot-utils/src/test/resources/config/jUnit_application.properties
@@ -0,0 +1,19 @@
+## embbeded Tomcat
+tomcat.workingdir=./target/work
+tomcat.ajp.enabled=true
+tomcat.ajp.port=8009
+tomcat.ajp.networkAddress=127.0.0.1
+tomcat.ajp.additionalAttributes.secretrequired=true
+tomcat.ajp.additionalAttributes.secret=junit
+
+#############################################################################
+## Embedded Tomcat Logging
+logging.accesslog.enabled=true
+logging.mdc.enabled=true
+logging.mdc.headers[0]=header1
+logging.mdc.headers[1]=header2
+logging.mdc.cookies[0]=cookie1
+logging.mdc.cookies[1]=cookie2
+logging.mdc.sessionAttributes[0]=attr1
+logging.mdc.sessionAttributes[1]=attr2
+logging.mdc.nullvalue=null
\ No newline at end of file
diff --git a/eaaf-springboot-utils/src/test/resources/jUnit_application.properties b/eaaf-springboot-utils/src/test/resources/jUnit_application.properties
deleted file mode 100644
index dd7a77c1..00000000
--- a/eaaf-springboot-utils/src/test/resources/jUnit_application.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-## embbeded Tomcat
-tomcat.workingdir=./target/work
-tomcat.ajp.enabled=true
-tomcat.ajp.port=8009
-tomcat.ajp.networkAddress=127.0.0.1
-tomcat.ajp.additionalAttributes.secretrequired=true
-tomcat.ajp.additionalAttributes.secret=junit
-
-#############################################################################
-## Embedded Tomcat Logging
-logging.accesslog.enabled=true
-logging.mdc.enabled=true
-logging.mdc.headers[0]=header1
-logging.mdc.headers[1]=header2
-logging.mdc.cookies[0]=cookie1
-logging.mdc.cookies[1]=cookie2
-logging.mdc.sessionAttributes[0]=attr1
-logging.mdc.sessionAttributes[1]=attr2
-logging.mdc.nullvalue=null
\ No newline at end of file
diff --git a/eaaf-springboot-utils/src/test/resources/spring/test_spring_actuator.xml b/eaaf-springboot-utils/src/test/resources/spring/test_spring_actuator.xml
new file mode 100644
index 00000000..f41efac9
--- /dev/null
+++ b/eaaf-springboot-utils/src/test/resources/spring/test_spring_actuator.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd"
+  default-lazy-init="true">
+
+  <bean id="dummyAuthConfigMap"
+        class="at.gv.egiz.eaaf.core.test.dummy.DummyAuthConfigMap" >
+    <constructor-arg value="/config/config1.properties" />
+  </bean>
+         
+  <!-- bean id="eaafKeyStoreFactory"
+        class="at.gv.egiz.eaaf.core.impl.credential.EaafKeyStoreFactory" /-->
+
+  <bean id="eaafUtilsMessageSource"
+        class="at.gv.egiz.eaaf.core.impl.logging.EaafUtilsMessageSource" />
+ 
+  <bean id="HsmFacadeProvider" 
+        class="at.gv.egiz.eaaf.utils.springboot.actuator.HsmFacadeProviderHealthCheck"/>
+ 
+</beans>
\ No newline at end of file
-- 
cgit v1.2.3