[ticket/16661] Add check executable files for extensions

marc1706 · marc1706 · commit 97ddf7e0086a · 2020-12-20T22:26:53.000+01:00
Also added some minor code adjustments.

PHPBB3-16661
diff --git a/.github/ext-check-executable-files.sh b/.github/ext-check-executable-files.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+#
+# This file is part of the phpBB Forum Software package.
+#
+# @copyright (c) phpBB Limited <https://www.phpbb.com>
+# @license GNU General Public License, version 2 (GPL-2.0)
+#
+# For full copyright and license information, please see
+# the docs/CREDITS.txt file.
+#
+set -e
+
+root="$1"
+extname="$2"
+path="${root}phpBB/ext/${extname}/"
+
+# Check the permissions of the files
+
+# The following variables MUST NOT contain any wildcard
+# Directories to skip
+directories_skipped="-path ${path}develop -o -path ${path}vendor"
+
+# Files to skip
+files_skipped="-false"
+
+# Files which have to be executable
+executable_files="-path ${path}bin/* -o -path ${path}install/phpbbcli.php"
+
+incorrect_files=$( 								\
+	find ${path}								\
+		'('										\
+			'('									\
+				${directories_skipped}			\
+			')'									\
+			-a -type d -prune -a -type f		\
+		')' -o 									\
+		'('										\
+			-type f -a							\
+			-not '('							\
+				${files_skipped}				\
+			')' -a								\
+			'('									\
+				'('								\
+					'('							\
+						${executable_files}		\
+					')' -a						\
+					-not -perm /100				\
+				')' -o							\
+				'('								\
+					-not '('					\
+						${executable_files}		\
+					')' -a						\
+					-perm /111					\
+				')'								\
+			')'									\
+		')'										\
+	)
+
+if [ "${incorrect_files}" != '' ]
+then
+	echo "The following files do not have proper permissions:";
+	ls -la ${incorrect_files}
+	exit 1;
+fi
diff --git a/.github/phpunit-sqlite3-github.xml b/.github/phpunit-sqlite3-github.xml
@@ -27,12 +27,6 @@
 	</groups>
 
 	<php>
-		<!--server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\sqlite3" /-->
-		<!--server name="PHPBB_TEST_DBHOST" value="../phpbb_unit_tests.sqlite3" /-->
-		<!--server name="PHPBB_TEST_DBPORT" value="" /-->
-		<!--server name="PHPBB_TEST_DBNAME" value="" /-->
-		<!--server name="PHPBB_TEST_DBUSER" value="" /-->
-		<!--server name="PHPBB_TEST_DBPASSWD" value="" /-->
 		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
 		<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost" />
 		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
diff --git a/.github/prepare-extension.sh b/.github/prepare-extension.sh
@@ -17,6 +17,6 @@ EXTNAME=$1
 mkdir --parents phpBB/ext/$EXTNAME
 cp -R ../tmp/* phpBB/ext/$EXTNAME
 
-# Move the extensions .github/phpunit-*-travis.xml files in place
+# Move the test files for extensions in place
 cp -R .github/*.xml phpBB/ext/$EXTNAME/.github
 cp -R .github/*.sh phpBB/ext/$EXTNAME/.github
