mirror of
https://github.com/XTLS/Xray-core.git
synced 2026-10-15 20:13:59 +00:00
Revert "lua: prevent configuration files from being executed as scripts"
This reverts commit 796bbd763a.
This commit is contained in:
Vendored
+2
-8
@@ -13,7 +13,6 @@ import (
|
||||
|
||||
"github.com/xtls/xray-core/common/buf"
|
||||
"github.com/xtls/xray-core/common/errors"
|
||||
"github.com/xtls/xray-core/common/platform"
|
||||
"github.com/xtls/xray-core/common/utils"
|
||||
"github.com/xtls/xray-core/main/confloader"
|
||||
)
|
||||
@@ -29,15 +28,10 @@ func ConfigLoader(arg string) (out io.Reader, err error) {
|
||||
data, err = FetchHTTPContent(arg)
|
||||
|
||||
case arg == "stdin:":
|
||||
data, err = platform.ReadConfigFile(os.Stdin)
|
||||
data, err = io.ReadAll(os.Stdin)
|
||||
|
||||
default:
|
||||
file, openErr := os.Open(arg)
|
||||
if openErr != nil {
|
||||
return nil, openErr
|
||||
}
|
||||
defer file.Close()
|
||||
data, err = platform.ReadConfigFile(file)
|
||||
data, err = os.ReadFile(arg)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user