lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-30 05:56:54 -05:00
Code Issues Releases Wiki Activity

Revert "show warning for asset directory transversal to prepare for network api based reload in v5"

Browse Source 
This reverts commit a720d1e2
This commit is contained in:
Shelikhoo 2021-05-05 13:29:36 +01:00
parent fa85afc920
commit 916d3857a0
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
4 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/platform/errors.generated.go
View File

@ -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{})
}

5
common/platform/others.go
View File

@ -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)

2
common/platform/platform.go
View File

@ -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

6
common/platform/windows.go
View File

@ -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)