mirror of
https://git.datalinker.icu/comfyanonymous/ComfyUI
synced 2026-11-22 05:37:01 +08:00
server.py: compare_image_hash configurable hash function
Uses an argument added in cli_args to specify the type of hashing to default to for duplicate hash checking. Uses an `eval()` to identify the specific hashlib class to utilize, but ultimately safely operates because we have specific options and only those options/choices in the arg parser. So we don't have any unsafe input there.
This commit is contained in:
parent
0b319e453f
commit
a065a9081f
10
server.py
10
server.py
@ -156,10 +156,16 @@ class PromptServer():
|
|||||||
return type_dir, dir_type
|
return type_dir, dir_type
|
||||||
|
|
||||||
def compare_image_hash(filepath, image):
|
def compare_image_hash(filepath, image):
|
||||||
|
# This eval operation is *safe* because we can only accept certain strings passed in via args.
|
||||||
|
# Because that can only be one of 'md5', 'sha1', 'sha256', or 'sha512' which we already define
|
||||||
|
# in comfy.cli_args as an argument passable to the args and only from a set of options, we can
|
||||||
|
# safely use an eval here, as the eval data is "safe" already.
|
||||||
|
hasher = eval(f"hashlib.{args.duplicate_check_hash_function}")
|
||||||
|
|
||||||
# function to compare hashes of two images to see if it already exists, fix to #3465
|
# function to compare hashes of two images to see if it already exists, fix to #3465
|
||||||
if os.path.exists(filepath):
|
if os.path.exists(filepath):
|
||||||
a = hashlib.sha256()
|
a = hasher()
|
||||||
b = hashlib.sha256()
|
b = hasher()
|
||||||
with open(filepath, "rb") as f:
|
with open(filepath, "rb") as f:
|
||||||
a.update(f.read())
|
a.update(f.read())
|
||||||
b.update(image.file.read())
|
b.update(image.file.read())
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user