diff --git a/verify.py b/verify.py index a04a3ae..8d7330c 100755 --- a/verify.py +++ b/verify.py @@ -28,15 +28,14 @@ def collect_user_dirs(): def last_commit_for(dir: Path, ref: git.Reference): """Returns the Git commit signature for the last commit on this path.""" - last_commit_hash = str(ref.repo.git.rev_list("--max-count=1", ref, dir)) + last_commit_hash = str(ref.repo.git.rev_list("--max-count=1", action_ref, dir)) return ref.repo.commit(last_commit_hash) def keylist_to_principals(keyfile_text: str, email: str) -> str: - # trailing newline, otherwise git may get confused and reject the key return "\n".join( f"{email} {public_key}" for public_key in keyfile_text.splitlines() - ) + "\n" + ) def get_forgejo_keys(username: str) -> str: @@ -54,8 +53,7 @@ def verify_dir(dir: Path, ref: git.Reference): raise Exception("Missing keyfile") commit = last_commit_for(dir, ref) log.debug(f"Found last commit: {commit.name_rev}") - # ignore author casing - if commit.author.name.lower() != username.lower(): + if commit.author.name != username: raise Exception( f"Commit author {commit.author.name} is not the owner of this directory." ) @@ -82,10 +80,9 @@ def verify_dir(dir: Path, ref: git.Reference): config.set_value("gpg.ssh", "allowedSignersFile", temp_keyfile.name) temp_keyfile_contents = keylist_to_principals(remote_keys, email) + log.debug(f"temp keyfile:\n{temp_keyfile_contents}") temp_keyfile.write(temp_keyfile_contents) temp_keyfile.flush() - - log.debug(f"temp keyfile:\n{Path(temp_keyfile.name).read_text()}") # Check whether one of the user keys signed this commit. # throws an exception automatically if verification fails, nothing else to do ref.repo.git.verify_commit("--raw", commit.hexsha) @@ -101,18 +98,7 @@ def verify_dir(dir: Path, ref: git.Reference): def current_ref(repo: git.Repo) -> git.Reference: - log.debug(f"{repo.references}") - # some of this logic stolen from https://code.forgejo.org/actions/checkout/src/branch/main/src/ref-helper.ts - the ref names github provides are beyond fucked - global action_ref - if (action_ref.startswith('refs/heads/')): - branch = action_ref.removeprefix('refs/heads/') - action_ref = branch - # refs/pull/ - elif (action_ref.startswith('refs/pull/')): - branch = action_ref.removeprefix('refs/pull/') - action_ref = f'refs/remotes/pull/{branch}' - - for ref in repo.refs: + for ref in repo.references: if ref.name == action_ref or ref.path == action_ref: return ref raise Exception(f"No ref named {action_ref} found")