Merge branch 'master' into develop

EUSurvey · Oct 18, 2024 · 0c17d74 · 0c17d74
2 parents 5e961df + d7fdc81
commit 0c17d74
Show file tree

Hide file tree

Showing 5 changed files with 169 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,6 +62,3 @@ helm/charts/
 src/main/java/com/ec/survey/config/RedisSessionBrowser.java
 docker/update.sh
 helm/clean.sh
-
-
-
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -38,3 +38,4 @@ volumes:
 networks:
   eusurvey-network:
     driver: bridge
+
diff --git a/docker/eulogin/docker-compose.yaml b/docker/eulogin/docker-compose.yaml
@@ -20,4 +20,5 @@ services:
       - docker_eusurvey-network
 networks:
   docker_eusurvey-network:
+
     external: true
diff --git a/docker/eulogin/eulogin-mockup-config/userDataBase.xml b/docker/eulogin/eulogin-mockup-config/userDataBase.xml
@@ -0,0 +1,165 @@
+<userDataBase xmlns="https://ecas.ec.europa.eu/cas/schemas/mockup/db">
+	<user>
+		<authenticationCount>21</authenticationCount>
+		<badAuthenticationCount>10</badAuthenticationCount>
+		<cn>Jason BOURNE</cn>
+		<cudGroups>MEDUSA</cudGroups>
+		<cudGroups>TREADSTONE</cudGroups>
+		<departmentNumber>DIGIT.X.1.001</departmentNumber>
+		<email>[email protected]</email>
+		<employeeNumber>00000001</employeeNumber>
+		<employeeType>f</employeeType>
+		<firstName>Jason</firstName>
+		<goodAuthenticationCount>11</goodAuthenticationCount>
+		<internalGroups>OPS-ADMIN</internalGroups>
+		<internalGroups>USER-ADMIN</internalGroups>
+		<internalTelephoneNumber>00002</internalTelephoneNumber>
+		<lastFailureTime>2024-06-13T09:40:02.621+02:00</lastFailureTime>
+		<lastName>BOURNE</lastName>
+		<lastSecureLoginTimes>2024-06-14T17:52:34.746+02:00</lastSecureLoginTimes>
+		<lastSecureLoginTimes>2024-08-28T15:43:38.499+02:00</lastSecureLoginTimes>
+		<mobilePhone>COMREF:+32480123456</mobilePhone>
+		<objectStatus>a</objectStatus>
+		<organisation>eu.europa.ec</organisation>
+		<organisationUsername>bournja</organisationUsername>
+		<orgId>1234567890</orgId>
+		<passwordLastChangedTime>2013-12-19T19:29:22.196+01:00</passwordLastChangedTime>
+		<passwordMustChange>N</passwordMustChange>
+		<resetPasswordPermission>N</resetPasswordPermission>
+		<retryCountResetTime>2024-08-28T15:43:38.499+02:00</retryCountResetTime>
+		<strongPasswordHash>{ARG2}Ku2i4VQtq3ASwpAmvn8ASD5CF/xzkE2Plqk58bWwS7944EaRm5FPeR8tO1oTMltxF83Y36pQgxvUL90lcvAYPvpcxFr6J86jurgoGmf0ErHu1QXms9ltfb9ACAyTDTVxhdMyZ2eKXYjWrw4CYBGPBUJ5Dc9rw9fnk+UdGwdFAxm624lpjU1rUfdoMegjAn6qA0u4V/KKKBaNUf2nxzAsbukKV1vQw99+1FzcaXDzGp7kZlpkwQnpNgDy2FhgQrpmqgpEDos8/KIHAEQZbQFJ2EospKmifx6K+fanmDkkA0IQQQyrQA1Ag16A7Z1rtceSo4q46Hn2hACDxVnER8klmA==</strongPasswordHash>
+		<tokenCramFailures>3</tokenCramFailures>
+		<tokenCramId>123@eu</tokenCramId>
+		<tokenCramLastFailureTime>2024-06-13T10:01:07.076+02:00</tokenCramLastFailureTime>
+		<tokenSerialNumber>12-3456789-0</tokenSerialNumber>
+		<uid>bournja</uid>
+	</user>
+	<user>
+		<authenticationCount>4</authenticationCount>
+		<cn>Chuck NORRIS</cn>
+		<created>1993-04-21T10:00:00.000+02:00</created>
+		<cudGroups>INTERNET</cudGroups>
+		<cudGroups>LIVENEWS</cudGroups>
+		<cudGroups>TEXAS_RANGER</cudGroups>
+		<departmentNumber>DIGIT.A.3.001</departmentNumber>
+		<description>chuckie</description>
+		<email>[email protected]</email>
+		<employeeType>f</employeeType>
+		<firstName>Chuck</firstName>
+		<goodAuthenticationCount>4</goodAuthenticationCount>
+		<internalTelephoneNumber>1</internalTelephoneNumber>
+		<lastName>NORRIS</lastName>
+		<lastSecureLoginTimes>2024-08-28T15:02:50.861+02:00</lastSecureLoginTimes>
+		<lastSecureLoginTimes>2024-08-28T15:18:05.431+02:00</lastSecureLoginTimes>
+		<mobilePhone>COMREF:+32123456789</mobilePhone>
+		<objectStatus>a</objectStatus>
+		<organisation>eu.europa.ec</organisation>
+		<organisationUsername>chucknorris</organisationUsername>
+		<passwordLastChangedTime>2013-12-19T19:29:22.196+01:00</passwordLastChangedTime>
+		<registrationLevelVersion level="HIGH">2dfe2ddd-a55e-4196-aa69-d52625c084ef</registrationLevelVersion>
+		<registrationLevelVersion level="LOW">8e9692d7-75ec-4bc1-8c92-402f706a8325</registrationLevelVersion>
+		<registrationLevelVersion level="MEDIUM">c88eaa81-87c2-40df-8595-7789c0afa5fa</registrationLevelVersion>
+		<registrationLevelVersion level="TOP">27e87a8c-c742-4df8-a5a3-b5dcee821f05</registrationLevelVersion>
+		<smsMessageId>RINGRING:123@2011-05-04T14:00:00.000+02:00</smsMessageId>
+		<smsMessageId>RINGRING:456@2011-05-05T14:00:00.000+02:00</smsMessageId>
+		<strongPasswordHash>{ARG2}FRKAKy/uUIRJv8EWFbVqf8g8p+cDqdyMhN6Omo+29ankQXIypJCL0XRPmD/bc3/UnHYOXCDYtInUfIjnloJz/4cWhggGJ5LUGH3mrZt4ruyiLBWvqL/5w845WeFCD8YhK895LRNTpNdpeE7Ujh/F947EeRza+4Q/eT8I0Wzn6rNG2MRF7K24X4pXZ+HJlw2ZEwKtnUWvXUbn+Ey7XZesaaXBUVjjsI0d5es9jewp4qt7jueKDGpHNXgs8z4HSXWLRRwsykpvLw+Cegy7LkqO9gL4zjOl3L2iBvCneAKq9+piCOpEDmsIIseNZUZSSv0OoPV4panMZLrEHDlLFLTEQg==</strongPasswordHash>
+		<tokenCramId>1234@eu</tokenCramId>
+		<tokenSerialNumber>90-1234567-8</tokenSerialNumber>
+		<uid>chucknorris</uid>
+	</user>
+	<user>
+		<cn>Jack BAUER</cn>
+		<created>2001-11-06T09:00:00.000+01:00</created>
+		<cudGroups>CTU</cudGroups>
+		<cudGroups>CTU_DIRECTOR</cudGroups>
+		<cudGroups>CTU_RETIRED</cudGroups>
+		<departmentNumber>DIGIT.A.3.001</departmentNumber>
+		<description>jack</description>
+		<email>[email protected]</email>
+		<employeeType>f</employeeType>
+		<firstName>Jack</firstName>
+		<internalTelephoneNumber>(310) 597-3781</internalTelephoneNumber>
+		<lastName>BAUER</lastName>
+		<mobilePhone>COMREF:+32123456789</mobilePhone>
+		<objectStatus>a</objectStatus>
+		<organisation>eu.europa.curia</organisation>
+		<organisationUsername>jackbauer</organisationUsername>
+		<passwordLastChangedTime>2013-12-19T19:29:22.196+01:00</passwordLastChangedTime>
+		<registrationLevelVersion level="HIGH">69fd9def-53b1-4df5-beae-855443679189</registrationLevelVersion>
+		<registrationLevelVersion level="LOW">f4de0343-a77a-4676-8942-fd72666a6afc</registrationLevelVersion>
+		<registrationLevelVersion level="MEDIUM">854aabe1-7b14-4610-8cb7-c401e956c218</registrationLevelVersion>
+		<registrationLevelVersion level="TOP">fa50479d-4539-43b4-99b1-9db38de01ca7</registrationLevelVersion>
+		<strongPasswordHash>{ARG2}ddxT+5BMmJNpapvuT8pItyXyXY0UZvoGL+7+bIMAUobrto8R79ov6NqAZB/CW0YOved53Up4LBwdgUUNIgRsEMR+bv03L8/nxKGHDpV7EJSdYDh64J34BmHFA7qz1Q8qaNguXrbeUqHqxEmprJhnsmRyz5ROfqj0JAr1hnPJ3G9jplPZby8qd6X6hfo+dV7CysZZG23kEk1C+q1WNEAT4Pa5VRUAF1RSg7H5XruXjPvw/qdgTBnsqzDWPZMHCtJO3IDA0C8HkGsejCH774F+2XLgyk8KPtqxATjxEysy8KyWQsHxM+ndYbQ1jZzpmeLLodbugzNIxhy2d0sr6MgwgA==</strongPasswordHash>
+		<uid>jackbauer</uid>
+	</user>
+	<user>
+		<cn>James BOND</cn>
+		<created>1953-04-19T09:00:00.000+01:00</created>
+		<cudGroups>AIDA_SELFRG</cudGroups>
+		<cudGroups>DOUBLE_KILL</cudGroups>
+		<cudGroups>LICENSE_TO_KILL</cudGroups>
+		<cudGroups>MI6</cudGroups>
+		<departmentNumber>DIGIT.A.3.001</departmentNumber>
+		<description>james</description>
+		<email>[email protected]</email>
+		<employeeType>n</employeeType>
+		<firstName>James</firstName>
+		<internalTelephoneNumber>123456</internalTelephoneNumber>
+		<lastName>BOND</lastName>
+		<mobilePhone>COMREF:+32123456789</mobilePhone>
+		<objectStatus>a</objectStatus>
+		<organisation>external</organisation>
+		<organisationUsername>jamesbond</organisationUsername>
+		<passwordLastChangedTime>2013-12-19T19:29:22.196+01:00</passwordLastChangedTime>
+		<registrationLevelVersion level="HIGH">6875b4e8-35e8-441c-aff0-d6876ff8490c</registrationLevelVersion>
+		<registrationLevelVersion level="LOW">c1eba41d-4b4b-4ebd-961b-ff7d3e82d80d</registrationLevelVersion>
+		<registrationLevelVersion level="MEDIUM">e89ac87d-8a49-d89c-6767-be145c4ba59c</registrationLevelVersion>
+		<registrationLevelVersion level="TOP">7e0fbde2-21ce-48a7-b26e-4ef26fa080dc</registrationLevelVersion>
+		<strongPasswordHash>{ARG2}tR19gSi3vEH8hBXYllfgRjsFHkBFmtq9gXQfG9hi6UFIqPOzYXW9NXUcvRI8B0RD4EW2pKJmH5VvxFdvSDzTUD5P5CGxrWM8SL8GKSoDgpTbNHsKO9d5RqdhcsV/72gVq33SCqqGgy78nEbMlAiLb67xdwxfh9b+HHZ1FarIzr9+cUgJ963nkWMsPcX5BJTn3grVDUdTJcXA6U1kQ7o8lJ1N7SmSj01N1MIjS3190bQKTYdj7N88xWkRwJeEin0HJXaB0AC3ht8uSL3T0hQHK1j2+Uiu1t7mLiDfd0/8fZuUNWdbCVcYXad3OXcfGAOzl5i6vjK9EtFGbRyWKWDp4w==</strongPasswordHash>
+		<tokenCramId>5678@uk</tokenCramId>
+		<uid>jb007</uid>
+	</user>
+	<user>
+		<cn>job1337</cn>
+		<description>job1337 is a job account</description>
+		<email>[email protected]</email>
+		<employeeType>e</employeeType>
+		<firstName>job</firstName>
+		<lastName>account</lastName>
+		<objectStatus>a</objectStatus>
+		<organisation>eu.europa.ec</organisation>
+		<organisationUsername>job account</organisationUsername>
+		<uid>job1337</uid>
+		<userManager>uid=bournja,ou=people,dc=commission,dc=europa,dc=eu</userManager>
+	</user>
+	<user>
+		<cn>Lisbeth SALANDER</cn>
+		<created>2000-01-01T01:00:00.000+01:00</created>
+		<cudGroups>INTERNET</cudGroups>
+		<cudGroups>LIVENEWS</cudGroups>
+		<cudGroups>MILTON_SECURITY</cudGroups>
+		<departmentNumber>DIGIT.A.3.001</departmentNumber>
+		<email>[email protected]</email>
+		<employeeType>x</employeeType>
+		<firstName>Lisbeth</firstName>
+		<lastName>SALANDER</lastName>
+		<mobilePhone>COMREF:+32133713371</mobilePhone>
+		<objectStatus>a</objectStatus>
+		<organisation>eu.europa.ec</organisation>
+		<organisationUsername>lsalander</organisationUsername>
+		<passwordLastChangedTime>2013-12-19T19:29:22.196+01:00</passwordLastChangedTime>
+		<strongPasswordHash>{ARG2}EKKtv/SQ9Xo/NcF5KavcPxUtspgV4va8BvdJ4IzTYBPpJmAiqxnmYdPIPLC361nohTM+mK1VND6knQWwwFGihhVTkjO+zvLW4TmWMVMuLQJR+AgW2Y63f+3hqxJ+uofsQw/Ssy+U7a0kgIWtFhwdWddN1QdpDcOVMlLGIv4x4PpGhSMpe4afb6DyQ5Q7uIEHE+cTQxnEbIC2A1xEtJyu0adpyyPSAXnpMJNm6hUo4HQJFTS8mRL7wW+EqMhOEVXu5Vo8IMTC01c3+oyLdk4UbPqMXhVYFBeMIzqsmkwvFESDNXyk774+87oCSUaxCGYSkSm6LQoP32KG5GoIMprIJQ==</strongPasswordHash>
+		<uid>lsalander</uid>
+	</user>
+	<user>
+		<email>[email protected]</email>
+		<firstName>Minimal_first_name</firstName>
+		<lastName>MINIMAL_LAST_NAME</lastName>
+		<objectStatus>a</objectStatus>
+		<organisation>eu.europa.ec</organisation>
+		<organisationUsername>minimal</organisationUsername>
+		<passwordLastChangedTime>2013-12-19T19:29:22.196+01:00</passwordLastChangedTime>
+		<strongPasswordHash>{ARG2}5+4HcfvJgSvi8+FvgLk5vthGAF4Lh8TI8ILIcxHRp6cr2k5v7EteHtD1Ydiu8b0GMxj9E62XLvpDotWRMduN06pZny2cnfF7FzImbntSMGtr+D1OncDsi4EY452Mhm3dzWjcRnDQ4qFfj6GPJWYd7lCxWz8sPEIPSAX1N8sKhGAwa+3mJJ8cqpCo7aRhL1pEbjfcK34UdxhSQf1UwNh719q7RPQD/bTTESL417VbryAPzd/16l3CoB1RI09san3Dl2zkHr/G1tspZbMEnrml+1f3eCIdew2uvgEkpFCsDbV+dKPy8s16qC9EUY6RHVJYzxrGM54HL5YH5XD391QySg==</strongPasswordHash>
+		<uid>minimal</uid>
+	</user>
+</userDataBase>
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
@@ -19,4 +19,5 @@ RUN rm eulogin.crt
 RUN rm -rf /opt/bitnami/tomcat/webapps/*
 COPY ./dist/eusurvey.war /opt/bitnami/tomcat/webapps/eusurvey.war
 
-USER 1001
+USER 1001
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,6 +62,3 @@ helm/charts/
		src/main/java/com/ec/survey/config/RedisSessionBrowser.java
		docker/update.sh
		helm/clean.sh
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,3 +38,4 @@ volumes:
		networks:
		eusurvey-network:
		driver: bridge