Skip to content

fix(adopt): two real bugs found in a live adoption (ReDoS + slug-hyphen breakage) #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
githubrobbi merged 3 commits into from
Jul 20, 2026
Merged

fix(adopt): two real bugs found in a live adoption (ReDoS + slug-hyphen breakage) #47

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae0fd77
fix(adopt): stop catastrophic backtracking in the edition-bump regex
githubrobbi Jul 20, 2026
6646b43
fix(adopt): use Rust-ident-safe forms of the slug inside .rs files
githubrobbi Jul 20, 2026
03f077a
Merge branch 'main' into fix/adopt-redos-edition-regex
githubrobbi Jul 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions adopt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,22 @@ fi
say "3/6 Renaming the internal placeholder to '$SLUG'"
CAP="$(printf '%s' "${SLUG:0:1}" | tr '[:lower:]' '[:upper:]')${SLUG:1}"
UP="$(printf '%s' "$SLUG" | tr '[:lower:]' '[:upper:]')"
# Rust identifiers can't contain '-', but SLUG is validated as
# [a-z][a-z0-9-]* (kebab-case is the norm for crate/tool names). Package
# names and paths stay kebab-case (Cargo itself maps "foo-bar" -> the
# `foo_bar` module path at compile time); *.rs files need that mapping
# done here, or a hyphenated slug produces `use uffs-products_version;` -
# invalid syntax, silently breaking every copied tool crate.
SLUG_IDENT="${SLUG//-/_}"
CAP_IDENT="${CAP//-/_}"
UP_IDENT="${UP//-/_}"
# Only files we just created (never the user's own files).
git ls-files --others --exclude-standard -z | while IFS= read -r -d '' f; do
case "$f" in *.forge-suggested) continue ;; esac
perl -pi -e "s/acmex/${SLUG}/g; s/Acmex/${CAP}/g; s/ACMEX/${UP}/g" "$f" 2>/dev/null || true
case "$f" in
*.rs) perl -pi -e "s/acmex/${SLUG_IDENT}/g; s/Acmex/${CAP_IDENT}/g; s/ACMEX/${UP_IDENT}/g" "$f" 2>/dev/null || true ;;
*) perl -pi -e "s/acmex/${SLUG}/g; s/Acmex/${CAP}/g; s/ACMEX/${UP}/g" "$f" 2>/dev/null || true ;;
esac
done
# Path renames among the new files (deepest first)
while IFS= read -r -d '' p; do
Expand Down Expand Up @@ -326,7 +338,13 @@ else:
# the tool crates need edition 2024
def fix_edition(mm):
return mm.group(1) + '"2024"'
s = re.sub(r"(?ms)^(\[workspace\.package\](?:(?!^\[).*\n)*?edition\s*=\s*)\"20(?:15|18|21)\"",
# (?m) only - NOT (?ms). The `s` (DOTALL) flag makes `.` match `\n`, which
# turns the repeated `(?:(?!^\[).*\n)*?` group into catastrophic
# backtracking (ReDoS) whenever the tail fails to match - e.g. an adoptee
# whose workspace.package is already edition = "2024" (nothing to bump).
# Sibling regex three lines up (tbl_m, same idiom) never had `s` and never
# hung; this is the fix, not a rewrite.
s = re.sub(r"(?m)^(\[workspace\.package\](?:(?!^\[).*\n)*?edition\s*=\s*)\"20(?:15|18|21)\"",
fix_edition, s)

# 3. workspace.dependencies: add what is missing, merge features into what exists
Expand Down
Loading