68ab12f77d
* Share the git URL check between theme-install and plugin-add Both commands clone a URL a stranger can choose, and each carried its own copy of the rule that refuses a git option or a `<helper>::<address>` transport helper before cloning. Two copies of a security check drift: the second one arrived four months after the first, and only because someone went looking for it. The rule now lives in omarchy-git-url-check and the callers ask it. Its absence refuses the URL rather than waving it through, since the callers read a non-zero status as a refusal and a missing command exits 127. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Co-Authored-By: Codex XHigh <noreply@openai.com> * Refuse a git URL naming a transport Omarchy does not clone from `<helper>::<address>` is only one of the two ways a URL reaches a remote helper. git also resolves git-remote-<scheme> for `<scheme>://<address>` whenever the scheme is not one it connects itself, so `ext::sh -c id` and `ext://sh -c id` arrive at the same helper while only the first was refused. That shape cannot be refused outright, because it is also how every legitimate URL arrives, so the scheme is checked against the transports git still connects itself. `git+ssh` and `ssh+git` are on that list: they are spelled like a helper and read as plain ssh, and leaving them off would refuse a URL that clones today. `ext` and `fd` are off it deliberately -- git ships a helper for each, and `ext` runs whatever command the URL carries. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Co-Authored-By: Codex XHigh <noreply@openai.com> --------- Co-authored-by: David Heinemeier Hansson <david@hey.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com> Co-authored-by: Codex XHigh <noreply@openai.com>
80 lines
3.1 KiB
Bash
Executable File
80 lines
3.1 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
# omarchy-git-url-check decides which URLs omarchy-theme-install and
|
|
# omarchy-plugin-add are willing to hand to `git clone`. git resolves a remote
|
|
# helper -- a program it runs at clone time -- from exactly two URL shapes,
|
|
# `<helper>::<address>` and `<scheme>://<address>`, so those are the two shapes
|
|
# asserted here, alongside every legitimate form a user is likely to paste.
|
|
|
|
source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
|
|
|
|
check() {
|
|
"$ROOT/bin/omarchy-git-url-check" "$@" 2>&1
|
|
}
|
|
|
|
# `<helper>::<address>`, the shape that runs a program. `ext::` is the dangerous
|
|
# one: git runs the rest as a shell command once protocol.ext.allow permits it.
|
|
for url in "ext::sh -c id" "fd::0,1" "gcrypt::x" "a+b::x" "a.b::x" "a-b::x" "1::x"; do
|
|
output=$(check "$url") &&
|
|
fail "omarchy-git-url-check refuses the transport helper '$url'" "$output"
|
|
grep -qF "names a git option or transport helper" <<<"$output" ||
|
|
fail "omarchy-git-url-check names the helper rejection for '$url'" "$output"
|
|
done
|
|
|
|
pass "a <helper>::<address> URL is refused"
|
|
|
|
# `<scheme>://<address>`, the shape #8067 left open: git looks up
|
|
# git-remote-<scheme> for any scheme it does not implement itself, so an
|
|
# allowlist is the only form of this check that holds.
|
|
for url in "ext://sh -c id" "fd://17" "gcrypt://example.com/x" "zzz://a" "ZZZ://a" "HTTPS://github.com/a/b"; do
|
|
output=$(check "$url") &&
|
|
fail "omarchy-git-url-check refuses the '$url' transport" "$output"
|
|
grep -qF "which Omarchy does not clone from" <<<"$output" ||
|
|
fail "omarchy-git-url-check names the transport rejection for '$url'" "$output"
|
|
done
|
|
|
|
pass "a <scheme>://<address> URL outside git's own transports is refused"
|
|
|
|
# A leading dash is an option to git, not a URL.
|
|
for url in "-x" "--upload-pack=touch /tmp/pwned" "-oProxyCommand=x"; do
|
|
output=$(check "$url") &&
|
|
fail "omarchy-git-url-check refuses the option '$url'" "$output"
|
|
done
|
|
|
|
pass "a URL shaped like a git option is refused"
|
|
|
|
output=$(check "") && fail "omarchy-git-url-check refuses an empty URL" "$output"
|
|
output=$(check) && fail "omarchy-git-url-check refuses a missing URL" "$output"
|
|
|
|
pass "an empty URL is refused"
|
|
|
|
# Everything a user actually pastes. The scp-style forms carry a single colon,
|
|
# which git never reads as a helper, and the IPv6 host carries `::` inside
|
|
# brackets rather than at the start.
|
|
for url in \
|
|
"https://github.com/acme/omarchy-weather.git" \
|
|
"http://example.com/a/b.git" \
|
|
"https://user:token@github.com/acme/repo.git" \
|
|
"ssh://git@github.com/acme/repo.git" \
|
|
"ssh://git@[2001:db8::1]:22/org/repo.git" \
|
|
"git://example.com/repo.git" \
|
|
"git+ssh://git@example.com/acme/repo.git" \
|
|
"ssh+git://git@example.com/acme/repo.git" \
|
|
"ftp://example.com/repo.git" \
|
|
"ftps://example.com/repo.git" \
|
|
"file:///home/me/repo" \
|
|
"git@github.com:acme/repo.git" \
|
|
"git@[2001:db8::1]:org/repo.git" \
|
|
"host:-s/foo.git" \
|
|
"/home/me/repo" \
|
|
"./repo" \
|
|
"../repo" \
|
|
"repo"; do
|
|
output=$(check "$url") ||
|
|
fail "omarchy-git-url-check accepts the legitimate URL '$url'" "$output"
|
|
done
|
|
|
|
pass "the URL forms a user pastes are accepted"
|