Merge branch 'main' into analyst-eval

Author: Kevinjil

.github/jobs/fix_pipelinecomponents_image.sh

@@ -8,10 +8,11 @@ set -eux
 
 echo "Set plugin config for version detection"
 phpcs --config-set installed_paths /app/vendor/phpcompatibility/php-compatibility
-      
+
 # Current released version does not know enums
 echo "Upgrade the compatibility for PHP versions"
 mydir=$(pwd)
 sed -i 's/"phpcompatibility\/php-compatibility": "9.3.5"/"phpcompatibility\/php-compatibility": "dev-develop"/g' /app/composer.json
+sed -i 's/"squizlabs\/php_codesniffer": "3.11.3"/"squizlabs\/php_codesniffer": "^3.13.0"/g' /app/composer.json
 cd /app; composer update
 cd $mydir

.github/workflows/integration.yml

@@ -96,7 +96,7 @@ jobs:
         with:
           dest: '/tmp/docker-logs'
       - name: Upload all logs/artifacts
-        if: ${{ !cancelled() }}
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: Logs

.github/workflows/phpstan.yml

@@ -15,10 +15,16 @@ jobs:
         run: .github/jobs/composer_setup.sh
       - name: Show the phpstan version
         run: webapp/vendor/phpstan/phpstan/phpstan --version
+      - name: Run PHPStan in the classic way
+        run: |
+          set -euo pipefail
+          webapp/vendor/bin/phpstan \
+            --configuration=webapp/phpstan.dist.neon \
+          | tee /tmp/artifacts/phpstan.out
+      # Run the test again for GHA annotations
       - uses: php-actions/[email protected]
         with:
           configuration: webapp/phpstan.dist.neon
-          path: webapp/src webapp/tests
           php_extensions: gd intl mysqli pcntl zip
           autoload_file: webapp/vendor/autoload.php
           version: composer

Makefile

@@ -11,6 +11,9 @@ REC_TARGETS=build domserver install-domserver judgehost install-judgehost \
 # Global Makefile definitions
 include $(TOPDIR)/Makefile.global
 
+debpool := /etc/php/$(PHPVERSION)/fpm/pool.d
+fedpool := /etc/php-fpm.d
+
 default:
 	@echo "No default target"
 	@echo
@@ -238,6 +241,8 @@ inplace-install-l:
 	@echo "        sudo make inplace-postinstall-apache"
 	@echo "    - Configure nginx"
 	@echo "        sudo make inplace-postinstall-nginx"
+	@echo "    - Configure judgedaemon"
+	@echo "        sudo make inplace-postinstall-judgedaemon"
 	@echo "    - Set up database"
 	@echo "        ./sql/dj_setup_database -u root [-r|-p ROOT_PASS] install"
 	@echo ""
@@ -275,6 +280,14 @@ inplace-postinstall-permissions:
 	setfacl -R -m   u:$(DOMJUDGE_USER):rwx    $(CURDIR)/webapp/var
 	setfacl -R -m d:m::rwx                    $(CURDIR)/webapp/var
 	setfacl -R -m   m::rwx                    $(CURDIR)/webapp/var
+	if command -v sestatus >/dev/null 2>&1; then \
+		chcon -R -t httpd_sys_content_t $(CURDIR)/webapp; \
+		chcon -R -t httpd_config_t $(CURDIR)/etc; \
+		chcon -R -t httpd_log_t $(CURDIR)/webapp/var/log; \
+		chcon -R -t httpd_sys_rw_content_t $(CURDIR)/webapp/var/cache; \
+		chcon -R -t httpd_sys_rw_content_t $(CURDIR)/webapp/public/images; \
+		chcon    -t httpd_exec_t $(CURDIR)/lib/alert; \
+	fi
 
 inplace-postinstall-apache: inplace-postinstall-permissions
 	@if [ ! -d "/etc/apache2/conf-enabled" ]; then echo "Couldn't find directory /etc/apache2/conf-enabled. Is apache installed?"; false; fi
@@ -284,12 +297,28 @@ inplace-postinstall-apache: inplace-postinstall-permissions
 	systemctl restart apache2
 
 inplace-postinstall-nginx: inplace-postinstall-permissions
-	@if [ ! -d "/etc/nginx/sites-enabled/" ]; then echo "Couldn't find directory /etc/nginx/sites-enabled/. Is nginx installed?"; false; fi
-	@if [ ! -d "/etc/php/$(PHPVERSION)/fpm/pool.d/" ]; then echo "Couldn't find directory /etc/php/$(PHPVERSION)/fpm/pool.d/. Is php-fpm installed?"; false; fi
-	ln -sf $(CURDIR)/etc/nginx-conf /etc/nginx/sites-enabled/domjudge.conf
-	ln -sf $(CURDIR)/etc/domjudge-fpm.conf /etc/php/$(PHPVERSION)/fpm/pool.d/domjudge-fpm.conf
+	@if [ ! -d "/etc/nginx/" ]; then echo "Couldn't find directory /etc/nginx/. Is nginx installed?"; false; fi
+	@cmd="ln -sf $(CURDIR)/etc/nginx-conf /etc/nginx/conf.d/domjudge.conf"; \
+	if [ -d "/etc/nginx/sites-enabled/" ]; then \
+		cmd="ln -sf $(CURDIR)/etc/nginx-conf /etc/nginx/sites-enabled/domjudge.conf"; \
+	fi; echo $$cmd; $$cmd
 	systemctl restart nginx
-	systemctl restart php$(PHPVERSION)-fpm
+	@if [ ! -d "$(debpool)" ] && [ ! -d "$(fedpool)" ]; then \
+		echo "Couldn't find directory $(debpool) or $(fedpool). Is php-fpm installed?"; false; \
+	fi
+	@service="php-fpm"; phppool="$(fedpool)"; \
+	if [ -d "$(debpool)" ]; then \
+		phppool="$(debpool)"; \
+		service="php$(PHPVERSION)-fpm"; \
+	fi; \
+	service="systemctl restart $$service"; \
+	ln="ln -sf $(CURDIR)/etc/domjudge-fpm.conf $$phppool/domjudge-fpm.conf"; \
+	echo $$ln; echo $$service; $$ln; $$service
+
+inplace-postinstall-judgedaemon:
+	cp $(CURDIR)/etc/sudoers-domjudge /etc/sudoers.d/domjudge
+	chown root:root /etc/sudoers.d/domjudge
+	chmod 0600 /etc/sudoers.d/domjudge
 
 # Removes created symlinks; generated logs, submissions, etc. remain in output subdir.
 inplace-uninstall-l:

doc/manual/config-advanced.rst

@@ -338,8 +338,11 @@ systemd, then edit the ``domjudge-judgehost.target`` unit file and add
 more judgedaemons there.
 
 Although each judgedaemon process will be bound to one single CPU
-core, shared use of other resources such as disk I/O might
-still have effect on run times.
+core, shared use of other resources such as disk I/O typically
+still has an effect on run times.
+Therefore we recommend running a single judgedaemon per physical
+machine for contests where precise timing is important.
+
 
 Multi-site contests
 -------------------

doc/manual/develop.rst

@@ -43,6 +43,15 @@ already listed under
     python3-sphinx python3-sphinx-rtd-theme fontconfig python3-yaml \
     latexmk texlive-latex-recommended texlive-latex-extra tex-gyre
 
+For Fedora use::
+
+  sudo dnf install git autoconf automake bats \
+    sphinx-build python3-sphinx_rtd_theme latexmk texlive-cmap \
+    texlive-metafont texlive-tex-gyre texlive-fncychap texlive-wrapfig \
+    texlive-capt-of texlive-framed texlive-upquote texlive-needspace \
+    texlive-tabulary texlive-parskip texlive-oberdiek texlive-makeindex \
+    texlive-ellipse texlive-pict2e texlive-collection-fontsextra
+
 When this software is present, bootstrapping can be done by running
 ``make dist``, which creates the ``configure`` script,
 downloads and installs the PHP dependencies via composer and

doc/manual/install-judgehost.rst

@@ -19,6 +19,8 @@ System requirements
 * A TCP/IP network which connects the DOMserver and the judgehosts.
   The machines only need HTTP(S) access to the DOMserver.
 
+We recommend running a single judgedaemon per physical machine.
+For more details see the section :ref:`multiple-judgedaemons`.
 
 .. _judgehost_software:
 

doc/manual/install-workstation.rst

@@ -19,7 +19,7 @@ Command line submit client
 DOMjudge comes with a command line submit client which makes it really
 convenient for teams to submit their solutions to DOMjudge.
 
-In order to use the submit client, you need Python, the python requests 
+In order to use the submit client, you need Python, the python requests
 library and optionally the python magic library installed on the team's
 workstation. To install this on Debian-like distributions::
 
@@ -85,7 +85,7 @@ the team manual can be generated with the command ``make docs``.
 The following should do it on a Debian-like system::
 
   sudo apt install python3-sphinx python3-sphinx-rtd-theme fontconfig python3-yaml
-  cd <INSTALL_PATH>/doc/
+  cd <DOWNLOAD_PATH>/doc/
   make docs
 
 The resulting manual will then be found in the ``team/`` subdirectory.

judge/create_cgroups.in

@@ -11,7 +11,7 @@ CGROUPBASE="/sys/fs/cgroup"
 
 cgroup_error_and_usage () {
     echo "$1" >&2
-    echo "To fix this, please make the following changes:
+    echo "Unable to continue. To fix this, you most likely need to follow these steps:
     1. In /etc/default/grub, add 'cgroup_enable=memory swapaccount=1' to GRUB_CMDLINE_LINUX_DEFAULT.
     2. Run update-grub
     3. Reboot" >&2
@@ -29,10 +29,13 @@ if [ "$fs_type" = "cgroup2" ]; then
 You can try using cgroup V1 by adding systemd.unified_cgroup_hierarchy=0 to the kernel params."
     fi
     if ! echo "+memory" >> /sys/fs/cgroup/cgroup.subtree_control; then
-        cgroup_error_and_usage "Error: Cannot add +memory to cgroup.subtree_control; check kernel params. Unable to continue."
+        cgroup_error_and_usage "Error: Cannot add +memory to cgroup.subtree_control; check kernel params."
     fi
     if ! echo "+cpuset" >> /sys/fs/cgroup/cgroup.subtree_control; then
-        cgroup_error_and_usage "Error: Cannot add +cpuset to cgroup.subtree_control; check kernel params. Unable to continue."
+        cgroup_error_and_usage "Error: Cannot add +cpuset to cgroup.subtree_control; check kernel params."
+    fi
+    if ! grep -q "slice" /proc/self/cgroup; then
+        cgroup_error_and_usage "Error: Cgroups not configured properly, missing systemd slice under /proc/self/cgroup. If running under docker, make sure to set cgroupns=host."
     fi
 
 else # Trying cgroup V1:
@@ -41,14 +44,14 @@ else # Trying cgroup V1:
         mkdir -p $CGROUPBASE/$i
         if [ ! -d $CGROUPBASE/$i/ ]; then
             if ! mount -t cgroup -o$i $i $CGROUPBASE/$i/; then
-                cgroup_error_and_usage "Error: Can not mount $i cgroup. Probably cgroup support is missing from running kernel. Unable to continue."
+                cgroup_error_and_usage "Error: Can not mount $i cgroup. Probably cgroup support is missing from running kernel."
             fi
         fi
         mkdir -p $CGROUPBASE/$i/domjudge
     done
 
     if [ ! -f $CGROUPBASE/memory/memory.limit_in_bytes ] || [ ! -f $CGROUPBASE/memory/memory.memsw.limit_in_bytes ]; then
-        cgroup_error_and_usage "Error: cgroup support missing memory features in running kernel. Unable to continue."
+        cgroup_error_and_usage "Error: cgroup support missing memory features in running kernel."
     fi
 
     chown -R $JUDGEHOSTUSER $CGROUPBASE/*/domjudge

judge/judgedaemon.main.php

@@ -626,7 +626,12 @@ function fetch_executable_internal(
     $new_judging_run = (array) dj_json_decode(base64_decode(file_get_contents($options['j'])));
     $judgeTaskId = $options['t'];
 
+    $success = false;
     for ($i = 0; $i < 5; $i++) {
+        if ($i > 0) {
+            $sleep_ms = 100 + random_int(200, ($i+1)*1000);
+            dj_sleep(0.001 * $sleep_ms);
+        }
         $response = request(
             sprintf('judgehosts/add-judging-run/%s/%s', $new_judging_run['hostname'],
                 urlencode((string)$judgeTaskId)),
@@ -636,11 +641,13 @@ function fetch_executable_internal(
         );
         if ($response !== null) {
             logmsg(LOG_DEBUG, "Adding judging run result for jt$judgeTaskId successful.");
+            $success = true;
             break;
         }
-        logmsg(LOG_WARNING, "Failed to report $judgeTaskId in attempt #" . ($i + 1) . ".");
-        $sleep_ms = 100 + random_int(200, ($i+1)*1000);
-        dj_sleep(0.001 * $sleep_ms);
+        logmsg(LOG_WARNING, "Failed to report jt$judgeTaskId in attempt #" . ($i + 1) . ".");
+    }
+    if (!$success) {
+        error("Final attempt of uploading jt$judgeTaskId was unsuccessful, giving up.");
     }
     unlink($options['j']);
     exit(0);
@@ -1318,6 +1325,7 @@ function compile(
 function judge(array $judgeTask): bool
 {
     global $EXITCODES, $myhost, $options, $workdirpath, $exitsignalled, $gracefulexitsignalled, $endpointID;
+    $startTime = microtime(true);
 
     $compile_config = dj_json_decode($judgeTask['compile_config']);
     $run_config     = dj_json_decode($judgeTask['run_config']);
@@ -1502,6 +1510,8 @@ function judge(array $judgeTask): bool
 
         $new_judging_run = [
             'runresult' => urlencode($result),
+            'start_time' => urlencode((string)$startTime),
+            'end_time' => urlencode((string)microtime(true)),
             'runtime' => urlencode((string)$runtime),
             'output_run' => rest_encode_file($passdir . '/program.out', $output_storage_limit),
             'output_error' => rest_encode_file($passdir . '/program.err', $output_storage_limit),