Commit Graph

2468 Commits

Author SHA1 Message Date
Matthias Fischer
26a9784751 vnstat 2.7: Adjusted 'traffic.cgi' to display 5-minute graphs
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-25 09:44:53 +00:00
Adolf Belka
6fcd779c05 dhcp.cgi: Bug 10400 - Add Additional DHCP Options - change default
- Make the default that Additional DHCP options Enabled checkbox is
   checked when entering a new option.
- For existing options the Enabled checkbox status is honoured.

Fixes: #10400
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-20 09:45:20 +00:00
Michael Tremer
08fa1272d2 Revert "IPsec: Ensure that iOS VPNs are always connected"
This reverts commit 8ce6222a10.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-20 09:26:13 +00:00
Michael Tremer
616d3bf9ac Merge remote-tracking branch 'ms/ipsec-ios' into next 2021-05-20 09:25:05 +00:00
Michael Tremer
468de80470 Update contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-18 09:33:47 +00:00
Leo-Andres Hofmann
a276dfba7a getrrdimage.cgi: Allow more non-word characters in the URL
As discussed in bug #12615

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-14 11:35:16 +00:00
Michael Tremer
db33a1220a IPsec: Add CA certificate in Apple profile
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
9326f51c24 Revert "IPsec: Apple: Stop prompting for credentials"
This reverts commit eef4cd4b101da0c7ceab0c3386ad755ed242f8d5.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
1108156c39 IPsec: Strip @ from IDs in Apple profile
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
8ce6222a10 IPsec: Ensure that iOS VPNs are always connected
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
839183d8b8 IPsec: Set display name for VPN connections
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
9f3742222a IPsec: Always send our host certificate to all RW clients
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
dccd7e874b IPsec: Allow sending DNS server addresses to RW clients
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
5b2e16dde2 IPsec: Apple: Stop prompting for credentials
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
2d7b3347ca IPsec: Apple: Add desired cipher suites to profiles
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
b75d92100c IPsec: Apple: Enable PFS on client when enabled
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
f356736432 vpnmain.cgi: Fix indentation on Apple profiles
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
c7fe09c6ad vpnmain.cgi: Add field for roadwarrior endpoint
This is the IP address or FQDN which will be written into
Apple Configuration profiles as public peer address.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
205c3c17c6 vpnmain.cgi: Generate random UUIDs
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:27:04 +00:00
Michael Tremer
26a0befd75 IPsec: Add prototype to export Apple Configuration profiles
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:21:00 +00:00
Michael Tremer
926e5519a6 IPsec: Use sane defaults for certificate lifetimes
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-05 11:20:22 +00:00
Robin Roevens
8b68ed1226 misc-progs: getipstat: Refactor + extend
* Return output of iptables directly instead of writing it to files.
 * Make iptables wait for 5s if xtables is locked by another iptables
 process. (--wait 5 argument)
 * Add optional parameter "-x" to have iptables report exact numbers.
 * Add optional parameter "-f" to display  the filter table  (default).
 * Add optional parameter "-n" to display the nat table.
 * Add optional parameter "-m" to display the mangle table.
  * Adapt iptables.cgi and guardian.cgi to catch getipstat output
  instead of reading temp-files.

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-04 14:27:27 +00:00
Michael Tremer
5a4412385f hostaopd: Drop box with links to other configuration pages
We do not have this for any other feature and it clutters the UI.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-16 10:03:58 +00:00
Michael Tremer
53d03ef352 hostapd: Find device by MAC address
With wireless device as members in bridges, we cannot predict the name
very well. So we will use the MAC address and find the correct device
name when we launch hostapd.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-16 10:03:58 +00:00
Leo-Andres Hofmann
c095f81435 rrdimage: Improve CGI & cosmetic changes
Write graph error messages to the system log, to simplify
further inspection by the user.
Add additional parameter check to prevent a possible redirect loop
if the URL format is changed in the future.

Cosmetic: Use underlining instead of background color for highlighting

Fixes #10643

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-12 09:31:18 +00:00
Michael Tremer
e90ef935a5 Update contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-08 10:20:40 +00:00
Daniel Weismüller
73476dd9dc Drop support for macvtap
This has been broken because of other changes on the network scripts and
since we now have support for bridges there is no point in supporting
something else that has the same functionality.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-08 10:19:55 +00:00
Jonatan Schlag
8186b37230 Hardcode theme to ipfire
This disables the theme support and makes it impossible to use any other
themes than the ipfire default theme.

The only intention of this patch is to hardcode the theme to ipfire.
To change any cgi we have is an ugly way, but the only way to do this
fast. The colour handling needs certainly to be improved as well, but
this will and should be done in other patches.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-08 10:11:34 +00:00
Leo-Andres Hofmann
9c6a0ce12d rrdimage: Switch graphs.pl to the new graph scripts
"makegraphbox" is modified to remove the old iframe method and output
a modern div container instead.
Graph errors are now returned, to be displayed by getrrdimage.cgi.

entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.

Add cache control HTTP header to image output.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-06 10:05:28 +00:00
Leo-Andres Hofmann
910f1e8494 rrdimage: Add scripts for new graph display method
This patch adds two scripts which will later be used to display graphs:

-> getrrdimage.cgi: Generates PNG images for graphs.
Until now, each CGI with embedded graphs had to be able to output
images. These functions are now gathered in this new script.
The additional parameter handling can be removed and the CGIs can
be simplified. This makes it easier to use and output the graphs.

-> rrdimage.js: Interactive Javascript functions
This allows the user to select time ranges without reloading the page.
In addition, the graphs are now periodically updated, allowing users
to live monitor the data.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-06 10:01:15 +00:00
Stefan Schantl
cdfbef5de7 logs.cgi/ids.dat: Change url to sid documentation site.
Fixes #12596.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-06 09:57:13 +00:00
Stefan Schantl
5ae1188589 logs.cgi/showrequestfromcountry.dat: Proper lookup country code.
Seems to be a code fragment has been left while switching to
libloc. Now call the right function from location-functions.pl.

Fixes #12599.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-06 09:56:15 +00:00
Leo-Andres Hofmann
a2f77069aa zoneconf.cgi: Avoid unnecessary MAC address changes
Ensure that a bridge always has a MAC address configured, to prevent
udev/network-hotplug-bridges assigning random addresses at each start.
Cache previously generated MAC addresses so that they are not
regenerated each time the configuration is saved by the user.

Add more comments to existing code.

Fixes: #12583

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-03-25 09:21:59 +00:00
Michael Tremer
9823fd82e1 Update contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-03-22 14:40:03 +00:00
Leo-Andres Hofmann
715aa887b6 zoneconf.cgi: Fix VLAN tag range check
Use the correct VLAN tag range 1-4094 and add an error message
to the range check.
The missing error message was discovered by Jonatan.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-03-22 10:37:47 +00:00
Alexander Marx
284bf12c58 BUG12479: Copied NAT rule in Firewall displays incorrect source Port
Fixes: #12479

When copying a NAT rule in the firewall the existing sourceport is copied, too.
This Fix deletes the sourceport from a copied NAT rule. After Saving, the correct port is used.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-03-22 10:36:31 +00:00
Michael Tremer
ef6979b51d Update contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-03-10 14:43:32 +00:00
Michael Tremer
ffafaa71a6 firewall: Remove ALGs from UI
This change drops the UIs that could enable ALGs for various protocols.

Those have been all forcibly disabled because "NAT Slipstream".

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-03-02 18:45:13 +00:00
Leo-Andres Hofmann
01139abbe1 zoneconf.cgi: Add default value for STP and require input
Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-02-22 18:59:12 +00:00
Leo-Andres Hofmann
5262805261 zoneconf.cgi: Import network-functions.pl
Remove custom functions and use network-functions.pl instead to detect
the available zones correctly. This also removes the requirement that
a device must be assigned for a zone to become visible/configurable.

Fixes: #12568

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-02-22 18:58:15 +00:00
Leo-Andres Hofmann
b4434345dc zoneconf.cgi: Add Javascript for new GUI elements
Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-02-22 18:58:13 +00:00
Leo-Andres Hofmann
8de94a23e0 zoneconf.cgi: Add STP options to GUI
Changes & new features:
- Add CSS for STP options, add texts to language files
- Read STP settings from ethernet configuration and display inputs
- Validate and save STP settings

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-02-22 18:58:12 +00:00
Leo-Andres Hofmann
5e6eba884b zoneconf.cgi: Modify CSS to allow additional rows
Simplify borders, load more colors from header and add dividers

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-02-22 18:58:10 +00:00
Leo-Andres Hofmann
63a1c81a63 zoneconf.cgi: Change NIC display order, improve code
Refactor duplicate perl code and add comments

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-02-22 18:58:08 +00:00
Michael Tremer
5459c8a4b7 Merge branch 'master' into next 2021-02-16 17:37:26 +00:00
Michael Tremer
e902ebe3be wirelessclient.cgi: Show when 802.11w is active
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-02-16 17:41:23 +01:00
Michael Tremer
5cdf3b8c78 wirelessclient.cgi: Show when actually connected using WPA3
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-02-16 17:37:07 +01:00
Michael Tremer
d95f360683 wirelessclient.cgi: Show when using WPA3
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-02-16 17:34:02 +01:00
Adolf Belka
896fa74d68 dhcp.cgi: Fix incorrect { placement from patch 3724
- When patch 3724 was created for bug #10743 a curly bracket was placed in the wrong place
This results in the overlap of two if loops meaning that there will be no validity
check carried out on Default Lease Time if Deny Known Clients is not checked.
- This patch moves the { bracket to the right location.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-02-16 15:02:33 +00:00
Matthias Fischer
6134b588a0 country.cgi: Fix for copy&paste typo
Fixes typo in line 103 (<-> is no tab...)

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-02-15 13:13:54 +00:00