Skip to content

Commit afe05a8

Browse files
committed
Story #15675: Migrate dev keystores from jks to p12 after full rewrite of pki scripts.
1 parent abb8cc9 commit afe05a8

File tree

137 files changed

+428
-506
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+428
-506
lines changed

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

Lines changed: 4 additions & 5 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/vitamui-services/server/archive-search/keystore_archive-search.jks
28+
key-store: ../../../dev-deployment/environments/keystores/vitamui-services/servers/keystore_archive-search.p12
2929
key-store-password: changeme
3030
key-password: changeme
31-
trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
31+
trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
3232
trust-store-password: changeme
3333
client-auth: want
3434
enabled-protocols: TLSv1.2,TLSv1.3
@@ -53,12 +53,11 @@ archive-search:
5353
secure: true
5454
ssl-configuration:
5555
truststore:
56-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
56+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
5757
key-password: changeme
5858
keystore:
59-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/archive-search/keystore_archive-search.jks
59+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/keystore_archive-search.p12
6060
key-password: changeme
61-
type: JKS
6261
hostname-verification: false
6362

6463
# Jaeger

api/api-archive-search/archive-search/src/test/resources/application.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@ archive-search:
2424
secure: true
2525
ssl-configuration:
2626
truststore:
27-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
27+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
2828
key-password: changeme
2929
keystore:
30-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/server/archive-search/keystore_archive-search.jks
30+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/servers/keystore_archive-search.p12
3131
key-password: changeme
32-
type: JKS
3332
hostname-verification: false
3433

3534
swagger:

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

Lines changed: 4 additions & 5 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/vitamui-services/server/collect/keystore_collect.jks
28+
key-store: ../../../dev-deployment/environments/keystores/vitamui-services/servers/keystore_collect.p12
2929
key-store-password: changeme
3030
key-password: changeme
31-
trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
31+
trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
3232
trust-store-password: changeme
3333
client-auth: want
3434
enabled-protocols: TLSv1.2,TLSv1.3
@@ -51,12 +51,11 @@ collect:
5151
secure: true
5252
ssl-configuration:
5353
truststore:
54-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
54+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
5555
key-password: changeme
5656
keystore:
57-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/collect/keystore_collect.jks
57+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/keystore_collect.p12
5858
key-password: changeme
59-
type: JKS
6059
hostname-verification: false
6160

6261
# Jaeger

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/vitamui-services/server/api-gateway/keystore_api-gateway.jks
4+
key-store: ../../dev-deployment/environments/keystores/vitamui-services/servers/keystore_api-gateway.p12
55
key-store-password: changeme
66
key-password: changeme
77
client-auth: need
8-
trust-store: ../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
8+
trust-store: ../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
99
trust-store-password: changeme
1010
max-http-request-header-size: 16KB
1111

api/api-iam/iam/README.md

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Presentation
1+
# API-IAM
2+
3+
## Presentation
24

35
This module is a set of REST/JSON web services to perform CRUD operations on the business models:
46

@@ -9,41 +11,37 @@ This module is a set of REST/JSON web services to perform CRUD operations on the
911
- profiles
1012
- users.
1113

12-
13-
# Run the web services
14+
## Run the web services
1415

1516
```shell
1617
mvn spring-boot:run
1718
```
1819

19-
# Provisioning
20+
## Provisioning
2021

21-
The users can be provided by a tier service
22+
The users can be provided by a tier service.
2223

2324
To enable this function, you must configure an external identity provider with the property autoprovisioning set to true.
2425

25-
At the module level, you must add properties to do the mapping between the identity provider and the webservice to call
26-
27-
Example : **application.yml**
28-
29-
```
30-
provisioning-client:
31-
identity-providers:
32-
- idp-identifier: system_idp
33-
uri: https://localhost:8090/provisioning/v1/users
34-
client:
35-
secure: true
36-
ssl-configuration:
37-
keystore:
38-
key-path: src/main/config/keystore_provisioning-users.jks
39-
key-password: changeme
40-
type: JKS
41-
truststore:
42-
key-path: src/main/config/truststore_server.jks
43-
key-password: changeme
44-
type: JKS
45-
hostname-verification: false
26+
At the module level, you must add properties to do the mapping between the identity provider and the webservice to call.
27+
28+
Example : `/vitamui/conf/iam/application.yml`
29+
30+
```yml
31+
provisioning-client:
32+
identity-providers:
33+
- idp-identifier: system_idp
34+
uri: https://localhost:8090/provisioning/v1/users
35+
client:
36+
secure: true
37+
ssl-configuration:
38+
keystore:
39+
key-path: src/main/config/keystore_provisioning-users.p12
40+
key-password: changeme
41+
truststore:
42+
key-path: src/main/config/truststore_server.p12
43+
key-password: changeme
44+
hostname-verification: false
4645
```
4746
4847
Please note that the configuration take a list in input
49-

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

Lines changed: 8 additions & 13 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/vitamui-services/server/iam/keystore_iam.jks
25+
key-store: ../../../dev-deployment/environments/keystores/vitamui-services/servers/keystore_iam.p12
2626
key-store-password: changeme
2727
key-password: changeme
28-
trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
28+
trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
2929
trust-store-password: changeme
3030
client-auth: want
3131
enabled-protocols: TLSv1.2,TLSv1.3
@@ -53,12 +53,11 @@ cas-client:
5353
secure: true
5454
ssl-configuration:
5555
truststore:
56-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
56+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
5757
key-password: changeme
5858
keystore:
59-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/iam/keystore_iam.jks
59+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/keystore_iam.p12
6060
key-password: changeme
61-
type: JKS
6261
hostname-verification: false
6362

6463
cas.reset.password.url: /cas/extras/resetPassword?username={username}&firstname={firstname}&lastname={lastname}&language={language}&customerId={customerId}&ttl=1day
@@ -112,27 +111,23 @@ provisioning-client:
112111
secure: false
113112
ssl-configuration:
114113
keystore:
115-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/iam/keystore_iam.jks
114+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/keystore_iam.p12
116115
key-password: changeme
117-
type: JKS
118116
truststore:
119-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
117+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
120118
key-password: changeme
121-
type: JKS
122119
hostname-verification: false
123120
- idp-identifier: 2
124121
uri: https://localhost:8090/provisioning/v1/users
125122
client:
126123
secure: true
127124
ssl-configuration:
128125
keystore:
129-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/iam/keystore_iam.jks
126+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/keystore_iam.p12
130127
key-password: changeme
131-
type: JKS
132128
truststore:
133-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
129+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
134130
key-password: changeme
135-
type: JKS
136131
hostname-verification: false
137132

138133
address:

api/api-iam/iam/src/test/resources/application.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ cas-client:
6262
secure: true
6363
ssl-configuration:
6464
truststore:
65-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
65+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
6666
key-password: changeme
6767
keystore:
68-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/server/iam/keystore_iam.jks
68+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/servers/keystore_iam.p12
6969
key-password: changeme
70-
type: JKS
7170
hostname-verification: false

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

Lines changed: 4 additions & 5 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/vitamui-services/server/ingest/keystore_ingest.jks
18+
key-store: ../../../dev-deployment/environments/keystores/vitamui-services/servers/keystore_ingest.p12
1919
key-store-password: changeme
2020
key-password: changeme
21-
trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
21+
trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
2222
trust-store-password: changeme
2323
client-auth: want
2424
enabled-protocols: TLSv1.2,TLSv1.3
@@ -43,12 +43,11 @@ ingest:
4343
secure: true
4444
ssl-configuration:
4545
truststore:
46-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
46+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
4747
key-password: changeme
4848
keystore:
49-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/ingest/keystore_ingest.jks
49+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/keystore_ingest.p12
5050
key-password: changeme
51-
type: JKS
5251
hostname-verification: false
5352
cas.tenant.identifier: -1
5453
# Jaeger

api/api-ingest/ingest/src/test/resources/application.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@ ingest:
2424
secure: true
2525
ssl-configuration:
2626
truststore:
27-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
27+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
2828
key-password: changeme
2929
keystore:
30-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/server/archive-search/keystore_archive-search.jks
30+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/servers/keystore_ingest.p12
3131
key-password: changeme
32-
type: JKS
3332
hostname-verification: false
3433

3534
swagger:

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

Lines changed: 4 additions & 5 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/vitamui-services/server/pastis/keystore_pastis.jks
38+
key-store: ../../../dev-deployment/environments/keystores/vitamui-services/servers/keystore_pastis.p12
3939
key-store-password: changeme
4040
key-password: changeme
41-
trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
41+
trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
4242
trust-store-password: changeme
4343
client-auth: want
4444
enabled-protocols: TLSv1.1,TLSv1.2,TLSv1.3
@@ -62,12 +62,11 @@ pastis:
6262
secure: true
6363
ssl-configuration:
6464
truststore:
65-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
65+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui-services.p12
6666
key-password: changeme
6767
keystore:
68-
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/pastis/keystore_pastis.jks
68+
key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/keystore_pastis.p12
6969
key-password: changeme
70-
type: JKS
7170
hostname-verification: false
7271

7372
# Jaeger

0 commit comments

Comments
 (0)