From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] BUG: 11696 - VPN Subnets missing from wpad.dat
Date: Tue, 24 Apr 2018 15:50:50 +0100
Message-ID: <1524581450.2274586.33.camel@ipfire.org>
In-Reply-To: <0a6c9f5b-2ef9-d0cc-832d-501c4f676050@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0563162517773933913=="
List-Id: <development.lists.ipfire.org>

--===============0563162517773933913==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

On Tue, 2018-04-24 at 16:34 +0200, Peter M=C3=BCller wrote:
> Hello,
> > Hello Oliver,
> >=20
> > welcome to the list.
> >=20
> > Unfortunately the patch has been fragmented by your email program. The li=
nes
> > have been wrapped and the patch won't apply any more. Could you please ch=
eck
> > the
> > settings of your email program and submit again?
>=20
> In case of Thunderbird, this might be helpful:
> https://wiki.ipfire.org/devel/send-tb-patches

That article is quite hidden. Would you like to change the chapter on the
"submitting patches" page so that it is obvious that it has some clues about =
how
to configure an MTA?

-Michael

>=20
> Best regards,
> Peter M=C3=BCller
> >=20
> > Best,
> > -Michael
> >=20
> > On Fri, 2018-04-20 at 23:00 +0200, Oliver Fuhrer wrote:
> > > This Patch excludes enabled ipsec/ OpenVPN N2N Subnets from wpad.dat so
> > > they
> > > don't go through the proxy.
> > > I could only test it with ipsec tunnels, however as the code for openvpn
> > > is
> > > pretty much the same, I included this one as well and some basic tests
> > > worked as expected.
> > > As I'm not very familiar with Perl, there probably is some room for
> > > improvement too.
> > >=20
> > > Regards
> > > Oliver
> > >=20
> > >=20
> > > diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
> > > index c36fc4e..69bfdd4 100644
> > > --- a/html/cgi-bin/proxy.cgi
> > > +++ b/html/cgi-bin/proxy.cgi
> > > @@ -3014,6 +3014,11 @@ 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";
> > > @@ -3039,6 +3044,26 @@ END
> > >                 print FILE "     (isInNet(host,
> > > \"$netsettings{'ORANGE_NETADDRESS'}\",
> > > \"$netsettings{'ORANGE_NETMASK'}\"))
> > > > > \n";
> > >=20
> > >         }
> > >=20
> > > +       foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp
> > > uc($vpnconfig{$b}[1]) } keys %vpnconfig) {
> > > +               if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] =
ne
> > > 'host') {
> > > +                       my @networks =3D split(/\|/, $vpnconfig{$key}[1=
1]);
> > > +                       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 <<END
> > >       (isInNet(host, "169.254.0.0", "255.255.0.0"))
> > >     )
> > > --
> > >=20

--===============0563162517773933913==--