runtime: fix the issue of create new socket with abstract address

fupan.lfp · Fupan Li · commit 4ab3e7a53a15 · 2021-07-27T23:24:26.000+08:00
For the abstract socket adress there's no need to chmod
the address's file, cause the file didn't exist actually.

Signed-off-by: Fupan Li &lt;fupan.lfp@antgroup.com&gt;
diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go
@@ -90,7 +90,10 @@ func NewSocket(address string) (*net.UnixListener, error) {
 		sock = socket(address)
 		path = sock.path()
 	)
-	if !sock.isAbstract() {
+
+	isAbstract := sock.isAbstract()
+
+	if !isAbstract {
 		if err := os.MkdirAll(filepath.Dir(path), 0600); err != nil {
 			return nil, errors.Wrapf(err, "%s", path)
 		}
@@ -99,10 +102,13 @@ func NewSocket(address string) (*net.UnixListener, error) {
 	if err != nil {
 		return nil, err
 	}
-	if err := os.Chmod(path, 0600); err != nil {
-		os.Remove(sock.path())
-		l.Close()
-		return nil, err
+
+	if !isAbstract {
+		if err := os.Chmod(path, 0600); err != nil {
+			os.Remove(sock.path())
+			l.Close()
+			return nil, err
+		}
 	}
 	return l.(*net.UnixListener), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,10 @@ func NewSocket(address string) (*net.UnixListener, error) {`
`90`	`90`	`sock = socket(address)`
`91`	`91`	`path = sock.path()`
`92`	`92`	`)`
`93`		`- if !sock.isAbstract() {`
	`93`	`+`
	`94`	`+ isAbstract := sock.isAbstract()`
	`95`	`+`
	`96`	`+ if !isAbstract {`
`94`	`97`	`if err := os.MkdirAll(filepath.Dir(path), 0600); err != nil {`
`95`	`98`	`return nil, errors.Wrapf(err, "%s", path)`
`96`	`99`	`}`
`@@ -99,10 +102,13 @@ func NewSocket(address string) (*net.UnixListener, error) {`
`99`	`102`	`if err != nil {`
`100`	`103`	`return nil, err`
`101`	`104`	`}`
`102`		`- if err := os.Chmod(path, 0600); err != nil {`
`103`		`- os.Remove(sock.path())`
`104`		`- l.Close()`
`105`		`- return nil, err`
	`105`	`+`
	`106`	`+ if !isAbstract {`
	`107`	`+ if err := os.Chmod(path, 0600); err != nil {`
	`108`	`+ os.Remove(sock.path())`
	`109`	`+ l.Close()`
	`110`	`+ return nil, err`
	`111`	`+ }`
`106`	`112`	`}`
`107`	`113`	`return l.(*net.UnixListener), nil`
`108`	`114`	`}`