diff --git a/.gitignore b/.gitignore index 48c5e68c..50e1e595 100644 --- 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 index 031b3ab0..acba44ce 100644 --- 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 index 8c06ac7d..40200d3a 100644 --- 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 new file mode 100644 index 00000000..60cae806 --- /dev/null +++ b/docker/eulogin/eulogin-mockup-config/userDataBase.xml @@ -0,0 +1,165 @@ + + + 21 + 10 + Jason BOURNE + MEDUSA + TREADSTONE + DIGIT.X.1.001 + Jason.BOURNE@ec.europa.eu + 00000001 + f + Jason + 11 + OPS-ADMIN + USER-ADMIN + 00002 + 2024-06-13T09:40:02.621+02:00 + BOURNE + 2024-06-14T17:52:34.746+02:00 + 2024-08-28T15:43:38.499+02:00 + COMREF:+32480123456 + a + eu.europa.ec + bournja + 1234567890 + 2013-12-19T19:29:22.196+01:00 + N + N + 2024-08-28T15:43:38.499+02:00 + {ARG2}Ku2i4VQtq3ASwpAmvn8ASD5CF/xzkE2Plqk58bWwS7944EaRm5FPeR8tO1oTMltxF83Y36pQgxvUL90lcvAYPvpcxFr6J86jurgoGmf0ErHu1QXms9ltfb9ACAyTDTVxhdMyZ2eKXYjWrw4CYBGPBUJ5Dc9rw9fnk+UdGwdFAxm624lpjU1rUfdoMegjAn6qA0u4V/KKKBaNUf2nxzAsbukKV1vQw99+1FzcaXDzGp7kZlpkwQnpNgDy2FhgQrpmqgpEDos8/KIHAEQZbQFJ2EospKmifx6K+fanmDkkA0IQQQyrQA1Ag16A7Z1rtceSo4q46Hn2hACDxVnER8klmA== + 3 + 123@eu + 2024-06-13T10:01:07.076+02:00 + 12-3456789-0 + bournja + + + 4 + Chuck NORRIS + 1993-04-21T10:00:00.000+02:00 + INTERNET + LIVENEWS + TEXAS_RANGER + DIGIT.A.3.001 + chuckie + texasranger@chuck.norris.com.eu + f + Chuck + 4 + 1 + NORRIS + 2024-08-28T15:02:50.861+02:00 + 2024-08-28T15:18:05.431+02:00 + COMREF:+32123456789 + a + eu.europa.ec + chucknorris + 2013-12-19T19:29:22.196+01:00 + 2dfe2ddd-a55e-4196-aa69-d52625c084ef + 8e9692d7-75ec-4bc1-8c92-402f706a8325 + c88eaa81-87c2-40df-8595-7789c0afa5fa + 27e87a8c-c742-4df8-a5a3-b5dcee821f05 + RINGRING:123@2011-05-04T14:00:00.000+02:00 + RINGRING:456@2011-05-05T14:00:00.000+02:00 + {ARG2}FRKAKy/uUIRJv8EWFbVqf8g8p+cDqdyMhN6Omo+29ankQXIypJCL0XRPmD/bc3/UnHYOXCDYtInUfIjnloJz/4cWhggGJ5LUGH3mrZt4ruyiLBWvqL/5w845WeFCD8YhK895LRNTpNdpeE7Ujh/F947EeRza+4Q/eT8I0Wzn6rNG2MRF7K24X4pXZ+HJlw2ZEwKtnUWvXUbn+Ey7XZesaaXBUVjjsI0d5es9jewp4qt7jueKDGpHNXgs8z4HSXWLRRwsykpvLw+Cegy7LkqO9gL4zjOl3L2iBvCneAKq9+piCOpEDmsIIseNZUZSSv0OoPV4panMZLrEHDlLFLTEQg== + 1234@eu + 90-1234567-8 + chucknorris + + + Jack BAUER + 2001-11-06T09:00:00.000+01:00 + CTU + CTU_DIRECTOR + CTU_RETIRED + DIGIT.A.3.001 + jack + Jack.Bauer@ctu.eu + f + Jack + (310) 597-3781 + BAUER + COMREF:+32123456789 + a + eu.europa.curia + jackbauer + 2013-12-19T19:29:22.196+01:00 + 69fd9def-53b1-4df5-beae-855443679189 + f4de0343-a77a-4676-8942-fd72666a6afc + 854aabe1-7b14-4610-8cb7-c401e956c218 + fa50479d-4539-43b4-99b1-9db38de01ca7 + {ARG2}ddxT+5BMmJNpapvuT8pItyXyXY0UZvoGL+7+bIMAUobrto8R79ov6NqAZB/CW0YOved53Up4LBwdgUUNIgRsEMR+bv03L8/nxKGHDpV7EJSdYDh64J34BmHFA7qz1Q8qaNguXrbeUqHqxEmprJhnsmRyz5ROfqj0JAr1hnPJ3G9jplPZby8qd6X6hfo+dV7CysZZG23kEk1C+q1WNEAT4Pa5VRUAF1RSg7H5XruXjPvw/qdgTBnsqzDWPZMHCtJO3IDA0C8HkGsejCH774F+2XLgyk8KPtqxATjxEysy8KyWQsHxM+ndYbQ1jZzpmeLLodbugzNIxhy2d0sr6MgwgA== + jackbauer + + + James BOND + 1953-04-19T09:00:00.000+01:00 + AIDA_SELFRG + DOUBLE_KILL + LICENSE_TO_KILL + MI6 + DIGIT.A.3.001 + james + 007@mi6.eu + n + James + 123456 + BOND + COMREF:+32123456789 + a + external + jamesbond + 2013-12-19T19:29:22.196+01:00 + 6875b4e8-35e8-441c-aff0-d6876ff8490c + c1eba41d-4b4b-4ebd-961b-ff7d3e82d80d + e89ac87d-8a49-d89c-6767-be145c4ba59c + 7e0fbde2-21ce-48a7-b26e-4ef26fa080dc + {ARG2}tR19gSi3vEH8hBXYllfgRjsFHkBFmtq9gXQfG9hi6UFIqPOzYXW9NXUcvRI8B0RD4EW2pKJmH5VvxFdvSDzTUD5P5CGxrWM8SL8GKSoDgpTbNHsKO9d5RqdhcsV/72gVq33SCqqGgy78nEbMlAiLb67xdwxfh9b+HHZ1FarIzr9+cUgJ963nkWMsPcX5BJTn3grVDUdTJcXA6U1kQ7o8lJ1N7SmSj01N1MIjS3190bQKTYdj7N88xWkRwJeEin0HJXaB0AC3ht8uSL3T0hQHK1j2+Uiu1t7mLiDfd0/8fZuUNWdbCVcYXad3OXcfGAOzl5i6vjK9EtFGbRyWKWDp4w== + 5678@uk + jb007 + + + job1337 + job1337 is a job account + mary@ec.europa.eu + e + job + account + a + eu.europa.ec + job account + job1337 + uid=bournja,ou=people,dc=commission,dc=europa,dc=eu + + + Lisbeth SALANDER + 2000-01-01T01:00:00.000+01:00 + INTERNET + LIVENEWS + MILTON_SECURITY + DIGIT.A.3.001 + Lisbeth.SALANDER@ext.ec.europa.eu + x + Lisbeth + SALANDER + COMREF:+32133713371 + a + eu.europa.ec + lsalander + 2013-12-19T19:29:22.196+01:00 + {ARG2}EKKtv/SQ9Xo/NcF5KavcPxUtspgV4va8BvdJ4IzTYBPpJmAiqxnmYdPIPLC361nohTM+mK1VND6knQWwwFGihhVTkjO+zvLW4TmWMVMuLQJR+AgW2Y63f+3hqxJ+uofsQw/Ssy+U7a0kgIWtFhwdWddN1QdpDcOVMlLGIv4x4PpGhSMpe4afb6DyQ5Q7uIEHE+cTQxnEbIC2A1xEtJyu0adpyyPSAXnpMJNm6hUo4HQJFTS8mRL7wW+EqMhOEVXu5Vo8IMTC01c3+oyLdk4UbPqMXhVYFBeMIzqsmkwvFESDNXyk774+87oCSUaxCGYSkSm6LQoP32KG5GoIMprIJQ== + lsalander + + + minimal@email.eu + Minimal_first_name + MINIMAL_LAST_NAME + a + eu.europa.ec + minimal + 2013-12-19T19:29:22.196+01:00 + {ARG2}5+4HcfvJgSvi8+FvgLk5vthGAF4Lh8TI8ILIcxHRp6cr2k5v7EteHtD1Ydiu8b0GMxj9E62XLvpDotWRMduN06pZny2cnfF7FzImbntSMGtr+D1OncDsi4EY452Mhm3dzWjcRnDQ4qFfj6GPJWYd7lCxWz8sPEIPSAX1N8sKhGAwa+3mJJ8cqpCo7aRhL1pEbjfcK34UdxhSQf1UwNh719q7RPQD/bTTESL417VbryAPzd/16l3CoB1RI09san3Dl2zkHr/G1tspZbMEnrml+1f3eCIdew2uvgEkpFCsDbV+dKPy8s16qC9EUY6RHVJYzxrGM54HL5YH5XD391QySg== + minimal + + diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 66c8b600..dfdeb20d 100644 --- 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 \ No newline at end of file +USER 1001 +