Commit Graph

1870 Commits

Author SHA1 Message Date
Peter Müller
40a930bda5 BUG:11312 Fix renaming GeoIP groups
When renaming a GeoIP Group, the corresponding names in
firewallrules (if any) are not changed accordingly. Now
when changing a GeoIP Group the firewallrules are renamed
correctly.

Slightly improved first version of this patch (contained
a blank line with trailing whitespace). No functionality
changed, patch has been confirmed as working correctly.

Fixes: #11312
Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-04-27 11:04:05 +01:00
Michael Tremer
4cd51e20ae Revert "IPsec: Try to restart always-on tunnels immediately"
This reverts commit a261cb06c6.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-04-19 15:36:37 +01:00
Michael Tremer
f5b2d0a14a OpenVPN: Drop Path MTU discovery settings
These have to be dropped since the entire system does not
support Path MTU discovery any more. This should not have
any disadvantage on any tunnels since PMTU didn't really
work in the first place.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-04-09 11:32:07 +01:00
Daniel Weismüller
20ffa7d1a8 As described in bug 11257 there is a mistake in the qos templates. The sum of the guaranteed bandwidth of the classes 101 - 120 is bigger than the available bandwidth. I adjusted the guaranteed bandwidth of the classes 101 - 104 so that each of them has a
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-03-06 15:13:16 +00: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
Michael Tremer
568a227bd3 vpnmain.cgi: Fix reading common names from certificates
OpenSSL has changed the output of the subject lines of
certificates.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-03-01 19:59:14 +00:00
Erik Kapfer via Development
52f61e496d OpenVPN: New AES-GCM cipher for N2N and RW
AES-GCM 128, 196 and 256 bit has been added to Net-to-Net and Roadwarrior section.

HMAC selection for N2N will be disabled if AES-GCM is used since GCM provides an own message authentication (GMAC).
    'auth *' line in N2N.conf will be deleted appropriately if AES-GCM is used since '--tls-auth' is not available for N2N.
HMAC selection menu for Roadwarriors is still available since '--tls-auth' is available for RWs
    which uses the configuered HMAC even AES-GCM has been applied.

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-02-25 19:31:30 +00:00
Michael Tremer
9434bffaf2 Merge branch 'openssl-11' into next 2018-02-21 12:21:10 +00:00
Michael Tremer
a261cb06c6 IPsec: Try to restart always-on tunnels immediately
When a tunnel that is in always-on configuration closes
unexpectedly, we can instruct strongSwan to restart it
immediately which is precisely what we do now.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-02-19 23:46:17 +00:00
Erik Kapfer
a4fd232541 OpenVPN: Added needed directive for v2.4 update
script-security: The support for the 'system' flag has been removed due to security implications
    with shell expansions when executing scripts via system() call.
    For more informations: https://community.openvpn.net/openvpn/wiki/Openvpn24ManPage .

ncp-disable: Negotiable crypto parameters has been disabled for the first.

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-02-15 10:41:41 +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
Erik Kapfer
ea6dd5b0ac OpenVPN: Mark unsecure ciphers and DH-parameter as 'weak' in WUI menu
64 bit block ciphers like Blowfish, TDEA and CAST5 are vulnerable to the so called 'Birthday attacks' .
    Infos for 'Sweet32' Birthday attacks can be found in here
        https://sweet32.info/ .
    An Overview of 64 bit clock ciphers can also be found in here
        http://en.citizendium.org/wiki/Block_cipher/Catalogs/Cipher_list#64-bit_blocks

1024 bit Diffie-Hellman parameter has also been marked as weak causing the 'Logjam Attack' .
   Infos for 'Logjam Attack' can be found in here
        https://weakdh.org/ .

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-02-11 23:41:42 +00:00
Michael Tremer
cb18f19307 index.cgi: Properly show IPsec subnets
Fixes: #11604

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-02-11 23:23:54 +00:00
Matthias Fischer
1b18943b15 urlfilter.dat: Added Older/Newer links at top of page
Hi,

Triggered by:
https://forum.ipfire.org/viewtopic.php?f=4&t=19998#p112930

Added 'Older'/'Newer'-links for better page browsing.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-01-10 16:55:23 +00:00
Matthias Fischer
bf1db4b28f Forgot to change language strings in captive.cgi
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-01-10 16:44:04 +00:00
Matthias Fischer
9d79aea24b snort 2.9.11.1: 'ids.cgi' - Update for snort rules download url
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-01-07 19:21:51 +00:00
Peter Müller
ff9fdd6388 use HTTPS for links to fireinfo.ipfire.org
Since fireinfo.ipfire.org is now supporting HTTPS, the
links in the WebUI should point to the secure version of the site.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-01-07 19:18:33 +00:00
Peter Müller
d894ef3615 fix GeoIP lookup in showrequestfromcountry.dat
This issue was caused by the rewrite of the perl GeoIP
library.

Fixes #11571.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Tested-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-01-07 19:17:11 +00:00
Peter Müller
6fc0f5eb92 mark 3DES and 1024 bit DH params as weak
These are not considered secure anymore but are unfortunately
still needed in some cases (legacy hardware, ...).

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-12-14 17:46:13 +00:00
Michael Tremer
3a44597467 OpenVPN: Allow to set routes to IPsec networks
This makes hub-and-spoke designs with OpenVPN RW and
IPsec N2N easier to configure

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-12-04 17:51:53 +00:00
Michael Tremer
af183eeb78 IPsec: Allow configuring inactivity timeout when in on-demand mode
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-12-04 17:31:53 +00:00
Michael Tremer
8c6b02e7f6 IPsec: Drop support for MODP with subgroup
These come from questionable sources and are not considered
to be secure any more: https://eprint.iacr.org/2016/961

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-12-04 13:12:38 +00:00
Peter Müller
ea4620fc4a display GeoIP information on active network connections
Display GeoIP information on active network connections in WebUI.
Use newly implemented function in /var/ipfire/geoip-functions.pl .

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-12-02 12:24:29 +00:00
Peter Müller
9b5a17bf94 display GeoIP information on ipinfo.cgi
Display GeoIP information on ipinfo.cgi and use newly implemented
function in /var/ipfire/geoip-functions.pl .

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-12-02 12:24:19 +00:00
Peter Müller
297110d460 add GeoIP and rDNS information to used nameservers
Add GeoIP and rDNS information to DNS nameserver list at netexternal.cgi

Use newly implemented GeoIP function in /var/ipfire/geoip-functions.pl

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-29 12:05:43 +00:00
Peter Müller
5b4be0f18f show IDS rule names correctly in WebUI log
The WebUI IDS log did not display the rule name for alerts
where a signature with a five digit number was triggered
(some Emerging Threats signatures are using them).

Changing the regular expression so it will match on five
digit SIDs, too.

Fixes #11519.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-29 12:03:42 +00:00
Peter Müller
e15d5f25c6 link to DNS server status page on index.cgi
Show a link to the DNS server status at netexternal.cgi
on index.cgi in WebUI.

For the lazy ones... :-)

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-29 12:02:13 +00:00
Peter Müller
fb6446d292 correct wrong headline at hardwaregraphs.cgi
The page description (title and headline) should print
"hardware graphs" instead of only mentioning HDDs.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-29 12:01:30 +00:00
Peter Müller
d49f6fdca9 translate 'firewall hits' at netother.cgi
Also translate 'firewall hits' at the network status
(other) page in WebUI.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-29 11:59:49 +00:00
Peter Müller
7f7b7b24b0 update links to www.ipfire.org at credits.cgi
The links to the IPFire homepage in the credits.cgi file should
point to the HTTPS version of the site now.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-29 11:58:48 +00:00
Michael Tremer
0545cba708 captive: Escape any special characters in title on PDF vouchers
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-29 11:57:55 +00:00
Peter Müller
817af14fd2 allow changing remote syslog protocol to TCP
Add option to change remote syslog protocol to TCP, which
is more reliable than UDP, but might be unsupported  on
older syslog servers.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-28 17:46:01 +00:00
Michael Tremer
120d77b33c vpnmain.cgi: Disable compression by default
The compression is causing some interoperatibility issues
and does not really compress data very much - even when the
data is quite compressible.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-28 17:17:46 +00:00
Michael Tremer
00793c27c9 GeoIP: Add lookup function for convenience
Instead of opening the database again for each lookup,
we will read it into memory on first use and every lookup
after that will be coming from cache.

Reviewed-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-13 22:37:19 +00:00
Alexander Marx
51141b150d BUG11466: fix routing.cgi the function call in routing.cgi was fixed to call the new "exact" function.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-07 16:20:29 +00:00
Peter Müller
eea4969dff Tor: Use relay mode as default setting
Set the default operating mode to "relay" in the Tor WebUI
configuration page.

Running a Tor exit relay may cause legal trouble in some
countries and should not be the default setting to prevent
users from accidentally running an exit router.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-07 16:14:36 +00:00
Michael Tremer
ad1204e4eb captive: One month is only 30 days instead of 210
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-06 19:07:10 +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
49f7ee5d72 snort: Update to 2.9.11
For details see:

Release notes:
https://snort.org/downloads/snort/release_notes_2.9.11.txt

Changelog:
https://snort.org/downloads/snort/changelog_2.9.11.txt

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-23 16:24:46 +01:00
Arne Fitzenreiter
fcd8ab4c23 Merge branch 'master' into core115 2017-10-18 21:20:23 +02:00
Michael Tremer
af6c5929b0 captive: Simplify coupon time selection
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-17 15:05:53 +02:00
Michael Tremer
f32174956e captive: Reindent code for better readability
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-17 12:43:42 +01:00
Michael Tremer
3a62dca68e captive: Localise GREEN/BLUE
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-17 12:41:17 +01:00
Michael Tremer
a54350cdb9 captive: Allow PDF export of coupons
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-16 16:36:24 +02:00
Michael Tremer
ebfb899693 captive: Add headline to T&C box
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-16 15:03:39 +02:00
Michael Tremer
e2bd5a6eb9 captive: Allow editing terms in coupon mode
Since the terms are always shown when set, we need a way
to edit them in coupon mode as well.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-11 14:52:03 +01:00
Erik Kapfer
b66b02ab73 OpenVPN: Fix for '--ns-cert-type server is deprecated' .
- Added extended key usage based on RFC3280 TLS rules for OpenVPNs OpenSSL configuration,
so '--remote-cert-tls' can be used instead of the old and deprecated '--ns-cert-type'
if the host certificate are newely generated with this options.
Nevertheless both directives (old and new) will work also with old CAs.

- Automatic detection if the host certificate uses the new options.
If it does, '--remote-cert-tls server' will be automatically set into the client
configuration files for Net-to-Net and Roadwarriors connections.

If it does NOT, the old '--ns-cert-type server' directive will be set in the client
configuration file.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-11 11:55:16 +01:00
Peter Müller
e34e72b6e1 add missing check for Curve25519 in vpnmain.cgi
This fixes bug #11501 which causes IPsec connections to crash if
Curve25519 has been enabled.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-09 14:54:37 +01:00
Michael Tremer
bef7ad5bbe captive: Fix saving empty terms
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-09 14:34:21 +01:00
Michael Tremer
bbc69f228d captive portal: Correctly initialise an array for 8h timeout
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-05 11:11:32 +01:00