Commit Graph

248 Commits

Author SHA1 Message Date
Michael Tremer
080e79f149 Don't show proxy configuration pages when GREEN is not available
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-01 12:21:59 +01:00
Michael Tremer
dc845b6c81 AWS: Hide certain things on the web UI
Those are practically unusable on AWS.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-07-01 12:15:00 +01:00
Michael Tremer
0009de91e8 Ship default settings for language, theme, etc. in all images
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-06-27 09:59:47 +01:00
Michael Tremer
3483602929 ssh: Update default configuration
This patch removes an old switch to enable SSH 1 and
makes port 22 the default port.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-06-25 10:53:53 +01: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
Michael Tremer
b1ad5b8b6c geoip-functions.pl: Fix typos and formatting
Reviewed-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-13 22:37:03 +00:00
Alexander Marx
3f3974b711 Network-functions: add check if variables are defined
in function network_equal and network2bin a check for undefined variables were missing.
added them.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-07 16:19:23 +00:00
Alexander Marx
1047805dba BUG11466: Fix network_equal function
The network_equal function only tested the subnet addresses of two given networks which lead to
errormessages saying "This is the green network"
The fix tests netwok and subnet IP's to fix this

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-07 16:16:18 +00:00
Michael Tremer
5f1b951102 captive: Show access page in browser language
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Tested-by: Daniel Weismüller <daniel.weismüller@ipfire.org>
2017-09-22 19:00:04 +01:00
Michael Tremer
a0b271e474 captive: Redesign generated coupons table
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
dbfd2622f5 captive: Get MAC address of a device without calling arp
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:55:27 +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
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
7cbdd31d6e graphs.pl: Fix HTML syntax error
The missing ' caused that a different URL was called

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-11 14:26:57 +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
65c3b7c913 Revert "BUG11278: enable creation from subnets of internal networks"
This reverts commit ff6cc71107.

This patch causes that no new networks can be created and
an error message is shown that the created network is the GREEN
network which is incorrect.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-03-22 11:15:44 +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
3713af1e27 network-functions.pl: Add tests for the new equals function
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-01-11 17:18:46 +00:00
Michael Tremer
8f23ce8e53 network-functions.pl: Fix code formatting
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-01-11 17:09:42 +00:00
Alexander Marx
ff6cc71107 BUG11278: enable creation from subnets of internal networks
In firewallgroups it was not possible to create new networks that are subnets of
IPFire internal networks. Now this is possible for all internal networks.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-01-11 17:05:53 +00:00
Alexander Marx
4f857eea41 BUG11278: Cleanup function for network check
Deleted some code which is also used in another function

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-01-11 17:05:12 +00: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
Heino Gutschmidt
ecc9c73bb5 BUG11131: fix errormessage when more ipsec subnets defined
When having more than one subnet in an ipsec connection it is not
possible to create a new openvpn static subnet.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Heino Gutschmidt <heino.gutschmidt@managedhosting.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-06-03 16:19:49 +01:00
Michael Tremer
03306ff6a2 general-functions.pl: Allow underscores in domain names
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-05-03 22:50:53 +01:00
Alexander Marx
b00797e260 BUG10963: implement a better email verification
We now check all allowed chars in the address before the @ sign.
The domainpart after the '@' sign is just checked for valid chars, so that user@ipfire is valid, too

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-19 12:53:28 +00:00
Alexander Marx
f770b72899 BUG10940: remove leading zeros in ip address
in firewallgroups (hosts) an error was created when using ip adresses
like 192.168.000.008. Now all leading zeros are deleted in
firewallgroups and in the firewall itself when using single ip addresses
as source or target.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-11-09 17:32:59 +00:00
Arne Fitzenreiter
01d61d1549 network_functions.pl: fix ip_address_in_network for x86_64
calculation of last address must use only 32bit of inverted netmask.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-09-20 13:03:34 +02:00
Michael Tremer
883c5453d9 network-functions: Add check_subnet()
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-08-25 21:55:40 +01:00
Matthias Fischer
b6adeb235d graphs.pl: bugfixes regarding rrdtool
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-06-18 13:14:14 +02:00
Michael Tremer
5428eeeeaa url-filter: Use upstream proxy when downloading blacklists
Fixes #10690

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-06-16 14:39:26 +02:00
Stefan Schantl
dfbee171cc geoip-functions: Adjust for new flag-icons and usage of "unknown" icon. 2015-05-04 20:13:52 +02:00
Stefan Schantl
b013822b99 Rename Locale::Country to Locale::Codes::Country in various scripts.
The new Locale-Country version needs to be loaded and used by specifing
Locale::Codes::Country since an upstream API change. Adjusting various perl
scripts to use the module in the proper way again.
2015-04-22 18:18:38 +02:00
Stefan Schantl
e6c4f090b6 Merge branch 'next-geoip' into core-90-geoip 2015-04-15 17:10:49 +02:00
Alexander Marx
5c3b3bd8e1 vpn-statistic: fix alignment of graph legend for n2n graphs 2015-04-10 17:20:43 +02:00
Stefan Schantl
93bfe63d55 Merge branch 'seventeen-geoip' into next-geoip 2015-03-15 11:38:45 +01:00
Michael Tremer
a71beeb234 lang.pl: Always fall back to English
Fixes #10769
2015-03-10 00:06:12 +01:00
Stefan Schantl
1dcd87157d geoip-functions.pl: A collection of functions dealing with GeoIP. 2015-02-08 18:23:01 +01:00
Michael Tremer
3906cf7e85 Merge remote-tracking branch 'amarx/vpn-statistic1' into next 2015-01-13 17:37:18 +01:00
Stefan Schantl
cc26ba71a1 header.pl: Increase maximum allowed size of hashes.
The "getcgihash" function only allowed hashes with a maximum size of 512kb, which
was to small for the new geoip-block.cgi. As a result of this some form data
were cut-off and couldn't be processed correctly.
2015-01-03 20:22:05 +01:00
Stefan Schantl
cebb1b7cb1 general-functions.pl: Add function to get full country name.
This function will return the full name a country specified by
it's country shortcut. It also will provide some additional names
which are not handled by the perl locale module but are parts of
ISO 3166.
2015-01-03 20:15:28 +01:00
Alexander Marx
c9ac8b8052 vpn-statistics: change graphs and datatypes of rrd 2014-10-21 07:29:06 +02:00
Alexander Marx
0d0ee70f3b Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into vpn-statistic1 2014-09-26 12:53:05 +02:00
Alexander Marx
5795fc1b55 vpn-statistic: added new statistic page for OpenVPN Roadwarrior 2014-09-18 16:29:10 +02:00
Michael Tremer
f5fe98fead Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into install-raid 2014-09-16 20:45:35 +02:00
Michael Tremer
499e7fc33f general-functions.pl: Fix perl coding error 2014-09-06 18:45:43 +02:00
Michael Tremer
7bfaaa0d35 general-functions.pl: Fix syntax error 2014-09-06 18:45:39 +02:00
Michael Tremer
9f64c06d94 general-functions.pl: Subroutine getnetworkip() accepted multiple arguments 2014-09-06 18:45:35 +02:00
Michael Tremer
c14203248c general-functions.pl: Fix perl coding error 2014-09-06 18:44:50 +02:00
Michael Tremer
da05e07629 general-functions.pl: Fix syntax error 2014-09-04 11:13:41 +02:00
Michael Tremer
6a2a62cf25 general-functions.pl: Subroutine getnetworkip() accepted multiple arguments 2014-09-03 22:23:04 +02:00