* fix format
This commit is contained in:
parent
2b6f5a5cb4
commit
d0552a1d6b
4 changed files with 38 additions and 19 deletions
|
|
@ -29,7 +29,12 @@ func applyPlatformIsolation(cmd *exec.Cmd, isolation config.IsolationConfig, roo
|
||||||
"disable_isolation": disableHint,
|
"disable_isolation": disableHint,
|
||||||
"risk": "disabling isolation lets child processes run without Linux filesystem isolation",
|
"risk": "disabling isolation lets child processes run without Linux filesystem isolation",
|
||||||
})
|
})
|
||||||
return fmt.Errorf("linux isolation requires bwrap and does not fall back automatically: %w; install bubblewrap with one of: %s; or disable isolation by setting %s; disabling isolation means child processes can run without Linux filesystem isolation and may access or modify more host files", err, hint, disableHint)
|
return fmt.Errorf(
|
||||||
|
"linux isolation requires bwrap and does not fall back automatically: %w; install bubblewrap with one of: %s; or disable isolation by setting %s; disabling isolation means child processes can run without Linux filesystem isolation and may access or modify more host files",
|
||||||
|
err,
|
||||||
|
hint,
|
||||||
|
disableHint,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
if cmd == nil || cmd.Path == "" || len(cmd.Args) == 0 {
|
if cmd == nil || cmd.Path == "" || len(cmd.Args) == 0 {
|
||||||
return nil
|
return nil
|
||||||
|
|
@ -45,13 +50,13 @@ func applyPlatformIsolation(cmd *exec.Cmd, isolation config.IsolationConfig, roo
|
||||||
plan := BuildLinuxMountPlan(root, isolation.ExposePaths)
|
plan := BuildLinuxMountPlan(root, isolation.ExposePaths)
|
||||||
plan = ensureLinuxMountRule(plan, originalPath, originalPath, "ro")
|
plan = ensureLinuxMountRule(plan, originalPath, originalPath, "ro")
|
||||||
plan = ensureLinuxMountRule(plan, filepath.Dir(originalPath), filepath.Dir(originalPath), "ro")
|
plan = ensureLinuxMountRule(plan, filepath.Dir(originalPath), filepath.Dir(originalPath), "ro")
|
||||||
if resolved, err := filepath.EvalSymlinks(originalPath); err == nil && resolved != originalPath {
|
if resolved, resolveErr := filepath.EvalSymlinks(originalPath); resolveErr == nil && resolved != originalPath {
|
||||||
plan = ensureLinuxMountRule(plan, resolved, resolved, "ro")
|
plan = ensureLinuxMountRule(plan, resolved, resolved, "ro")
|
||||||
plan = ensureLinuxMountRule(plan, filepath.Dir(resolved), filepath.Dir(resolved), "ro")
|
plan = ensureLinuxMountRule(plan, filepath.Dir(resolved), filepath.Dir(resolved), "ro")
|
||||||
}
|
}
|
||||||
if originalDir != "" {
|
if originalDir != "" {
|
||||||
plan = ensureLinuxMountRule(plan, originalDir, originalDir, "rw")
|
plan = ensureLinuxMountRule(plan, originalDir, originalDir, "rw")
|
||||||
if resolved, err := filepath.EvalSymlinks(originalDir); err == nil && resolved != originalDir {
|
if resolved, resolveErr := filepath.EvalSymlinks(originalDir); resolveErr == nil && resolved != originalDir {
|
||||||
plan = ensureLinuxMountRule(plan, resolved, resolved, "rw")
|
plan = ensureLinuxMountRule(plan, resolved, resolved, "rw")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -101,7 +106,12 @@ func postStartPlatformIsolation(cmd *exec.Cmd, isolation config.IsolationConfig,
|
||||||
|
|
||||||
// buildLinuxBwrapArgs translates the mount plan into the bubblewrap command
|
// buildLinuxBwrapArgs translates the mount plan into the bubblewrap command
|
||||||
// line that re-executes the original process inside the isolated mount view.
|
// line that re-executes the original process inside the isolated mount view.
|
||||||
func buildLinuxBwrapArgs(originalPath string, originalArgs []string, originalDir string, plan []MountRule) ([]string, error) {
|
func buildLinuxBwrapArgs(
|
||||||
|
originalPath string,
|
||||||
|
originalArgs []string,
|
||||||
|
originalDir string,
|
||||||
|
plan []MountRule,
|
||||||
|
) ([]string, error) {
|
||||||
bwrapArgs := []string{
|
bwrapArgs := []string{
|
||||||
"bwrap",
|
"bwrap",
|
||||||
"--die-with-parent",
|
"--die-with-parent",
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,10 @@ import (
|
||||||
"syscall"
|
"syscall"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
|
|
||||||
|
"golang.org/x/sys/windows"
|
||||||
|
|
||||||
"github.com/sipeed/picoclaw/pkg/config"
|
"github.com/sipeed/picoclaw/pkg/config"
|
||||||
"github.com/sipeed/picoclaw/pkg/logger"
|
"github.com/sipeed/picoclaw/pkg/logger"
|
||||||
"golang.org/x/sys/windows"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const disableMaxPrivilege = 0x1
|
const disableMaxPrivilege = 0x1
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,12 @@ func TestValidateExposePaths(t *testing.T) {
|
||||||
t.Fatal("ValidateExposePaths() expected invalid mode error")
|
t.Fatal("ValidateExposePaths() expected invalid mode error")
|
||||||
}
|
}
|
||||||
|
|
||||||
err = ValidateExposePaths([]config.ExposePath{{Source: "/src", Target: "/dst", Mode: "ro"}, {Source: "/other", Target: "/dst", Mode: "rw"}})
|
err = ValidateExposePaths(
|
||||||
|
[]config.ExposePath{
|
||||||
|
{Source: "/src", Target: "/dst", Mode: "ro"},
|
||||||
|
{Source: "/other", Target: "/dst", Mode: "rw"},
|
||||||
|
},
|
||||||
|
)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatal("ValidateExposePaths() expected duplicate target error")
|
t.Fatal("ValidateExposePaths() expected duplicate target error")
|
||||||
}
|
}
|
||||||
|
|
@ -98,7 +103,10 @@ func TestBuildLinuxMountPlan(t *testing.T) {
|
||||||
|
|
||||||
func TestBuildWindowsAccessRules(t *testing.T) {
|
func TestBuildWindowsAccessRules(t *testing.T) {
|
||||||
t.Setenv("USERPROFILE", `C:\Users\tester`)
|
t.Setenv("USERPROFILE", `C:\Users\tester`)
|
||||||
rules := BuildWindowsAccessRules(`C:\picoclaw`, []config.ExposePath{{Source: `D:\data`, Target: `C:\mapped`, Mode: "ro"}})
|
rules := BuildWindowsAccessRules(
|
||||||
|
`C:\picoclaw`,
|
||||||
|
[]config.ExposePath{{Source: `D:\data`, Target: `C:\mapped`, Mode: "ro"}},
|
||||||
|
)
|
||||||
if len(rules) == 0 {
|
if len(rules) == 0 {
|
||||||
t.Fatal("BuildWindowsAccessRules returned empty rules")
|
t.Fatal("BuildWindowsAccessRules returned empty rules")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue