Merge branch 'main' into jh_saferun

Author: meisterT

.github/jobs/baseinstall.sh

@@ -67,6 +67,9 @@ password=${MYSQL_ROOT_PASSWORD}
 EOF
 cat ~/.my.cnf
 
+# TODO: Remove after fixing https://github.com/DOMjudge/domjudge/issues/2848
+mysql_root "SET GLOBAL innodb_snapshot_isolation = OFF;"
+
 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 \`$DATABASE_NAME\`.* TO 'domjudge'@'%';"
@@ -79,6 +82,7 @@ mysql_root "SELECT USER();"
 mysql_root "SELECT user,host FROM mysql.user"
 mysql_root "SET GLOBAL max_allowed_packet=1073741824"
 mysql_root "SHOW GLOBAL STATUS LIKE 'Connection_errors_%'"
+mysql_root "SHOW VARIABLES LIKE 'innodb_snapshot_isolation'"
 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();"

.github/jobs/webstandard.sh

@@ -117,8 +117,10 @@ if [ "$TEST" = "w3cval" ]; then
 
     section_start "Install testsuite"
     cd "$DIR"
-    wget https://github.com/validator/validator/releases/latest/download/vnu.linux.zip
+    wget https://github.com/validator/validator/releases/download/latest/vnu.linux.zip
     unzip -q vnu.linux.zip
+    # Remove a warning by creating an empty config.
+    touch vnu.properties
     section_end
 
     FLTR='--filterpattern .*autocomplete.*|.*role=tab.*|.*descendant.*|.*Stray.*|.*attribute.*|.*Forbidden.*|.*stream.*|.*obsolete.*'
@@ -128,7 +130,7 @@ if [ "$TEST" = "w3cval" ]; then
         # shellcheck disable=SC2086
         "$DIR"/vnu-runtime-image/bin/vnu --errors-only --exit-zero-always --skip-non-$typ --format json $FLTR "$URL" 2> result.json
         # shellcheck disable=SC2086
-        NEWFOUNDERRORS=$("$DIR"/vnu-runtime-image/bin/vnu --errors-only --exit-zero-always --skip-non-$typ --format gnu $FLTR "$URL" 2>&1 | wc -l)
+        NEWFOUNDERRORS=$("$DIR"/vnu-runtime-image/bin/vnu --errors-only --exit-zero-always --skip-non-$typ --format gnu $FLTR "$URL" 2>&1 | tee "$ARTIFACTS/w3c_${typ}_${URL}.log" | wc -l)
         FOUNDERR=$((NEWFOUNDERRORS+FOUNDERR))
         python3 -m "json.tool" < result.json > "$ARTIFACTS/w3c$typ$URL.json"
         trace_off; python3 .github/jobs/jsontogha.py "$ARTIFACTS/w3c$typ$URL.json"; trace_on

judge/judgedaemon.main.php

@@ -33,9 +33,12 @@ function read_credentials(): void
     global $endpoints;
 
     $credfile = ETCDIR . '/restapi.secret';
-    $credentials = @file($credfile);
-    if (!$credentials) {
-        error("Cannot read REST API credentials file " . $credfile);
+    if (!is_readable($credfile)) {
+        error("REST API credentials file " . $credfile . " is not readable or does not exist.");
+    }
+    $credentials = file($credfile);
+    if ($credentials === false) {
+        error("Error reading REST API credentials file " . $credfile);
     }
     $lineno = 0;
     foreach ($credentials as $credential) {
@@ -1524,8 +1527,8 @@ function judge(array $judgeTask): bool
         $runtime = null;
         $metadata = read_metadata($passdir . '/program.meta');
 
-        if (isset($metadata['time-used'])) {
-            $runtime = @$metadata[$metadata['time-used']];
+        if (isset($metadata['time-used']) && array_key_exists($metadata['time-used'], $metadata)) {
+            $runtime = $metadata[$metadata['time-used']];
         }
 
         if ($result === 'compare-error') {

judge/runguard.cc

@@ -117,11 +117,6 @@ FILE  *metafile;
 char  cgroupname[255];
 const char *cpuset;
 
-/* Linux Out-Of-Memory adjustment for current process. */
-#define OOM_PATH_NEW "/proc/self/oom_score_adj"
-#define OOM_PATH_OLD "/proc/self/oom_adj"
-#define OOM_RESET_VALUE 0
-
 char *runuser;
 char *rungroup;
 int runuid;
@@ -1288,24 +1283,23 @@ int main(int argc, char **argv)
 	}
 
 	/* Check if any Linux Out-Of-Memory killer adjustments have to
-	 * be made. The oom_adj or oom_score_adj is inherited by child
-	 * processes, and at least older versions of sshd seemed to set
+	 * be made. The oom_score_adj is inherited by child
+	 * processes, and at least some configurations of sshd set
 	 * it, leading to processes getting a timelimit instead of memory
 	 * exceeded, when running via SSH. */
 	FILE *fp = nullptr;
-	char *oom_path;
-	if ( !fp && (fp = fopen(OOM_PATH_NEW,"r+")) ) oom_path = strdup(OOM_PATH_NEW);
-	if ( !fp && (fp = fopen(OOM_PATH_OLD,"r+")) ) oom_path = strdup(OOM_PATH_OLD);
-	if ( fp!=nullptr ) {
-		if ( fscanf(fp,"%d",&ret)!=1 ) error(errno,"cannot read from `%s'",oom_path);
+	const char *oom_score_path = "/proc/self/oom_score_adj";
+	if ( (fp = fopen(oom_score_path, "r+"))!=nullptr ) {
+		if ( fscanf(fp,"%d", &ret)!=1 ) error(errno,"cannot read from `%s'", oom_score_path);
 		if ( ret<0 ) {
-			verbose("resetting `%s' from %d to %d",oom_path,ret,OOM_RESET_VALUE);
+			int oom_reset_value = 0;
+			verbose("resetting `%s' from %d to %d", oom_score_path, ret, oom_reset_value);
 			rewind(fp);
-			if ( fprintf(fp,"%d\n",OOM_RESET_VALUE)<=0 ) {
-				error(errno,"cannot write to `%s'",oom_path);
+			if ( fprintf(fp,"%d\n", oom_reset_value) <= 0 ) {
+				error(errno, "cannot write to `%s'", oom_score_path);
 			}
 		}
-		if ( fclose(fp)!=0 ) error(errno,"closing file `%s'",oom_path);
+		if ( fclose(fp)!=0 ) error(errno, "closing file `%s'", oom_score_path);
 	}
 
 	switch ( child_pid = fork() ) {