Browse Source

Revert "add file soft link path resolve support (#1482)" (#1495)

This reverts commit eaf401eda93ea97f95136e480f465dba8b652275.
RPRX 2 năm trước cách đây
mục cha
commit
ff5ce767df
2 tập tin đã thay đổi với 3 bổ sung12 xóa
  1. 2 6
      common/platform/filesystem/file.go
  2. 1 6
      infra/conf/serial/builder.go

+ 2 - 6
common/platform/filesystem/file.go

@@ -3,7 +3,7 @@ package filesystem
 import (
 	"io"
 	"os"
-	"path/filepath"
+
 	"github.com/xtls/xray-core/common/buf"
 	"github.com/xtls/xray-core/common/platform"
 )
@@ -11,11 +11,7 @@ import (
 type FileReaderFunc func(path string) (io.ReadCloser, error)
 
 var NewFileReader FileReaderFunc = func(path string) (io.ReadCloser, error) {
-	resolved_path,err:=filepath.EvalSymlinks(path)
-	if err!= nil{
-		return nil,err
-	}
-	return os.Open(resolved_path)
+	return os.Open(path)
 }
 
 func ReadFile(path string) ([]byte, error) {

+ 1 - 6
infra/conf/serial/builder.go

@@ -2,7 +2,6 @@ package serial
 
 import (
 	"io"
-	"path/filepath"
 
 	"github.com/xtls/xray-core/core"
 	"github.com/xtls/xray-core/infra/conf"
@@ -11,11 +10,7 @@ import (
 
 func BuildConfig(files []string, formats []string) (*core.Config, error) {
 	cf := &conf.Config{}
-	for i, file_ := range files {
-		file, err := filepath.EvalSymlinks(file_)
-		if err != nil {
-			return nil, err
-		}
+	for i, file := range files {
 		newError("Reading config: ", file).AtInfo().WriteToLog()
 		r, err := confloader.LoadConfig(file)
 		if err != nil {