Merge branch 'main' into api_admin_actions

Author: vmcj

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,32 +7,46 @@ assignees: ''
 
 ---
 
-NOTE: If this is a _discussion starter_, you need any _installation help_ or have a _question_ on how to accomplish something,
+<!--
+NOTE: If this is a _discussion starter_, you need any _installation help_, or have a _question_ on how to accomplish something,
 rather post at [our discussion channel](https://www.domjudge.org/chat) or send an email to our
 [DOMjudge-devel mailinglist](https://www.domjudge.org/mailman/postorius/lists/domjudge-devel.domjudge.org/)
 instead of filing an issue here.
+-->
 
 ### Description of the problem
-> Replace this line with a short description.
+<!--
+Write here a short description.
+-->
 
 ### Your environment
-> Include details about your installation here.
-> - DOMjudge version (e.g. 7.0.0 or a github commit hash)
-> - Operating system / Linux distribution and version (e.g. Ubuntu 18.04)
-> - Webserver (e.g. Apache or nginx)
+<!--
+Include details about your installation here.
+- DOMjudge version (e.g. 7.0.0 or a github commit hash)
+- Operating system / Linux distribution and version (e.g. Ubuntu 18.04)
+- Webserver (e.g. Apache or nginx)
+-->
 
 ### Steps to reproduce
-> Replace this with a description how we can reproduce your bug.
-> - Step 1
-> - Step 2
-> - Step 3
+<!--
+Write here a description how we can reproduce your bug.
+1. Step 1
+1. Step 2
+1. Step 3
+-->
 
 ### Expected behaviour
-> Replace this line with what you would expect to happen.
+<!--
+Write here what you would expect to happen.
+-->
 
 ### Actual behaviour
-> Replace this line with what happens instead.
+<!--
+Write here what happens instead.
+-->
 
 ### Any other information that you want to share?
-> Please include webserver, symfony and judgedaemon log snippets here as appropriate.
-> Screenshots may help in case of UI bugs.
+<!--
+Please include webserver, symfony and judgedaemon log snippets here as appropriate.
+Screenshots may help in case of UI bugs.
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,25 +7,36 @@ assignees: ''
 
 ---
 
-NOTE: If this is a _discussion starter_, you need any _installation help_ or have a _question_ on how to accomplish something,
+<!--
+NOTE: If this is a _discussion starter_, you need any _installation help_, or have a _question_ on how to accomplish something,
 rather post at [our discussion channel](https://www.domjudge.org/chat) or send an email to our
 [DOMjudge-devel mailinglist](https://www.domjudge.org/mailman/postorius/lists/domjudge-devel.domjudge.org/).
 
 Thank you for suggesting ways to improve DOMjudge. Before you file a feature
 request, it might be useful to discuss it first via the chat or mailing list
 linked above. We can then assess together whether there is
 not already a way to accomplish your goal with DOMjudge currently.
+-->
 
 ### Description of the enhancement request
-> Replace this line with a short description.
+<!--
+Write here a short description.
+-->
 
 ### The goal you want to achieve
-> Please elaborate on the (larger, higher level) goal you want to achieve with this enhancement, so we have a good understanding what this feature would be useful for and how it fits in DOMjudge as a whole.
+<!--
+Please elaborate on the (larger, higher level) goal you want to achieve with this enhancement, so we have a good understanding what this feature would be useful for and how it fits in DOMjudge as a whole.
+-->
 
 ### Expected behaviour
-> Replace this line with what you would expect to happen.
-> Please describe the workflow how you want this feature to work with expected start URL
-> - Step 1
-> - Step 2
+<!--
+Write here what you would expect to happen.
+For example describe the flow how you want this feature to work.
+1. Step 1
+2. Step 2
+-->
+
 ### Any other information that you want to share?
-> Screenshots may help in case of UI enhancements with annotated drawings.
+<!--
+Screenshots with annotated drawings may help in case of UI enhancements.
+-->

.github/dependabot.yml

@@ -44,3 +44,12 @@ updates:
     allow:
         - dependency-type: "all"
     target-branch: "8.2"
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 0
+    versioning-strategy: lockfile-only
+    allow:
+        - dependency-type: "all"
+    target-branch: "8.3"

.github/jobs/baseinstall.sh

@@ -1,14 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 
 . .github/jobs/ci_settings.sh
 
 export version="$1"
 db=${2:-install}
+phpversion="${3:-8.1}"
+# If this script is called from unit-tests.sh, we use the test environment
+export APP_ENV="${4:-prod}"
 
-set -eux
+# In the test environment, we need to use a different database
+[ "$APP_ENV" = "prod" ] && DATABASE_NAME=domjudge || DATABASE_NAME=domjudge_test
 
-PHPVERSION=$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION."\n";')
-export PHPVERSION
+MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}
+
+set -euxo pipefail
+
+if [ -z "$phpversion" ]; then
+phpversion=$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION."\n";')
+fi
+
+show_phpinfo "$phpversion"
 
 section_start "Run composer"
 export APP_ENV="dev"
@@ -24,43 +35,65 @@ section_end
 
 section_start "Install domserver"
 make configure
-./configure \
-  --with-baseurl='https://localhost/domjudge/' \
-  --with-domjudge-user=root \
-  --enable-doc-build=no \
-  --enable-judgehost-build=no | tee "$ARTIFACTS"/configure.txt
-
-make domserver
-make install-domserver
+if [ "$version" = "all" ]; then
+    # Note that we use http instead of https here as python requests doesn't
+    # like our self-signed cert. We should fix this separately.
+    ./configure \
+      --with-baseurl='http://localhost/domjudge/' \
+      --with-domjudge-user=domjudge \
+      --with-judgehost-chrootdir=/chroot/domjudge | tee "$ARTIFACTS"/configure.txt
+    make build-scripts domserver judgehost docs
+    make install-domserver install-judgehost install-docs
+else
+    ./configure \
+      --with-baseurl='https://localhost/domjudge/' \
+      --with-domjudge-user=root \
+      --enable-doc-build=no \
+      --enable-judgehost-build=no | tee "$ARTIFACTS"/configure.txt
+    make domserver
+    make install-domserver
+    rm -rf /opt/domjudge/domserver/webapp/public/doc
+    cp -r doc /opt/domjudge/domserver/webapp/public/
+    find /opt/domjudge/domserver -name DOMjudgelogo.pdf
+fi
 section_end
 
 section_start "SQL settings"
 cat > ~/.my.cnf <<EOF
 [client]
 host=sqlserver
 user=root
-password=root
+password=${MYSQL_ROOT_PASSWORD}
 EOF
 cat ~/.my.cnf
 
-mysql_root "CREATE DATABASE IF NOT EXISTS \`domjudge\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
+mysql_root "CREATE DATABASE IF NOT EXISTS \`$DATABASE_NAME\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
 mysql_root "CREATE USER IF NOT EXISTS \`domjudge\`@'%' IDENTIFIED BY 'domjudge';"
-mysql_root "GRANT SELECT, INSERT, UPDATE, DELETE ON \`domjudge\`.* TO 'domjudge'@'%';"
+mysql_root "GRANT SELECT, INSERT, UPDATE, DELETE ON \`$DATABASE_NAME\`.* TO 'domjudge'@'%';"
 mysql_root "FLUSH PRIVILEGES;"
 
 # Show some MySQL debugging
 mysql_root "show databases"
 mysql_root "SELECT CURRENT_USER();"
 mysql_root "SELECT USER();"
 mysql_root "SELECT user,host FROM mysql.user"
-echo "unused:sqlserver:domjudge:domjudge:domjudge:3306" > /opt/domjudge/domserver/etc/dbpasswords.secret
+mysql_root "SET GLOBAL max_allowed_packet=1073741824"
+mysql_root "SHOW GLOBAL STATUS LIKE 'Connection_errors_%'"
+mysql_root "SHOW VARIABLES LIKE '%_timeout'"
+echo "unused:sqlserver:$DATABASE_NAME:domjudge:domjudge:3306" > /opt/domjudge/domserver/etc/dbpasswords.secret
 mysql_user "SELECT CURRENT_USER();"
 mysql_user "SELECT USER();"
 section_end
 
-section_start "Install DOMjudge database"
-/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot bare-install
-section_end
+if [ "${db}" = "install" ]; then
+    section_start "Install DOMjudge database"
+    /opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} bare-install
+    section_end
+elif [ "${db}" = "upgrade" ]; then
+    section_start "Upgrade DOMjudge database"
+    /opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} upgrade
+    section_end
+fi
 
 section_start "Show PHP config"
 php -v | tee -a "$ARTIFACTS"/php.txt
@@ -74,7 +107,7 @@ cp /proc/cmdline "$ARTIFACTS"/cmdline.txt
 section_end
 
 section_start "Setup webserver"
-cp /opt/domjudge/domserver/etc/domjudge-fpm.conf /etc/php/"$PHPVERSION"/fpm/pool.d/domjudge.conf
+cp /opt/domjudge/domserver/etc/domjudge-fpm.conf /etc/php/"$phpversion"/fpm/pool.d/domjudge.conf
 
 rm -f /etc/nginx/sites-enabled/*
 cp /opt/domjudge/domserver/etc/nginx-conf /etc/nginx/sites-enabled/domjudge
@@ -88,34 +121,41 @@ nginx -t
 section_end
 
 section_start "Show webserver is up"
-for service in nginx php${PHPVERSION}-fpm; do
+for service in nginx php${phpversion}-fpm; do
     service "$service" restart
     service "$service" status
 done
 section_end
 
 if [ "${db}" = "install" ]; then
     section_start "Install the example data"
-    /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples | tee -a "$ARTIFACTS/mysql.txt"
+    if [ "$version" = "unit" ]; then
+	    # Make sure admin has no team associated so we will not insert submissions during unit tests.
+	    mysql_root "UPDATE user SET teamid=null WHERE userid=1;" $DATABASE_NAME
+    fi
+    /opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} install-examples | tee -a "$ARTIFACTS/mysql.txt"
     section_end
 fi
 
 section_start "Setup user"
 # We're using the admin user in all possible roles
-mysql_root "DELETE FROM userrole WHERE userid=1;" domjudge
+mysql_root "DELETE FROM userrole WHERE userid=1;" $DATABASE_NAME
 if [ "$version" = "team" ]; then
     # Add team to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 3);" domjudge
-    mysql_root "UPDATE user SET teamid = 1 WHERE userid = 1;" domjudge
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 3);" $DATABASE_NAME
+    mysql_root "UPDATE user SET teamid = 1 WHERE userid = 1;" $DATABASE_NAME
 elif [ "$version" = "jury" ]; then
     # Add jury to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 2);" domjudge
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 2);" $DATABASE_NAME
 elif [ "$version" = "balloon" ]; then
     # Add balloon to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 4);" domjudge
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 4);" $DATABASE_NAME
 elif [ "$version" = "admin" ]; then
     # Add admin to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 1);" domjudge
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 1);" $DATABASE_NAME
+elif [ "$version" = "all" ] || [ "$version" = "unit" ]; then
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 1);" $DATABASE_NAME
+    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 3);" $DATABASE_NAME
+    mysql_root "UPDATE user SET teamid = 1 WHERE userid = 1;" $DATABASE_NAME
 fi
 section_end
-

gitlab/chroot.bats renamed to .github/jobs/chroot.bats

@@ -3,8 +3,8 @@
 load 'assert'
 
 CHROOT="/chroot/domjudge"
-if [ -n "${CI_JOB_ID+x}" ]; then
-    CHROOT="/builds/DOMjudge/domjudge${CHROOT}"
+if [ -n "${GITHUB_REPOSITORY+x}" ]; then
+    CHROOT="/__w/domjudge/domjudge${CHROOT}"
 fi
 # Cleanup old dir
 rm -rf $CHROOT

.github/jobs/chroot_checks.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+. .github/jobs/ci_settings.sh
+
+if [ -n "$1" ] && [ "$1" != "default" ]; then
+    export ARCH_OPTION="-a $1"
+else
+    export ARCH_OPTION=""
+fi
+
+function finish() {
+    echo -e "\\n\\n=======================================================\\n"
+    echo "Storing artifacts..."
+    trace_on
+    set +e
+    cp /proc/cmdline "$ARTIFACTS/cmdline"
+    cp /__w/domjudge/domjudge/chroot/domjudge/etc/apt/sources.list "$ARTIFACTS/sources.list"
+    cp /__w/domjudge/domjudge/chroot/domjudge/debootstrap/debootstrap.log "$ARTIFACTS/debootstrap.log"
+}
+
+FAILED=0
+
+trap finish EXIT
+
+set -euo pipefail
+
+DIR=$PWD
+section_start "Debug info"
+lsb_release -a   | tee -a "$ARTIFACTS/debug-info"
+mount            | tee -a "$ARTIFACTS/debug-info"
+whoami           | tee -a "$ARTIFACTS/debug-info"
+echo "Dir: $DIR" | tee -a "$ARTIFACTS/debug-info"
+section_end
+
+section_start "Basic judgehost install"
+chown -R domjudge ./
+
+# configure, make and install (but skip documentation)
+sudo -u domjudge make configure
+sudo -u domjudge ./configure --with-baseurl='http://localhost/domjudge/' --with-domjudge-user=domjudge --with-judgehost_chrootdir=${DIR}/chroot/domjudge |& tee "$ARTIFACTS/configure.log"
+sudo -u domjudge make judgehost |& tee "$ARTIFACTS/make.log"
+make install-judgehost          |& tee -a "$ARTIFACTS/make.log"
+section_end setup
+
+section_start "Configure chroot"
+
+cd /opt/domjudge/judgehost/bin || exit 1
+section_end chroot
+
+section_start "Show minimal chroot"
+./dj_make_chroot $ARCH_OPTION | tee -a "$ARTIFACTS"/chroot.log
+section_end
+
+section_start "Test chroot contents"
+set -xe
+cp ${DIR}/submit/assert.bash .
+cp ${DIR}/.github/jobs/chroot.bats .
+bats ./chroot.bats
+section_end

.github/jobs/ci_settings.sh

@@ -34,6 +34,15 @@ mysql_user () {
     echo "$1" | mysql -udomjudge -pdomjudge ${2:-} | tee -a "$ARTIFACTS"/mysql.txt
 }
 
+show_phpinfo() {
+    phpversion=$1
+    section_start "Show the new PHP info"
+    update-alternatives --set php /usr/bin/php"${phpversion}"
+    php -v
+    php -m
+    section_end
+}
+
 section_start () {
     if [ "$#" -ne 1 ]; then
         echo "Only 1 argument is needed for GHA, 2 was needed for GitLab."

.github/jobs/composer_setup.sh

@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-set -eux
+set -euxo pipefail
 
 . .github/jobs/ci_settings.sh