Fix error message path

Author: nigelhorne

lib/VWF/Allow.pm

@@ -14,7 +14,7 @@ use File::Spec;
 
 use constant DSHIELD_BASE => 'https://secure.dshield.org/api/sources/attacks/100/';
 
-our %blacklist_countries = (
+my %blacklist_countries = (
 	'BY' => 1,
 	'MD' => 1,
 	'RU' => 1,
@@ -35,7 +35,7 @@ our %blacklist_countries = (
 	'XH' => 1,
 );
 
-our %blacklist_agents = (
+my %blacklist_agents = (
 	'Barkrowler' => 'Barkrowler',
 	'masscan' => 'Masscan',
 	'WBSearchBot' => 'Warebay',
@@ -48,7 +48,7 @@ our %blacklist_agents = (
 	'ZoominfoBot (zoominfobot at zoominfo dot com)' => 'zoominfobot',
 );
 
-our %status;
+my %status;
 
 my $STATUS_TTL = 300;	# 5 minutes; keeps memory bounded and lets throttle windows expire
 
@@ -139,13 +139,16 @@ sub allow {
 			}
 		};
 		if($@) {
-			# Genuine YAML/IO error from Data::Throttler — delete the corrupt DB and continue
-			if($logger) {
-				$logger->info("removing $db_file: $@");
-			} elsif(ref($@) && $@->isa('Error')) {
-				# Deliberate block (throttle) — re-throw so caller sees the denial
+			if(ref($@) && $@->isa('Error')) {
+				# Deliberate throttle block: re-throw so the caller sees the denial.
+				# Do NOT unlink the DB here -- that would erase the throttle window.
 				$@->throw();
 			}
+			# Genuine YAML/IO error from Data::Throttler -- remove the corrupt file
+			# and fall through so this request is served (fail open).
+			if($logger) {
+				$logger->info("removing corrupt throttle DB $db_file: $@");
+			}
 			unlink($db_file);
 		}
 
@@ -242,7 +245,7 @@ sub allow {
 	my $cache = $args{'cache'};
 	if(!defined($cache)) {
 		throw Error::Simple('Either cache or config must be given') unless($args{config});
-		$cache = ::create_memory_cache(config => $args{'config'}, namespace => __PACKAGE__, logger => $logger);
+		$cache = VWF::Utils::create_memory_cache(config => $args{'config'}, namespace => __PACKAGE__, logger => $logger);
 	}
 	if(defined($cache)) {
 		my $cachecontent = $cache->get($today);

lib/VWF/Config.pm

@@ -142,12 +142,7 @@ sub new
 			unless -d $ENV{'CONFIG_DIR'} && -r $ENV{'CONFIG_DIR'};
 		@config_dirs = ($ENV{'CONFIG_DIR'});
 	} else {
-		if($params->{config_directory}) {
-			throw Error::Simple("config_directory must be a string") if(ref($params->{config_directory}));
-			throw Error::Simple("config_directory '$params->{config_directory}' does not exist")
-				unless -d $params->{config_directory};
-			push(@config_dirs, $params->{config_directory});
-		}
+		# Build the standard search path; caller's config_directory is prepended below
 		@config_dirs = (
 			File::Spec->catdir(
 				$info->script_dir(),
@@ -176,6 +171,14 @@ sub new
 				'conf'
 			));
 		}
+
+		# Prepend the caller-supplied directory so it takes highest precedence
+		if($params->{config_directory}) {
+			throw Error::Simple("config_directory must be a string") if ref($params->{config_directory});
+			throw Error::Simple("config_directory '$params->{config_directory}' does not exist")
+				unless -d $params->{config_directory};
+			unshift @config_dirs, $params->{config_directory};
+		}
 	}
 
 	# Look for localised configurations