Merge branch 'QA_4_6' into QA_4_6-security

phpmyadmin · Dec 8, 2016 · fe394c9 · fe394c9
2 parents 3a62476 + f2bfa7d
commit fe394c9
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 2 deletions.
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
@@ -3,6 +3,12 @@
 # vim: expandtab sw=4 ts=4 sts=4:
 #
 
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 # More documentation about making a release is available at:
 # https://wiki.phpmyadmin.net/pma/Releasing
 

diff --git a/scripts/generate-mo b/scripts/generate-mo
@@ -1,4 +1,10 @@
 #!/bin/sh
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 if [ x$1 = x--quiet ] ; then
     stats=""
     shift

diff --git a/scripts/generate-sprites b/scripts/generate-sprites
@@ -1,6 +1,12 @@
 #!/bin/sh
 # vim: expandtab sw=4 ts=4 sts=4:
 
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 # Check for proper number of command line args.
 if [ $# -ne 1 ]; then
   echo "Usage: `basename $0` {path_to_pma_root_folder}"

diff --git a/scripts/lang-cleanup.sh b/scripts/lang-cleanup.sh
@@ -4,6 +4,12 @@
 #
 # Script for removing language selection from phpMyAdmin
 
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 if [ $# -lt 1 ] ; then
     echo "Usage: lang-cleanup.sh type"
     echo "Type can be one of:"

diff --git a/scripts/line-counts.sh b/scripts/line-counts.sh
@@ -1,4 +1,11 @@
 #!/bin/bash
+
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 cat > js/line_counts.php <<EOF
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */

diff --git a/scripts/locales-contributors b/scripts/locales-contributors
@@ -1,4 +1,10 @@
 #!/bin/sh
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 for x in po/*.po  ; do
     grep 'Team' $x | sed 's/.*: \(.*\)<.*/\1/'
     git shortlog -sne --no-merges -- $x | grep '^  [ 0-9][0-9]\{3\}'

diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo
@@ -3,6 +3,12 @@
 # Removes mo files for incomplete translations
 #
 
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 set -e
 
 #

diff --git a/scripts/transformations_generator_main_class.sh b/scripts/transformations_generator_main_class.sh
@@ -7,10 +7,16 @@
 # $2: MIMESubtype
 # $3: Transformation Name
 
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 if [ $# != 3 ]
 then
   echo -e "Usage: ./generator_main_class.sh MIMEType MIMESubtype TransformationName\n"
   exit 65
 fi
 
-./generator_plugin.sh "$1" "$2" "$3" "--generate_only_main_class"
+./generator_plugin.sh "$1" "$2" "$3" "--generate_only_main_class"
diff --git a/scripts/transformations_generator_plugin.sh b/scripts/transformations_generator_plugin.sh
@@ -11,6 +11,12 @@
 # $3: Transformation Name
 # $4: (optional) Description
 
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 echo $#
 if [ $# -ne 3 -a $# -ne 4 ]; then
   echo -e "Usage: ./generator_plugin.sh MIMEType MIMESubtype TransformationName [Description]\n"
@@ -61,4 +67,4 @@ if [ $GenerateAbstractClass -eq 1 ]; then
     echo "Created $AbstractClassFile"
 fi
 
-echo ""
+echo ""
diff --git a/scripts/update-po b/scripts/update-po
@@ -2,6 +2,12 @@
 # vim: expandtab sw=4 ts=4 sts=4:
 export LC_ALL=C
 
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 # Exit on failure
 set -e
 

diff --git a/scripts/upload-release b/scripts/upload-release
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 set -e
 set -u
 

diff --git a/test/install-browserstack b/test/install-browserstack
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 set -e
 set -x
 

diff --git a/test/install-runkit b/test/install-runkit
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 if [ "$TRAVIS_PHP_VERSION" = "nightly" -o "$TRAVIS_PHP_VERSION" = "hhvm" -o "$TRAVIS_PHP_VERSION" = "7.0" ] ; then
     exit 0
 fi

diff --git a/test/start-local-server b/test/start-local-server
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+# Do not run as CGI
+if [ -n "$GATEWAY_INTERFACE" ] ; then
+    echo 'Can not invoke as CGI!'
+    exit 1
+fi
+
 set -e
 set -x