Skip to content

fix: allow worktree directories through InstanceMiddleware access check #1506

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

Open
onnoink wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −2
Open

fix: allow worktree directories through InstanceMiddleware access check #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion packages/opencode/src/server/routes/instance/httpapi/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { Effect, Layer, Redacted, Schema } from "effect"
import nodePath from "path"
import { HttpApiBuilder, HttpApiMiddleware, HttpApiSecurity } from "effect/unstable/httpapi"
import { HttpRouter, HttpServer, HttpServerRequest } from "effect/unstable/http"
import { AppRuntime } from "@/effect/app-runtime"
import { InstanceRef, WorkspaceRef } from "@/effect/instance-ref"
import { Observability } from "@/effect"
import { Flag } from "@/flag/flag"
import { Global } from "@/global"
import { InstanceBootstrap } from "@/project/bootstrap"
import { Instance } from "@/project/instance"
import { lazy } from "@/util/lazy"
Expand Down Expand Up @@ -103,7 +105,8 @@ const instance = HttpRouter.middleware()(

if (!Flag.MIMOCODE_SERVER_PASSWORD) {
const cwd = Filesystem.resolve(process.cwd())
if (!Filesystem.contains(cwd, directory)) {
const worktreeRoot = Filesystem.resolve(nodePath.join(Global.Path.data, "worktree"))
if (!Filesystem.contains(cwd, directory) && !Filesystem.contains(worktreeRoot, directory)) {
return yield* new DirectoryAccessDenied({
message: "Access denied: directory must be within the server's working directory",
})
Expand Down
5 changes: 4 additions & 1 deletion packages/opencode/src/server/routes/instance/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import type { MiddlewareHandler } from "hono"
import path from "path"
import { Instance } from "@/project/instance"
import { InstanceBootstrap } from "@/project/bootstrap"
import { AppRuntime } from "@/effect/app-runtime"
import { AppFileSystem } from "@mimo-ai/shared/filesystem"
import { WorkspaceContext } from "@/control-plane/workspace-context"
import { WorkspaceID } from "@/control-plane/schema"
import { Flag } from "@/flag/flag"
import { Global } from "@/global"
import { Filesystem } from "@/util"

export function InstanceMiddleware(workspaceID?: WorkspaceID): MiddlewareHandler {
Expand All @@ -23,7 +25,8 @@ export function InstanceMiddleware(workspaceID?: WorkspaceID): MiddlewareHandler

if (!Flag.MIMOCODE_SERVER_PASSWORD) {
const cwd = Filesystem.resolve(process.cwd())
if (!Filesystem.contains(cwd, directory)) {
const worktreeRoot = Filesystem.resolve(path.join(Global.Path.data, "worktree"))
if (!Filesystem.contains(cwd, directory) && !Filesystem.contains(worktreeRoot, directory)) {
return c.json({ error: "Access denied: directory must be within the server's working directory" }, 403)
}
}
Expand Down