Skip to content

Commit 1e9d665

Browse files
committed
Add unset xtrace while configuring tls certificates
To be extra safe and ensure no certificate details are logged via shell tracing.
1 parent 48f53ed commit 1e9d665

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

pkg/deploy/generator/scripts/util-system.sh

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,20 @@ pull_container_images() {
219219
configure_certs_general() {
220220
log "starting"
221221

222+
xtrace_set_capture
223+
xtrace_unset
224+
222225
# setting MONITORING_GCS_AUTH_ID_TYPE=AuthKeyVault seems to have caused mdsd not
223226
# to honour SSL_CERT_FILE any more, heaven only knows why.
224227
local -r ssl_certs_basedir="/usr/lib/ssl/certs"
225228
mkdir -p "$ssl_certs_basedir"
226-
csplit -f "$ssl_certs_basedir/cert-" -b %03d.pem /etc/pki/tls/certs/ca-bundle.crt /^$/1 "{*}" 1>/dev/null
229+
230+
ca_bundle="/etc/pki/tls/certs/ca-bundle.crt"
231+
log "Configuring $ca_bundle"
232+
csplit -f "$ssl_certs_basedir/cert-" -b %03d.pem "$ca_bundle" /^$/1 "{*}" 1>/dev/null
227233
c_rehash "$ssl_certs_basedir"
234+
235+
xtrace_set
228236
}
229237

230238
# configure_certs_rp Configure system certificates for RP VMSS
@@ -233,6 +241,8 @@ configure_certs_rp() {
233241
log "starting"
234242

235243
verify_role role_rp
244+
xtrace_set_capture
245+
xtrace_unset
236246

237247
local -r rp_certs_basedir="/etc/aro-rp"
238248
mkdir -p "$rp_certs_basedir"
@@ -242,6 +252,8 @@ configure_certs_rp() {
242252
fi
243253
chown -R 1000:1000 "$rp_certs_basedir"
244254

255+
256+
xtrace_set
245257
configure_certs_general
246258
}
247259

@@ -258,6 +270,8 @@ configure_certs_devproxy() {
258270
log "starting"
259271

260272
verify_role role_devproxy
273+
xtrace_set_capture
274+
xtrace_unset
261275

262276
local -r proxy_certs_basedir="/etc/proxy"
263277
mkdir -p "$proxy_certs_basedir"
@@ -266,6 +280,8 @@ configure_certs_devproxy() {
266280
base64 -d <<<"$PROXYCLIENTCERT" > "$proxy_certs_basedir/proxy-client.crt"
267281
chown -R 1000:1000 /etc/proxy
268282
chmod 0600 "$proxy_certs_basedir/proxy.key"
283+
284+
xtrace_set
269285
}
270286

271287
configure_azsecd_scan() {

0 commit comments

Comments
 (0)