Skip to content

Commit 2337858

Browse files
yosifkityosifkit
authored
Merge pull request docker-library#489 from infosiftr/escape-escape-escape-colon-wq
Update psql invocations to properly escape user input!
2 parents 91939da + 36294f4 commit 2337858

13 files changed

+65
-65
lines changed

‎10/alpine/docker-entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
8181
# messes it up
8282
file_env 'POSTGRES_PASSWORD'
8383
if [ "$POSTGRES_PASSWORD" ]; then
84-
pass="PASSWORD '$POSTGRES_PASSWORD'"
84+
pass="PASSWORD :'pass'"
8585
authMethod=md5
8686
else
8787
# The - option suppresses leading tabs but *not* spaces. :)
@@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
121121
psql=( psql -v ON_ERROR_STOP=1 )
122122

123123
if [ "$POSTGRES_DB" != 'postgres' ]; then
124-
"${psql[@]}" --username postgres <<-EOSQL
125-
CREATE DATABASE "$POSTGRES_DB" ;
124+
"${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
125+
CREATE DATABASE :"db" ;
126126
EOSQL
127127
echo
128128
fi
@@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
132132
else
133133
op='CREATE'
134134
fi
135-
"${psql[@]}" --username postgres <<-EOSQL
136-
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
135+
"${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
136+
$op USER :"user" WITH SUPERUSER $pass ;
137137
EOSQL
138138
echo
139139

‎10/docker-entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
8181
# messes it up
8282
file_env 'POSTGRES_PASSWORD'
8383
if [ "$POSTGRES_PASSWORD" ]; then
84-
pass="PASSWORD '$POSTGRES_PASSWORD'"
84+
pass="PASSWORD :'pass'"
8585
authMethod=md5
8686
else
8787
# The - option suppresses leading tabs but *not* spaces. :)
@@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
121121
psql=( psql -v ON_ERROR_STOP=1 )
122122

123123
if [ "$POSTGRES_DB" != 'postgres' ]; then
124-
"${psql[@]}" --username postgres <<-EOSQL
125-
CREATE DATABASE "$POSTGRES_DB" ;
124+
"${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
125+
CREATE DATABASE :"db" ;
126126
EOSQL
127127
echo
128128
fi
@@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
132132
else
133133
op='CREATE'
134134
fi
135-
"${psql[@]}" --username postgres <<-EOSQL
136-
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
135+
"${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
136+
$op USER :"user" WITH SUPERUSER $pass ;
137137
EOSQL
138138
echo
139139

‎11/alpine/docker-entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
8181
# messes it up
8282
file_env 'POSTGRES_PASSWORD'
8383
if [ "$POSTGRES_PASSWORD" ]; then
84-
pass="PASSWORD '$POSTGRES_PASSWORD'"
84+
pass="PASSWORD :'pass'"
8585
authMethod=md5
8686
else
8787
# The - option suppresses leading tabs but *not* spaces. :)
@@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
121121
psql=( psql -v ON_ERROR_STOP=1 )
122122

123123
if [ "$POSTGRES_DB" != 'postgres' ]; then
124-
"${psql[@]}" --username postgres <<-EOSQL
125-
CREATE DATABASE "$POSTGRES_DB" ;
124+
"${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
125+
CREATE DATABASE :"db" ;
126126
EOSQL
127127
echo
128128
fi
@@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
132132
else
133133
op='CREATE'
134134
fi
135-
"${psql[@]}" --username postgres <<-EOSQL
136-
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
135+
"${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
136+
$op USER :"user" WITH SUPERUSER $pass ;
137137
EOSQL
138138
echo
139139

‎11/docker-entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
8181
# messes it up
8282
file_env 'POSTGRES_PASSWORD'
8383
if [ "$POSTGRES_PASSWORD" ]; then
84-
pass="PASSWORD '$POSTGRES_PASSWORD'"
84+
pass="PASSWORD :'pass'"
8585
authMethod=md5
8686
else
8787
# The - option suppresses leading tabs but *not* spaces. :)
@@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
121121
psql=( psql -v ON_ERROR_STOP=1 )
122122

123123
if [ "$POSTGRES_DB" != 'postgres' ]; then
124-
"${psql[@]}" --username postgres <<-EOSQL
125-
CREATE DATABASE "$POSTGRES_DB" ;
124+
"${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
125+
CREATE DATABASE :"db" ;
126126
EOSQL
127127
echo
128128
fi
@@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
132132
else
133133
op='CREATE'
134134
fi
135-
"${psql[@]}" --username postgres <<-EOSQL
136-
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
135+
"${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
136+
$op USER :"user" WITH SUPERUSER $pass ;
137137
EOSQL
138138
echo
139139

‎9.3/alpine/docker-entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
8181
# messes it up
8282
file_env 'POSTGRES_PASSWORD'
8383
if [ "$POSTGRES_PASSWORD" ]; then
84-
pass="PASSWORD '$POSTGRES_PASSWORD'"
84+
pass="PASSWORD :'pass'"
8585
authMethod=md5
8686
else
8787
# The - option suppresses leading tabs but *not* spaces. :)
@@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
121121
psql=( psql -v ON_ERROR_STOP=1 )
122122

123123
if [ "$POSTGRES_DB" != 'postgres' ]; then
124-
"${psql[@]}" --username postgres <<-EOSQL
125-
CREATE DATABASE "$POSTGRES_DB" ;
124+
"${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
125+
CREATE DATABASE :"db" ;
126126
EOSQL
127127
echo
128128
fi
@@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
132132
else
133133
op='CREATE'
134134
fi
135-
"${psql[@]}" --username postgres <<-EOSQL
136-
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
135+
"${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
136+
$op USER :"user" WITH SUPERUSER $pass ;
137137
EOSQL
138138
echo
139139

‎9.3/docker-entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
8181
# messes it up
8282
file_env 'POSTGRES_PASSWORD'
8383
if [ "$POSTGRES_PASSWORD" ]; then
84-
pass="PASSWORD '$POSTGRES_PASSWORD'"
84+
pass="PASSWORD :'pass'"
8585
authMethod=md5
8686
else
8787
# The - option suppresses leading tabs but *not* spaces. :)
@@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
121121
psql=( psql -v ON_ERROR_STOP=1 )
122122

123123
if [ "$POSTGRES_DB" != 'postgres' ]; then
124-
"${psql[@]}" --username postgres <<-EOSQL
125-
CREATE DATABASE "$POSTGRES_DB" ;
124+
"${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
125+
CREATE DATABASE :"db" ;
126126
EOSQL
127127
echo
128128
fi
@@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
132132
else
133133
op='CREATE'
134134
fi
135-
"${psql[@]}" --username postgres <<-EOSQL
136-
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
135+
"${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
136+
$op USER :"user" WITH SUPERUSER $pass ;
137137
EOSQL
138138
echo
139139

‎9.4/alpine/docker-entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
8181
# messes it up
8282
file_env 'POSTGRES_PASSWORD'
8383
if [ "$POSTGRES_PASSWORD" ]; then
84-
pass="PASSWORD '$POSTGRES_PASSWORD'"
84+
pass="PASSWORD :'pass'"
8585
authMethod=md5
8686
else
8787
# The - option suppresses leading tabs but *not* spaces. :)
@@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
121121
psql=( psql -v ON_ERROR_STOP=1 )
122122

123123
if [ "$POSTGRES_DB" != 'postgres' ]; then
124-
"${psql[@]}" --username postgres <<-EOSQL
125-
CREATE DATABASE "$POSTGRES_DB" ;
124+
"${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
125+
CREATE DATABASE :"db" ;
126126
EOSQL
127127
echo
128128
fi
@@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
132132
else
133133
op='CREATE'
134134
fi
135-
"${psql[@]}" --username postgres <<-EOSQL
136-
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
135+
"${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
136+
$op USER :"user" WITH SUPERUSER $pass ;
137137
EOSQL
138138
echo
139139

‎9.4/docker-entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
8181
# messes it up
8282
file_env 'POSTGRES_PASSWORD'
8383
if [ "$POSTGRES_PASSWORD" ]; then
84-
pass="PASSWORD '$POSTGRES_PASSWORD'"
84+
pass="PASSWORD :'pass'"
8585
authMethod=md5
8686
else
8787
# The - option suppresses leading tabs but *not* spaces. :)
@@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
121121
psql=( psql -v ON_ERROR_STOP=1 )
122122

123123
if [ "$POSTGRES_DB" != 'postgres' ]; then
124-
"${psql[@]}" --username postgres <<-EOSQL
125-
CREATE DATABASE "$POSTGRES_DB" ;
124+
"${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
125+
CREATE DATABASE :"db" ;
126126
EOSQL
127127
echo
128128
fi
@@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
132132
else
133133
op='CREATE'
134134
fi
135-
"${psql[@]}" --username postgres <<-EOSQL
136-
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
135+
"${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
136+
$op USER :"user" WITH SUPERUSER $pass ;
137137
EOSQL
138138
echo
139139

‎9.5/alpine/docker-entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
8181
# messes it up
8282
file_env 'POSTGRES_PASSWORD'
8383
if [ "$POSTGRES_PASSWORD" ]; then
84-
pass="PASSWORD '$POSTGRES_PASSWORD'"
84+
pass="PASSWORD :'pass'"
8585
authMethod=md5
8686
else
8787
# The - option suppresses leading tabs but *not* spaces. :)
@@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
121121
psql=( psql -v ON_ERROR_STOP=1 )
122122

123123
if [ "$POSTGRES_DB" != 'postgres' ]; then
124-
"${psql[@]}" --username postgres <<-EOSQL
125-
CREATE DATABASE "$POSTGRES_DB" ;
124+
"${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
125+
CREATE DATABASE :"db" ;
126126
EOSQL
127127
echo
128128
fi
@@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
132132
else
133133
op='CREATE'
134134
fi
135-
"${psql[@]}" --username postgres <<-EOSQL
136-
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
135+
"${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
136+
$op USER :"user" WITH SUPERUSER $pass ;
137137
EOSQL
138138
echo
139139

‎9.5/docker-entrypoint.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
8181
# messes it up
8282
file_env 'POSTGRES_PASSWORD'
8383
if [ "$POSTGRES_PASSWORD" ]; then
84-
pass="PASSWORD '$POSTGRES_PASSWORD'"
84+
pass="PASSWORD :'pass'"
8585
authMethod=md5
8686
else
8787
# The - option suppresses leading tabs but *not* spaces. :)
@@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
121121
psql=( psql -v ON_ERROR_STOP=1 )
122122

123123
if [ "$POSTGRES_DB" != 'postgres' ]; then
124-
"${psql[@]}" --username postgres <<-EOSQL
125-
CREATE DATABASE "$POSTGRES_DB" ;
124+
"${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
125+
CREATE DATABASE :"db" ;
126126
EOSQL
127127
echo
128128
fi
@@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
132132
else
133133
op='CREATE'
134134
fi
135-
"${psql[@]}" --username postgres <<-EOSQL
136-
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
135+
"${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
136+
$op USER :"user" WITH SUPERUSER $pass ;
137137
EOSQL
138138
echo
139139

0 commit comments

Comments
 (0)