Commit Graph

495 Commits

Author SHA1 Message Date
Michael Tremer
237f3ab7d3 IPsec: Allow to configure a connection in waiting state
This allows to create an IPsec connection that will never actively
try to reach the other peer. It helps in environments where this is
not desired or impossible because of NAT.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-06-13 15:47:57 +01:00
Peter Müller
ea566f8485 fix aesthetic issues in remote.cgi and ship them
Fix some minor cosmetic issues on remote.cgi as well as a typo in
the language files ("sesstions" -> "sessions"). The changes are
listed in "filelists" for Core Update 121.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-09 14:49:48 +01:00
Alexander Marx
c07eea1d38 BUG11559: Languagefiles
When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.

This patch adds a new languagefileword "fwdfw all subnets" which is used in firewall.cgi and fwhosts.cgi
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Tested-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-09 14:48:36 +01:00
Peter Müller
e70aa2e0b8 update language files
Add new language strings to the language files.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-07 11:37:11 +01:00
Matthias Fischer
80908b44b7 Fixed missing 'Captive' localization string for 'logs.dat'
Added 'Captive' localization string in 'de/en.pl'.

After a fresh install of Core 117, the system log shows a blank line
for 'Captive Portal' entries.

Deleted translation for 'Captive menu' and changed '30-network.menu' accordingly
to avoid duplicate translation strings.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-01-09 14:14:37 +00:00
Peter Müller
b62299702b update german translations
Correct some grammar errors and unify spelling of interface names (GREEN vs. GRÜN).

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-12-14 16:45:51 +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
b429cc66cb captive: Translate times for coupon expiry time
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-29 12:11:58 +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
2e94e04ec0 add language strings
Add language strings for changed config.dat CGI file.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-28 17:47:49 +00:00
Michael Tremer
1c1babf44b captive: Fix localisations
Voucher was used instead of coupon in English, and Coupon
was used instead of Gutschein in German.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-17 15:11:14 +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
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
027614d2dc Merge branch 'captive-portal' into next 2017-10-04 16:10:07 +01:00
Michael Tremer
0a219160ac captive portal: Allow sessions to expire after 8 hours
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-04 14:21:12 +01:00
Michael Tremer
94e1d35c54 captive: Fix typo in German translation
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 19:00:04 +01:00
Michael Tremer
4eecd722b7 Update German translation for captive portal
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
97b91e8a94 captive: Rename "Voucher" mode to "Coupon"
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:55:27 +01:00
Michael Tremer
f8d35875d8 captive: Allow selecting highlight colour in web interface
To be able to customise the access page, we now allow the
user to select a brand colour.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:55:27 +01:00
Michael Tremer
48fb1d3b69 captive: Import new design
This is the new design of the access page of the captive
portal. It is based on the Bootstrap 4 grid system and
reboot but does not use anything else from it.

It is responsive and customisable.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
0806170370 BUG11141: Redesign of configuration website
To improve the user experience, the configuration part of generating new vouchers has been reworked.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
213335372d BUG11140: Captive logo dimensions
Now the min and max logo dimensions are shown in webinterface.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Michael Tremer
7ab3f84b2a Improve the wording of the Captive Portal configuration site
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Michael Tremer
2d92a4eca4 Update translations
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
52383f583e Captive-Portal: fix some typos and missing dir
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
b32d9e92be Captive-Portal: Add logo upload feature
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:45 +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
Matthias Fischer
d3790c6a0b wlanap.cgi: Some cosmetics...
- Added missing box heading ('Access Point Configuration') in 'wlanap.cgi'.
- For this to work, added missing string 'wlanap configuration' in translations.
- Changed existing translation strings in 'de.pl' and 'en.pl': 'wlanap' means 'wlan access point', so why is it called
'wlan*ap* access point'?

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-20 22:23:19 +01:00
Peter Müller
3dcf1822e6 update german translations
- Unify translations of various terms.
- Unify translations of week days.
- Correct some typos and grammar errors.
- Modify some phrases which were not fully translated.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-04 12:25:01 +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
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
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
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
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
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
40065ca773 BUG10972: Typo in 'de.pl'
Second try... ;-)
First: "Submitted by IT Superhack on Dec. 18, 2015, 5:48 p.m."

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Timmothy Wilson <itsuperhack@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-02-04 13:28:25 +00: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
Michael Tremer
80a474183e Improve wording of the Guardian translations
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-08-02 12:43:01 +01:00
Michael Tremer
f62bd2742c Update translation
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-08-02 12:18:45 +01:00
Stefan Schantl
8651c94e9a Language file update.
Add guardian related strings to the german language file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:19:14 +02: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
8a1a3bf393 Merge remote-tracking branch 'ms/iptables-conntrack' into next 2016-01-22 00:54:14 +00:00
Michael Tremer
71af643cda openvpn: Add option to download a client package with PEM files
This patch adds the option to download a client package
that comes with a regular PEM and key file instead of a
PKCS12 file which is easier to use with clients that
don't support PKCS12 (like iOS) opposed to converting
the file manually.

This requires that the connection is created without
using a password for the certificate. Then the certificate
is already stored in an insecure way.

This patch also adds this to the Core Update 95 updater.

Fixes: #10966

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
CC: Alexander Marx <alexander.marx@ipfire.org>
2015-11-04 21:10:41 +00:00
Lars Schuhmacher
673351d8a2 Fix unnecessary space character in "E-Mail Absender"
Fix unnecessary space character in "E-Mail Absender".

Replaces the space character with a dash as is correct and already used in the other words in that part.

Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-10-31 19:44:42 +00:00
Michael Tremer
364452506f Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next 2015-10-21 13:50:31 +01:00