ipfire-2.x.git
3 years agocaptive portal: Allow sessions to expire after 8 hours
Michael Tremer [Wed, 4 Oct 2017 13:21:12 +0000 (14:21 +0100)] 
captive portal: Allow sessions to expire after 8 hours

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive-portal: Serve Ubuntu font files locally
Michael Tremer [Wed, 4 Oct 2017 11:55:17 +0000 (12:55 +0100)] 
captive-portal: Serve Ubuntu font files locally

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoAdd Ubuntu font family package
Michael Tremer [Wed, 4 Oct 2017 11:47:28 +0000 (12:47 +0100)] 
Add Ubuntu font family package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Update configuration for Apache 2.4
Michael Tremer [Fri, 22 Sep 2017 18:34:29 +0000 (19:34 +0100)] 
captive: Update configuration for Apache 2.4

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoRootfile update
Michael Tremer [Fri, 5 May 2017 10:48:03 +0000 (11:48 +0100)] 
Rootfile update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Show access page in browser language
Michael Tremer [Wed, 3 May 2017 13:39:50 +0000 (15:39 +0200)] 
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>
3 years agocaptive: Do not try to execute the favicon
Michael Tremer [Wed, 3 May 2017 13:11:30 +0000 (15:11 +0200)] 
captive: Do not try to execute the favicon

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Fix passing redirection URL
Michael Tremer [Wed, 3 May 2017 13:01:02 +0000 (15:01 +0200)] 
captive: Fix passing redirection URL

Reported-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Run apache in HTTP/1.0 mode
Michael Tremer [Wed, 3 May 2017 12:58:23 +0000 (14:58 +0200)] 
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>
3 years agocaptive: Fix another typo in captivectrl
Michael Tremer [Tue, 2 May 2017 10:04:06 +0000 (11:04 +0100)] 
captive: Fix another typo in captivectrl

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Fix typo in German translation
Michael Tremer [Tue, 2 May 2017 10:02:21 +0000 (11:02 +0100)] 
captive: Fix typo in German translation

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Let apache follow symlinks to load bootstrap
Michael Tremer [Tue, 2 May 2017 09:58:57 +0000 (10:58 +0100)] 
captive: Let apache follow symlinks to load bootstrap

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Fix directory permissions
Michael Tremer [Tue, 2 May 2017 09:55:58 +0000 (10:55 +0100)] 
captive: Fix directory permissions

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Logo directory no longer exists
Michael Tremer [Tue, 2 May 2017 09:55:19 +0000 (10:55 +0100)] 
captive: Logo directory no longer exists

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoRootfile update
Michael Tremer [Tue, 2 May 2017 09:37:54 +0000 (10:37 +0100)] 
Rootfile update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoapache2: Create captive portal logging directory
Michael Tremer [Tue, 2 May 2017 09:37:41 +0000 (10:37 +0100)] 
apache2: Create captive portal logging directory

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoActually build bootstrap
Michael Tremer [Tue, 2 May 2017 09:36:43 +0000 (10:36 +0100)] 
Actually build bootstrap

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoUpdate German translation for captive portal
Michael Tremer [Mon, 1 May 2017 15:13:06 +0000 (16:13 +0100)] 
Update German translation for captive portal

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Link .map files as well
Michael Tremer [Mon, 1 May 2017 15:08:24 +0000 (16:08 +0100)] 
captive: Link .map files as well

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agobootstrap: Install map files, too
Michael Tremer [Mon, 1 May 2017 15:07:40 +0000 (16:07 +0100)] 
bootstrap: Install map files, too

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Show message when an invalid coupon code was entered
Michael Tremer [Mon, 1 May 2017 11:39:42 +0000 (12:39 +0100)] 
captive: Show message when an invalid coupon code was entered

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Do not show checkbox when in coupon mode
Michael Tremer [Mon, 1 May 2017 11:37:44 +0000 (12:37 +0100)] 
captive: Do not show checkbox when in coupon mode

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Verify that the user actually accepted the terms and conditions
Michael Tremer [Mon, 1 May 2017 11:35:45 +0000 (12:35 +0100)] 
captive: Verify that the user actually accepted the terms and conditions

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Style any error messages
Michael Tremer [Mon, 1 May 2017 11:24:07 +0000 (12:24 +0100)] 
captive: Style any error messages

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Show a message when no coupon code was entered
Michael Tremer [Mon, 1 May 2017 11:06:11 +0000 (12:06 +0100)] 
captive: Show a message when no coupon code was entered

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Fix some template updates that I forgot
Michael Tremer [Mon, 1 May 2017 10:47:04 +0000 (11:47 +0100)] 
captive: Fix some template updates that I forgot

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Drop duplicate function to list active clients
Michael Tremer [Mon, 1 May 2017 10:41:51 +0000 (11:41 +0100)] 
captive: Drop duplicate function to list active clients

There was a function with different name but essentially
same functionality which is already existant in &show_clients().

Therefore this patch drops the old function without any functional
changes.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Redesign clients list box
Michael Tremer [Mon, 1 May 2017 10:40:06 +0000 (11:40 +0100)] 
captive: Redesign clients list box

Mostly code cleanup

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Redesign generated coupons table
Michael Tremer [Mon, 1 May 2017 10:26:04 +0000 (11:26 +0100)] 
captive: Redesign generated coupons table

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Correctly set coupon lifetime
Michael Tremer [Fri, 28 Apr 2017 14:39:05 +0000 (15:39 +0100)] 
captive: Correctly set coupon lifetime

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Remember selected coupon expiry time
Michael Tremer [Fri, 28 Apr 2017 14:12:08 +0000 (15:12 +0100)] 
captive: Remember selected coupon expiry time

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Allow creating multiple coupons in bulk
Michael Tremer [Fri, 28 Apr 2017 14:09:56 +0000 (15:09 +0100)] 
captive: Allow creating multiple coupons in bulk

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Reformat times
Michael Tremer [Fri, 28 Apr 2017 13:56:48 +0000 (14:56 +0100)] 
captive: Reformat times

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Cleanup coupon generation block
Michael Tremer [Fri, 28 Apr 2017 13:54:26 +0000 (14:54 +0100)] 
captive: Cleanup coupon generation block

No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Cleanup logo upload
Michael Tremer [Fri, 28 Apr 2017 13:41:57 +0000 (14:41 +0100)] 
captive: Cleanup logo upload

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Cleanup authentication selection
Michael Tremer [Fri, 28 Apr 2017 13:38:59 +0000 (14:38 +0100)] 
captive: Cleanup authentication selection

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Code cleanup
Michael Tremer [Fri, 28 Apr 2017 13:34:14 +0000 (14:34 +0100)] 
captive: Code cleanup

No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Allow uploading JPEG images, too
Michael Tremer [Fri, 28 Apr 2017 13:29:15 +0000 (14:29 +0100)] 
captive: Allow uploading JPEG images, too

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Serve logo through an extra CGI script
Michael Tremer [Fri, 28 Apr 2017 13:21:18 +0000 (14:21 +0100)] 
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>
3 years agocaptive: Save logo in /var/ipfire/captive
Michael Tremer [Fri, 28 Apr 2017 12:53:57 +0000 (13:53 +0100)] 
captive: Save logo in /var/ipfire/captive

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Allow selecting the session expiry time for terms
Michael Tremer [Wed, 26 Apr 2017 15:44:27 +0000 (16:44 +0100)] 
captive: Allow selecting the session expiry time for terms

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Group settings together and create branding section
Michael Tremer [Wed, 26 Apr 2017 11:59:36 +0000 (12:59 +0100)] 
captive: Group settings together and create branding section

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Some more CGI cleanup
Michael Tremer [Wed, 26 Apr 2017 11:55:40 +0000 (12:55 +0100)] 
captive: Some more CGI cleanup

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Rename "Voucher" mode to "Coupon"
Michael Tremer [Wed, 26 Apr 2017 11:50:43 +0000 (12:50 +0100)] 
captive: Rename "Voucher" mode to "Coupon"

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Rename "License" mode to "Terms & Conditions"
Michael Tremer [Wed, 26 Apr 2017 11:27:35 +0000 (12:27 +0100)] 
captive: Rename "License" mode to "Terms & Conditions"

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Allow selecting highlight colour in web interface
Michael Tremer [Wed, 26 Apr 2017 11:03:08 +0000 (12:03 +0100)] 
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>
3 years agocaptive: Refactor the access page
Michael Tremer [Wed, 26 Apr 2017 10:53:15 +0000 (11:53 +0100)] 
captive: Refactor the access page

This brings no functional changes, but cleans up the code
to re-use more and write less.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Get MAC address of a device without calling arp
Michael Tremer [Tue, 25 Apr 2017 11:52:29 +0000 (12:52 +0100)] 
captive: Get MAC address of a device without calling arp

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Don't compare action string
Michael Tremer [Tue, 25 Apr 2017 11:32:05 +0000 (12:32 +0100)] 
captive: Don't compare action string

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Import new design
Michael Tremer [Tue, 25 Apr 2017 11:24:45 +0000 (12:24 +0100)] 
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>
3 years agobootstrap: New package
Michael Tremer [Mon, 24 Apr 2017 11:25:53 +0000 (12:25 +0100)] 
bootstrap: New package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive-portal: Use template engine to render HTML template
Michael Tremer [Fri, 21 Apr 2017 16:34:59 +0000 (17:34 +0100)] 
captive-portal: Use template engine to render HTML template

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive-portal: Move CGI files to CGI directory
Michael Tremer [Fri, 21 Apr 2017 15:46:49 +0000 (16:46 +0100)] 
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>
3 years agocaptive-portal: Code cleanup
Michael Tremer [Fri, 21 Apr 2017 15:29:39 +0000 (16:29 +0100)] 
captive-portal: Code cleanup

No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Fix bug with multiple license clients
Michael Tremer [Sun, 4 Sep 2016 08:57:26 +0000 (09:57 +0100)] 
captive: Fix bug with multiple license clients

If one active client with a license existed, any other client
authenticating will overwrite the configuration line.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Do not generally allow access to TCP/1013
Michael Tremer [Sun, 4 Sep 2016 08:45:53 +0000 (09:45 +0100)] 
captive: Do not generally allow access to TCP/1013

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Only make CGI script executable in document root
Michael Tremer [Sun, 4 Sep 2016 08:31:46 +0000 (09:31 +0100)] 
captive: Only make CGI script executable in document root

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Reindent apache configuration
Michael Tremer [Sun, 4 Sep 2016 08:27:29 +0000 (09:27 +0100)] 
captive: Reindent apache configuration

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptive: Log into default apache log files
Michael Tremer [Sun, 4 Sep 2016 08:25:41 +0000 (09:25 +0100)] 
captive: Log into default apache log files

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoCaptive-portal: Design changes
Alexander Marx [Tue, 12 Jul 2016 06:13:04 +0000 (08:13 +0200)] 
Captive-portal: Design changes

When choosing voucher as authentication type there is no need to display the license agreement textbox

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoBUG11141: Redesign of configuration website
Alexander Marx [Thu, 7 Jul 2016 09:27:40 +0000 (11:27 +0200)] 
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>
3 years agoBUG11140: Captive logo dimensions
Alexander Marx [Tue, 5 Jul 2016 09:39:16 +0000 (11:39 +0200)] 
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>
3 years agoBUG11137: Captive save action messes up the form
Alexander Marx [Wed, 29 Jun 2016 10:47:55 +0000 (12:47 +0200)] 
BUG11137: Captive save action messes up the form

When configuring the captiveportal for the first time the form
will be empty after clicking on save button if not all relevant fields are set.

Now the settings are stored even if there is an error.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoBUG11139: Captive voucher table too wide
Alexander Marx [Wed, 29 Jun 2016 10:36:18 +0000 (12:36 +0200)] 
BUG11139: Captive voucher table too wide

Set table to 100% and the remark textfield to 96% (cellwidth)

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoImprove the wording of the Captive Portal configuration site
Michael Tremer [Mon, 20 Jun 2016 19:26:00 +0000 (20:26 +0100)] 
Improve the wording of the Captive Portal configuration site

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoUpdate translations
Michael Tremer [Mon, 20 Jun 2016 14:50:05 +0000 (15:50 +0100)] 
Update translations

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoRootfile update
Michael Tremer [Mon, 20 Jun 2016 14:49:26 +0000 (15:49 +0100)] 
Rootfile update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoCaptive-Portal: fix fontsize of generated voucher
Alexander Marx [Thu, 11 Feb 2016 06:21:29 +0000 (07:21 +0100)] 
Captive-Portal: fix fontsize of generated voucher

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: Fix folder permissions
Alexander Marx [Wed, 10 Feb 2016 14:36:49 +0000 (15:36 +0100)] 
Captive-Portal: Fix folder permissions

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: fix some typos and missing dir
Alexander Marx [Wed, 10 Feb 2016 14:05:35 +0000 (15:05 +0100)] 
Captive-Portal: fix some typos and missing dir

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: Add logo upload feature
Alexander Marx [Wed, 10 Feb 2016 09:20:52 +0000 (10:20 +0100)] 
Captive-Portal: Add logo upload feature

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-portal: Add directory for logo upload
Alexander Marx [Wed, 10 Feb 2016 09:09:23 +0000 (10:09 +0100)] 
Captive-portal: Add directory for logo upload

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agocaptivectrl: Add protection against DNS tunnels
Michael Tremer [Mon, 8 Feb 2016 16:38:34 +0000 (16:38 +0000)] 
captivectrl: Add protection against DNS tunnels

Limit the amount of DNS traffic for each client that
has not registered, yet.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptivectrl: Skip all lines that start with #
Michael Tremer [Mon, 8 Feb 2016 16:37:21 +0000 (16:37 +0000)] 
captivectrl: Skip all lines that start with #

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoCaptive-Portal: fix cleanup script
Alexander Marx [Mon, 8 Feb 2016 09:56:01 +0000 (10:56 +0100)] 
Captive-Portal: fix cleanup script

The cleanup-script did not write back the hash after the expired voucher
was delted

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: add Errormessage when wrong code is entered
Alexander Marx [Thu, 4 Feb 2016 12:26:35 +0000 (13:26 +0100)] 
Captive-Portal: add Errormessage when wrong code is entered

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: fix wrong expiretime of unused vouchers
Alexander Marx [Thu, 4 Feb 2016 11:04:47 +0000 (12:04 +0100)] 
Captive-Portal: fix wrong expiretime of unused vouchers

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: fix voucher form
Alexander Marx [Thu, 4 Feb 2016 11:01:30 +0000 (12:01 +0100)] 
Captive-Portal: fix voucher form

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: add logging to syslog
Alexander Marx [Thu, 4 Feb 2016 07:10:11 +0000 (08:10 +0100)] 
Captive-Portal: add logging to syslog

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: SHow always licencebox in config
Alexander Marx [Thu, 4 Feb 2016 06:30:05 +0000 (07:30 +0100)] 
Captive-Portal: SHow always licencebox in config

Also fix index.cgi to show individual title

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: several design changes
Alexander Marx [Tue, 2 Feb 2016 13:30:13 +0000 (14:30 +0100)] 
Captive-Portal: several design changes

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: redesign Webinterface
Alexander Marx [Mon, 1 Feb 2016 15:14:50 +0000 (16:14 +0100)] 
Captive-Portal: redesign Webinterface

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: fix some rootfiles
Alexander Marx [Fri, 29 Jan 2016 11:52:27 +0000 (12:52 +0100)] 
Captive-Portal: fix some rootfiles

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: add backup-part
Alexander Marx [Fri, 29 Jan 2016 08:17:22 +0000 (09:17 +0100)] 
Captive-Portal: add backup-part

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: add captive logdir to apache2 rootfile
Alexander Marx [Fri, 29 Jan 2016 08:02:31 +0000 (09:02 +0100)] 
Captive-Portal: add captive logdir to apache2 rootfile

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: add files to configroot rootfile
Alexander Marx [Fri, 29 Jan 2016 07:56:16 +0000 (08:56 +0100)] 
Captive-Portal: add files to configroot rootfile

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: Add files for webinterface tio rootfile
Alexander Marx [Fri, 29 Jan 2016 07:52:32 +0000 (08:52 +0100)] 
Captive-Portal: Add files for webinterface tio rootfile

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: add vhost config to apache2 rootfile
Alexander Marx [Fri, 29 Jan 2016 07:44:01 +0000 (08:44 +0100)] 
Captive-Portal: add vhost config to apache2 rootfile

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: create dir for cative logfiles
Alexander Marx [Thu, 28 Jan 2016 15:21:51 +0000 (16:21 +0100)] 
Captive-Portal: create dir for cative logfiles

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: add captive dirs and files to configroot
Alexander Marx [Thu, 28 Jan 2016 15:14:34 +0000 (16:14 +0100)] 
Captive-Portal: add captive dirs and files to configroot

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: add captive chains to firewall initscript
Alexander Marx [Thu, 28 Jan 2016 15:08:32 +0000 (16:08 +0100)] 
Captive-Portal: add captive chains to firewall initscript

When loading the initscript of the firewall the neccessary chains for
the captive portalneed to be created.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
3 years agoCaptive-Portal: add crontab and cleanup scripts
Alexander Marx [Thu, 28 Jan 2016 15:05:53 +0000 (16:05 +0100)] 
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>
3 years agoCaptive-Portal: add web-part
Alexander Marx [Thu, 28 Jan 2016 10:18:59 +0000 (11:18 +0100)] 
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>
3 years agocaptivectrl: Move sure that the settings are always initialised
Michael Tremer [Thu, 4 Feb 2016 14:34:11 +0000 (14:34 +0000)] 
captivectrl: Move sure that the settings are always initialised

This just removes a compiler warning.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agowirelessctrl: Disable MAC filter on blue if captive portal is enabled
Michael Tremer [Thu, 4 Feb 2016 14:29:57 +0000 (14:29 +0000)] 
wirelessctrl: Disable MAC filter on blue if captive portal is enabled

Fixes #11038

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptivectrl: Add missing space character
Michael Tremer [Sun, 31 Jan 2016 21:38:26 +0000 (21:38 +0000)] 
captivectrl: Add missing space character

The iptables argument list was botched. Oops. Sorry.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptivectrl: Support unlimited leases
Michael Tremer [Sat, 30 Jan 2016 14:46:55 +0000 (14:46 +0000)] 
captivectrl: Support unlimited leases

When the expiry time equals zero, the lease will have
no time constraints. The IP address will also be removed
as it might probably change.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptivectrl: Allow empty IP addresses
Michael Tremer [Sat, 30 Jan 2016 14:30:13 +0000 (14:30 +0000)] 
captivectrl: Allow empty IP addresses

Probably required for very long leases

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocaptivectrl: Change format of clients configuration
Michael Tremer [Sat, 30 Jan 2016 13:55:44 +0000 (13:55 +0000)] 
captivectrl: Change format of clients configuration

We store the start of the lease now and the time in
seconds after the lease expires

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoCaptive Portal: add c-wrapper captivectrl
Michael Tremer [Thu, 28 Jan 2016 13:24:07 +0000 (14:24 +0100)] 
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>