github2gerrit 1.4.4__tar.gz → 2.0.0__tar.gz

{github2gerrit-1.4.4 → github2gerrit-2.0.0}/.pre-commit-config.yaml

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: 2025 The Linux Foundation
 
 ci:
+  autofix_prs: false
   # pre-commit.ci sandbox prevents network calls; aislop runs engines
   # that can call the network at scan time, so it cannot run there
   # either. gha-workflow-linter validates action calls over the
@@ -63,7 +64,7 @@ repos:
         types: [yaml]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 2700fd5671c633760d912769c041bfcde2b9a01b  # frozen: v0.15.22
+    rev: 65dbdb59d2f2d9c3bdc343c566821ad3319ddaa3  # frozen: v0.16.3
     hooks:
       - id: ruff
         files: ^(src|scripts|tests)/.+\.py$
@@ -72,7 +73,7 @@ repos:
         files: ^(src|scripts|tests)/.+\.py$
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 41e691678310dfd3833f7ab4e180ddb014310356  # frozen: v2.3.0
+    rev: 7ff8d35ae36a7d2b968f2f90b4c723e292e594ee  # frozen: v2.3.1
     hooks:
       - id: mypy
         files: ^src/.+\.py$
@@ -119,13 +120,13 @@ repos:
 
   # Requires a mirror, primary repo lacks .pre-commit-hooks.yaml
   - repo: https://github.com/DetachHead/basedpyright-prek-mirror
-    rev: d55eabd2531b4f4a4c49c30fba627ce3a636ab79  # frozen: 1.39.9
+    rev: 3c94d276aa3005fa1f5a977946c9dc106135c083  # frozen: 1.39.10
     hooks:
       - id: basedpyright
         files: ^src/.+\.py$
 
   - repo: https://github.com/lfreleng-actions/gha-workflow-linter
-    rev: cec679e88cd818179079f52925ba80b9e6cb705c  # frozen: v1.2.3
+    rev: 7f11ad46be1cd2b3d778428d40fcb09309bb3be5  # frozen: v1.4.1
     hooks:
       - id: gha-workflow-linter
 
@@ -141,12 +142,12 @@ repos:
         name: aislop
         entry: aislop ci --human
         language: node
-        additional_dependencies: ["aislop@0.13.1"]
+        additional_dependencies: ["aislop@0.14.1"]
         pass_filenames: false
         always_run: true
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 1a4bb160cab6417b3045e1b37b6b72449243e658  # frozen: 0.37.4
+    rev: c4654a7e007c9619a5eb63c39a456572a0fa1851  # frozen: 0.38.0
     hooks:
       - id: check-github-actions
       - id: check-github-workflows

{github2gerrit-1.4.4 → github2gerrit-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: github2gerrit
-Version: 1.4.4
+Version: 2.0.0
 Summary: Submit a GitHub pull request to a Gerrit repository.
 Project-URL: Homepage, https://github.com/lfreleng-actions/github2gerrit-action
 Project-URL: Repository, https://github.com/lfreleng-actions/github2gerrit-action
@@ -235,7 +235,7 @@ uvx github2gerrit https://github.com/onap/portal-ng-bff/pull/33
 | `GERRIT_HTTP_PASSWORD`      | No       | `""`             | Gerrit HTTP password/token for REST queries                    |
 | `ORGANIZATION`              | No       | repository owner | GitHub organization/owner used for credential derivation       |
 | `PR_NUMBER`                 | No       | `"0"`            | PR number to process; `0` processes all open PRs (dispatch)    |
-| `FETCH_DEPTH`               | No       | `"10"`           | Fetch depth for checkout                                       |
+| `FETCH_DEPTH`               | No       | `"10"`           | Git history depth: PR fetch, push checkout, reconciliation     |
 | `SUBMIT_SINGLE_COMMITS`     | No       | `"false"`        | Submit one commit at a time to Gerrit                          |
 | `USE_PR_AS_COMMIT`          | No       | `"false"`        | Use PR title and body as the commit message                    |
 | `PRESERVE_GITHUB_PRS`       | No       | `"true"`         | Do not close GitHub PRs after pushing to Gerrit                |
@@ -312,7 +312,7 @@ Input defaults match the composite action defaults.
 | `G2G_USE_SSH_AGENT`         | boolean | `true`           | Use SSH agent instead of file-based keys         |
 | `ORGANIZATION`              | string  | repository owner | GitHub organization/owner                        |
 | `PR_NUMBER`                 | string  | `"0"`            | PR to process on dispatch; `0` processes all     |
-| `FETCH_DEPTH`               | string  | `"10"`           | Fetch depth for checkout                         |
+| `FETCH_DEPTH`               | string  | `"10"`           | Git depth: PR, push, reconciliation              |
 | `SUBMIT_SINGLE_COMMITS`     | boolean | `false`          | Submit one commit at a time                      |
 | `USE_PR_AS_COMMIT`          | boolean | `false`          | Use PR title and body as the commit message      |
 | `PRESERVE_GITHUB_PRS`       | boolean | `true`           | Do not close GitHub PRs after pushing            |

{github2gerrit-1.4.4 → github2gerrit-2.0.0}/README.md

@@ -189,7 +189,7 @@ uvx github2gerrit https://github.com/onap/portal-ng-bff/pull/33
 | `GERRIT_HTTP_PASSWORD`      | No       | `""`             | Gerrit HTTP password/token for REST queries                    |
 | `ORGANIZATION`              | No       | repository owner | GitHub organization/owner used for credential derivation       |
 | `PR_NUMBER`                 | No       | `"0"`            | PR number to process; `0` processes all open PRs (dispatch)    |
-| `FETCH_DEPTH`               | No       | `"10"`           | Fetch depth for checkout                                       |
+| `FETCH_DEPTH`               | No       | `"10"`           | Git history depth: PR fetch, push checkout, reconciliation     |
 | `SUBMIT_SINGLE_COMMITS`     | No       | `"false"`        | Submit one commit at a time to Gerrit                          |
 | `USE_PR_AS_COMMIT`          | No       | `"false"`        | Use PR title and body as the commit message                    |
 | `PRESERVE_GITHUB_PRS`       | No       | `"true"`         | Do not close GitHub PRs after pushing to Gerrit                |
@@ -266,7 +266,7 @@ Input defaults match the composite action defaults.
 | `G2G_USE_SSH_AGENT`         | boolean | `true`           | Use SSH agent instead of file-based keys         |
 | `ORGANIZATION`              | string  | repository owner | GitHub organization/owner                        |
 | `PR_NUMBER`                 | string  | `"0"`            | PR to process on dispatch; `0` processes all     |
-| `FETCH_DEPTH`               | string  | `"10"`           | Fetch depth for checkout                         |
+| `FETCH_DEPTH`               | string  | `"10"`           | Git depth: PR, push, reconciliation              |
 | `SUBMIT_SINGLE_COMMITS`     | boolean | `false`          | Submit one commit at a time                      |
 | `USE_PR_AS_COMMIT`          | boolean | `false`          | Use PR title and body as the commit message      |
 | `PRESERVE_GITHUB_PRS`       | boolean | `true`           | Do not close GitHub PRs after pushing            |

{github2gerrit-1.4.4 → github2gerrit-2.0.0}/action.yaml

@@ -19,18 +19,13 @@ inputs:
     required: false
     default: "false"
   FETCH_DEPTH:
-    description: "Fetch depth for checkout"
-    required: false
-    default: "10"
-  SKIP_CHECKOUT:
     description: >-
-      Skip the internal repository checkout. Set when the caller has
-      already checked out the target repository at the desired ref
-      (e.g. the bundled reusable workflow, which also checks out this
-      action into the workspace and must not have it deleted by a
-      nested checkout)
+      Depth of git history fetched. Applied to the tool's own fetch of
+      refs/pull/<N>/head, to the push-event checkout, and as the git log
+      window used to find merged commits during PR reconciliation, so
+      raising it widens how far back a merged change is matched
     required: false
-    default: "false"
+    default: "10"
   PR_NUMBER:
     description: "Pull request number to process, use 0 to process all open"
     required: false
@@ -213,19 +208,32 @@ runs:
           echo "disabled=false" >> "$GITHUB_OUTPUT"
         fi
 
-    - name: "Checkout repository"
-      # yamllint disable-line rule:line-length
-      if: steps.disabled-check.outputs.disabled != 'true' && inputs.SKIP_CHECKOUT != 'true'
+    - name: "Checkout repository (push events)"
+      # Push runs reconcile merged Gerrit changes back to their GitHub
+      # PRs, which reads commit trailers with a local `git show` in the
+      # working directory. Pull request runs need no checkout: the tool
+      # fetches refs/pull/<N>/head into its own temporary directory, and
+      # checking a fork head out here would both fail under
+      # pull_request_target and expose a fork-controlled .gitreview.
+      if: >-
+        steps.disabled-check.outputs.disabled != 'true'
+        && github.event_name == 'push'
       # yamllint disable-line rule:line-length
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
       with:
         fetch-depth: ${{ inputs.FETCH_DEPTH }}
-        # Ensure we are on the PR's head SHA when triggered by PR events
-        ref: ${{ github.event.pull_request.head.sha || github.sha }}
-        # The action authenticates to Gerrit over SSH and to GitHub via an
-        # explicit GITHUB_TOKEN env var, so the checkout token does not need
-        # to be persisted into the local git config.
+        # The action authenticates to Gerrit over SSH and to GitHub via
+        # an explicit GITHUB_TOKEN env var, so the checkout token does
+        # not need to be persisted into the local git config.
         persist-credentials: false
+        # Callers may place files in the workspace that this action
+        # depends on. The bundled reusable workflow checks the action
+        # itself out to .g2g-action and then runs it from there, so a
+        # cleaning checkout would delete the action mid-run. That
+        # workflow also seeds the workspace root with the target
+        # repository first, because actions/checkout wipes a directory
+        # that is not already a git repository whatever `clean` says.
+        clean: false
 
     - name: "Setup Python"
       if: steps.disabled-check.outputs.disabled != 'true'
@@ -237,7 +245,7 @@ runs:
     - name: "Setup uv"
       if: steps.disabled-check.outputs.disabled != 'true'
       # yamllint disable-line rule:line-length
-      uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990  # v8.3.2
+      uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d  # v10.0.1
       with:
         enable-cache: false
 
@@ -396,6 +404,11 @@ runs:
         GITHUB_SHA: ${{ github.sha }}
         GITHUB_BASE_REF: ${{ github.base_ref }}
         GITHUB_HEAD_REF: ${{ github.head_ref }}
+        # Full owner/repo of the PR head. Differs from GITHUB_REPOSITORY
+        # for fork pull requests, whose tree must not influence Gerrit
+        # target resolution.
+        # yamllint disable-line rule:line-length
+        PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
         GITHUB_ACTOR: ${{ github.actor }}
         SYNC_ALL_OPEN_PRS: ${{ steps.extract.outputs.sync_all }}
         PR_NUMBER: ${{ steps.extract.outputs.pr_number }}

{github2gerrit-1.4.4 → github2gerrit-2.0.0}/docs/cli.md

@@ -84,7 +84,7 @@ set by GitHub Actions) and undergo proper boolean parsing.
 | `--preserve-github-prs/--no-preserve-github-prs` | `PRESERVE_GITHUB_PRS`   | `true`  | Do not close GitHub PRs after pushing to Gerrit                                |
 | `--close-merged-prs/--no-close-merged-prs`       | `CLOSE_MERGED_PRS`      | `true`  | Close GitHub PRs when corresponding Gerrit changes merge                       |
 | `--force`                                        | `FORCE`                 | `false` | Force PR closure regardless of Gerrit change status (abandoned, etc.)          |
-| `--fetch-depth INTEGER`                          | `FETCH_DEPTH`           | `10`    | Fetch depth for checkout                                                       |
+| `--fetch-depth INTEGER`                          | `FETCH_DEPTH`           | `10`    | Git history depth: PR fetch, push checkout, reconciliation window              |
 | `--reviewers-email TEXT`                         | `REVIEWERS_EMAIL`       | `""`    | Email address(es) of reviewers (comma-separated)                               |
 | `--organization TEXT`                            | `ORGANIZATION`          | unset   | Organization (defaults to `GITHUB_REPOSITORY_OWNER` when unset)                |
 | `--github-actor TEXT`                            | `GITHUB_ACTOR`          | `""`    | GitHub actor (username) who triggered the workflow                             |

{github2gerrit-1.4.4 → github2gerrit-2.0.0}/docs/features.md

@@ -16,6 +16,7 @@ action in detail. For a quick start and the full inputs table, see the
 - [Closing Merged PRs](#closing-merged-prs)
 - [Automatic Cleanup](#automatic-cleanup)
 - [Restricting PRs to Automation Tools](#restricting-prs-to-automation-tools)
+- [Fork Pull Requests](#fork-pull-requests)
 - [Duplicate Detection](#duplicate-detection)
 - [Commit Message Normalization](#commit-message-normalization)
 - [Change-ID Reconciliation](#change-id-reconciliation)
@@ -284,6 +285,74 @@ Set `AUTOMATION_ONLY: "false"` to accept PRs from all users:
     GERRIT_SSH_PRIVKEY_G2G: ${{ secrets.GERRIT_SSH_PRIVKEY_G2G }}
 ```
 
+## Fork Pull Requests
+
+A pull request raised from a fork carries a tree that someone without write
+access to the base repository wrote. The tool treats that tree as untrusted
+input.
+
+### No runner checkout for pull requests
+
+The action does not check the target repository out into the runner workspace
+for pull request events. It fetches `refs/pull/<N>/head` into a private
+temporary directory instead. That ref lives on the base repository and resolves
+fork pull request heads, so the tool never contacts the fork directly.
+
+This sidesteps the `pull_request_target` checkout restriction that
+`actions/checkout` enforces, and keeps fork content out of the working
+directory, where the tool might otherwise read it as configuration.
+
+Push events still check the repository out. Those runs reconcile merged Gerrit
+changes back to their GitHub pull requests, which reads commit trailers from
+the working directory. A push carries no fork content, so the checkout is safe
+there.
+
+### Gerrit target resolution
+
+For fork pull requests the tool ignores any `.gitreview` in the pull request
+tree and resolves against the **base repository** instead. A fork could
+otherwise redirect the push to a different Gerrit project simply by editing
+`.gitreview`.
+
+The tool applies the same treatment when it cannot establish where the pull
+request head lives. Specific-PR `workflow_dispatch` runs and direct URL
+invocations carry no pull request payload, and GitHub reports a null head
+repository for a deleted fork. The tool resolves provenance through the API
+where it can, and treats whatever remains unresolved as untrusted, so a missing
+signal never earns a fork unwarranted trust.
+
+Resolution order for a fork pull request:
+
+1. `.gitreview` from the base repository at the pull request's base branch,
+   via the GitHub API or `raw.githubusercontent.com`
+2. Explicit `GERRIT_SERVER` / `GERRIT_SERVER_PORT` / `GERRIT_PROJECT` inputs
+3. Per-organization configuration file
+4. Derivation from the organization name (`gerrit.[org].org`)
+
+The lookup stops at the base branch. It does not fall back to the repository
+default branch, and it does not read `.gitreview` through the API without an
+authoritative base ref, because either would answer for a branch the pull
+request does not target — and `.gitreview` outranks the explicit inputs.
+
+The base repository's copy carries the same authority and lies outside an
+attacker's reach, so this costs no accuracy. Skipping straight to derivation
+would instead guess the Gerrit project name, and that guess goes wrong for
+repositories whose name contains a hyphen that does not mark a path separator.
+
+For the same reason, the tool drops branch names that originate in the fork
+(`GITHUB_HEAD_REF` and the pull request head ref) from base-repository
+lookups. Duplicate detection, which resolves `.gitreview` independently and
+earlier, applies the same rule.
+
+Same-repository pull requests keep their previous behaviour and still read
+`.gitreview` from the pull request tree.
+
+### Approval gating
+
+The tool does not yet require a maintainer approval before it transfers a fork
+pull request to Gerrit. Until it does, use `AUTOMATION_ONLY` (see above) to
+control which pull requests the tool accepts.
+
 ## Duplicate Detection
 
 Duplicate detection uses a scoring-based approach. The detector compares the

{github2gerrit-1.4.4 → github2gerrit-2.0.0}/pyproject.toml

@@ -139,6 +139,11 @@ ignore = [
 "sitecustomize.py" = ["S110", "SIM103", "SIM105", "PLW2901"]
 "src/github2gerrit/duplicate_detection.py" = ["S310"]
 "src/github2gerrit/gerrit_rest.py" = ["S310", "TRY301"]
+# S310 audits urlopen for non-HTTP schemes such as file:. This module
+# builds the URL from a literal https://raw.githubusercontent.com/ prefix
+# and passes it through _validate_raw_url, which requires scheme https and
+# host raw.githubusercontent.com before the fetch runs.
+"src/github2gerrit/gitreview.py" = ["S310"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["github2gerrit"]

{github2gerrit-1.4.4 → github2gerrit-2.0.0}/src/github2gerrit/cli.py

@@ -961,7 +961,11 @@ def main(
         10,
         "--fetch-depth",
         envvar="FETCH_DEPTH",
-        help="Fetch depth for checkout.",
+        help=(
+            "Git history depth. Also the git log window for merged-PR "
+            "reconciliation, so lowering it narrows how far back a "
+            "merged change is matched."
+        ),
     ),
     gerrit_known_hosts: str = typer.Option(
         "",
@@ -1429,6 +1433,25 @@ def _finish_bulk_no_prs(
     return True  # Success (no failures because no work)
 
 
+def _head_repo_for_pr(pr: Any) -> str:
+    """Return the ``owner/repo`` of a PyGithub pull request's head.
+
+    Used in bulk mode, where each pull request carries its own
+    provenance rather than inheriting it from the triggering event.
+    Returns an empty string when unavailable.
+    """
+    head = getattr(pr, "head", None)
+    repo = getattr(head, "repo", None)
+    full_name = getattr(repo, "full_name", "")
+    return str(full_name or "").strip()
+
+
+def _ref_for_pr(pr: Any, side: str) -> str:
+    """Return ``pr.<side>.ref`` as a string, or empty when unavailable."""
+    end = getattr(pr, side, None)
+    return str(getattr(end, "ref", "") or "").strip()
+
+
 def _build_bulk_pr_tasks(
     gh: GitHubContext, prs_list: list[Any]
 ) -> list[tuple[Any, models.GitHubContext]]:
@@ -1439,6 +1462,10 @@ def _build_bulk_pr_tasks(
         if pr_number <= 0:
             continue
 
+        # Bulk runs are triggered by workflow_dispatch or a repository
+        # URL, so the outer context carries no PR refs. Take each pull
+        # request's own refs so .gitreview resolves against the branch
+        # the PR actually targets.
         per_ctx = models.GitHubContext(
             event_name=gh.event_name,
             event_action=gh.event_action,
@@ -1448,9 +1475,10 @@ def _build_bulk_pr_tasks(
             server_url=gh.server_url,
             run_id=gh.run_id,
             sha=gh.sha,
-            base_ref=gh.base_ref,
-            head_ref=gh.head_ref,
+            base_ref=_ref_for_pr(pr, "base") or gh.base_ref,
+            head_ref=_ref_for_pr(pr, "head") or gh.head_ref,
             pr_number=pr_number,
+            head_repo=_head_repo_for_pr(pr),
         )
         pr_tasks.append((pr, per_ctx))
     return pr_tasks
@@ -2154,40 +2182,51 @@ def _load_effective_inputs() -> Inputs:
 
 
 def _augment_pr_refs_if_needed(gh: GitHubContext) -> GitHubContext:
-    # When a target URL was provided via CLI, G2G_TARGET_URL contains
-    # the actual URL string. We use a truthy check (non-empty string is truthy)
-    # to detect when running in direct URL mode vs GitHub Actions CI mode.
-    if (
-        os.getenv("G2G_TARGET_URL")
-        and gh.pr_number
-        and (not gh.head_ref or not gh.base_ref)
-    ):
-        try:
-            client = build_client()
-            repo = get_repo_from_env(client)
-            pr_obj = get_pull(repo, int(gh.pr_number))
-            base_ref = str(
-                getattr(getattr(pr_obj, "base", object()), "ref", "") or ""
-            )
-            head_ref = str(
-                getattr(getattr(pr_obj, "head", object()), "ref", "") or ""
-            )
-            head_sha = str(
-                getattr(getattr(pr_obj, "head", object()), "sha", "") or ""
-            )
-            if base_ref:
-                os.environ["GITHUB_BASE_REF"] = base_ref
-                log.debug("Resolved base_ref via GitHub API: %s", base_ref)
-            if head_ref:
-                os.environ["GITHUB_HEAD_REF"] = head_ref
-                log.debug("Resolved head_ref via GitHub API: %s", head_ref)
-            if head_sha:
-                os.environ["GITHUB_SHA"] = head_sha
-                log.debug("Resolved head sha via GitHub API: %s", head_sha)
-            return _read_github_context()
-        except Exception as exc:
-            log.debug("Could not resolve PR refs via GitHub API: %s", exc)
-    return gh
+    """Fill in PR refs and provenance that the event context lacks.
+
+    Direct URL invocations and specific-PR ``workflow_dispatch`` runs
+    carry no pull request payload, so ``base_ref``, ``head_ref`` and
+    ``head_repo`` all arrive empty.  Provenance in particular must not
+    stay unknown: ``_read_gitreview`` treats an unresolved head
+    repository as untrusted, so leaving it blank needlessly forfeits the
+    PR tree's own ``.gitreview`` on same-repository pull requests.
+    """
+    needs_refs = not gh.head_ref or not gh.base_ref
+    needs_provenance = not gh.head_repo
+    if not gh.pr_number or not (needs_refs or needs_provenance):
+        return gh
+
+    # Deliberately not gated on event name. Pull request events populate
+    # both refs and provenance from the payload and so return above;
+    # anything still missing them here (workflow_dispatch, issue_comment,
+    # direct URL) needs the API regardless of how it was triggered.
+    try:
+        client = build_client()
+        repo = get_repo_from_env(client)
+        pr_obj = get_pull(repo, int(gh.pr_number))
+        base_ref = _ref_for_pr(pr_obj, "base")
+        head_ref = _ref_for_pr(pr_obj, "head")
+        head_repo = _head_repo_for_pr(pr_obj)
+        head_sha = str(
+            getattr(getattr(pr_obj, "head", object()), "sha", "") or ""
+        )
+        if base_ref:
+            os.environ["GITHUB_BASE_REF"] = base_ref
+            log.debug("Resolved base_ref via GitHub API: %s", base_ref)
+        if head_ref:
+            os.environ["GITHUB_HEAD_REF"] = head_ref
+            log.debug("Resolved head_ref via GitHub API: %s", head_ref)
+        if head_repo:
+            os.environ["PR_HEAD_REPO"] = head_repo
+            log.debug("Resolved head repository via GitHub API: %s", head_repo)
+        if head_sha:
+            os.environ["GITHUB_SHA"] = head_sha
+            log.debug("Resolved head sha via GitHub API: %s", head_sha)
+    except Exception as exc:
+        log.debug("Could not resolve PR refs via GitHub API: %s", exc)
+        return gh
+    else:
+        return _read_github_context()
 
 
 def _process_close_gerrit_change(
@@ -3019,6 +3058,31 @@ def _extract_pr_number(evt: dict[str, Any]) -> int | None:
     return None
 
 
+def _read_head_repo(evt: dict[str, Any]) -> str:
+    """Return the ``owner/repo`` of the pull request head repository.
+
+    Prefers the ``PR_HEAD_REPO`` environment variable supplied by the
+    composite action, falling back to the raw event payload so the CLI
+    behaves identically when invoked outside that wrapper.
+
+    Returns an empty string when the provenance cannot be established.
+    """
+    env_value = os.getenv("PR_HEAD_REPO", "").strip()
+    if env_value:
+        return env_value
+
+    pr = evt.get("pull_request")
+    if isinstance(pr, dict):
+        head = pr.get("head")
+        if isinstance(head, dict):
+            repo = head.get("repo")
+            if isinstance(repo, dict):
+                full_name = repo.get("full_name")
+                if isinstance(full_name, str):
+                    return full_name.strip()
+    return ""
+
+
 def _read_github_context() -> GitHubContext:
     event_name = os.getenv("GITHUB_EVENT_NAME", "")
     event_action = ""
@@ -3037,6 +3101,7 @@ def _read_github_context() -> GitHubContext:
 
     base_ref = os.getenv("GITHUB_BASE_REF", "")
     head_ref = os.getenv("GITHUB_HEAD_REF", "")
+    head_repo = _read_head_repo(evt)
 
     pr_number = _extract_pr_number(evt)
     if pr_number is None:
@@ -3056,6 +3121,7 @@ def _read_github_context() -> GitHubContext:
         base_ref=base_ref,
         head_ref=head_ref,
         pr_number=pr_number,
+        head_repo=head_repo,
     )
     return ctx
 

{github2gerrit-1.4.4 → github2gerrit-2.0.0}/src/github2gerrit/config.py

@@ -520,9 +520,26 @@ def _read_gitreview_host(repository: str | None = None) -> str | None:
     Delegates to the shared :mod:`github2gerrit.gitreview` module which
     consolidates all ``.gitreview`` parsing and fetching logic.
 
-    Checks the local workspace first (available after actions/checkout),
-    then falls back to fetching via raw.githubusercontent.com when a
-    GITHUB_REPOSITORY is set.
+    This runs during parameter derivation, before the pull request
+    context is read, so provenance comes from ``PR_HEAD_REPO`` as the
+    composite action exports it.
+
+    ``GITHUB_HEAD_REF`` is consulted only when the head is known to live
+    in the base repository.  A fork chooses its own branch name, and one
+    matching a real base-repository branch would otherwise select that
+    branch's host.  Keeping the head ref for a *trusted* head matters
+    too: :meth:`Orchestrator._read_gitreview` reads the head tree in
+    that case, and dropping it here would let derivation record one host
+    while the pipeline pushes to another.
+
+    Provenance that cannot be established counts as untrusted, so the
+    absent-signal case falls back to the base ref alone.
+
+    The local working-directory file is still read.  This layer cannot
+    tell a pull request the *tool* is processing from one the *workflow*
+    merely runs inside, so any attempt to skip it here also breaks
+    legitimate local reads.  See issue #386: the fix belongs with the
+    wider question of tracking where a configuration value came from.
 
     Args:
         repository: GitHub repository in owner/repo format (optional).
@@ -532,8 +549,26 @@ def _read_gitreview_host(repository: str | None = None) -> str | None:
         The host string from .gitreview, or None if unavailable.
     """
     from .gitreview import read_gitreview_host
-
-    return read_gitreview_host(repository)
+    from .models import head_repo_is_trusted
+
+    repo_full = (repository or os.getenv("GITHUB_REPOSITORY") or "").strip()
+    head_repo = os.getenv("PR_HEAD_REPO", "").strip()
+    trusted_head = head_repo_is_trusted(repo_full, head_repo)
+
+    branches: list[str] = []
+    if trusted_head:
+        head_ref = os.getenv("GITHUB_HEAD_REF", "").strip()
+        if head_ref:
+            branches.append(head_ref)
+    base_ref = os.getenv("GITHUB_BASE_REF", "").strip()
+    if base_ref:
+        branches.append(base_ref)
+
+    return read_gitreview_host(
+        repository,
+        branches=tuple(branches),
+        include_env_refs=False,
+    )
 
 
 def derive_gerrit_parameters(