Skip to content

Add parameter MIRRORCACHE_VPN_PREFIX_NEG to escape some vpn ranges #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrii-suse merged 1 commit into from
Oct 29, 2025
Merged

Add parameter MIRRORCACHE_VPN_PREFIX_NEG to escape some vpn ranges #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/MirrorCache/Datamodule.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2021-2024 SUSE LLC
# Copyright (C) 2021-2025 SUSE LLC
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -64,6 +64,7 @@ has root_subtree => ($ENV{MIRRORCACHE_SUBTREE} // "");

has _vpn_var => $ENV{MIRRORCACHE_VPN};
has vpn_prefix => ($ENV{MIRRORCACHE_VPN_PREFIX} ? lc($ENV{MIRRORCACHE_VPN_PREFIX}) : "10.");
has vpn_prefix_neg => ($ENV{MIRRORCACHE_VPN_PREFIX_NEG} ? lc($ENV{MIRRORCACHE_VPN_PREFIX_NEG}) : "");

has 'at';
has '_mime';
Expand Down Expand Up @@ -139,6 +140,11 @@ sub vpn($self) {
for my $pref (split /[\s]+/, $self->vpn_prefix) {
$match = 1 if (rindex($ip, $pref, 0) == 0);
}
if ($match && $self->vpn_prefix_neg) {
for my $pref (split /[\s]+/, $self->vpn_prefix_neg) {
$match = 0 if (rindex($ip, $pref, 0) == 0);
}
}
$self->_vpn($match);
}
}
Expand Down
5 changes: 3 additions & 2 deletions t/environ/15-local-symlink-subtree-rootredirect.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ $mcsub/gen_env MIRRORCACHE_ROOT="'$mc/dt:testhost.com:testhost.vpn'" \
MIRRORCACHE_SUBTREE=/updates \
MIRRORCACHE_TOP_FOLDERS=tool \
MIRRORCACHE_VPN_PREFIX='"11. 10.10"' \
MIRRORCACHE_VPN_PREFIX_NEG='"10.10.99"' \
MIRRORCACHE_ROOT_COUNTRY=us

$mcsub/start
Expand All @@ -64,9 +65,9 @@ $mcsub/curl /tool/v2/file1.1.dat.metalink | grep -C10 $($ap8/print_address)/up
$mcsub/curl /tool/v1/file1.1.dat.mirrorlist | grep -C30 $($ap7/print_address)/folder1/file1.1.dat | grep -C30 $($ap8/print_address)/updates/tool/v1/file1.1.dat | grep testhost.com/folder1/file1.1.dat
$mcsub/curl /tool/v2/file1.1.dat.mirrorlist | grep -C30 $($ap8/print_address)/updates/tool/v2/file1.1.dat | grep testhost.com/folder2/file1.1.dat

$mcsub/curl /tool/v1/file1.1.dat.metalink?IP=10.11.10.1 | grep testhost
$mcsub/curl /tool/v1/file1.1.dat.metalink?IP=10.10.99.1 | grep testhost.com
$mcsub/curl /tool/v1/file1.1.dat.metalink?IP=10.11.10.1 | grep testhost.com
$mcsub/curl /tool/v1/file1.1.dat.metalink?IP=10.10.10.1 | grep testhost
$mcsub/curl /tool/v1/file1.1.dat.metalink?IP=10.10.10.1 | grep testhost.vpn
rc=0
$mcsub/curl /tool/v1/file1.1.dat.metalink?IP=10.10.10.1 | grep testhost.com || rc=$?
test $rc -gt 0
Expand Down