Skip to content

Commit 52db1d9

Browse files
mkhedirimkhediri
committed
Story #15211: separate client and server certificate
1 parent 4f13fad commit 52db1d9

File tree

39 files changed

+330
-185
lines changed

39 files changed

+330
-185
lines changed

‎api/api-archive-search/archive-search/src/main/resources/application-dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ server:
2525
host:
2626
port: 8089
2727
ssl:
28-
key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_archive-search.jks
28+
key-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/server/localhost/keystore_archive-search.jks
2929
key-store-password: changeme
3030
key-password: changeme
31-
trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
31+
trust-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
3232
trust-store-password: changeme
3333
client-auth: want
3434
enabled-protocols: TLSv1.2,TLSv1.3
@@ -53,10 +53,10 @@ archive-search:
5353
secure: true
5454
ssl-configuration:
5555
truststore:
56-
key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
56+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
5757
key-password: changeme
5858
keystore:
59-
key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_archive-search.jks
59+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/clients/keystore_archive-search.jks
6060
key-password: changeme
6161
type: JKS
6262
hostname-verification: false

‎api/api-collect/collect/src/main/resources/application-dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ server:
2525
host:
2626
port: 8090
2727
ssl:
28-
key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_collect.jks
28+
key-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/server/localhost/keystore_collect.jks
2929
key-store-password: changeme
3030
key-password: changeme
31-
trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
31+
trust-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
3232
trust-store-password: changeme
3333
client-auth: want
3434
enabled-protocols: TLSv1.2,TLSv1.3
@@ -51,10 +51,10 @@ collect:
5151
secure: true
5252
ssl-configuration:
5353
truststore:
54-
key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
54+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
5555
key-password: changeme
5656
keystore:
57-
key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_collect.jks
57+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/clients/keystore_collect.jks
5858
key-password: changeme
5959
type: JKS
6060
hostname-verification: false

‎api/api-gateway/src/main/resources/application-dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
server:
22
port: 8070
33
ssl:
4-
key-store: ../../dev-deployment/environments/keystores/server/localhost/keystore_api-gateway.jks
4+
key-store: ../../dev-deployment/environments/keystores/vitam-ui-service/server/localhost/keystore_api-gateway.jks
55
key-store-password: changeme
66
key-password: changeme
77
client-auth: need
8-
trust-store: ../../dev-deployment/environments/keystores/server/truststore_server.jks
8+
trust-store: ../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
99
trust-store-password: changeme
1010
max-http-request-header-size: 16KB
1111

‎api/api-iam/iam/src/main/resources/application-dev.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ server:
2222
host:
2323
port: 8083
2424
ssl:
25-
key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam.jks
25+
key-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/server/localhost/keystore_iam.jks
2626
key-store-password: changeme
2727
key-password: changeme
28-
trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
28+
trust-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
2929
trust-store-password: changeme
3030
client-auth: want
3131
enabled-protocols: TLSv1.2,TLSv1.3
@@ -53,10 +53,10 @@ cas-client:
5353
secure: true
5454
ssl-configuration:
5555
truststore:
56-
key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
56+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
5757
key-password: changeme
5858
keystore:
59-
key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam.jks
59+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/clients/keystore_iam.jks
6060
key-password: changeme
6161
type: JKS
6262
hostname-verification: false
@@ -112,11 +112,11 @@ provisioning-client:
112112
secure: false
113113
ssl-configuration:
114114
keystore:
115-
key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam.jks
115+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/clients/keystore_iam.jks
116116
key-password: changeme
117117
type: JKS
118118
truststore:
119-
key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
119+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
120120
key-password: changeme
121121
type: JKS
122122
hostname-verification: false
@@ -126,11 +126,11 @@ provisioning-client:
126126
secure: true
127127
ssl-configuration:
128128
keystore:
129-
key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam.jks
129+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/clients/keystore_iam.jks
130130
key-password: changeme
131131
type: JKS
132132
truststore:
133-
key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
133+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
134134
key-password: changeme
135135
type: JKS
136136
hostname-verification: false

‎api/api-ingest/ingest/src/main/resources/application-dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ server:
1515
host:
1616
port: 8088
1717
ssl:
18-
key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_ingest.jks
18+
key-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/server/localhost/keystore_ingest.jks
1919
key-store-password: changeme
2020
key-password: changeme
21-
trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
21+
trust-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
2222
trust-store-password: changeme
2323
client-auth: want
2424
enabled-protocols: TLSv1.2,TLSv1.3
@@ -43,10 +43,10 @@ ingest:
4343
secure: true
4444
ssl-configuration:
4545
truststore:
46-
key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
46+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
4747
key-password: changeme
4848
keystore:
49-
key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_ingest.jks
49+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/clients/keystore_ingest.jks
5050
key-password: changeme
5151
type: JKS
5252
hostname-verification: false

‎api/api-pastis/pastis/src/main/resources/application-dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ server:
3535
host:
3636
port: 8015
3737
ssl:
38-
key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_pastis.jks
38+
key-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/server/localhost/keystore_pastis.jks
3939
key-store-password: changeme
4040
key-password: changeme
41-
trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
41+
trust-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
4242
trust-store-password: changeme
4343
client-auth: want
4444
enabled-protocols: TLSv1.1,TLSv1.2,TLSv1.3
@@ -62,10 +62,10 @@ pastis:
6262
secure: true
6363
ssl-configuration:
6464
truststore:
65-
key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
65+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
6666
key-password: changeme
6767
keystore:
68-
key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_pastis.jks
68+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/clients/keystore_pastis.jks
6969
key-password: changeme
7070
type: JKS
7171
hostname-verification: false

‎api/api-referential/referential/src/main/resources/application-dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ server:
1919
port: 8087
2020
tomcat.connection-timeout: 60000
2121
ssl:
22-
key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_referential.jks
22+
key-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/server/localhost/keystore_referential.jks
2323
key-store-password: changeme
2424
key-password: changeme
25-
trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
25+
trust-store: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
2626
trust-store-password: changeme
2727
client-auth: want
2828
enabled-protocols: TLSv1.2,TLSv1.3
@@ -49,10 +49,10 @@ referential:
4949
secure: true
5050
ssl-configuration:
5151
truststore:
52-
key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
52+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
5353
key-password: changeme
5454
keystore:
55-
key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_referential.jks
55+
key-path: ../../../dev-deployment/environments/keystores/vitam-ui-service/clients/keystore_referential.jks
5656
key-password: changeme
5757
type: JKS
5858
hostname-verification: false

‎cas/cas-server/src/main/config/cas-server-application-dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ spring:
99
server:
1010
ssl:
1111
#client-auth: want
12-
key-store: ../../dev-deployment/environments/keystores/server/localhost/keystore_cas-server.jks
12+
key-store: ../../dev-deployment/environments/keystores/vitam-ui-service/server/localhost/keystore_cas-server.jks
1313
key-store-password: changeme
1414
key-password: changeme
1515
enabled-protocols: TLSv1.2,TLSv1.3
1616
ciphers: ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384
17-
#trust-store: ../../dev-deployment/environments/keystores/server/truststore_server.jks
17+
#trust-store: ../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
1818
#trust-store-password: changeme
1919
host: dev.vitamui.com
2020
port: 8080
@@ -49,11 +49,11 @@ iam-client:
4949
secure: true
5050
ssl-configuration:
5151
keystore:
52-
key-path: ../../dev-deployment/environments/keystores/server/localhost/keystore_cas-server.jks
52+
key-path: ../../dev-deployment/environments/keystores/vitam-ui-service/clients/keystore_cas-server.jks
5353
key-password: changeme
5454
type: JKS
5555
truststore:
56-
key-path: ../../dev-deployment/environments/keystores/server/truststore_server.jks
56+
key-path: ../../dev-deployment/environments/keystores/vitam-ui-service/truststore_vitam-ui.jks
5757
key-password: changeme
5858
hostname-verification: false
5959

‎deployment/ansible-vitamui/app_api_gateway.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
vitamui_struct: "{{ vitamui.api_gateway }}"
99
vitamui_certificate_type: external
1010
password_keystore: "{{ keystores_server_api_gateway }}"
11+
password_client_keystore: "{{ keystores_client_vitam_api_gateway }}"
1112
password_truststore: "{{ truststores_client_external }}"
1213
vitam_cert: "{{ vitam_certs.vitamui }}"

‎deployment/ansible-vitamui/app_archive_search.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
vitamui_struct: "{{ vitamui.archive_search }}"
99
vitamui_certificate_type: external
1010
password_keystore: "{{ keystores_server_archive_search }}"
11+
password_client_keystore: "{{ keystores_client_vitam_archive_search }}"
1112
password_truststore: "{{ truststores_client_external }}"
1213
vitam_cert: "{{ vitam_certs.vitamui }}"

0 commit comments

Comments
 (0)