X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=fba%2Fhelpers%2Fprocessing.py;fp=fba%2Fhelpers%2Fprocessing.py;h=00f6ae073d036c1d2102051e5853d4cd4e3e1a6f;hb=43dd23d7ccef049f98d9735c2348f3409714c12c;hp=c79815c600dbcee2a234583d63777e05bb830fd9;hpb=41a81639a9378013593a871c8bb2d4fdf65431dd;p=fba.git diff --git a/fba/helpers/processing.py b/fba/helpers/processing.py index c79815c..00f6ae0 100644 --- a/fba/helpers/processing.py +++ b/fba/helpers/processing.py @@ -45,6 +45,10 @@ def instance(blocked: str, blocker: str, command: str) -> bool: raise ValueError(f"Parameter command[]='{type(command)}' is not of type 'str'") elif command == "": raise ValueError("Parameter 'command' is empty") + elif blacklist.is_blacklisted(blocked): + raise ValueError(f"blocked='{blocked}' is blacklisted but function was invoked") + elif blacklist.is_blacklisted(blocker): + raise ValueError(f"blocker='{blocker}' is blacklisted but function was invoked") logger.debug("blocked='%s' - BEFORE!", blocked) blocked = utils.deobfuscate(blocked, blocker) @@ -89,6 +93,8 @@ def block(blocker: str, blocked: str, reason: str, block_level: str) -> bool: raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not of type 'str'") elif block_level == "": raise ValueError("Parameter block_level is empty") + elif blacklist.is_blacklisted(blocker): + raise ValueError(f"blocker='{blocker}' is blacklisted but function was invoked") elif blacklist.is_blacklisted(blocked): raise ValueError(f"blocked='{blocked}' is blacklisted but function was invoked") @@ -116,6 +122,8 @@ def csv_block(blocker: str, url: str, command: str): raise ValueError(f"command[]='{command}' is not of type 'str'") elif command == "": raise ValueError("Parameter 'command' is empty") + elif blacklist.is_blacklisted(blocker): + raise ValueError(f"blocker='{blocker}' is blacklisted but function was invoked") logger.debug("Setting last_blocked for blocker='%s' ...", blocker) instances.set_last_blocked(blocker)