mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-11-19 14:36:22 -05:00
serve, single-file and readability-extractor install from a committed lockfile (#912)
They were installed with `npm i -g`, which pinned only the three top-level versions and resolved their 156 dependencies fresh from the registry, so a forged TLS certificate (as the eMudhra key compromise allowed) could change code WROLPi runs on every archive. npm-tools/package-lock.json pins every package with its sha512, and install_npm_tools.sh runs `npm ci` and links the commands into /usr/local/bin for every install path, upgrades, both images and the archive container. The app container's unpinned, unused global serve is removed. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
ecdad6c3e0
commit
d69f8317aa
12 changed files with 1838 additions and 32 deletions
|
|
@ -20,11 +20,8 @@ apt-get install -y $(cat /opt/wrolpi/debian-live-config/config/package-lists/wro
|
|||
node -v
|
||||
npm -v
|
||||
|
||||
# Install serve, and archiving tools. Check each independently so a present
|
||||
# single-file cannot mask a missing serve (which breaks wrolpi-app).
|
||||
command -v serve >/dev/null || sudo npm i -g serve@12.0.1
|
||||
single-file --version >/dev/null 2>&1 || sudo npm i -g single-file-cli@2.0.73
|
||||
command -v readability-extractor >/dev/null || sudo npm i -g readability-extractor@0.0.6
|
||||
# Install serve and the archiving tools from the committed lockfile.
|
||||
/opt/wrolpi/scripts/install_npm_tools.sh
|
||||
|
||||
# Install Deno runtime; single-file runs under it.
|
||||
command -v deno || {
|
||||
|
|
|
|||
18
scripts/install_npm_tools.sh
Executable file
18
scripts/install_npm_tools.sh
Executable file
|
|
@ -0,0 +1,18 @@
|
|||
#!/usr/bin/env bash
|
||||
# Usage: install_npm_tools.sh [NPM_TOOLS_DIR]
|
||||
#
|
||||
# Installs the npm command-line tools WROLPi runs (serve, single-file, readability-extractor) from the committed
|
||||
# npm-tools/package-lock.json. `npm ci` checks every package against its sha512 in the lockfile, so a forged TLS
|
||||
# certificate for the registry cannot change them; `npm i -g` resolved the whole dependency tree fresh. The commands
|
||||
# are linked into /usr/local/bin, where WROLPi, help.sh and the systemd units find them.
|
||||
set -e
|
||||
|
||||
NPM_TOOLS=${1:-$(dirname "$(dirname "$(realpath "$0")")")/npm-tools}
|
||||
|
||||
npm ci --prefix "${NPM_TOOLS}" --omit=dev --no-audit --no-fund
|
||||
# Remove the copies older WROLPi versions installed globally (in /usr/bin on Raspberry Pi OS) so they cannot be found
|
||||
# instead of these.
|
||||
npm rm -g serve single-file-cli readability-extractor >/dev/null 2>&1 || :
|
||||
for command in serve single-file readability-extractor; do
|
||||
ln -sf "${NPM_TOOLS}/node_modules/.bin/${command}" "/usr/local/bin/${command}"
|
||||
done
|
||||
|
|
@ -20,11 +20,8 @@ apt-get install -y $(cat /opt/wrolpi/pi-gen/stage2/04-wrolpi/01-packages-nr)
|
|||
node -v
|
||||
npm -v
|
||||
|
||||
# Install serve, and archiving tools. Check each independently so a present
|
||||
# single-file cannot mask a missing serve (which breaks wrolpi-app).
|
||||
command -v serve >/dev/null || sudo npm i -g serve@12.0.1
|
||||
single-file --version >/dev/null 2>&1 || sudo npm i -g single-file-cli@2.0.73
|
||||
command -v readability-extractor >/dev/null || sudo npm i -g readability-extractor@0.0.6
|
||||
# Install serve and the archiving tools from the committed lockfile.
|
||||
/opt/wrolpi/scripts/install_npm_tools.sh
|
||||
|
||||
# Install Deno runtime; single-file runs under it.
|
||||
command -v deno || {
|
||||
|
|
|
|||
|
|
@ -216,20 +216,9 @@ upgrade_deno() {
|
|||
|
||||
upgrade_deno || echo "Deno upgrade failed, continuing..."
|
||||
|
||||
# Upgrade single-file to the pinned version; old versions (1.x) create compressed Archives without
|
||||
# the SingleFile comment header in the prelude, which WROLPi cannot validate.
|
||||
# readability-extractor is pinned alongside it to match the install scripts.
|
||||
upgrade_singlefile() {
|
||||
SINGLE_FILE_VERSION="2.0.73"
|
||||
if [ "$(single-file --version 2>/dev/null)" != "${SINGLE_FILE_VERSION}" ]; then
|
||||
echo "Upgrading single-file-cli to ${SINGLE_FILE_VERSION}..."
|
||||
npm i -g single-file-cli@${SINGLE_FILE_VERSION} readability-extractor@0.0.6
|
||||
else
|
||||
echo "single-file-cli ${SINGLE_FILE_VERSION} already installed"
|
||||
fi
|
||||
}
|
||||
|
||||
upgrade_singlefile || echo "single-file upgrade failed, continuing..."
|
||||
# Install serve and the archiving tools at the versions in the committed lockfile; old single-file versions (1.x)
|
||||
# create compressed Archives without the SingleFile comment header in the prelude, which WROLPi cannot validate.
|
||||
/opt/wrolpi/scripts/install_npm_tools.sh || echo "npm tools install failed, continuing..."
|
||||
|
||||
# Clear Python bytecode cache before upgrading packages.
|
||||
echo "Clearing Python bytecode cache..."
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue