From 93e44b72d9f13afb35e04433230ea4df5546dc21 Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Sat, 3 Apr 2021 10:14:23 +0100 Subject: [PATCH] rework the file name checking logic --- common/platform/securedload/embeddedhash.go | 4 +++- common/platform/securedload/file.go | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common/platform/securedload/embeddedhash.go b/common/platform/securedload/embeddedhash.go index da5419dc3..b9a402638 100644 --- a/common/platform/securedload/embeddedhash.go +++ b/common/platform/securedload/embeddedhash.go @@ -4,6 +4,7 @@ import ( "bytes" "crypto/sha256" "encoding/hex" + "path/filepath" "strings" "github.com/v2fly/VSign/insmgr" @@ -18,7 +19,8 @@ type EmbeddedHashProtectedLoader struct { } func (e EmbeddedHashProtectedLoader) VerifyAndLoad(filename string) ([]byte, error) { - filecontent, err := filesystem.ReadFile(platform.GetAssetLocation(filename)) + platformFileName := filepath.FromSlash(filename) + filecontent, err := filesystem.ReadFile(platform.GetAssetLocation(platformFileName)) if err != nil { return nil, newError("Cannot find file", filename).Base(err) } diff --git a/common/platform/securedload/file.go b/common/platform/securedload/file.go index 1d8705064..3192aeac6 100644 --- a/common/platform/securedload/file.go +++ b/common/platform/securedload/file.go @@ -1,9 +1,6 @@ package securedload -import "path/filepath" - func GetAssetSecured(name string) ([]byte, error) { - name = filepath.FromSlash(name) var err error for k, v := range knownProtectedLoader {