Merge upstream WeBWorK 2.20 into UBC branch

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+max_line_length = 120
+trim_trailing_whitespace = true
+indent_style = tab
+indent_size = 4
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.pg]
+trim_trailing_whitespace = false

.github/workflows/check-formats.yml

@@ -0,0 +1,50 @@
+---
+name: Check Formatting of Code Base
+
+# UBC adaptations from the upstream check-formats.yml (kept otherwise verbatim so
+# it stays in sync with upstream): declare least-privilege permissions to satisfy
+# CodeQL, and add UBC's default branch `ubc` to the push branches-ignore list.
+permissions:
+  contents: read
+
+defaults:
+  run:
+    shell: bash
+
+on:
+  push:
+    branches-ignore: [main, develop, ubc]
+  pull_request:
+
+jobs:
+  perltidy:
+    name: Check Perl file formatting with perltidy
+    runs-on: ubuntu-24.04
+    container:
+      image: perl:5.38
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        run: cpanm -n Perl::Tidy@20240903
+      - name: Run perltidy
+        shell: bash
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          shopt -s extglob globstar nullglob
+          perltidy --pro=./.perltidyrc -b -bext='/' ./**/*.p[lm] ./**/*.t && git diff --exit-code
+
+  prettier:
+    name: Check JavaScript, style, and HTML file formatting with prettier
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Install Dependencies
+        run: cd htdocs && npm ci --ignore-scripts
+      - name: Check formatting with prettier
+        run: cd htdocs && npm run prettier-check

.github/workflows/main.yml

@@ -1,5 +1,8 @@
 name: CI to Docker Hub
 
+permissions:
+  contents: read
+
 # Controls when the workflow will run
 on:
   # Triggers the workflow on push or pull request events but only for the master branch

.perltidyrc

@@ -20,4 +20,3 @@
 -nlop   # No logical padding (this causes mixed tabs and spaces)
 -wn     # Weld nested containers
 -xci    # Extended continuation indentation
--vxl='q' # No vertical alignment of qw quotes

.prettierrc

@@ -0,0 +1,8 @@
+{
+	"arrowParens": "always",
+	"bracketSpacing": true,
+	"printWidth": 120,
+	"semi": true,
+	"singleQuote": true,
+	"trailingComma": "none"
+}

Dockerfile

@@ -30,10 +30,10 @@ RUN echo Cloning branch $PG_BRANCH branch from $PG_GIT_URL \
 
 # We need to change FROM before setting the ENV variables.
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ENV WEBWORK_URL=/webwork2 \
-	WEBWORK_ROOT_URL=http://localhost::8080 \
+	WEBWORK_ROOT_URL=http://localhost:8080 \
 	WEBWORK_SMTP_SERVER=localhost \
 	WEBWORK_SMTP_SENDER=webwork@example.com \
 	WEBWORK_TIMEZONE=America/New_York \
@@ -71,6 +71,7 @@ RUN apt-get update \
 	imagemagick \
 	iputils-ping \
 	jq \
+	libarchive-extract-perl \
 	libarchive-zip-perl \
 	libarray-utils-perl \
 	libc6-dev \
@@ -94,23 +95,21 @@ RUN apt-get update \
 	libextutils-helpers-perl \
 	libextutils-installpaths-perl \
 	libextutils-xsbuilder-perl \
+	libfile-copy-recursive-perl \
 	libfile-find-rule-perl-perl \
 	libfile-sharedir-install-perl \
 	libfuture-asyncawait-perl \
+	libgd-barcode-perl \
 	libgd-perl \
 	libhtml-scrubber-perl \
 	libhtml-template-perl \
 	libhttp-async-perl \
 	libiterator-perl \
 	libiterator-util-perl \
-	libjson-maybexs-perl \
-	libjson-perl \
-	libjson-xs-perl \
 	liblocale-maketext-lexicon-perl \
-	libmail-sender-perl \
-	libmail-sender-perl \
 	libmariadb-dev \
 	libmath-random-secure-perl \
+	libmime-base32-perl \
 	libmime-tools-perl \
 	libminion-backend-sqlite-perl \
 	libminion-perl \
@@ -124,13 +123,12 @@ RUN apt-get update \
 	libnet-oauth-perl \
 	libossp-uuid-perl \
 	libpadwalker-perl \
+	libpandoc-wrapper-perl \
 	libpath-class-perl \
 	libpath-tiny-perl \
-	libpandoc-wrapper-perl \
 	libphp-serialization-perl \
 	libpod-wsdl-perl \
 	libsoap-lite-perl \
-	libsql-abstract-classic-perl \
 	libsql-abstract-perl \
 	libstring-shellquote-perl \
 	libsub-uplevel-perl \
@@ -176,15 +174,20 @@ RUN apt-get update \
 	texlive-xetex \
 	tzdata \
 	zip $ADDITIONAL_BASE_IMAGE_PACKAGES \
-	&& curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
+	&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
 	&& apt-get install -y --no-install-recommends --no-install-suggests nodejs \
 	&& apt-get clean \
 	&& rm -fr /var/lib/apt/lists/* /tmp/*
 
 # ==================================================================
 # Phase 4 - Install additional Perl modules from CPAN that are not packaged for Ubuntu or are outdated in Ubuntu.
 
-RUN cpanm install Statistics::R::IO DBD::MariaDB Mojo::SQLite@3.002 Perl::Tidy@20220613 \
+RUN cpanm install -n \
+	Statistics::R::IO \
+	DBD::MariaDB \
+	Perl::Tidy@20240903 \
+	Archive::Zip::SimpleZip \
+	Net::SAML2 \
 	&& rm -fr ./cpanm /root/.cpanm /tmp/*
 
 # ==================================================================
@@ -211,7 +214,7 @@ COPY --from=base /opt/base/pg $APP_ROOT/pg
 # 7. Apply patches
 
 # Patch files that are applied below
-COPY docker-config/imagemagick-allow-pdf-read.patch /tmp
+COPY docker-config/pgfsys-dvisvmg-bbox-fix.patch /tmp
 
 RUN echo "PATH=$PATH:$APP_ROOT/webwork2/bin" >> /root/.bashrc \
 	&& mkdir /run/webwork2 /etc/ssl/local \
@@ -228,8 +231,8 @@ RUN echo "PATH=$PATH:$APP_ROOT/webwork2/bin" >> /root/.bashrc \
 		&& npm install \
 	&& cd $PG_ROOT/htdocs \
 		&& npm install \
-	&& patch -p1 -d / < /tmp/imagemagick-allow-pdf-read.patch \
-	&& rm /tmp/imagemagick-allow-pdf-read.patch
+	&& patch -p1 -d / < /tmp/pgfsys-dvisvmg-bbox-fix.patch \
+	&& rm /tmp/pgfsys-dvisvmg-bbox-fix.patch
 
 # ==================================================================
 # Phase 7 - Final setup and prepare docker-entrypoint.sh

Dockerfile-prod

@@ -8,7 +8,10 @@
 ARG WEBWORK2_GIT_URL
 ARG WEBWORK2_BRANCH
 ARG PG_GIT_URL=https://github.com/openwebwork/pg.git
-ARG PG_BRANCH=PG-2.18+
+# PG releases in lockstep with webwork2; 2.20 needs PG-2.20 (PG 2.18 lacks
+# getSampleProblemCode, the reorganized Plots::* modules, and WeBWorK::PG::Localize,
+# which breaks the PG Problem Editor and plot rendering).
+ARG PG_BRANCH=PG-2.20
 # CUSTOM: allow customized OPL repo & branch
 ARG OPL_GIT_URL=https://github.com/ubc/webwork-open-problem-library.git
 ARG OPL_BRANCH=ubc
@@ -30,7 +33,7 @@
 ############################### CUSTOM #############################
 # Webwork Node Stuff, separated here for caching purposes
 
-FROM node:20 AS npmww
+FROM node:26 AS npmww
 
 WORKDIR /npmww
 
@@ -50,7 +53,7 @@
 ############################### CUSTOM #############################
 # PG Node Stuff, separated here for caching purposes
 
-FROM node:20 AS npmpg
+FROM node:26 AS npmpg
 
 WORKDIR /npmpg
 COPY --from=base /opt/base/pg/htdocs/package.json .
@@ -65,7 +68,7 @@
 
 # We need to change FROM before setting the ENV variables.
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ENV WEBWORK_URL=/webwork2 \
 	WEBWORK_ROOT_URL=http://localhost::8080 \
@@ -84,15 +87,15 @@
 	PG_ROOT=$APP_ROOT/pg \
 	PATH=$PATH:$APP_ROOT/webwork2/bin
 
 ENV WEBWORK_DB_HOST db
 ENV WEBWORK_DB_PORT 3306
 ENV WEBWORK_DB_NAME webwork
 ENV WEBWORK_DB_USER webworkWrite
 ENV WEBWORK_DB_PASSWORD passwordRW
 ENV WEBWORK_SMTP_SERVER localhost
 ENV WEBWORK_SMTP_SENDER webwork@example.com
 ENV R_HOST r
 ENV DEBUG 0
 
 # ==================================================================
 # Phase 3 - Install required packages
@@ -116,6 +119,7 @@
 	imagemagick \
 	iputils-ping \
 	jq \
+	libarchive-extract-perl \
 	libarchive-zip-perl \
 	libarray-utils-perl \
 	libc6-dev \
@@ -130,7 +134,6 @@
 	libdatetime-perl \
 	libdbd-mysql-perl \
 	libdevel-checklib-perl \
-	#libdbd-mariadb-perl \
 	libemail-address-xs-perl \
 	libemail-date-format-perl \
 	libemail-sender-perl \
@@ -140,23 +143,21 @@
 	libextutils-helpers-perl \
 	libextutils-installpaths-perl \
 	libextutils-xsbuilder-perl \
+	libfile-copy-recursive-perl \
 	libfile-find-rule-perl-perl \
 	libfile-sharedir-install-perl \
 	libfuture-asyncawait-perl \
+	libgd-barcode-perl \
 	libgd-perl \
 	libhtml-scrubber-perl \
 	libhtml-template-perl \
 	libhttp-async-perl \
 	libiterator-perl \
 	libiterator-util-perl \
-	libjson-maybexs-perl \
-	libjson-perl \
-	libjson-xs-perl \
 	liblocale-maketext-lexicon-perl \
-	libmail-sender-perl \
-	libmail-sender-perl \
 	libmariadb-dev \
 	libmath-random-secure-perl \
+	libmime-base32-perl \
 	libmime-tools-perl \
 	#libminion-backend-sqlite-perl \ # we're using mysql instead
 	libminion-perl \
@@ -170,13 +171,12 @@
 	libnet-oauth-perl \
 	libossp-uuid-perl \
 	libpadwalker-perl \
+	libpandoc-wrapper-perl \
 	libpath-class-perl \
 	libpath-tiny-perl \
-	libpandoc-wrapper-perl \
 	libphp-serialization-perl \
 	libpod-wsdl-perl \
 	libsoap-lite-perl \
-	libsql-abstract-classic-perl \
 	libsql-abstract-perl \
 	libstring-shellquote-perl \
 	libsub-uplevel-perl \
@@ -230,23 +230,27 @@
 	texlive-xetex \
 	tzdata \
 	zip $ADDITIONAL_BASE_IMAGE_PACKAGES \
-	&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+	&& curl -fsSL https://deb.nodesource.com/setup_26.x | bash - \
 	&& apt-get install -y --no-install-recommends --no-install-suggests nodejs \
     vim
 
 # ==================================================================
 # Phase 4 - Install additional Perl modules from CPAN that are not packaged for Ubuntu or are outdated in Ubuntu.
 
-RUN cpanm install Statistics::R::IO DBD::MariaDB Mojo::SQLite Perl::Tidy@20220613 \
+RUN cpanm install -n \
+    Statistics::R::IO \
+	DBD::MariaDB \
+	Perl::Tidy@20240903 \
+	Archive::Zip::SimpleZip \
+	Net::SAML2 \
 	&& rm -fr ./cpanm /root/.cpanm /tmp/*
 
 # App::Genpass - used by LTI1p3's CourseUpdater
 # Data::ObjectDriver - used by DelayedJob
 # Bytes::Random::Secure::Tiny - used by LTI1p3 for secure random string
 # Minion::Backend::mysql - let us reuse webwork db for Minion job queue database
-# Net::SAML2 - for Shibboleth auth
 RUN cpanm install App::Genpass Data::ObjectDriver Bytes::Random::Secure::Tiny \
-	Minion::Backend::mysql Net::SAML2 && rm -fr ./cpanm /root/.cpanm /tmp/*
+	Minion::Backend::mysql && rm -fr ./cpanm /root/.cpanm /tmp/*
 
 # ==================================================================
 # Phase 5 - Install webwork2 and pg which were downloaded to /opt/base/ in phase 1
@@ -275,7 +279,7 @@
 # 7. Apply patches
 
 # Patch files that are applied below
-COPY docker-config/imagemagick-allow-pdf-read.patch /tmp
+COPY docker-config/pgfsys-dvisvmg-bbox-fix.patch /tmp
 
 RUN echo "PATH=$PATH:$APP_ROOT/webwork2/bin" >> /root/.bashrc \
 	&& mkdir /run/webwork2 /etc/ssl/local \
@@ -288,8 +292,8 @@
 		&& debconf-set-selections /tmp/preseed.txt \
 	&& rm /etc/localtime /etc/timezone && echo "Etc/UTC" > /etc/timezone \
 		&&   dpkg-reconfigure -f noninteractive tzdata \
-	&& patch -p1 -d / < /tmp/imagemagick-allow-pdf-read.patch \
-	&& rm /tmp/imagemagick-allow-pdf-read.patch
+	&& patch -p1 -d / < /tmp/pgfsys-dvisvmg-bbox-fix.patch \
+	&& rm /tmp/pgfsys-dvisvmg-bbox-fix.patch
 
 # ==================================================================
 # Phase 7 - Final setup and prepare docker-entrypoint.sh