Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON] Fix ${!name} bashisms
[oom.git]
/
kubernetes
/
common
/
cassandra
/
resources
/
config
/
docker-entrypoint.sh
diff --git
a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
index
5b65222
..
ff1908c
100644
(file)
--- a/
kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
+++ b/
kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
@@
-1,4
+1,5
@@
#!/bin/bash
#!/bin/bash
+
set -e
# first arg is `-f` or `--some-option`
set -e
# first arg is `-f` or `--some-option`
@@
-71,7
+72,8
@@
if [ "$1" = 'cassandra' ]; then
authenticator \
; do
var="CASSANDRA_${yaml^^}"
authenticator \
; do
var="CASSANDRA_${yaml^^}"
- val="${!var}"
+ # eval presents no security issue here because of limited possible values of var
+ eval val=\$$var
if [ "$val" ]; then
_sed-in-place "$CASSANDRA_CONFIG/cassandra.yaml" \
-r 's/^(# )?('"$yaml"':).*/\2 '"$val"'/'
if [ "$val" ]; then
_sed-in-place "$CASSANDRA_CONFIG/cassandra.yaml" \
-r 's/^(# )?('"$yaml"':).*/\2 '"$val"'/'
@@
-80,7
+82,8
@@
if [ "$1" = 'cassandra' ]; then
for rackdc in dc rack; do
var="CASSANDRA_${rackdc^^}"
for rackdc in dc rack; do
var="CASSANDRA_${rackdc^^}"
- val="${!var}"
+ # eval presents no security issue here because of limited possible values of var
+ eval val=\$$var
if [ "$val" ]; then
_sed-in-place "$CASSANDRA_CONFIG/cassandra-rackdc.properties" \
-r 's/^('"$rackdc"'=).*/\1 '"$val"'/'
if [ "$val" ]; then
_sed-in-place "$CASSANDRA_CONFIG/cassandra-rackdc.properties" \
-r 's/^('"$rackdc"'=).*/\1 '"$val"'/'