mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-11-20 23:16:17 -05:00
An upgrade refuses to roll back to an older commit of the current branch (#910)
* An upgrade refuses to roll back to an older commit of the current branch upgrade.sh verifies the fetched commit's signature, but a signature proves a commit is WROLPi's, not that it is the newest; an intercepted fetch could serve an old signed release and the forced checkout would roll the device back to it. refuse_rollback stops when the target is an older commit of the branch the device is on (a detached HEAD from a release image counts as that branch). Branch switches, the same commit, and history the device does not contain (Debian 12 devices on debian12-final) are allowed, and -d allows a deliberate downgrade; it reaches the upgrade service through the env file. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * An upgrade also refuses a signed commit with a lower version from other history Ancestry alone only caught older commits in the device's own history; any other signed commit, such as debian12-final or an old experimental branch, passed. refuse_rollback now also compares wrolpi/version.txt, which is inside the signed tree, and refuses a lower or missing version. A force-pushed branch at the same or a higher version still upgrades. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Tests pin the two parts of refuse_rollback that only one rule catches An earlier commit of the same version is refused only by the ancestry check, and 0.30.10-beta after 0.30.3-beta only orders correctly with sort -V; the fixture's single-digit versions passed with either part removed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
fb3b959fff
commit
bde1209c63
3 changed files with 197 additions and 2 deletions
|
|
@ -31,6 +31,8 @@ A Debian 12 (bookworm) WROLPi stays on the final version for Debian 12; reinstal
|
|||
1. Run the upgrade script
|
||||
* `sudo /bin/bash /opt/wrolpi/upgrade.sh`
|
||||
* (If the upgrade script does not exist, run the installation script: `sudo /bin/bash /opt/wrolpi/install.sh`)
|
||||
* The upgrade refuses to move back to an older commit of the branch you are on. To downgrade on purpose,
|
||||
run `sudo /bin/bash /opt/wrolpi/upgrade.sh -d`.
|
||||
|
||||
## Upgrading a WROLPi Portable USB
|
||||
|
||||
|
|
|
|||
39
upgrade.sh
39
upgrade.sh
|
|
@ -5,16 +5,19 @@ Help() {
|
|||
# Display Help
|
||||
echo "Upgrade WROLPi API and App on this machine."
|
||||
echo
|
||||
echo "Syntax: upgrade.sh [-h] [-b BRANCH]"
|
||||
echo "Syntax: upgrade.sh [-h] [-b BRANCH] [-d]"
|
||||
echo "options:"
|
||||
echo "h Print this help."
|
||||
echo "b Upgrade from this git BRANCH (default: current branch, or 'release')."
|
||||
echo "d Allow a downgrade to an older commit of the current branch."
|
||||
echo
|
||||
}
|
||||
|
||||
BRANCH=""
|
||||
BRANCH_OVERRIDE=false
|
||||
while getopts ":hb:" option; do
|
||||
# The upgrade service reads this from the env file written below.
|
||||
ALLOW_DOWNGRADE=${ALLOW_DOWNGRADE:-false}
|
||||
while getopts ":hb:d" option; do
|
||||
case $option in
|
||||
h) # display Help
|
||||
Help
|
||||
|
|
@ -24,6 +27,9 @@ while getopts ":hb:" option; do
|
|||
BRANCH="${OPTARG}"
|
||||
BRANCH_OVERRIDE=true
|
||||
;;
|
||||
d)
|
||||
ALLOW_DOWNGRADE=true
|
||||
;;
|
||||
*) # invalid argument(s)
|
||||
echo "Error: Invalid option"
|
||||
exit 1
|
||||
|
|
@ -64,6 +70,7 @@ if [ -z "$WROLPI_UPGRADE_SERVICE" ]; then
|
|||
systemctl daemon-reload
|
||||
# Write branch config for the service.
|
||||
echo "BRANCH=${BRANCH}" >/tmp/wrolpi-upgrade.env
|
||||
echo "ALLOW_DOWNGRADE=${ALLOW_DOWNGRADE}" >>/tmp/wrolpi-upgrade.env
|
||||
chown wrolpi:wrolpi /tmp/wrolpi-upgrade.env
|
||||
# Start following journal in background (new entries only).
|
||||
journalctl -fn0 -u wrolpi-upgrade.service &
|
||||
|
|
@ -119,6 +126,32 @@ rollback_or_no_restart() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Refuses to move a checkout back to an older WROLPi on the branch it is already on. A signature proves a commit is
|
||||
# WROLPi's, not that it is the newest, so an intercepted fetch could otherwise roll a device back to an old signed
|
||||
# commit. Older means an ancestor of HEAD, or a lower wrolpi/version.txt (that file is inside the signed tree, and it
|
||||
# catches old signed commits from other history). A rewritten branch at the same or a higher version, a branch switch,
|
||||
# and the same commit are allowed; -d allows a deliberate downgrade. Debian 12 devices never reach this: they run the
|
||||
# upgrade.sh pinned at debian12-final.
|
||||
refuse_rollback() {
|
||||
local repo=$1 branch=$2 target=$3 current head head_version target_version
|
||||
[ "${ALLOW_DOWNGRADE}" = true ] && return 0
|
||||
current=$(git -C "${repo}" branch --show-current)
|
||||
# A detached HEAD (a device built from a release image) is on the branch it upgrades.
|
||||
[ -n "${current}" ] && [ "${current}" != "${branch}" ] && return 0
|
||||
head=$(git -C "${repo}" rev-parse HEAD)
|
||||
target=$(git -C "${repo}" rev-parse "${target}^{commit}")
|
||||
[ "${head}" = "${target}" ] && return 0
|
||||
head_version=$(git -C "${repo}" show "${head}:wrolpi/version.txt" 2>/dev/null | tr -d '[:space:]')
|
||||
target_version=$(git -C "${repo}" show "${target}:wrolpi/version.txt" 2>/dev/null | tr -d '[:space:]')
|
||||
if git -C "${repo}" merge-base --is-ancestor "${target}" "${head}" ||
|
||||
{ [ "${target_version}" != "${head_version}" ] &&
|
||||
[ "$(printf '%s\n%s\n' "${target_version}" "${head_version}" | sort -V | head -n1)" = "${target_version}" ]; }; then
|
||||
echo "ERROR: ${branch} (${target}, version ${target_version:-unknown}) is older than this WROLPi (${head}," \
|
||||
"version ${head_version}). Refusing to roll back; run upgrade.sh -d to allow it."
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Fetch the latest commits without modifying the working tree.
|
||||
git -C /opt/wrolpi fetch || exit 4
|
||||
|
||||
|
|
@ -141,6 +174,8 @@ if ! git -C /opt/wrolpi verify-commit origin/"${BRANCH}" 2>&1; then
|
|||
exit 5
|
||||
fi
|
||||
|
||||
refuse_rollback /opt/wrolpi "${BRANCH}" "origin/${BRANCH}" || exit 7
|
||||
|
||||
# Signature verified, safe to apply.
|
||||
PREVIOUS_HEAD=$(git -C /opt/wrolpi rev-parse HEAD)
|
||||
# Force the checkout so local working-tree changes (e.g. app/package-lock.json
|
||||
|
|
|
|||
158
wrolpi/test/test_upgrade_sh.py
Normal file
158
wrolpi/test/test_upgrade_sh.py
Normal file
|
|
@ -0,0 +1,158 @@
|
|||
"""
|
||||
Tests of the root upgrade.sh, which runs as root and swaps WROLPi's code.
|
||||
"""
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
import pytest
|
||||
|
||||
from wrolpi.vars import PROJECT_DIR
|
||||
|
||||
UPGRADE_SH = PROJECT_DIR / 'upgrade.sh'
|
||||
|
||||
|
||||
def _function(name: str) -> str:
|
||||
match = re.search(rf'^{name}\(\) \{{\n.*?^\}}\n', UPGRADE_SH.read_text(), re.MULTILINE | re.DOTALL)
|
||||
assert match, f'{name} is not defined in upgrade.sh'
|
||||
return match.group(0)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def repo(tmp_path):
|
||||
"""A checkout on `release` at the third of three commits (versions 0.1.0 to 0.3.0), plus commits from unrelated
|
||||
history: `orphan-old` (0.1.0), `orphan-same` (0.3.0), `orphan-new` (0.4.0) and `orphan-unversioned`."""
|
||||
path = tmp_path / 'repo'
|
||||
path.mkdir()
|
||||
|
||||
def git(*args):
|
||||
return subprocess.run(['git', '-C', str(path), *args], capture_output=True, text=True,
|
||||
check=True).stdout.strip()
|
||||
|
||||
git('init', '-q', '-b', 'release')
|
||||
git('config', 'user.email', 'test@test.com')
|
||||
git('config', 'user.name', 'Test')
|
||||
version = path / 'wrolpi/version.txt'
|
||||
version.parent.mkdir()
|
||||
|
||||
def commit(name, version_=None):
|
||||
if version_:
|
||||
version.write_text(f'{version_}\n')
|
||||
git('add', 'wrolpi/version.txt')
|
||||
git('commit', '-q', '--allow-empty', '--no-gpg-sign', '-m', name)
|
||||
git('tag', name)
|
||||
|
||||
for name, version_ in (('first', '0.1.0'), ('second', '0.2.0'), ('third', '0.3.0')):
|
||||
commit(name, version_)
|
||||
for name, version_ in (('orphan-old', '0.1.0'), ('orphan-same', '0.3.0'), ('orphan-new', '0.4.0')):
|
||||
git('checkout', '-q', '--orphan', name + '-branch')
|
||||
commit(name, version_)
|
||||
git('checkout', '-q', '--orphan', 'unversioned-branch')
|
||||
git('rm', '-q', '-r', '--cached', '.')
|
||||
version.unlink()
|
||||
commit('orphan-unversioned')
|
||||
git('checkout', '-q', '-f', 'release')
|
||||
yield path, git
|
||||
|
||||
|
||||
def _refuse_rollback(path, branch, target, allow_downgrade=False):
|
||||
script = _function('refuse_rollback') + f'refuse_rollback "{path}" "{branch}" "{target}"\n'
|
||||
env = {**os.environ, 'ALLOW_DOWNGRADE': 'true' if allow_downgrade else 'false'}
|
||||
return subprocess.run(['bash', '-c', script], env=env, capture_output=True, text=True)
|
||||
|
||||
|
||||
def test_refuse_rollback_older_commit_of_the_same_branch(repo):
|
||||
"""An older commit of the branch the device is on is a rollback, however validly it is signed."""
|
||||
path, _ = repo
|
||||
result = _refuse_rollback(path, 'release', 'second')
|
||||
assert result.returncode != 0
|
||||
assert 'Refusing to roll back' in result.stdout
|
||||
|
||||
|
||||
@pytest.mark.parametrize('target', ['third', 'release'])
|
||||
def test_refuse_rollback_allows_the_same_commit(repo, target):
|
||||
assert _refuse_rollback(repo[0], 'release', target).returncode == 0
|
||||
|
||||
|
||||
def test_refuse_rollback_allows_a_newer_commit(repo):
|
||||
path, git = repo
|
||||
git('checkout', '-q', '-B', 'release', 'first')
|
||||
assert _refuse_rollback(path, 'release', 'third').returncode == 0
|
||||
|
||||
|
||||
def test_refuse_rollback_allows_switching_branches(repo):
|
||||
"""Moving from master to release goes back in history, and is what the user asked for."""
|
||||
path, git = repo
|
||||
git('checkout', '-q', '-b', 'master')
|
||||
assert _refuse_rollback(path, 'release', 'second').returncode == 0
|
||||
|
||||
|
||||
def test_refuse_rollback_detached_head(repo):
|
||||
"""A device built from a release image starts on a detached HEAD; it is on the branch it upgrades."""
|
||||
path, git = repo
|
||||
git('checkout', '-q', '--detach', 'third')
|
||||
assert _refuse_rollback(path, 'release', 'second').returncode != 0
|
||||
assert _refuse_rollback(path, 'release', 'third').returncode == 0
|
||||
|
||||
|
||||
@pytest.mark.parametrize('target', ['orphan-same', 'orphan-new'])
|
||||
def test_refuse_rollback_allows_rewritten_history(repo, target):
|
||||
"""A force-pushed branch is not in the device's history; it is allowed when its version is not lower."""
|
||||
assert _refuse_rollback(repo[0], 'release', target).returncode == 0
|
||||
|
||||
|
||||
@pytest.mark.parametrize('target', ['orphan-old', 'orphan-unversioned'])
|
||||
def test_refuse_rollback_lower_version_from_other_history(repo, target):
|
||||
"""An old signed commit from other history (an old experimental branch) is a rollback by its version."""
|
||||
result = _refuse_rollback(repo[0], 'release', target)
|
||||
assert result.returncode != 0
|
||||
assert 'Refusing to roll back' in result.stdout
|
||||
|
||||
|
||||
def test_refuse_rollback_older_commit_with_the_same_version(repo):
|
||||
"""A version spans many commits, so only ancestry catches a rollback to an earlier commit of the same version."""
|
||||
path, git = repo
|
||||
git('commit', '-q', '--allow-empty', '--no-gpg-sign', '-m', 'fourth') # Still 0.3.0.
|
||||
result = _refuse_rollback(path, 'release', 'third')
|
||||
assert result.returncode != 0
|
||||
assert 'Refusing to roll back' in result.stdout
|
||||
|
||||
|
||||
@pytest.mark.parametrize('head_version,target_version,refused', [
|
||||
('0.30.3-beta', '0.30.10-beta', False),
|
||||
('0.30.10-beta', '0.30.3-beta', True),
|
||||
('0.9.0-beta', '0.10.0-beta', False),
|
||||
])
|
||||
def test_refuse_rollback_compares_versions_numerically(repo, head_version, target_version, refused):
|
||||
"""Versions compare by their numbers: a plain text sort puts 0.30.10 before 0.30.3."""
|
||||
path, git = repo
|
||||
version = path / 'wrolpi/version.txt'
|
||||
for name, version_ in (('target', target_version), ('head', head_version)):
|
||||
git('checkout', '-q', '--orphan', f'{name}-version-branch')
|
||||
version.write_text(f'{version_}\n')
|
||||
git('add', 'wrolpi/version.txt')
|
||||
git('commit', '-q', '--no-gpg-sign', '-m', name)
|
||||
git('tag', f'{name}-version')
|
||||
git('checkout', '-q', '-B', 'release', 'head-version')
|
||||
assert (_refuse_rollback(path, 'release', 'target-version').returncode != 0) is refused
|
||||
|
||||
|
||||
@pytest.mark.parametrize('target', ['second', 'orphan-old'])
|
||||
def test_refuse_rollback_allow_downgrade(repo, target):
|
||||
assert _refuse_rollback(repo[0], 'release', target, allow_downgrade=True).returncode == 0
|
||||
|
||||
|
||||
def test_upgrade_refuses_rollback_before_checkout():
|
||||
"""The check runs after the fetched commit's signature is verified, and before anything is checked out."""
|
||||
text = UPGRADE_SH.read_text()
|
||||
verify = text.index('verify-commit origin/"${BRANCH}"')
|
||||
refuse = text.index('refuse_rollback /opt/wrolpi')
|
||||
checkout = text.index('git checkout -f -B "${BRANCH}" "origin/${BRANCH}"')
|
||||
assert verify < refuse < checkout
|
||||
|
||||
|
||||
def test_allow_downgrade_reaches_the_upgrade_service():
|
||||
"""upgrade.sh hands the work to wrolpi-upgrade.service, which only sees what the env file carries."""
|
||||
text = UPGRADE_SH.read_text()
|
||||
assert re.search(r'getopts ":hb:d"', text)
|
||||
assert 'echo "ALLOW_DOWNGRADE=${ALLOW_DOWNGRADE}" >>/tmp/wrolpi-upgrade.env' in text
|
||||
Loading…
Add table
Add a link
Reference in a new issue