diff --git a/common/platform/errors.generated.go b/common/platform/errors.generated.go deleted file mode 100644 index c3ad350b1..000000000 --- a/common/platform/errors.generated.go +++ /dev/null @@ -1,9 +0,0 @@ -package platform - -import "github.com/v2fly/v2ray-core/v4/common/errors" - -type errPathObjHolder struct{} - -func newError(values ...interface{}) *errors.Error { - return errors.New(values...).WithPathObj(errPathObjHolder{}) -} diff --git a/common/platform/others.go b/common/platform/others.go index 934a5b336..a2f92c714 100644 --- a/common/platform/others.go +++ b/common/platform/others.go @@ -7,7 +7,6 @@ import ( "io/fs" "os" "path/filepath" - "strings" ) func ExpandEnv(s string) string { @@ -26,10 +25,6 @@ func GetToolLocation(file string) string { // GetAssetLocation search for `file` in certain locations func GetAssetLocation(file string) string { - filepathCleaned := filepath.Clean(file) - if strings.HasPrefix("..", filepathCleaned) { - newError("directory transversal is not allowed for assets. This will be forbidden in v5.").AtWarning().WriteToLog() - } const name = "v2ray.location.asset" assetPath := NewEnvFlag(name).GetValue(getExecutableDir) defPath := filepath.Join(assetPath, file) diff --git a/common/platform/platform.go b/common/platform/platform.go index b1aa0f1ad..845782b00 100644 --- a/common/platform/platform.go +++ b/common/platform/platform.go @@ -7,8 +7,6 @@ import ( "strings" ) -//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen - type EnvFlag struct { Name string AltName string diff --git a/common/platform/windows.go b/common/platform/windows.go index 1296f3261..454a24063 100644 --- a/common/platform/windows.go +++ b/common/platform/windows.go @@ -19,12 +19,8 @@ func GetToolLocation(file string) string { return filepath.Join(toolPath, file+".exe") } -// GetAssetLocation search for `file` in the executable dir +// GetAssetLocation search for `file` in the excutable dir func GetAssetLocation(file string) string { - filepathCleaned := filepath.Clean(file) - if strings.HasPrefix("..", filepathCleaned) { - newError("directory transversal is not allowed for assets. This will be forbidden in v5.").AtWarning().WriteToLog() - } const name = "v2ray.location.asset" assetPath := NewEnvFlag(name).GetValue(getExecutableDir) return filepath.Join(assetPath, file)