Commit Graph

5530 Commits

Author SHA1 Message Date
Michael Tremer
afd0cd232f Rootfile update
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 19:00:05 +01: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
1d68e28753 captive: Do not try to execute the favicon
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 19:00:04 +01:00
Michael Tremer
78148cc1e5 captive: Run apache in HTTP/1.0 mode
Reported-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Tested-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 19:00:04 +01:00
Michael Tremer
9b6227cc2a captive: Let apache follow symlinks to load bootstrap
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 19:00:04 +01:00
Michael Tremer
c91899797b captive: Logo directory no longer exists
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 19:00:04 +01:00
Michael Tremer
b020b6190f Rootfile update
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 19:00:04 +01:00
Michael Tremer
733de0e4a0 bootstrap: Install map files, too
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56: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
8802d70a28 captive: Serve logo through an extra CGI script
This CGI script makes saving the logo easier (especially for
backup purposes).

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
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
Michael Tremer
050ce75678 bootstrap: New package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Michael Tremer
a2c26388db captive-portal: Use template engine to render HTML template
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Michael Tremer
0a02d9bb0c captive-portal: Move CGI files to CGI directory
Previously the assets directory has ExecCGI privileges
which is not at all required and potentially dangerous.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Michael Tremer
4ddf453804 captive: Reindent apache configuration
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Michael Tremer
a79b220c5a captive: Log into default apache log files
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Michael Tremer
f339af2704 Rootfile update
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
47406df0fe Captive-Portal: fix some rootfiles
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Alexander Marx
a6c985284d Captive-Portal: add backup-part
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Alexander Marx
8ef627839f Captive-Portal: add captive logdir to apache2 rootfile
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Alexander Marx
c04d2de74e Captive-Portal: add files to configroot rootfile
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Alexander Marx
585703d8a3 Captive-Portal: Add files for webinterface tio rootfile
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Alexander Marx
19cd2b6a7c Captive-Portal: add vhost config to apache2 rootfile
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Alexander Marx
4d9002279f Captive-Portal: add crontab and cleanup scripts
The cleanup script is called every hour and deletes expired clients from
the clients file.
every night the captivectrl warpper runs once to flush the chains and
reload rules for active clients

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
Michael Tremer
ee40139d9a Captive Portal: add c-wrapper captivectrl
This wrapper reads the captive settings and clients and sets the
firewall access rules. It is called every time the config changed or
everytime that a client changes. Also this wrapper is later called once
hourly to flush the chains and rebuild rules for actual clients.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Michael Tremer
a041054941 core114: Update apache configuration of all add-ons that have one
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-04 13:09:43 +01:00
Michael Tremer
5f7487f676 core114: Ship updated apache2
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-04 13:02:43 +01:00
Wolfgang Apolinarski
d41fe99f74 Update to apache 2.4.27
- Updated to apache 2.4
- Updated the htpasswd generation to use the more secure bcrypt algorithm

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-04 12:40:20 +01:00
Wolfgang Apolinarski
c8e9a7a85e apr and aprutil: Added as requirement for apache 2.4
- APR 1.6.2 is a requirement for building apache httpd 2.4
- APR-Util 1.6.0 is a requirement for building apache httpd 2.4

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-04 12:37:56 +01:00
Peter Müller
0effbb3569 fix WebUI system information leak
Disable unauthenticated access to cgi-bin/credits.cgi. The page
leaks the currently installed version of IPFire and the hardware
architecture.

Both information might make a successful attack much easier.

This issue can be reproduced by accessing https://[IPFire-IP]:444/cgi-bin/credits.cgi
and accepting a SSL certificate warning (if any).

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-04 12:25:23 +01:00
Arne Fitzenreiter
d57f8d886f strongswan: rootfile update
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2017-08-30 19:03:25 +02:00
Arne Fitzenreiter
a51ce2defa core114: add unbound initskript to updater.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2017-08-30 19:03:15 +02:00
Michael Tremer
0c55ec5a49 strongswan: Update to 5.6.0
Fixes CVE-2017-11185:

Fixed a DoS vulnerability in the gmp plugin that was caused by insufficient input validation
when verifying RSA signatures, which requires decryption with the operation m^e mod n,
where m is the signature, and e and n are the exponent and modulus of the public key.
The value m is an integer between 0 and n-1, however, the gmp plugin did not verify this.
So if m equals n the calculation results in 0, in which case mpz_export() returns NULL.
This result wasn't handled properly causing a null-pointer dereference.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-23 20:03:21 +01:00
Michael Tremer
455f261b15 core114: Ship updated squid
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-23 11:33:41 +01:00
Michael Tremer
fa9c7bd047 core114: Ship updated gnutls
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-23 11:31:56 +01:00
Matthias Fischer
3fdddd37ab gnutls: Update to 3.5.15
For details see:
https://lists.gnupg.org/pipermail/gnutls-devel/2017-August/008483.html

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-23 11:31:39 +01:00
Michael Tremer
38b95ad5d9 core114: Ship updated unbound
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-23 11:29:55 +01:00
Matthias Fischer
7fe22fdc0c unbound: Update to 1.6.5
Changelog:

"21 Aug 2017: Wouter
	- Fix install of trust anchor when two anchors are present, makes both
	  valid.  Checks hash of DS but not signature of new key.  This fixes installs between
	  sep11 and oct11 2017."

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-23 11:28:43 +01:00
Michael Tremer
1d7d4460d6 core114: Ship updated hdparm
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-21 12:21:45 +01:00
Michael Tremer
05e7808cd6 Start Core Update 114
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-21 12:21:14 +01:00
Arne Fitzenreiter
d1043adde9 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2017-08-17 15:00:38 +02:00
Arne Fitzenreiter
40c81f6929 unbound: update dns hints and keys
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2017-08-17 14:25:42 +02:00
Michael Tremer
3bee566f45 core113: Ship openvpn which has been missing in core112 updater
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-17 13:15:27 +01:00
Arne Fitzenreiter
16388774a4 rootfile updates: nano, misc-progs
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2017-08-17 10:18:44 +02:00
Arne Fitzenreiter
e4837ceffe core113: add strongswan-padlock to updater
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2017-08-16 20:12:45 +02:00
Michael Tremer
0e7d340f2b core113: Ship packages that have not been shipped with 112
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-16 11:32:43 +01:00
Michael Tremer
4d417ab022 libgcrypt: Rootfile update
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-08-15 20:23:46 +01:00