docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-07-28 10:42:06 +03:00
Code Activity

Update psql invocations to properly escape user input!

Browse Source 
See also:

- https://stackoverflow.com/a/18683163/433558
- https://www.postgresql.org/docs/9.3/static/app-psql.html#APP-PSQL-VARIABLES
- https://www.postgresql.org/docs/9.3/static/app-psql.html#APP-PSQL-INTERPOLATION
This commit is contained in:
Tianon Gravi
2018-08-24 11:22:17 -07:00
parent 91939daa3f
commit 36294f464a
13 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
10/alpine/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
10/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
11/alpine/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
11/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
9.3/alpine/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
9.3/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
9.4/alpine/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
9.4/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
9.5/alpine/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
9.5/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
9.6/alpine/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
9.6/docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo

10
docker-entrypoint.sh
View File

@ -81,7 +81,7 @@ if [ "$1" = 'postgres' ]; then
# messes it up # messes it up
file_env 'POSTGRES_PASSWORD' file_env 'POSTGRES_PASSWORD'
if [ "$POSTGRES_PASSWORD" ]; then if [ "$POSTGRES_PASSWORD" ]; then
pass="PASSWORD '$POSTGRES_PASSWORD'" pass="PASSWORD :'pass'"
authMethod=md5 authMethod=md5
else else
# The - option suppresses leading tabs but *not* spaces. :) # The - option suppresses leading tabs but *not* spaces. :)
@ -121,8 +121,8 @@ if [ "$1" = 'postgres' ]; then
psql=( psql -v ON_ERROR_STOP=1 ) psql=( psql -v ON_ERROR_STOP=1 )
if [ "$POSTGRES_DB" != 'postgres' ]; then if [ "$POSTGRES_DB" != 'postgres' ]; then
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set db="$POSTGRES_DB" <<-'EOSQL'
CREATE DATABASE "$POSTGRES_DB" ; CREATE DATABASE :"db" ;
EOSQL EOSQL
echo echo
fi fi
@ -132,8 +132,8 @@ if [ "$1" = 'postgres' ]; then
else else
op='CREATE' op='CREATE'
fi fi
"${psql[@]}" --username postgres <<-EOSQL "${psql[@]}" --username postgres --set user="$POSTGRES_USER" --set pass="$POSTGRES_PASSWORD" <<-EOSQL
$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ; $op USER :"user" WITH SUPERUSER $pass ;
EOSQL EOSQL
echo echo