Fixed sandbox detection on linux (#33)

zzanp · web-flow · commit 051297330fcc · 2021-12-14T09:12:01.000+01:00
diff --git a/sandbox.go b/sandbox.go
@@ -62,8 +62,8 @@ func SandboxCpu(cores int) bool {
 func SandboxRam(ram_mb int) bool {
 	var m runtime.MemStats
 	runtime.ReadMemStats(&m)
+	ram := m.Sys / 1024
 	rmb := uint64(ram_mb)
-	ram := m.TotalAlloc / 1024 / 1024
 
 	return ram < rmb
 }
diff --git a/sandbox_linux.go b/sandbox_linux.go
@@ -4,7 +4,9 @@ import "os"
 
 func sandboxFilepath() bool {
 	out, _ := cmdOut("systemd-detect-virt")
-	return out != "none"
+	if out != "none\n" {
+	}
+	return out != "none\n"
 }
 
 // HOTFIX - below function returns false negative, because

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ func SandboxCpu(cores int) bool {`
`62`	`62`	`func SandboxRam(ram_mb int) bool {`
`63`	`63`	`var m runtime.MemStats`
`64`	`64`	`runtime.ReadMemStats(&m)`
	`65`	`+ ram := m.Sys / 1024`
`65`	`66`	`rmb := uint64(ram_mb)`
`66`		`- ram := m.TotalAlloc / 1024 / 1024`
`67`	`67`
`68`	`68`	`return ram < rmb`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@ import "os"`
`4`	`4`
`5`	`5`	`func sandboxFilepath() bool {`
`6`	`6`	`out, _ := cmdOut("systemd-detect-virt")`
`7`		`- return out != "none"`
	`7`	`+ if out != "none\n" {`
	`8`	`+ }`
	`9`	`+ return out != "none\n"`
`8`	`10`	`}`
`9`	`11`
`10`	`12`	`// HOTFIX - below function returns false negative, because`