Commit Graph

109 Commits

Author SHA1 Message Date
Oliver Fuhrer
bf2a1c524b BUG 11696: VPN Subnets missing from wpad.dat
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.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-20 10:38:17 +01:00
Alexander Koch
cdc82a993a squid / WPAD: Add Wiki-Link for required further adjustments to GUI
This patch adds a notice with a link to the Wiki-page https://wiki.ipfire.org/configuration/network/proxy/extend/wpad to the new WebGUI-Setion to make the user aware of the fact, that WPAD will only work correctly if he makes further adjustments:

- Add DHCP-Options for WPAD via DHCP
- Add HOST-Entries to DNS and Apache-vhost or haproxy-frontend/backend or firewall-redirect for WPAD via DNS

These additional options depend on the users environment and can not be shipped by default as they might break the users setups.

Note: The translations are only done for "en" and "de" yet!

Signed-off-by: Alexander Koch <ipfire@starkstromkonsument.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-20 14:16:00 +01:00
Alexander Koch
ce1c170b0c squid / WPAD: Add GUI for exception-files for generation of proxy.pac
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 <ipfire@starkstromkonsument.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-20 14:15:51 +01:00
Alexander Koch
ddc5602ac6 squid / WPAD: Add exception-files for generation of proxy.pac
This patch extends the script /srv/web/ipfire/cgi-bin/proxy.cgi by additional code for reading exceptions for URL's and IP's/Subnets from two new files:

- /var/ipfire/proxy/advanced/acls/dst_noproxy_url.acl
- /var/ipfire/proxy/advanced/acls/dst_noproxy_ip.acl

as described in: https://wiki.ipfire.org/configuration/network/proxy/extend/add_distri

These can be used to define additional URL's, IP's and Subnets that should be retrieved "DIRECT" and not via the proxy. The files have to be created by the user, as the WPAD-Feature is not enabled by default anyway. If the files are not present or their size is 0, nothing is done. I'll revise the wiki-page, after the patch is merged and the core update is released.

Signed-off-by: Alexander Koch <ipfire@starkstromkonsument.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-20 14:15:10 +01:00
Matthias Fischer
d50a78220d Bug 12008 - Typo in 'proxy.cgi' leads to wrong path for 'basic_ldap_auth'
Hi,

This should fix https://bugzilla.ipfire.org/show_bug.cgi?id=12008

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-02 14:13:17 +00:00
Michael Tremer
7ec83993e5 proxy: Show error messages in English by default
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-23 06:21:53 +00:00
Michael Tremer
ce1f04ee40 proxy: Allow selecting throttled bandwidth in MBit/s
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 16:10:59 +01:00
Michael Tremer
c2f1b8183c proxy: Suggest modern defaults for cache memory and disk
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 16:02:05 +01:00
Michael Tremer
cdd4cf4094 proxy: Drop support for throttling only certain mime types
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 16:00:05 +01:00
Michael Tremer
d68e150e86 proxy: Drop web browser check
This is neither reliable nor up to date and is therefore removed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:54:56 +01:00
Michael Tremer
a1018d86ae proxy: Set authentication TTL for NTLM authentication also
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:49:18 +01:00
Michael Tremer
6df2d52887 proxy: Use correct authentication cache TTL for AD
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:48:32 +01:00
Michael Tremer
fa286b1330 proxy: Use entered setting for auth children for AD
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:46:20 +01:00
Michael Tremer
5c2a76f7b3 proxy: Use correct realm for AD authentication
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:44:19 +01:00
Michael Tremer
dc637f087f proxy: Remove AUTH_IPCACHE_TTL
This is potentially dangerous to set larger than zero.

Authentication is perfomed on basis of IP addresses which is
not a good idea at all.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:39:36 +01:00
Michael Tremer
ea72700a3b proxy: Drop NTLM authentication
This is the authentication againt NT 4.0 style domain controllers.

squid has dropped support for this in the 4.5 release and nobody
should be using these old domain controllers any more.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-01-08 15:28:46 +01:00
Michael Tremer
eedca6e36c squid: Run as many redirectors as we have CPU cores
This makes sure that we use the optimal ratio of memory and
CPU usage.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Tested-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Tested-by: Matthias Fischer <matthias.fischer@ipfire.org>
2019-01-08 03:33:37 +01:00
Daniel Weismüller
1a3323f2e6 BUG 11786 - squid: Remove setting for filter processes the number of Squid processes
I added a function to determine the number of cores.
Now the number of squid processes will be equal to the number of logical cores.
Further I removed the possibility of changing the number
of squid processes in the proxy.cgi

Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: root <root@ipfire.test>
2019-01-08 02:02:05 +01:00
Michael Tremer
a44eed2536 proxy.cgi: The group name cannot be in quotes
Squid interprets the quotes as part of the group name, too

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-01 12:38:48 +01:00
Daniel Weismüller via Development
53d6755451 squid: Add RAM-only Proxy functionality
As suggested by Oliver "giller" Fieker <oli@new-lan.de>
in bug 10592 I added the functionality to use the squid as ram-only cache.

Further it defines the maximum_object_size_in_memory
as 2% of the in the webif defined "Memory cache size".
The maximum_object_size_in_memory should have a useful
size of the defined memory cache and I don't want to
create another variable which muste be fulled in by the user.

Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Suggested-by: Oliver "giller" Fieker <oli@new-lan.de>
Suggested-by: Kim Wölfel <xaver4all@gmx.de>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
Cc: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-03-06 15:12:17 +00:00
Bernhard Held
a2b2ac7854 proxy.cgi: remove excessive newlines in generated proxy.pac
Remove excessive newlines in generated proxy.pac

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-02-14 22:22:49 +00:00
Matthias Fischer
c4b12981e2 proxy.cgi: Even more cosmetics
Another clickable link for 'proxy.cgi', this time for 'Cache Manager Interface' - this one opens in a new window.

And: This time - hopefully - with correct '_blank'-attribute (deleted the backslashes) - based on current 'next'.

Plus: Deleted some "blind" tabs - found by chance.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-23 16:28:29 +01:00
Matthias Fischer
082771c1f4 proxy.cgi: Some cosmetics for the absolutely lazy ones (V2)
Added clickable links for 'URL filter' and 'Update accelerator' for faster access,
this time without the need to alter the language-files.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-24 20:22:45 +01:00
Alf Høgemark
f00699e8bb Change case of the unit "bit" from "Bit" to "bit" in web UI
The correct case for "kilobit" is "kilobit", not "kiloBit".
And the same applies for Mbit, Gbit etc.
Reference is https://en.wikipedia.org/wiki/Kilobit

This commit changes the texts used in the web UI, so
that it correctly displays as "bit", "kbit", "Mbit" etc.

This fixes bugzilla item 10918.

Signed-off-by: Alf Høgemark <alf@i100.no>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-07-20 16:46:23 +01:00
Michael Tremer
0aff7b8196 {proxy,chpasswd}.cgi: Fix a remote code execution vulnerability
Handcrafted requests with shell commands could be sent to these
CGI files and gain shell access as unprivileged user.

References: #11087

Reported-by: Yann Cam <yann.cam@gmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-04-08 15:54:53 +01:00
Lars Schuhmacher
e3edceeb7a Mark required input fields with a star
Mark required input fields with a star as nowadays this is
the de-facto default. Before, it was the other way around and
optional fields were marked.

Signed-off-by: Lars Schumacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-09-21 16:40:41 +01:00
Michael Tremer
8fbcf730ae proxy.cgi: Move ACL definitions up
ACl definitions could not be used in some other directives
unless they are defined earlier.
2014-08-28 17:01:44 +02:00
Michael Tremer
2fc5124b7e proxy: Allow HTTP Basic authentication against Active Directory servers
Some clients may not support NTLMv2. Basic authentication can
now be activated. This is dangerous as it sends the credentials
in cleartext to the proxy server.
2014-08-11 11:49:56 +02:00
Michael Tremer
2deb75c0f3 Merge remote-tracking branch 'ms/squid-ad' into next 2014-07-27 12:01:50 +02:00
Michael Tremer
f0b7534f7f proxy.cgi: Move {minimum,maximum}_object_size before cache_dir.
The cache_dir directive ignores the object size directives
if those have not been set prior to cache_dir.

http://bugs.squid-cache.org/show_bug.cgi?id=3830
2014-07-10 14:04:05 +02:00
Michael Tremer
3ebc0da70f proxy.cgi: Allow safe/SSL ports to be empty.
Fixes a syntax error in the generated squid configuration
file.
2014-07-10 13:30:02 +02:00
Michael Tremer
b56746432b proxy: Add option to require a certain group for Internet access. 2014-06-12 11:29:18 +02:00
Michael Tremer
603248db53 squid: Add NTLM authentication against Windows Active Directory servers. 2014-06-10 20:15:58 +02:00
Michael Tremer
dd58c50c3e proxy.pac: Don't use proxy for direct domain access. 2014-05-12 13:21:24 +02:00
Bernhard Bitsch
7c1b7d3e22 proxy.pac: Only grant direct access for actual subnets.
Fixes #10324.
2014-05-12 13:16:43 +02:00
Alf Høgemark
153cf6406c cgi-bin: Use readonly="readonly" attribute on html input elements
The proper way to mark readonly is to use readonly="readonly", not
readonly="true", like it was done some places.
2014-02-18 18:48:57 +01:00
Alf Høgemark
631b67b7cd cgi-bin: HTML cleanup, add quotes for attribute values 2014-02-15 16:54:38 +01:00
Alexander Marx
73cb6627fc SQUID: fixed length of FAKE_REFERRER field 2014-01-06 13:03:06 +01:00
Michael Tremer
4f160f04cb proxy: Set number of file descriptors much higher.
Some users are hitting the 65k limit regularly, so
we set the limit to a much higher number.
2013-11-21 21:36:02 +01:00
Michael Tremer
d3527a38c1 Multiple CGI files: Check if BLUE or ORANGE are actually configured. 2013-11-08 14:32:08 +01:00
Michael Tremer
8dc177053f squid: Increase default number of file descriptors. 2013-10-14 14:07:35 +02:00
Michael Tremer
0f6b606785 squid: Implement intercept mode. 2013-10-14 13:54:24 +02:00
Michael Tremer
754f508b5b squid: Update to 3.3.8. 2013-08-22 12:57:56 +02:00
Michael Tremer
8b417dd143 proxy.cgi: Re-apply accidentially removed changes.
Removed in dfee7582f9,
originally introduced in 49c7cb2328.
2013-07-16 19:38:54 +02:00
Michael Tremer
920cc72333 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2013-07-15 22:05:12 +02:00
Michael Tremer
a610e13655 squid: Allow to set more FDs in CGI. 2013-07-15 22:04:59 +02:00
Stefan Schantl
dfee7582f9 Increase performance of the squidclamav redirector.
To boost up the performance, now we trust the proxy cache.

I add some changes to the proxy.cgi to configure the proxy and the
squidclamav in the right way.

I also add a hook that allows us to generate a new configuration
if the cgi script will be launched from the shell.

Fixes #10367.
2013-06-30 11:21:42 +02:00
Michael Tremer
49c7cb2328 squid: Include /etc/squid/squid.conf.pre.local.
This configuration file is included _before_ the
default IPFire configuration.
2013-06-18 15:59:03 +02:00
Jan Behrens
6bea848d34 squid: Compile with --enable-cache-digests.
Bug #10311
https://bugzilla.ipfire.org/show_bug.cgi?id=10311
2013-03-01 00:03:20 +01:00
Arne Fitzenreiter
b34fdcae83 proxy: allow access to IPFire itself if nets are blocked.
This fixes missing pictures on blocking pages.
fixes #10138
2013-02-14 19:33:37 +01:00