rework filesystem function

albertodonato · Jan 11, 2024 · cb5fe1b · cb5fe1b
1 parent dedd9c6
commit cb5fe1b
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/server/filesystem.go b/server/filesystem.go
@@ -71,21 +71,20 @@ func (fs FileSystem) newFile(name string) (*File, error) {
 		return nil, err
 	}
 	if !fs.AllowOutsideSymlinks {
-		if target, err := filepath.EvalSymlinks(absPath); target != "" {
-			if err != nil {
-				return nil, err
-			}
-			path, err := filepath.Abs(target)
-			if err != nil {
-				return nil, err
-			}
-			root, err := filepath.Abs(fs.Root)
-			if err != nil {
-				return nil, err
-			}
-			if !strings.HasPrefix(path, root) {
-				return nil, os.ErrPermission
-			}
+		target, err := filepath.EvalSymlinks(absPath)
+		if err != nil {
+			return nil, err
+		}
+		path, err := filepath.Abs(target)
+		if err != nil {
+			return nil, err
+		}
+		root, err := filepath.Abs(fs.Root)
+		if err != nil {
+			return nil, err
+		}
+		if !strings.HasPrefix(path, root) {
+			return nil, os.ErrPermission
 		}
 	}
 	return NewFile(absPath, fs.HideDotFiles)