lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-30 19:15:23 +00:00
Code Issues Releases Wiki Activity

use environment based operation in protofilter

Browse Source
This commit is contained in:
Shelikhoo 2021-09-05 15:38:15 +01:00
parent 8982a38eb4
commit 4c4d6c6944
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/protofilter/filter.go
View File

@ -2,10 +2,12 @@ package protofilter
import ( import (
"context" "context"
"github.com/v2fly/v2ray-core/v4/common/platform/filesystem" "github.com/v2fly/v2ray-core/v4/common/environment/envctx"
"github.com/v2fly/v2ray-core/v4/common/environment/filesystemcap"
"github.com/v2fly/v2ray-core/v4/common/protoext" "github.com/v2fly/v2ray-core/v4/common/protoext"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/reflect/protoreflect"
"io"
) )
//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
@ -55,13 +57,24 @@ func filterMessage(ctx context.Context, message protoreflect.Message) error {
return true return true
}) })
if err != nil {
return err
}
fsenvironment := envctx.EnvironmentFromContext(ctx)
fsifce := fsenvironment.(filesystemcap.FileSystemCapabilitySet)
for _, v := range fileReadingQueue { for _, v := range fileReadingQueue {
file, err := filesystem.ReadFile(v.filename) file, err := fsifce.OpenFileForRead()(v.filename)
if err != nil {
return newError("unable to open file").Base(err)
}
fileContent, err := io.ReadAll(file)
if err != nil { if err != nil {
return newError("unable to read file").Base(err) return newError("unable to read file").Base(err)
} }
file.Close()
field := message.Descriptor().Fields().ByTextName(v.field) field := message.Descriptor().Fields().ByTextName(v.field)
message.Set(field, protoreflect.ValueOf(file)) message.Set(field, protoreflect.ValueOf(fileContent))
} }
return nil return nil
} }