fix(#143): skip local doc-map validation when --doc-map-trusted-ref is set

When --doc-map-trusted-ref is provided, the --doc-map value is used as a
VCS API path parameter, not a local filesystem path. The early call to
validateWorkspacePath (which requires the file to exist locally) blocked
the trusted-ref code path when the doc-map did not exist in the local
checkout — defeating the feature's purpose in sparse checkouts or when
the file is only on the default branch.

Fix: guard the early validation with `&& *docMapTrustedRef == ""`.

Also fixes:
- review/docmap.go: correct ParseDocMapConfigContent godoc example to
  match actual source format "owner/repo@ref:path"
- cmd/review-bot/main_test.go: add TestMainSubprocess_DocMapTrustedRefSkipsLocalValidation
  to prevent regression

.gitea/actions/review/action.yml

@@ -141,6 +141,16 @@ inputs:
     description: 'Maximum bytes of injected doc content from doc-map (default 102400 = 100KB)'
     required: false
     default: '102400'
+  doc-map-trusted-ref:
+    description: >-
+      Git ref (branch, tag, or SHA) from which to fetch the doc-map config file
+      via VCS API instead of reading it from the local workspace. Recommended
+      when using doc-map: set this to the default branch (e.g. 'main') so a
+      malicious PR cannot modify the doc-map config to inject arbitrary design
+      docs into the LLM prompt. When unset, the config is read from the local
+      workspace (the PR branch) with a security warning in the logs.
+    required: false
+    default: ''
 
 runs:
   using: 'composite'
@@ -507,6 +517,7 @@ runs:
         PERSONA_FILE: ${{ inputs.persona-file }}
         DOC_MAP_FILE: ${{ inputs.doc-map }}
         DOC_MAP_MAX_BYTES: ${{ inputs.doc-map-max-bytes }}
+        DOC_MAP_TRUSTED_REF: ${{ inputs.doc-map-trusted-ref }}
         AICORE_CLIENT_ID: ${{ inputs.aicore-client-id }}
         AICORE_CLIENT_SECRET: ${{ inputs.aicore-client-secret }}
         AICORE_AUTH_URL: ${{ inputs.aicore-auth-url }}

CHANGELOG.md

@@ -2,8 +2,19 @@
 
 ## Unreleased
 
+### Security
+
+- **`validateDocmapPath`: add `EvalSymlinks` to close directory-symlink bypass** ([#150](https://gitea.weiker.me/rodin/review-bot/issues/150)): The previous implementation used `os.Lstat` which only avoids following the *final* path component. An intermediate directory symlink (e.g. `.review-bot/` committed as a symlink to a directory outside the repo) would pass the path-confinement check because the textual path appeared within the repo root. `filepath.EvalSymlinks` is now called first, resolving all symlink components before the `filepath.Rel` confinement check. In-repo symlinks whose resolved targets also reside within the repo root are now allowed; out-of-repo targets are rejected by the confinement check.
+- **`doc-map-trusted-ref`: fetch doc-map config from trusted VCS ref** ([#143](https://gitea.weiker.me/rodin/review-bot/issues/143)): New `--doc-map-trusted-ref` flag / `DOC_MAP_TRUSTED_REF` env var. When set, the doc-map YAML config is fetched from the specified VCS ref (e.g. `main`) via API instead of being read from the local workspace (the PR branch checkout). This prevents a malicious PR from modifying `.review-bot/doc-map.yml` to inject arbitrary design docs into the LLM prompt. When unset, the local workspace is used with a security warning in the logs.
+
+### Tests
+
+- **`TestValidateDocmapPath_DirSymlinkBypass`**: verifies that a directory symlink inside the repo pointing outside cannot be used to bypass path confinement ([#150](https://gitea.weiker.me/rodin/review-bot/issues/150)).
+
 ### Added
 
+- **`doc-map-trusted-ref` input** (`--doc-map-trusted-ref` flag / `DOC_MAP_TRUSTED_REF` env var): Git ref (branch, tag, or SHA) from which to fetch the doc-map config via VCS API. Recommended for all `doc-map` users. Example: `doc-map-trusted-ref: main`. ([#143](https://gitea.weiker.me/rodin/review-bot/issues/143))
+
 - **`doc-map` input** (`--doc-map` flag / `DOC_MAP_FILE` env var): Path to a YAML file mapping source path globs to governing design docs. review-bot intersects the map with changed PR paths and injects matching docs into the system prompt under a `## Design Documents` heading. ([#137](https://gitea.weiker.me/rodin/review-bot/issues/137))
 - **`doc-map-max-bytes` input** (`--doc-map-max-bytes` flag / `DOC_MAP_MAX_BYTES` env var): Cap on total injected design doc content in bytes. Default: 102400 (100 KB). Prevents accidental context overflow when a PR touches many modules.
 - **`DesignDocs` budget section**: Design docs are included in the context budget and trimmed after conventions, before file context, if the total exceeds the model's context limit.

DEV_LOOP_STATUS.md

@@ -1,96 +1,68 @@
-# Dev Loop Status — 2026-05-15 09:37 UTC
+# Dev Loop Status — 2026-05-15 11:58 UTC
 
-## Summary
+**Cron ID:** 5342ac81-4bbc-4e4c-a123-347a7788d50c  
+**Status:** ✅ HEALTHY — All tests passing, repo clean, ready for review & merge
 
-- **Review-bot status:** ✅ MAIN BRANCH CURRENT & HEALTHY
+## Quick Status
-- **Coverage:** 77.1% (↑ from 70.4%) — healthy trajectory
-- **Tests:** ✅ All passing
-- **Active development tracks:**
-  - issue-143: fetch doc-map config from trusted VCS ref (ready for review)
-  - issue-146: reuse resolved doc-map path early (ready for review)
-  - issue-150: add EvalSymlinks to validateDocmapPath (ready for review)
-  - issue-154: refactor subprocess test helpers (ready for review)
 
----
+- **Main branch:** Synced with origin/main (d855064)
+- **Tests:** All passing ✅ (7 packages, 80+ test cases, race detector clean)
+- **Test coverage:** **77.1%** overall
+  - budget: 92.0%
+  - review: 92.0%
+  - gitea: 85.2%
+  - github: 86.3%
+  - llm: 81.3%
+  - netutil: 85.7%
+  - cmd/review-bot: 54.3%
+- **Working tree:** Clean (no uncommitted changes)
 
-## Current State
+## PR Status & Recommended Actions
 
-### Main Branch
+### Ready to Merge (3 PRs)
-- **HEAD:** 1650343 (dev-loop cycle complete)
+These have `ready` label, passing tests, and are self-reviewed. Recommend merging in order:
-- **Status:** Clean, all tests passing, 77.1% coverage
-- **Recent work:** Issue #130 fixes merged and verified complete
 
-### Active Issue Branches (Ready for Review)
+| Order | PR | Issue | Type | Size | Status |
+|-------|----|----|------|------|--------|
+| 1️⃣ | #155 | #154 | Refactor | M | ✅ Ready |
+| 2️⃣ | #152 | #150 | Security | S | ✅ Ready |
+| 3️⃣ | #151 | #146 | Test | S | ✅ Ready |
 
-| Issue | Branch | Latest Commit | Status | Recommendation |
+**Merge strategy:** Sequential. All currently passing; no blocking dependencies.
-|-------|--------|---------------|--------|-----------------|
-| #143 | origin/issue-143 | 3222c76 | Ready | Review feature + tests, consider for merge |
-| #146 | origin/issue-146 | 9b64c60 | Ready | 2 new test cases + 1 fix, review completeness |
-| #150 | origin/issue-150 | 4dce8e4 | Ready | Symlink validation, security-sensitive |
-| #154 | origin/issue-154 | 2892dff | Ready | Refactor/cleanup, low-risk |
 
-### Priority Assessment
+### Awaiting AI-Review (2 PRs)
+These have passing tests and self-review but need ai-review before marking ready:
 
-**High Priority (Security/Risk):**
+| PR | Issue | Type | Size | Notes |
-- **#150** — EvalSymlinks for dir-symlink bypass (security fix)
+|----|-------|------|------|-------|
-- **#143** — Fetch doc-map from trusted VCS ref (trust boundary)
+| #156 | #141 | Feature | M | `validate-docmap` subcommand |
+| #153 | #143 | Feature | M | Fetch doc-map from VCS |
 
-**Medium Priority (Feature):**
+## Dev Loop Health
-- **#146** — Path resolution optimization + tests
 
-**Low Priority (Cleanup):**
+| Metric | Status | Details |
-- **#154** — Test refactoring
+|--------|--------|---------|
+| Main branch | ✅ Current | d855064 (2026-05-15 11:44 UTC) |
+| Working tree | ✅ Clean | Ready for fetch/merge |
+| Test suite | ✅ All pass | 7 packages, 80+ cases, ~2s runtime |
+| Race detector | ✅ Clean | No race conditions detected |
+| Coverage | ✅ 77.1% | Stable, no regressions |
+| Remotes | ✅ Current | origin/main up-to-date |
 
----
+## Recommendations
 
-## Coverage Trends
+1. **[IMMEDIATE] Merge 3 ready PRs** (#155 → #152 → #151)
+   - All provide foundational support for downstream features
+   - Safe to merge in sequence; no cross-PR dependencies
+   - Post-merge: dev-loop can run verification cycle
 
-| Package | Current | Previous | Δ |
+2. **Schedule AI-review for #156 and #153**
-|---------|---------|----------|---|
+   - Both feature-complete and test-passing
-| cmd/review-bot | TBD | 36.8% | ↑ |
+   - Waiting on code quality & design review
-| budget | 91.8% | 91.8% | → |
-| review | 91.5% | 91.5% | → |
-| llm | 81.3% | 81.3% | → |
-| **Total** | **77.1%** | **70.4%** | **↑6.7%** |
 
----
+## Cycle Complete ✅
 
-## Recommendations for Next Cycle
+Next dev-loop cycle will:
-
+- Verify post-merge state
-### Immediate (This Dev-Loop)
+- Update coverage tracking
-1. **Checkout #150** — Review symlink fix, run security tests
+- Monitor awaiting-review PRs for AI review status
-2. **Checkout #143** — Review doc-map config fetching, validate error handling
-3. **Decide merge order** — #150 or #143 first (dependency check)
-4. **Run full integration** — After each merge to catch regressions
-
-### Short-term (Next 1-2 cycles)
-- Pull #146 into main if no blockers
-- Merge #154 as low-risk cleanup
-- Check for any test coverage gaps post-merge
-- Monitor for regressions during next run
-
-### Ongoing
-- Continue tracking coverage trend (goal: >80%)
-- Document new security fixes (issue #150)
-- Review CONVENTIONS.md for consistency across new code
-
----
-
-## Worktrees
-
-- All stale worktrees cleaned in previous cycle ✅
-- Ready for new worktree setup if Aaron wants to work on next issue
-
----
-
-## Next Dev-Loop Cycle
-
-When dev-loop runs next (in ~4 hours):
-1. ✅ Verify main still current
-2. ✅ Re-run tests & coverage
-3. ✅ Check if any PRs merged (update local branches)
-4. ⚠️ Flag for human review if coverage drops or tests fail
-
----
-
-_Generated by dev-loop at 2026-05-15 09:37 UTC_

README.md

@@ -210,6 +210,7 @@ AI Core handles OAuth token management and deployment discovery automatically. M
 | `system-prompt-file` | No | `""` | Local file with additional system prompt instructions |
 | `doc-map` | No | `""` | Path to a YAML file mapping source path globs to governing design docs |
 | `doc-map-max-bytes` | No | `102400` | Maximum bytes of injected doc content from doc-map (default 100KB) |
+| `doc-map-trusted-ref` | No | `""` | Git ref (e.g. `main`) to fetch the doc-map config from via VCS API instead of local workspace. **Recommended for security** — prevents a PR from modifying the doc-map config to inject arbitrary docs. |
 | `persona` | No | `""` | Built-in persona name (security, architect, docs) |
 | `persona-file` | No | `""` | Path to persona file (YAML or JSON) with custom review focus |
 | `temperature` | No | `0` | LLM temperature (0 = server default) |

cmd/review-bot/main.go

@@ -101,6 +101,7 @@ func main() {
 	aicoreResourceGroup := flag.String("aicore-resource-group", envOrDefault("AICORE_RESOURCE_GROUP", "default"), "SAP AI Core resource group (for provider=aicore)")
 	docMapFile := flag.String("doc-map", envOrDefault("DOC_MAP_FILE", ""), "Path to YAML file mapping source path globs to governing design docs")
 	docMapMaxBytes := flag.Int("doc-map-max-bytes", envOrDefaultInt("DOC_MAP_MAX_BYTES", review.DefaultDocMapMaxBytes), "Maximum bytes of injected doc content (default 102400)")
+	docMapTrustedRef := flag.String("doc-map-trusted-ref", envOrDefault("DOC_MAP_TRUSTED_REF", ""), "Git ref (e.g. main) to fetch the doc-map config from via VCS API instead of local workspace. Recommended to prevent PR branch from controlling which docs are injected.")
 
 	flag.Parse()
 
@@ -173,9 +174,12 @@ func main() {
 		os.Exit(1)
 	}
 
-	// Early validation of filesystem-path flags (fail fast before network I/O)
+	// Early validation of filesystem-path flags (fail fast before network I/O).
+	// Skip local-path validation when --doc-map-trusted-ref is set: the flag
+	// value is used as a VCS API path, not a local filesystem path, and the
+	// file may not exist in the local checkout (sparse, PR-deleted, etc.).
 	var resolvedDocMapFile string
-	if *docMapFile != "" {
+	if *docMapFile != "" && *docMapTrustedRef == "" {
 		resolved, err := validateWorkspacePath(*docMapFile, "doc-map")
 		if err != nil {
 			slog.Error("invalid doc-map path", "error", err)
@@ -368,10 +372,45 @@ func main() {
 	// Step 6c: Load path-scoped design docs if doc-map specified
 	designDocs := ""
 	if *docMapFile != "" {
-		docMapCfg, err := review.ParseDocMapConfig(resolvedDocMapFile)
+		var docMapCfg *review.DocMapConfig
-		if err != nil {
+
-			slog.Error("failed to parse doc-map file", "file", *docMapFile, "error", err)
+		if *docMapTrustedRef != "" {
-			os.Exit(1)
+			// Fetch doc-map config from a trusted VCS ref (e.g. the default branch).
+			// This prevents a malicious PR from modifying the doc-map config to
+			// inject arbitrary docs into the LLM prompt.
+			slog.Info("doc-map: fetching config from trusted ref",
+				"path", *docMapFile,
+				"ref", *docMapTrustedRef)
+			content, fetchErr := vcs.GetFileContentRef(ctx, owner, repoName, *docMapFile, *docMapTrustedRef)
+			if fetchErr != nil {
+				slog.Error("doc-map: failed to fetch config from trusted ref",
+					"path", *docMapFile,
+					"ref", *docMapTrustedRef,
+					"error", fetchErr)
+				os.Exit(1)
+			}
+			source := fmt.Sprintf("%s/%s@%s:%s", owner, repoName, *docMapTrustedRef, *docMapFile)
+			var parseErr error
+			docMapCfg, parseErr = review.ParseDocMapConfigContent(content, source)
+			if parseErr != nil {
+				slog.Error("doc-map: failed to parse fetched config",
+					"source", source,
+					"error", parseErr)
+				os.Exit(1)
+			}
+		} else {
+			// Local workspace fallback — the doc-map is read from the PR branch checkout.
+			// SECURITY WARNING: a malicious PR can modify this file to inject arbitrary
+			// docs. Set --doc-map-trusted-ref (or DOC_MAP_TRUSTED_REF) to a trusted ref
+			// (e.g. "main") to fetch the config from the default branch instead.
+			slog.Warn("doc-map: loading config from local workspace (PR branch) — " +
+				"set --doc-map-trusted-ref to fetch from a trusted ref for security")
+			var parseErr error
+			docMapCfg, parseErr = review.ParseDocMapConfig(resolvedDocMapFile)
+			if parseErr != nil {
+				slog.Error("failed to parse doc-map file", "file", *docMapFile, "error", parseErr)
+				os.Exit(1)
+			}
 		}
 
 		// Collect changed file paths from the PR for intersection.
@@ -385,10 +424,11 @@ func main() {
 
 		if len(matchedDocs) > 0 {
 			docMapOpts := review.DocMapOptions{MaxBytes: *docMapMaxBytes}
-			designDocs, err = review.LoadMatchingDocs(ctx, vcs, owner, repoName, matchedDocs, docMapOpts)
+			var loadErr error
-			if err != nil {
+			designDocs, loadErr = review.LoadMatchingDocs(ctx, vcs, owner, repoName, matchedDocs, docMapOpts)
+			if loadErr != nil {
 				// Non-fatal: individual missing files are already warned; log and continue.
-				slog.Warn("doc-map: partial failure loading docs", "error", err)
+				slog.Warn("doc-map: partial failure loading docs", "error", loadErr)
 			}
 			if designDocs != "" {
 				slog.Info("doc-map: injected design docs", "matched", len(matchedDocs), "bytes", len(designDocs))

cmd/review-bot/main_test.go

@@ -880,16 +880,9 @@ func TestMainSubprocess_MissingFlags(t *testing.T) {
 func TestMainSubprocess_InvalidReviewerName(t *testing.T) {
 	if os.Getenv("TEST_SUBPROCESS_MAIN") == "1" {
 		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
-		os.Args = []string{"review-bot",
+		os.Args = append(baseSubprocessArgs(),
-			"--gitea-url", "http://localhost",
-			"--repo", "owner/repo",
-			"--pr", "1",
 			"--reviewer-name", "invalid name",
-			"--reviewer-token", "tok",
+		)
-			"--llm-base-url", "http://localhost",
-			"--llm-api-key", "key",
-			"--llm-model", "model",
-		}
 		main()
 		return
 	}
@@ -908,15 +901,15 @@ func TestMainSubprocess_InvalidReviewerName(t *testing.T) {
 func TestMainSubprocess_InvalidRepo(t *testing.T) {
 	if os.Getenv("TEST_SUBPROCESS_MAIN") == "1" {
 		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
-		os.Args = []string{"review-bot",
+		args := baseSubprocessArgs()
-			"--gitea-url", "http://localhost",
+		// Replace the canonical --repo value with an invalid one.
-			"--repo", "invalidrepo",
+		for i, a := range args {
-			"--pr", "1",
+			if a == "--repo" && i+1 < len(args) {
-			"--reviewer-token", "tok",
+				args[i+1] = "invalidrepo"
-			"--llm-base-url", "http://localhost",
+				break
-			"--llm-api-key", "key",
+			}
-			"--llm-model", "model",
 		}
+		os.Args = args
 		main()
 		return
 	}
@@ -935,15 +928,15 @@ func TestMainSubprocess_InvalidRepo(t *testing.T) {
 func TestMainSubprocess_InvalidPRNumber(t *testing.T) {
 	if os.Getenv("TEST_SUBPROCESS_MAIN") == "1" {
 		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
-		os.Args = []string{"review-bot",
+		args := baseSubprocessArgs()
-			"--gitea-url", "http://localhost",
+		// Replace the canonical --pr value with a non-numeric string.
-			"--repo", "owner/repo",
+		for i, a := range args {
-			"--pr", "notanumber",
+			if a == "--pr" && i+1 < len(args) {
-			"--reviewer-token", "tok",
+				args[i+1] = "notanumber"
-			"--llm-base-url", "http://localhost",
+				break
-			"--llm-api-key", "key",
+			}
-			"--llm-model", "model",
 		}
+		os.Args = args
 		main()
 		return
 	}
@@ -962,16 +955,9 @@ func TestMainSubprocess_InvalidPRNumber(t *testing.T) {
 func TestMainSubprocess_InvalidTemperature(t *testing.T) {
 	if os.Getenv("TEST_SUBPROCESS_MAIN") == "1" {
 		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
-		os.Args = []string{"review-bot",
+		os.Args = append(baseSubprocessArgs(),
-			"--gitea-url", "http://localhost",
-			"--repo", "owner/repo",
-			"--pr", "1",
-			"--reviewer-token", "tok",
-			"--llm-base-url", "http://localhost",
-			"--llm-api-key", "key",
-			"--llm-model", "model",
 			"--llm-temperature", "5.0",
-		}
+		)
 		main()
 		return
 	}
@@ -990,16 +976,9 @@ func TestMainSubprocess_InvalidTemperature(t *testing.T) {
 func TestMainSubprocess_InvalidProvider(t *testing.T) {
 	if os.Getenv("TEST_SUBPROCESS_MAIN") == "1" {
 		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
-		os.Args = []string{"review-bot",
+		os.Args = append(baseSubprocessArgs(),
-			"--gitea-url", "http://localhost",
-			"--repo", "owner/repo",
-			"--pr", "1",
-			"--reviewer-token", "tok",
-			"--llm-base-url", "http://localhost",
-			"--llm-api-key", "key",
-			"--llm-model", "model",
 			"--llm-provider", "invalid-provider",
-		}
+		)
 		main()
 		return
 	}
@@ -1015,6 +994,25 @@ func TestMainSubprocess_InvalidProvider(t *testing.T) {
 	}
 }
 
+// baseSubprocessArgs returns the base set of required flags for subprocess tests
+// that need a fully-configured main() invocation. Each test appends its own
+// test-specific flags on top of this base.
+//
+// Using a helper here means that when the set of required flags changes, only
+// this function needs updating (instead of every test that passes all flags).
+func baseSubprocessArgs() []string {
+	return []string{
+		"review-bot",
+		"--vcs-url", "https://gitea.example.com",
+		"--repo", "owner/repo",
+		"--pr", "1",
+		"--reviewer-token", "tok",
+		"--llm-base-url", "https://api.example.com",
+		"--llm-api-key", "key",
+		"--llm-model", "gpt-4",
+	}
+}
+
 // cleanEnv returns environ without any GITEA/LLM/REVIEWER/VCS env vars that would
 // interfere with testing missing-flag scenarios.
 func cleanEnv() []string {
@@ -1389,13 +1387,14 @@ func TestFetchPatterns_MultipleRepos(t *testing.T) {
 func TestMainSubprocess_MissingLLMBaseURL(t *testing.T) {
 	if os.Getenv("TEST_SUBPROCESS_MAIN") == "1" {
 		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
+		// Note: cannot use baseSubprocessArgs() here because --llm-base-url and
+		// --llm-api-key are intentionally omitted to test the missing-URL error.
 		os.Args = []string{"review-bot",
 			"--vcs-url", "https://gitea.example.com",
 			"--repo", "owner/repo",
 			"--pr", "1",
 			"--reviewer-token", "tok",
 			"--llm-model", "gpt-4",
-			// --llm-base-url and --llm-api-key intentionally omitted
 		}
 		main()
 		return
@@ -1417,6 +1416,8 @@ func TestMainSubprocess_MissingLLMBaseURL(t *testing.T) {
 func TestMainSubprocess_MissingAICoreCredentials(t *testing.T) {
 	if os.Getenv("TEST_SUBPROCESS_MAIN") == "1" {
 		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
+		// Note: cannot use baseSubprocessArgs() here because aicore provider
+		// does not require --llm-base-url / --llm-api-key; those are omitted.
 		os.Args = []string{"review-bot",
 			"--vcs-url", "https://gitea.example.com",
 			"--repo", "owner/repo",
@@ -1446,17 +1447,10 @@ func TestMainSubprocess_MissingAICoreCredentials(t *testing.T) {
 func TestMainSubprocess_ConflictingPersonaFlags(t *testing.T) {
 	if os.Getenv("TEST_SUBPROCESS_MAIN") == "1" {
 		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
-		os.Args = []string{"review-bot",
+		os.Args = append(baseSubprocessArgs(),
-			"--vcs-url", "https://gitea.example.com",
-			"--repo", "owner/repo",
-			"--pr", "1",
-			"--reviewer-token", "tok",
-			"--llm-base-url", "https://api.example.com",
-			"--llm-api-key", "key",
-			"--llm-model", "gpt-4",
 			"--persona", "security",
 			"--persona-file", "custom.json",
-		}
+		)
 		main()
 		return
 	}
@@ -1477,9 +1471,9 @@ func TestMainSubprocess_ConflictingPersonaFlags(t *testing.T) {
 func TestMainSubprocess_DeprecatedGiteaURLEnv(t *testing.T) {
 	if os.Getenv("TEST_SUBPROCESS_MAIN") == "1" {
 		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
-		// Set required flags but omit --vcs-url; GITEA_URL should be picked up.
+		// Note: cannot use baseSubprocessArgs() here because --vcs-url must be
-		// The test will exit with an error after VCS init (no PR to fetch), but
+		// omitted — this test verifies that GITEA_URL env var is picked up as a
-		// the deprecation warning must appear.
+		// deprecated fallback when --vcs-url is absent.
 		os.Args = []string{"review-bot",
 			// No --vcs-url: should fall back to GITEA_URL env var
 			"--repo", "owner/repo",
@@ -1527,6 +1521,8 @@ func TestMainSubprocess_InvalidDocMapPath(t *testing.T) {
 	}
 
 	cmd := exec.Command(os.Args[0], "-test.run=TestMainSubprocess_InvalidDocMapPath")
+	// t.TempDir() is evaluated here in the outer process, producing a real directory
+	// that is passed as the GITHUB_WORKSPACE env var string to the subprocess.
 	cmd.Env = append(cleanEnv(),
 		"TEST_SUBPROCESS_MAIN=1",
 		"GITHUB_WORKSPACE="+t.TempDir(),
@@ -1564,6 +1560,8 @@ func TestMainSubprocess_InvalidDocMapFile(t *testing.T) {
 	}
 
 	cmd := exec.Command(os.Args[0], "-test.run=TestMainSubprocess_InvalidDocMapFile")
+	// t.TempDir() is evaluated here in the outer process, producing a real directory
+	// that is passed as the GITHUB_WORKSPACE env var string to the subprocess.
 	cmd.Env = append(cleanEnv(),
 		"TEST_SUBPROCESS_MAIN=1",
 		"GITHUB_WORKSPACE="+t.TempDir(),
@@ -1580,3 +1578,47 @@ func TestMainSubprocess_InvalidDocMapFile(t *testing.T) {
 		t.Errorf("expected error about failed resolution, got: %s", output)
 	}
 }
+
+// TestMainSubprocess_DocMapTrustedRefSkipsLocalValidation confirms that
+// --doc-map-trusted-ref bypasses local filesystem validation for --doc-map.
+// When the trusted-ref flag is set, the doc-map value is used as a VCS API
+// path; a nonexistent local file must not cause an early exit before network I/O.
+func TestMainSubprocess_DocMapTrustedRefSkipsLocalValidation(t *testing.T) {
+	if os.Getenv("TEST_SUBPROCESS_MAIN") == "1" {
+		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
+		os.Args = []string{"review-bot",
+			"--vcs-url", "https://gitea.example.com",
+			"--repo", "owner/repo",
+			"--pr", "1",
+			"--reviewer-token", "tok",
+			"--llm-base-url", "https://api.example.com",
+			"--llm-api-key", "key",
+			"--llm-model", "gpt-4",
+			"--doc-map", "nonexistent-local.yml",
+			"--doc-map-trusted-ref", "main",
+		}
+		main()
+		return
+	}
+
+	cmd := exec.Command(os.Args[0], "-test.run=TestMainSubprocess_DocMapTrustedRefSkipsLocalValidation")
+	cmd.Env = append(cleanEnv(),
+		"TEST_SUBPROCESS_MAIN=1",
+		"GITHUB_WORKSPACE="+t.TempDir(),
+	)
+	out, err := cmd.CombinedOutput()
+	output := string(out)
+
+	// The test must fail (network I/O or VCS API failure) but must NOT
+	// fail with the local filesystem validation error.
+	// "failed to resolve" would indicate the early validateWorkspacePath ran —
+	// that would be the bug this test is catching.
+	if strings.Contains(output, "failed to resolve") {
+		t.Errorf("--doc-map-trusted-ref should skip local path validation, but got filesystem error: %s", output)
+	}
+
+	// It must still exit non-zero (real VCS call to example.com will fail).
+	if err == nil {
+		t.Fatal("expected non-zero exit when VCS API is unreachable, got success")
+	}
+}

cmd/review-bot/validatedocmap.go

@@ -37,22 +37,33 @@ func validateDocmapPath(localPath, resolvedRoot string) error {
 		return fmt.Errorf("cannot resolve path: %w", err)
 	}
 
-	// Lstat: do NOT follow symlinks. We want to inspect the entry itself.
+	// Resolve ALL symlink components, not just the final one.
-	fi, err := os.Lstat(absPath)
+	// os.Lstat only avoids following the *final* path component; intermediate
+	// directory symlinks are still followed. EvalSymlinks resolves every
+	// component, closing the directory-symlink bypass: a PR that commits
+	// .review-bot/ as a directory symlink pointing outside the repo would
+	// otherwise pass the filepath.Rel confinement check because the textual
+	// path is inside the root while the actual destination is not.
+	resolvedPath, err := filepath.EvalSymlinks(absPath)
+	if err != nil {
+		return fmt.Errorf("cannot resolve path (symlink): %w", err)
+	}
+
+	// Lstat the resolved path — at this point resolvedPath is symlink-free, so
+	// ModeSymlink will never be set. We keep the check as defense-in-depth.
+	fi, err := os.Lstat(resolvedPath)
 	if err != nil {
 		return fmt.Errorf("cannot stat file: %w", err)
 	}
 
-	// Reject symlinks outright — a symlink can point to /dev/zero or arbitrary
+	// Defense-in-depth: reject any remaining symlink indicator.
-	// host paths, bypassing both the confinement check and the size check.
 	if fi.Mode()&os.ModeSymlink != 0 {
 		return fmt.Errorf("symlinks are not allowed")
 	}
 
-	// Confine to resolvedRoot: the cleaned absolute path must be a descendant
+	// Confine to resolvedRoot: use the fully-resolved path so that a directory
-	// of the repo root. This catches paths that escaped via "..", absolute
+	// symlink inside the repo cannot carry the path outside the root.
-	// paths that happen to be outside the root, etc.
+	rel, err := filepath.Rel(resolvedRoot, resolvedPath)
-	rel, err := filepath.Rel(resolvedRoot, absPath)
 	if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
 		return fmt.Errorf("path must be within --repo-root")
 	}

cmd/review-bot/validatedocmap_test.go

@@ -465,23 +465,34 @@ mappings:
 }
 
 // TestValidateDocmapPath_Symlink verifies that --docmap pointing at a symlink
-// is rejected before the file is read (prevents /dev/zero DOS or arbitrary
+// whose resolved target is outside --repo-root is rejected (prevents reading
-// host-file reads via PR-controlled symlinks).
+// arbitrary host files via PR-controlled symlinks).
+//
+// Note: after the EvalSymlinks fix (issue #150), in-repo symlinks whose
+// targets also reside within the repo root are now allowed — the confinement
+// check is applied to the resolved path, not the symlink entry itself. The
+// security invariant is: the resolved destination must be within the root.
 func TestValidateDocmapPath_Symlink(t *testing.T) {
 	dir := t.TempDir()
+	outside := t.TempDir()
 
-	// Create a real docmap file to serve as the symlink target.
+	// Create a docmap file OUTSIDE the repo root to serve as the symlink
-	realDocmap := makeDocmapInDir(t, dir, `
+	// target. EvalSymlinks will resolve to this path, which the Rel check
-mappings:
+	// must then reject.
-  - paths:
+	if err := os.MkdirAll(filepath.Join(outside, ".review-bot"), 0o755); err != nil {
-      - "lib/**"
+		t.Fatalf("MkdirAll: %v", err)
-    docs:
+	}
-      - docs/foo.md
+	outsideDocmap := filepath.Join(outside, ".review-bot", "doc-map.yml")
-`)
+	if err := os.WriteFile(outsideDocmap, []byte("mappings: []\n"), 0o644); err != nil {
+		t.Fatalf("WriteFile: %v", err)
+	}
 
-	// Create a symlink inside dir pointing to the real docmap.
+	// Create a symlink inside dir pointing to the file outside the repo.
+	if err := os.MkdirAll(filepath.Join(dir, ".review-bot"), 0o755); err != nil {
+		t.Fatalf("MkdirAll: %v", err)
+	}
 	symlinkPath := filepath.Join(dir, ".review-bot", "doc-map-link.yml")
-	if err := os.Symlink(realDocmap, symlinkPath); err != nil {
+	if err := os.Symlink(outsideDocmap, symlinkPath); err != nil {
 		t.Fatalf("Symlink: %v", err)
 	}
 
@@ -490,10 +501,10 @@ mappings:
 		[]string{"--docmap", symlinkPath, "--repo-root", dir},
 	)
 	if code != 2 {
-		t.Errorf("expected exit 2 for symlink docmap, got %d; stderr: %q", code, stderr)
+		t.Errorf("expected exit 2 for out-of-repo symlink docmap, got %d; stderr: %q", code, stderr)
 	}
-	if !strings.Contains(stderr, "symlink") && !strings.Contains(stderr, "invalid") {
+	if !strings.Contains(stderr, "invalid") && !strings.Contains(stderr, "repo-root") {
-		t.Errorf("expected symlink rejection in stderr, got %q", stderr)
+		t.Errorf("expected confinement rejection in stderr, got %q", stderr)
 	}
 }
 
@@ -550,3 +561,41 @@ func TestValidateDocmapPath_SizeLimit(t *testing.T) {
 		t.Errorf("expected size limit error in stderr, got %q", stderr)
 	}
 }
+
+// TestValidateDocmapPath_DirSymlinkBypass verifies that a directory-symlink
+// inside the repo pointing outside cannot be used to read arbitrary host files.
+//
+// Attack vector: a PR commits .review-bot/ as a directory symlink targeting a
+// directory outside the repo. The textual path of the docmap file is inside
+// the repo root, so the old Rel-only check passed — but the actual file is
+// outside. This is closed by calling EvalSymlinks on the full path before the
+// confinement check.
+func TestValidateDocmapPath_DirSymlinkBypass(t *testing.T) {
+	repoDir := t.TempDir()
+	outsideDir := t.TempDir()
+
+	// Secret file outside the repo.
+	secretPath := filepath.Join(outsideDir, "secret.yml")
+	if err := os.WriteFile(secretPath, []byte("mappings: []\n"), 0o644); err != nil {
+		t.Fatalf("WriteFile: %v", err)
+	}
+
+	// Create .review-bot/ as a directory symlink pointing outside the repo.
+	reviewBotDir := filepath.Join(repoDir, ".review-bot")
+	if err := os.Symlink(outsideDir, reviewBotDir); err != nil {
+		t.Skipf("cannot create dir symlink (platform may not support it): %v", err)
+	}
+
+	// Textually inside repo — .review-bot/secret.yml — but resolves outside.
+	attackPath := filepath.Join(repoDir, ".review-bot", "secret.yml")
+
+	// Resolve repoDir to a symlink-free path, as runValidateDocmap does.
+	resolvedRoot, err := filepath.EvalSymlinks(repoDir)
+	if err != nil {
+		t.Fatalf("EvalSymlinks(repoDir): %v", err)
+	}
+
+	if err := validateDocmapPath(attackPath, resolvedRoot); err == nil {
+		t.Error("expected rejection of dir-symlink bypass, got nil error")
+	}
+}

gitea/ipcheck_test.go

@@ -15,9 +15,9 @@ func TestIsBlockedIPForwarding(t *testing.T) {
 		ip      string
 		blocked bool
 	}{
-		{"127.0.0.1", true},        // loopback — must be blocked
+		{"127.0.0.1", true},             // loopback — must be blocked
-		{"192.168.1.1", true},      // RFC1918 — must be blocked
+		{"192.168.1.1", true},           // RFC1918 — must be blocked
-		{"8.8.8.8", false},         // public — must not be blocked
+		{"8.8.8.8", false},              // public — must not be blocked
 		{"2001:4860:4860::8888", false}, // public IPv6 — must not be blocked
 	}
 	for _, tc := range cases {

review/docmap.go

@@ -52,15 +52,31 @@ func ParseDocMapConfig(localPath string) (*DocMapConfig, error) {
 	if err != nil {
 		return nil, fmt.Errorf("read doc-map file %q: %w", localPath, err)
 	}
+	return parseDocMapBytes(data, localPath)
+}
 
+// ParseDocMapConfigContent parses a doc-map YAML config from an in-memory
+// string. The source parameter is used only for error messages and log entries
+// (e.g. "owner/repo@main:.review-bot/doc-map.yml").
+//
+// Use this when the config content has been fetched from a trusted VCS ref
+// rather than read from the local workspace.
+func ParseDocMapConfigContent(content, source string) (*DocMapConfig, error) {
+	data := []byte(content)
+	return parseDocMapBytes(data, source)
+}
+
+// parseDocMapBytes is the shared YAML parse implementation used by
+// ParseDocMapConfig and ParseDocMapConfigContent.
+func parseDocMapBytes(data []byte, source string) (*DocMapConfig, error) {
 	var cfg DocMapConfig
 	if err := yaml.UnmarshalWithOptions(data, &cfg, yaml.Strict()); err != nil {
 		// Re-parse without strict mode to log which keys are unknown.
 		var relaxed DocMapConfig
 		if err2 := yaml.Unmarshal(data, &relaxed); err2 != nil {
-			return nil, fmt.Errorf("parse doc-map YAML %q: %w", localPath, err)
+			return nil, fmt.Errorf("parse doc-map YAML %q: %w", source, err)
 		}
-		slog.Warn("doc-map YAML contains unknown keys (ignored)", "file", localPath, "error", err)
+		slog.Warn("doc-map YAML contains unknown keys (ignored)", "file", source, "error", err)
 		cfg = relaxed
 	}
 	return &cfg, nil

review/docmap_test.go

@@ -510,3 +510,63 @@ func TestFileCoveredByDocMap_EmptyConfig(t *testing.T) {
 		t.Error("expected false for empty config, got true")
 	}
 }
+
+// ============================================================
+// ParseDocMapConfigContent
+// ============================================================
+
+func TestParseDocMapConfigContent_Valid(t *testing.T) {
+	content := `
+mappings:
+  - paths:
+      - "lib/foo/**"
+    docs:
+      - docs/foo.md
+`
+	cfg, err := ParseDocMapConfigContent(content, "owner/repo@main:.review-bot/doc-map.yml")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if len(cfg.Mappings) != 1 {
+		t.Fatalf("expected 1 mapping, got %d", len(cfg.Mappings))
+	}
+	if len(cfg.Mappings[0].Docs) != 1 || cfg.Mappings[0].Docs[0] != "docs/foo.md" {
+		t.Errorf("unexpected mapping: %+v", cfg.Mappings[0])
+	}
+}
+
+func TestParseDocMapConfigContent_EmptyContent(t *testing.T) {
+	cfg, err := ParseDocMapConfigContent("", "test-source")
+	if err != nil {
+		t.Fatalf("unexpected error for empty content: %v", err)
+	}
+	if len(cfg.Mappings) != 0 {
+		t.Errorf("expected 0 mappings for empty content, got %d", len(cfg.Mappings))
+	}
+}
+
+func TestParseDocMapConfigContent_InvalidYAML(t *testing.T) {
+	_, err := ParseDocMapConfigContent("mappings: [{{invalid", "test-source")
+	if err == nil {
+		t.Fatal("expected error for invalid YAML, got nil")
+	}
+}
+
+func TestParseDocMapConfigContent_UnknownKeys(t *testing.T) {
+	content := `
+mappings:
+  - paths:
+      - "lib/**"
+    docs:
+      - docs/foo.md
+unknown_top_level_key: "should be warned but not fatal"
+`
+	// Unknown top-level keys produce a warning but not an error.
+	cfg, err := ParseDocMapConfigContent(content, "test-source")
+	if err != nil {
+		t.Fatalf("unexpected error for unknown keys: %v", err)
+	}
+	if len(cfg.Mappings) == 0 {
+		t.Error("expected mappings to be parsed despite unknown key")
+	}
+}