From 786a3ac992043e1e1ca398d4b408e34d9ae46973 Mon Sep 17 00:00:00 2001 From: Hamidreza Ghavami <70919649+hamid-gh98@users.noreply.github.com> Date: Sat, 20 May 2023 21:46:42 +0430 Subject: FIX hashStorage --- web/global/hashStorage.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'web/global') diff --git a/web/global/hashStorage.go b/web/global/hashStorage.go index 099a54ed..3d5a6a0d 100644 --- a/web/global/hashStorage.go +++ b/web/global/hashStorage.go @@ -3,8 +3,10 @@ package global import ( "crypto/md5" "encoding/hex" + "regexp" "sync" "time" + "x-ui/util/common" ) type HashEntry struct { @@ -59,15 +61,23 @@ func (h *HashStorage) saveValue(query string) string { return md5HashString } -func (h *HashStorage) GetValue(hash string) string { +func (h *HashStorage) GetValue(hash string) (string, error) { h.RLock() defer h.RUnlock() entry, exists := h.Data[hash] if !exists { - return hash + if h.isMD5(hash) { + return "", common.NewError("hash not found in storage!") + } + return hash, nil } - return entry.Value + return entry.Value, nil +} + +func (h *HashStorage) isMD5(hash string) bool { + match, _ := regexp.MatchString("^[a-f0-9]{32}$", hash) + return match } func (h *HashStorage) RemoveExpiredHashes() { -- cgit v1.2.3