From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Koch To: development@lists.ipfire.org Subject: [PATCH 1/2] squid / WPAD: Add GUI for exception-files for generation of proxy.pac Date: Sun, 21 Apr 2019 23:56:58 +0200 Message-ID: <1555883819-3329-1-git-send-email-ipfire@starkstromkonsument.de> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5641993658669579973==" List-Id: --===============5641993658669579973== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This patch adds the missing Web-GUI for the WPAD-Exceptions to proxy.cgi Note: The translations are only done for "en" and "de" yet! Signed-off-by: Alexander Koch --- html/cgi-bin/proxy.cgi | 110 +++++++++++++++++++++++++++++++++++++++++++++++= -- langs/de/cgi-bin/de.pl | 7 ++++ langs/en/cgi-bin/en.pl | 7 ++++ 3 files changed, 120 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 369a5cb..55fdc1c 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -559,6 +559,8 @@ ERROR: delete $proxysettings{'SRC_UNRESTRICTED_MAC'}; delete $proxysettings{'DST_NOCACHE'}; delete $proxysettings{'DST_NOAUTH'}; + delete $proxysettings{'DST_NOPROXY_IP'}; + delete $proxysettings{'DST_NOPROXY_URL'}; delete $proxysettings{'PORTS_SAFE'}; delete $proxysettings{'PORTS_SSL'}; delete $proxysettings{'MIME_TYPES'}; @@ -1318,6 +1320,58 @@ END ; } =20 +# =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +# WPAD settings +# =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +print < + + $Lang::tr{'advproxy wpad title'} + + + + + + $Lang::tr{'advproxy wpad label dst_noproxy= _ip'}: + $Lang::tr{'advproxy wpad label dst_noproxy= _url'}: + + + + + + + + $Lang::tr{'advproxy wpad example dst_nopro= xy_ip'} + $Lang::tr{'advproxy wpad example dst_nopro= xy_url'} + + +   + + + $Lang::tr{'advproxy wpad view pac'}: http://$ENV{SERVER_ADDR}:81/wp= ad.dat + + + +
+ +END +; + # ------------------------------------------------------------------- =20 print <) { $proxysettings{'DST_NOAUTH'} .=3D $_ }; close(FILE); } + if (-e "$acl_dst_noproxy_ip") { + open(FILE,"$acl_dst_noproxy_ip"); + delete $proxysettings{'DST_NOPROXY_IP'}; + while () { $proxysettings{'DST_NOPROXY_IP'} .=3D $_ }; + close(FILE); + } + if (-e "$acl_dst_noproxy_url") { + open(FILE,"$acl_dst_noproxy_url"); + delete $proxysettings{'DST_NOPROXY_URL'}; + while () { $proxysettings{'DST_NOPROXY_URL'} .=3D $_ }; + close(FILE); + } if (-e "$acl_ports_safe") { open(FILE,"$acl_ports_safe"); delete $proxysettings{'PORTS_SAFE'}; @@ -2446,6 +2512,31 @@ sub check_acls } } =20 + @temp =3D split(/\n/,$proxysettings{'DST_NOPROXY_IP'}); + undef $proxysettings{'DST_NOPROXY_IP'}; + foreach (@temp) + { + s/^\s+//g; s/\s+$//g; + if ($_) + { + unless (&General::validipormask($_)) { $errormessage =3D $Lang::tr{'adv= proxy errmsg wpad invalid ip or mask'}; } + $proxysettings{'DST_NOPROXY_IP'} .=3D $_."\n"; + } + } + + @temp =3D split(/\n/,$proxysettings{'DST_NOPROXY_URL'}); + undef $proxysettings{'DST_NOPROXY_URL'}; + foreach (@temp) + { + s/^\s+//g; + unless (/^#/) { s/\s+//g; } + if ($_) + { + if (/^\./) { $_ =3D '*'.$_; } + $proxysettings{'DST_NOPROXY_URL'} .=3D $_."\n"; + } + } + if (($proxysettings{'NTLM_ENABLE_ACL'} eq 'on') && ($proxysettings{'NTLM_US= ER_ACL'} eq 'positive')) { @temp =3D split(/\n/,$proxysettings{'NTLM_ALLOW_USERS'}); @@ -2584,6 +2675,16 @@ sub write_acls print FILE $proxysettings{'DST_NOAUTH'}; close(FILE); =20 + open(FILE, ">$acl_dst_noproxy_ip"); + flock(FILE, 2); + print FILE $proxysettings{'DST_NOPROXY_IP'}; + close(FILE); + + open(FILE, ">$acl_dst_noproxy_url"); + flock(FILE, 2); + print FILE $proxysettings{'DST_NOPROXY_URL'}; + close(FILE); + open(FILE, ">$acl_dst_noauth_net"); close(FILE); open(FILE, ">$acl_dst_noauth_dom"); @@ -2769,7 +2870,7 @@ END # Additional exceptions for URLs # The file has to be created by the user and should contain one entry per l= ine # Line-Format: - # e.g. *ipfire.org* + # e.g. *.ipfire.org* if (-s "$acl_dst_noproxy_url") { undef @templist; =20 @@ -2786,8 +2887,8 @@ END =20 # Additional exceptions for Subnets # The file has to be created by the user and should contain one entry per l= ine - # Line-Format: "", "" - # e.g. "192.168.0.0", "255.255.255.0" + # Line-Format: / + # e.g. 192.168.0.0/255.255.255.0 if (-s "$acl_dst_noproxy_ip") { undef @templist; =20 @@ -2798,7 +2899,8 @@ END =20 foreach (@templist) { - print FILE " (isInNet(host, $_)) ||\n"; + @temp =3D split(/\//); + print FILE " (isInNet(host, \"$temp[0]\", \"$temp[1]\")) ||\n"; } } =20 diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 90b1ada..8f84042 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -396,6 +396,13 @@ 'advproxy visible hostname' =3D> 'Sichtbarer Hostname', 'advproxy web browser' =3D> 'Web-Browser', 'advproxy wednesday' =3D> 'Mi', +'advproxy wpad title' =3D> 'Web Proxy Auto-Discovery Protocol (WPAD) / Proxy= Auto-Config (PAC)', +'advproxy wpad label dst_noproxy_url' =3D> 'Ausgenommene URL\'s (eine pro Ze= ile)', +'advproxy wpad label dst_noproxy_ip' =3D> 'Ausgenommene IP-Subnetze (eins pr= o Zeile)', +'advproxy wpad example dst_noproxy_url' =3D> 'z.B. *.ipfire.org*', +'advproxy wpad example dst_noproxy_ip' =3D> 'z.B. 192.168.2.0/255.255.255.0', +'advproxy errmsg wpad invalid ip or mask' =3D> 'WPAD: Ungültige IP oder= Subnetz für ausgenommenes IP-Subnetz', +'advproxy wpad view pac' =3D> 'PAC-Datei aufrufen', 'again' =3D> 'Wiederholung:', 'age second' =3D> 'Sekunde', 'age seconds' =3D> 'Sekunden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 98e99f1..9a3e8b0 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -397,6 +397,13 @@ 'advproxy visible hostname' =3D> 'Visible hostname', 'advproxy web browser' =3D> 'Web browser', 'advproxy wednesday' =3D> 'Wed', +'advproxy wpad title' =3D> 'Web Proxy Auto-Discovery Protocol (WPAD) / Proxy= Auto-Config (PAC)', +'advproxy wpad label dst_noproxy_url' =3D> 'Excluded URL\'s (one per line)', +'advproxy wpad label dst_noproxy_ip' =3D> 'Excluded IP-Subnets (one per line= )', +'advproxy wpad example dst_noproxy_url' =3D> 'e.g. *.ipfire.org*', +'advproxy wpad example dst_noproxy_ip' =3D> 'e.g. 192.168.2.0/255.255.255.0', +'advproxy errmsg wpad invalid ip or mask' =3D> 'WPAD: Invalid IP or subnet f= or excluded IP-subnet', +'advproxy wpad view pac' =3D> 'Open PAC-File', 'again' =3D> 'Again:', 'age second' =3D> 'second', 'age seconds' =3D> 'seconds', --=20 2.7.4 --===============5641993658669579973==--