Skip to content

Commit a2cdbca

Browse files
committed
No more specific LDAP SSL certificate
1 parent 2c1c6eb commit a2cdbca

2 files changed

Lines changed: 10 additions & 35 deletions

File tree

.secrets.baseline

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "^.git/.*|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2026-07-15T07:58:14Z",
6+
"generated_at": "2026-07-15T07:59:30Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -82,7 +82,7 @@
8282
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
8383
"is_secret": false,
8484
"is_verified": false,
85-
"line_number": 47,
85+
"line_number": 48,
8686
"type": "Basic Auth Credentials",
8787
"verified_result": null
8888
}
@@ -268,7 +268,7 @@
268268
"hashed_secret": "07313f0e320f22cbfa35cfc220508eb3ff457c7e",
269269
"is_secret": false,
270270
"is_verified": false,
271-
"line_number": 111,
271+
"line_number": 41,
272272
"type": "Secret Keyword",
273273
"verified_result": null
274274
}
@@ -278,31 +278,31 @@
278278
"hashed_secret": "642c4d230c27058424a132dbff9a0d1317fd0deb",
279279
"is_secret": false,
280280
"is_verified": false,
281-
"line_number": 125,
281+
"line_number": 132,
282282
"type": "Secret Keyword",
283283
"verified_result": null
284284
},
285285
{
286286
"hashed_secret": "fa9beb99e4029ad5a6615399e7bbae21356086b3",
287287
"is_secret": false,
288288
"is_verified": false,
289-
"line_number": 128,
289+
"line_number": 135,
290290
"type": "Secret Keyword",
291291
"verified_result": null
292292
},
293293
{
294294
"hashed_secret": "07313f0e320f22cbfa35cfc220508eb3ff457c7e",
295295
"is_secret": false,
296296
"is_verified": false,
297-
"line_number": 131,
297+
"line_number": 138,
298298
"type": "Secret Keyword",
299299
"verified_result": null
300300
},
301301
{
302302
"hashed_secret": "dece3177de6ef53ccd2138fa6a36213476061cb3",
303303
"is_secret": false,
304304
"is_verified": false,
305-
"line_number": 133,
305+
"line_number": 149,
306306
"type": "Secret Keyword",
307307
"verified_result": null
308308
}
@@ -646,7 +646,7 @@
646646
"hashed_secret": "d53cc24e20ca1808d3df033258b6d8e78168ecef",
647647
"is_secret": false,
648648
"is_verified": false,
649-
"line_number": 20,
649+
"line_number": 25,
650650
"type": "Secret Keyword",
651651
"verified_result": null
652652
}
@@ -768,7 +768,7 @@
768768
"hashed_secret": "d53cc24e20ca1808d3df033258b6d8e78168ecef",
769769
"is_secret": false,
770770
"is_verified": false,
771-
"line_number": 18,
771+
"line_number": 23,
772772
"type": "Secret Keyword",
773773
"verified_result": null
774774
}

common/script/configureTlsSecurity.sh

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -99,33 +99,8 @@ then
9999
fi
100100
# End - Configuration for the TLS security
101101

102-
if [ -f "/config/ldap/ldap.jks" ]
103-
then
104-
if [ -n "$LDAP_TRUSTSTORE_PASSWORD" ] || [ -f /config/secrets/dba-env-context/ldapSslTruststorePassword ]
105-
then
106-
# Set env var if secrets are passed using mounted volumes
107-
[ -f /config/secrets/dba-env-context/ldapSslTruststorePassword ] && export LDAP_TRUSTSTORE_PASSWORD=$(cat /config/secrets/dba-env-context/ldapSslTruststorePassword)
108-
echo "import /config/ldap/ldap.jks in trustore using provided LDAP truststore password"
109-
else
110-
echo "import /config/ldap/ldap.jks in trustore using default LDAP truststore password"
111-
LDAP_TRUSTSTORE_PASSWORD=changeit
112-
fi
113-
114-
i=0
115-
mapfile -t trust_list < <(keytool -J"-Xshareclasses:none" -list -v -keystore /config/ldap/ldap.jks -storepass $LDAP_TRUSTSTORE_PASSWORD | grep "Alias name" | awk 'NF>1{print $NF}')
116-
for trust_file in "${trust_list[@]}"
117-
do
118-
keytool -J"-Xshareclasses:none" -changealias -alias ${trust_file} -destalias "LDAP_ALIAS_FOR_ODM_"$i -keystore /config/ldap/ldap.jks -storepass $LDAP_TRUSTSTORE_PASSWORD
119-
((i=i+1))
120-
done
121-
keytool -J"-Xshareclasses:none" -importkeystore -srckeystore /config/ldap/ldap.jks -destkeystore /config/security/truststore.jks -srcstorepass $LDAP_TRUSTSTORE_PASSWORD -deststorepass $DEFAULT_TRUSTSTORE_PASSWORD
122-
123-
else
124-
echo "no /config/ldap/ldap.jks file"
125-
fi
126-
127102
# This part allow to import a list of PEM certificate in the JVM
128-
echo "Importing trusted certificates $dir"
103+
echo "Importing trusted certificates $dir"
129104
TRUSTSTORE=/config/security/truststore.jks
130105
CERTDIR="/config/security/trusted-cert-volume/"
131106
if [ -d $CERTDIR ]; then

0 commit comments

Comments
 (0)