From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oliver Fuhrer To: development@lists.ipfire.org Subject: [PATCH v2] BUG 11696: VPN Subnets missing from wpad.dat Date: Sun, 19 May 2019 15:30:52 +0200 Message-ID: <1558272652-23969-1-git-send-email-oliver.fuhrer@bluewin.ch> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6470879527929752773==" List-Id: --===============6470879527929752773== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This patch fixes the behavior in 11696 and adds IPSEC and OpenVPN n2n subnets= to wpad.dat so they don't pass through the proxy. --- Hi List, New version of the patch, this one has been created against next branch and s= uccessfully tested on a fresh build. Regards Oliver html/cgi-bin/proxy.cgi | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 91e4fce..b639640 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2848,6 +2848,10 @@ sub write_acls =20 sub writepacfile { + my %vpnconfig=3D(); + my %ovpnconfig=3D(); + &General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig); + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ovpnconfig); open(FILE, ">/srv/web/ipfire/html/proxy.pac"); flock(FILE, 2); print FILE "function FindProxyForURL(url, host)\n"; @@ -2910,6 +2914,27 @@ END } } =20 + foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } k= eys %vpnconfig) { + if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host') { + my @networks =3D split(/\|/, $vpnconfig{$key}[11]); + foreach my $network (@networks) { + my ($vpnip, $vpnsub) =3D split("/", $network); + $vpnsub =3D &Network::convert_prefix2netmask($vpnsub) || $vpnsub; + print FILE " (isInNet(host, \"$vpnip\", \"$vpnsub\")) ||\n"; + } + } + } + + foreach my $key (sort { uc($ovpnconfig{$a}[1]) cmp uc($ovpnconfig{$b}[1]) }= keys %ovpnconfig) { + if ($ovpnconfig{$key}[0] eq 'on' && $ovpnconfig{$key}[3] ne 'host') { + my @networks =3D split(/\|/, $ovpnconfig{$key}[11]); + foreach my $network (@networks) { + my ($vpnip, $vpnsub) =3D split("/", $network); + print FILE " (isInNet(host, \"$vpnip\", \"$vpnsub\")) ||\n"; + } + } + } + print FILE <