Commit Graph

1867 Commits

Author SHA1 Message Date
Alexander Marx
5dc32e5877 Captive-Portal: add Errormessage when wrong code is entered
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
f3802750ac Captive-Portal: fix wrong expiretime of unused vouchers
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
facfdcd040 Captive-Portal: fix voucher form
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
6d31cfdd58 Captive-Portal: add logging to syslog
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:44 +01:00
Alexander Marx
e14adf759a Captive-Portal: SHow always licencebox in config
Also fix index.cgi to show individual title

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Alexander Marx
c7e78cc62e Captive-Portal: several design changes
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Alexander Marx
e01c5ab71a Captive-Portal: redesign Webinterface
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Alexander Marx
8b92078917 Captive-Portal: add web-part
Introduce new Captive-Portal.
Here we add the menu, apache configuration (vhost), IPFire configuration
website and Captive-Portal Access site. Also the languagefiles are
updated.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Stephan Feddersen
dec5269370 WIO: patch log.dat to show wio logs
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-15 11:45:51 +01:00
Matthias Fischer
d659de88cc Dropped 'dnsmasq' from System log
I think we don't need this anymore...

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-06-14 15:52:33 +01:00
Alexander Marx
e924369706 Delete unused function from fwhosts.cgi
This function is not used by any other script.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-06-14 15:52:33 +01:00
Michael Tremer
a9a91e5fa7 ids.cgi: Fix remote command execution vulnerability
The OINKCODE variable was only validated for proper input
when the Save button was clicked.

Did the user demand to download new rules instead, the
content of that variable was not being validated (again)
and was passed to wget on the shell.

This was done with privileges of the "nobody" user.

Fixes #11401

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-06-14 12:58:12 +01:00
Alexander Marx
b7ab17ad83 BUG11278: It is not possible to create subnets of internal networks in firewallgroups
Fixes: #11278

When creating networks which are part of an internal network, there was an errormessage displayed and the creation was prohibited.
Now it is possible to create such subnets. This is used at own risk! Users have to take care of the firewallrule sequence.
It is possible to create situations that are not wanted.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-06-07 17:19:30 +01:00
Michael Tremer
e65d5a0061 imspector: Drop package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-22 20:03:01 +01:00
Michael Tremer
844e542e60 Merge remote-tracking branch 'ms/wlanclient' into next 2017-05-18 11:22:20 +01:00
Michael Tremer
c335b0cd8e index.cgi: Show WiFi properties on front page
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-16 16:02:25 +02:00
Michael Tremer
0628d956a7 WiFi: Show EAP status on wireless client page
This patch adds some status information so that we know what
authentication an access point is using.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-16 15:05:25 +02:00
Michael Tremer
86282bdc7d vpnmain.cgi: Fix typo
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-05 12:02:21 +01:00
Michael Tremer
19f0fa5694 wlan client: Allow configuration of EAP-PEAP and EAP-TTLS on web user interface
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-05 11:17:06 +01:00
Matthias Fischer
415cbcecfa GUI: Some simple FW-Log cosmetics
I altered 'showrequestfromcountry.dat', 'showrequestfromip.dat' and 'showrequestfromport.dat'
in the same manner as the 'Loggraphs'-Pages in commit

Each 'Details'-page got a unique title.

Furthermore, I added a 'Back'-Button to go back to the previous page. For this, I used
'back.png' from 'wio' (thanks Stephan! ;-) ) since I found no other appropriate image.

'ipinfo.cgi' got a centered 'Back'-Button, too.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-03 17:06:29 +01:00
Michael Tremer
f3dfb261c8 OpenVPN: Mark SHA1 as weak
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-28 13:03:46 +01:00
Michael Tremer
7090074557 OpenVPN: Use SHA512 by default
This will break compatibility with old clients like
Windows XP, but these are too old now to be supported.

SHA1 is considered to be weak and should not be used any more

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-28 13:01:41 +01:00
Matthias Fischer
1bea8be2ce GUI: Some simple FW-Log cosmetics
Fixed the 'details'-Button in 'firewalllogcountry.dat' by adding missing
translation string.

Each 'Loggraphs'-Page got a unique title and a new heading for the corresponding
diagram.

Just cosmetics...

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-24 10:53:25 +01:00
Michael Tremer
1fab4edfa6 IPsec: Show status in WUI when VPN is connecting
This is helpful when debugging on-demand connections
when you can see if strongswan tries to connect or is
still idle.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-20 13:00:42 +01:00
Michael Tremer
c94d1976d3 IPsec: Mark MODP<=1024 and MD5 as broken and SHA1 as weak
Since we somehow have to support these algorithms this patch
adds some information for the user that it is very strongly
discouraged to use them in production.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-20 12:53:53 +01:00
Michael Tremer
2c2cf3918b IPsec: Allow using MODP-768 in proposal
MODP-768 is broken but some systems out there (for example old
Cisco ASAs) do not support anything better. Hence it is better
to allow this instead of using no VPN at all.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-20 12:44:27 +01:00
Matthias Fischer
77cdccf4c0 BUG 11318: Fix deletion of temporary files from IPTables-GUI
For details see:
https://bugzilla.ipfire.org/show_bug.cgi?id=11318

Temporary files for 'iptables', 'iptablesmangle' and 'iptablesnat' created by
'iptables.cgi' were not deleted after use but stayed in '/srv/weg/ipfire/html/'.

As a workaround I changed 'getipstat.c' to create these files in '/var/tmp' and the
"open (file..." and "rm" commands in 'iptables.cgi'.

Works here.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-18 11:22:18 +01:00
Matthias Fischer
d68ead3dec Fix for guardian-CGI: As a result of fixing BUG11318
This is necessary because commit bf1985fae5baca327fcded31264f45638442f02e changes the
place where temporary files from 'iptables' are stored.

Some typos where fixed, too.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-18 11:22:13 +01:00
Michael Tremer
9bc2e596d0 IPsec: Include Curve 25519 in default proposal
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-05 12:16:52 +01:00
Michael Tremer
64056cae46 IPsec: Allow selecting Curve 25519 as group type
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-05 12:16:20 +01:00
Michael Tremer
570d54fd84 IPsec: Drop SHA1 and MODP<=1536 from proposed ciphers
IPsec is still proposing to use SHA1 and MODP-1536 or MODP-1024
when initiating a connection. These are considered weak although
many off-the-shelf hardware is still using this as defaults.

This patch disables those algorithms and additionally changes
default behaviour to only accept the configured cipher suites.

This might create some interoperability issues, but increases
security of IPFire-to-IPFire IPsec connections.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-05 11:42:55 +01:00
Michael Tremer
183b23b5ca DNS: Show DNSSEC status on index page if deavtivated
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-02 19:48:20 +01:00
Michael Tremer
e89b407f88 Fix updated graphs in legacy theme
The images are now a little bigger and will be scaled down
here, but the iframe box never grows bigger than the max.
size of the container.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-03-22 17:22:26 +00:00
Michael Tremer
a249ccd2e4 Improve graphs
The graphs are using an iframe and PNG images where the resolution
did often not fit and the browser had to resize the image. That
led to blurred fonts and hard to read graphs.

This patch increases the size of the box and the image. With that
higher resolution resizing should not be too much of an issue, but
since the sizes of the iframe and image have been aligned should
not even be necessary.

Reported-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-03-15 13:45:05 +00:00
Michael Tremer
8057ab15b9 Show better connection information for on-demand IPsec connections
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-02-15 12:15:42 +00:00
Michael Tremer
1ee1666ee4 IPsec: Close on-demand tunnels after 15 min of inactivity
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-02-15 11:22:27 +00:00
Michael Tremer
dcb406cc67 IPsec: Allow to create on-demand connections
This will create IPsec VPN connections with auto=route set
instead of auto=start which will cause the connection being
created, but not brought up yet.

As soon as the first packet is received, the connection will
be established and data will be passed through it.

This allows IPFire to handle more VPN connections on weaker
systems and avoids negotiating many connections which are
rarely used.

Suggested-by: Tom Rymes <tomvend@rymes.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Fixes: #10733
2017-02-15 10:11:58 +00:00
Matthias Fischer
ba6fc476fb snort: Update to 2.9.9.0
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-12-18 15:19:52 +00:00
Michael Tremer
adb11e90df Always enable asynchronous logging
This patch always enables asynchronous logging which slows
down the system a lot on slow storage and some virtual environments.

It also removes the configuration options in the web
user interface, since this is not configurable any more.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-11-29 12:18:41 +00:00
Alexander Marx
bc4a68812b BUG11242: Fix for adding 2 VPN Hosts/network with same name
If one has an IPSec network named "aaa" and an OpenVPn Host with the same name
it was not possible to group them together because of the same name.
Now the Network type is also checked wich allows Entries with same name, but different networks.

Fixes: #11242

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-11-17 14:11:50 +00:00
Matthias Fischer
5e818d6afb log.dat: cosmetical upgrade
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-10-25 12:15:07 +01:00
Matthias Fischer
58c2333bdc iptables.cgi: cosmetics - wider columns
Hi,

Since the first three columns of 'iptables.cgi' gave a nearly unreadable output
with large numbers, so I made 'pkts', 'bytes' and 'target'-columns a bit wider.

BEFORE - it was something like this:

Chain INPUT (policy DROP 0 packets, 0 bytes)
  pkts bytestarget        proc opt in     out source    destination
  32M38G    BADTCP        tcp  --  *      *   0.0.0.0/0 0.0.0.0/0
  32M38G    CUSTOMINPUT   all  --  *      *   0.0.0.0/0 0.0.0.0/0
  32M38G    P2PBLOCK      all  --  *      *   0.0.0.0/0 0.0.0.0/0
  32M38G    GUARDIAN      all  --  *      *   0.0.0.0/0 0.0.0.0/0
  00        OVPNBLOCK     all  --  tun+   *   0.0.0.0/0 0.0.0.0/0
  32M38G    IPTVINPUT     all  --  *      *   0.0.0.0/0 0.0.0.0/0
  32M38G    ICMPINPUT     all  --  *      *   0.0.0.0/0 0.0.0.0/0
  32M38G    LOOPBACK      all  --  *      *   0.0.0.0/0 0.0.0.0/0
  21M21G    CONNTRACK     all  --  *      *   0.0.0.0/0 0.0.0.0/0
  393873484KDHCPGREENINPUTall  --  green0 *   0.0.0.0/0 0.0.0.0/0
  645153642KGEOIPBLOCK    all  --  *      *   0.0.0.0/0 0.0.0.0/0
  386592304KIPSECINPUT    all  --  *      *   0.0.0.0/0 0.0.0.0/0
  386592304KGUIINPUT      all  --  *      *   0.0.0.0/0 0.0.0.0/0
  368332209KWIRELESSINPUT all  --  *      *   0.0.0.0/0 0.0.0.0/0 ctstate NEW
  368332209KOVPNINPUT     all  --  *      *   0.0.0.0/0 0.0.0.0/0
  368332209KTOR_INPUT     all  --  *      *   0.0.0.0/0 0.0.0.0/0
  368332209KINPUTFW       all  --  *      *   0.0.0.0/0 0.0.0.0/0
  309641833KREDINPUT      all  --  *      *   0.0.0.0/0 0.0.0.0/0
  309641833KPOLICYIN      all  --  *      *   0.0.0.0/0 0.0.0.0/0

AFTER - somehow better readable - I think: ;-)

Chain INPUT (policy DROP 0 packets, 0 bytes)
  pkts  bytes target         proc opt in     out source    destination
  32M   38G   BADTCP         tcp  --  *      *   0.0.0.0/0 0.0.0.0/0
  32M   38G   CUSTOMINPUT    all  --  *      *   0.0.0.0/0 0.0.0.0/0
  32M   38G   P2PBLOCK       all  --  *      *   0.0.0.0/0 0.0.0.0/0
  32M   38G   GUARDIAN       all  --  *      *   0.0.0.0/0 0.0.0.0/0
  0     0     OVPNBLOCK      all  --  tun+   *   0.0.0.0/0 0.0.0.0/0
  32M   38G   IPTVINPUT      all  --  *      *   0.0.0.0/0 0.0.0.0/0
  32M   38G   ICMPINPUT      all  --  *      *   0.0.0.0/0 0.0.0.0/0
  32M   38G   LOOPBACK       all  --  *      *   0.0.0.0/0 0.0.0.0/0
  21M   21G   CONNTRACK      all  --  *      *   0.0.0.0/0 0.0.0.0/0
  39387 3484K DHCPGREENINPUT all  --  green0 *   0.0.0.0/0 0.0.0.0/0
  64515 3642K GEOIPBLOCK     all  --  *      *   0.0.0.0/0 0.0.0.0/0
  38659 2304K IPSECINPUT     all  --  *      *   0.0.0.0/0 0.0.0.0/0
  38659 2304K GUIINPUT       all  --  *      *   0.0.0.0/0 0.0.0.0/0
  36833 2209K WIRELESSINPUT  all  --  *      *   0.0.0.0/0 0.0.0.0/0 ctstate NEW
  36833 2209K OVPNINPUT      all  --  *      *   0.0.0.0/0 0.0.0.0/0
  36833 2209K TOR_INPUT      all  --  *      *   0.0.0.0/0 0.0.0.0/0
  36833 2209K INPUTFW        all  --  *      *   0.0.0.0/0 0.0.0.0/0
  30964 1833K REDINPUT       all  --  *      *   0.0.0.0/0 0.0.0.0/0
  30964 1833K POLICYIN       all  --  *      *   0.0.0.0/0 0.0.0.0/0

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-10-10 12:03:51 +01:00
Matthias Fischer
c5f633c917 guardian 2.0: suggested cosmetic changes
I did the following:

- Rearranged the fields on 'guardian.cgi' a bit - in a (hopefully) logical manner,
  so that they don't need so much room.
- Added some translation-strings and explanations to (revised) 'guardian.cgi'.
- Added missing language string(s), deleted obsolete.
- Deleted all guardian entries from standard language files in
  '/var/ipfire/langs'-directory.
- Added (upgraded) addon-specific language files to '/var/ipfire/addon-lang'-directory.

I hope, I didn't forget something...

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-10-03 12:12:13 +01:00
Arne Fitzenreiter
642b831b72 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2016-10-02 16:36:57 +02:00
Arne Fitzenreiter
e24d6112bb index.cgi: display unbound dns servers
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2016-10-02 16:35:50 +02:00
Michael Tremer
5edc06b701 Remove IPAC stuff
This is unused for a very very very long time and serves
no purpose any more.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-10-02 15:13:55 +01:00
Arne Fitzenreiter
3cf764f338 samba: default enable SMBv2.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2016-09-27 19:38:38 +02:00
Jonatan Schlag
4c8f144e58 Fix URL to list of public name servers in dns.cgi
We have only one english wiki, so the link to the list of public
dns servers can point directly to the right page.
(The link was also not correct).

Fixes: #11191

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-09-24 12:25:46 +01:00
Alexander Marx
bbe8e009b8 BUG11184: Error if DNAT address ends with 0 or 255 now disabled
When using dnat addresses, it is possible to use big subnets and host addresses like 172.16.0.0/12.
These addresses where rejected because it was recognised as network address.
The check is now removed.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-09-15 18:58:51 +01:00
Michael Tremer
cc53e7ef23 unbound: Restart after local hosts have been modified
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-09-12 20:52:51 +01:00