bugfix: infinite loop in dfget/config/config.go#checkOutput

Signed-off-by: lowzj <[email protected]>
dragonflyoss · Jul 2, 2020 · 032161d · 032161d
1 parent 0b48f55
commit 032161d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/dfget/config/config.go b/dfget/config/config.go
@@ -304,7 +304,7 @@ func checkOutput(cfg *Config) error {
 	for dir := cfg.Output; !stringutils.IsEmptyStr(dir); dir = filepath.Dir(dir) {
 		if err := syscall.Access(dir, syscall.O_RDWR); err == nil {
 			break
-		} else if os.IsPermission(err) {
+		} else if os.IsPermission(err) || dir == "/" {
 			return fmt.Errorf("user[%s] path[%s] %v", cfg.User, cfg.Output, err)
 		}
 	}

diff --git a/dfget/config/config_test.go b/dfget/config/config_test.go
@@ -104,7 +104,9 @@ func (suite *ConfigSuite) TestAssertConfig(c *check.C) {
 		{clog: clog, url: "htt://a", checkFunc: errortypes.IsInvalidValue},
 		{clog: clog, url: "htt://a.b.com", checkFunc: errortypes.IsInvalidValue},
 		{clog: clog, url: "http://a.b.com", output: "/tmp/output", checkFunc: errortypes.IsNilError},
+		{clog: clog, url: "http://a.b.com", output: "./root", checkFunc: errortypes.IsNilError},
 		{clog: clog, url: "http://a.b.com", output: "/root", checkFunc: errortypes.IsInvalidValue},
+		{clog: clog, url: "http://a.b.com", output: "/", checkFunc: errortypes.IsInvalidValue},
 	}
 
 	var f = func() (err error) {
@@ -139,6 +141,7 @@ func (suite *ConfigSuite) TestCheckOutput(c *check.C) {
 		{"", "zj.test", j("zj.test")},
 		{"", "/tmp", ""},
 		{"", "/tmp/a/b/c/d/e/zj.test", "/tmp/a/b/c/d/e/zj.test"},
+		{"", "/", ""},
 	}
 
 	if cfg.User != "root" {