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

Allow setting permission on CopyFile helper

Browse Source
This commit is contained in:
Shelikhoo 2024-03-11 20:57:55 +00:00 committed by Xiaokang Wang (Shelikhoo)
parent 887280e848
commit 353326b432
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/platform/filesystem/file.go
View File

@ -45,12 +45,12 @@ func ReadAsset(file string) ([]byte, error) {
return ReadFile(platform.GetAssetLocation(file)) return ReadFile(platform.GetAssetLocation(file))
} }
func CopyFile(dst string, src string) error { func CopyFile(dst string, src string, perm os.FileMode) error {
bytes, err := ReadFile(src) bytes, err := ReadFile(src)
if err != nil { if err != nil {
return err return err
} }
f, err := os.OpenFile(dst, os.O_CREATE|os.O_WRONLY, 0o644) f, err := os.OpenFile(dst, os.O_CREATE|os.O_WRONLY, perm)
if err != nil { if err != nil {
return err return err
} }

2
infra/conf/rule/rule_test.go
View File

@ -39,7 +39,7 @@ func init() {
func TestToCidrList(t *testing.T) { func TestToCidrList(t *testing.T) {
t.Log(os.Getenv("v2ray.location.asset")) t.Log(os.Getenv("v2ray.location.asset"))
common.Must(filesystem.CopyFile(platform.GetAssetLocation("geoiptestrouter.dat"), platform.GetAssetLocation("geoip.dat"))) common.Must(filesystem.CopyFile(platform.GetAssetLocation("geoiptestrouter.dat"), platform.GetAssetLocation("geoip.dat"), 0o600))
ips := cfgcommon.StringList([]string{ ips := cfgcommon.StringList([]string{
"geoip:us", "geoip:us",