hesoyam/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-10-28 05:57:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify again

Browse Source
This commit is contained in:
Meo597
2026-10-26 05:46:09 +08:00
parent 98d7b719c5
commit 75c08917e3
5 changed files with 43 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/commands/all/lua/sign.go
+7 -10
View File
@@ -5,7 +5,6 @@ import (
"path/filepath"
xlua "github.com/xtls/xray-core/common/lua"
"github.com/xtls/xray-core/common/platform/filesystem"
"github.com/xtls/xray-core/main/commands/base"
)
@@ -33,15 +32,14 @@ func executeSign(cmd *base.Command, args []string) {
cmd.Usage()
}
input, info, err := filesystem.ResolveRegularFile(args[0])
if filepath.Ext(args[0]) != ".lua" {
base.Fatalf("Lua file extension must be .lua")
}
info, err := os.Stat(args[0])
if err != nil {
base.Fatalf("failed to inspect Lua file: %s", err)
}
if filepath.Ext(input) != ".lua" {
base.Fatalf("Lua file extension must be .lua")
}
code, err := os.ReadFile(input)
code, err := os.ReadFile(args[0])
if err != nil {
base.Fatalf("failed to read Lua file: %s", err)
}
@@ -59,7 +57,7 @@ func executeSign(cmd *base.Command, args []string) {
}
output := *signOutput
if output == "" {
output = input
output = args[0]
}
if err := writeSignedFile(output, signed, info.Mode().Perm()); err != nil {
base.Fatalf("failed to write signed Lua file: %s", err)
@@ -67,8 +65,7 @@ func executeSign(cmd *base.Command, args []string) {
}
func writeSignedFile(path string, code []byte, mode os.FileMode) error {
if resolved, info, err := filesystem.ResolveRegularFile(path); err == nil {
path = resolved
if info, err := os.Stat(path); err == nil {
mode = info.Mode().Perm()
} else if !os.IsNotExist(err) {
return err
main/confloader/external/external.go
Vendored
+2 -7
View File
@@ -14,7 +14,6 @@ import (
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/platform/filesystem"
"github.com/xtls/xray-core/common/utils"
"github.com/xtls/xray-core/main/commands/base"
"github.com/xtls/xray-core/main/confloader"
@@ -59,14 +58,10 @@ func readConfigFile(file *os.File) ([]byte, error) {
return nil, err
}
if info.Mode().IsRegular() {
path, _, err := filesystem.ResolveRegularFile(file.Name())
if err != nil {
return nil, err
}
switch strings.ToLower(filepath.Ext(path)) {
switch strings.ToLower(filepath.Ext(file.Name())) {
case ".jsonc", ".json", ".yml", ".yaml", ".toml", ".pb", ".protobuf":
default:
return nil, errors.New("unsupported config file extension: ", path)
return nil, errors.New("unsupported config file extension: ", file.Name())
}
}
return io.ReadAll(file)