Commit Graph

522 Commits

Author SHA1 Message Date
Rob White
919a0707ee Enable travis build of docs again
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-29 17:26:28 +01:00
Moritz Warning
5ec4523a2d only support iptables >=v1.4.17
this version deprecated '-m state --state' in favour of '-m conntrack --ctstate'
2018-08-28 18:38:31 +02:00
Moritz Warning
8397b2ecfc improve error message 2018-08-27 14:41:57 +02:00
Moritz Warning
db2a9216b4 Merge branch 'master' of github.com:nodogsplash/nodogsplash 2018-08-27 14:20:45 +02:00
Moritz Warning
a384f316e8 include iptables version check 2018-08-27 14:19:59 +02:00
Rob White
b73a271b3c Merge pull request #279 from nodogsplash/ForwardAuthentication
Documentation update for version 3.1.0
2018-08-26 14:41:42 +01:00
Rob White
2e702ebb4f Documentation update for version 3.1.0
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-26 14:21:57 +01:00
Rob White
0f67390733 Merge pull request #278 from nodogsplash/ForwardAuthentication
Bump to Version 3.1.0
2018-08-26 13:23:35 +01:00
Rob White
92c2e9cdf4 Bump to Version 3.1.0
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-26 13:13:26 +01:00
Moritz Warning
778f4c3c8b adjust some whitespaces 2018-08-26 14:07:10 +02:00
Moritz Warning
12706ebf5d fix travis 2018-08-26 14:03:46 +02:00
Moritz Warning
e9c75700dd move build_libmicrohttpd.sh 2018-08-26 12:57:57 +02:00
Moritz Warning
bc94e81ebd use standard redirect to silence errors
Silences "iptables:No chain/target/match by that name" error on iptalbes rule cleanup.
2018-08-26 03:07:53 +02:00
Moritz Warning
1bb9a7061c make auxiliary libmicrohttpd build script executeable 2018-08-26 01:59:05 +02:00
Moritz Warning
89c85b8079 Merge branch 'master' of github.com:nodogsplash/nodogsplash 2018-08-26 01:53:54 +02:00
Moritz Warning
4888bfacc1 fix config initialisation 2018-08-26 01:53:29 +02:00
Rob White
4f744726f1 Merge pull request #276 from nodogsplash/ForwardAuthentication
Update splash.html and status.html
2018-08-25 20:25:36 +01:00
Rob White
37080db965 Update splash.html and status.html
Make status.html say something meaningful.
Tidy up splash.html a bit

Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-25 20:17:11 +01:00
Rob White
638b69d389 Merge pull request #274 from nodogsplash/ForwardAuthentication
Remove superfluous / character from FAS splashpageurl.
2018-08-24 14:00:20 +01:00
Rob White
8898ab7bd9 Remove superfluous / character from FAS splashpageurl.
Update comment in .conf file to clarify.

Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-24 13:55:33 +01:00
Moritz Warning
952c0a573e remove quotation marks for json numbers 2018-08-24 13:42:10 +02:00
Moritz Warning
2240fe1902 Merge pull request #270 from nodogsplash/json_filter
Json filter
2018-08-24 12:11:28 +02:00
Moritz Warning
d47f1fe89b ndsctl: refactor code to reduce complexity 2018-08-23 22:04:43 +02:00
Moritz Warning
569de84dc3 ndsctl: add optional ip/mac/token filter to json output 2018-08-23 22:04:28 +02:00
Rob White
8a1ce66fde Merge pull request #271 from nodogsplash/ForwardAuthentication
FAS: Update Demo Files and Documentation
2018-08-22 20:34:06 +01:00
Rob White
945a8e6569 Update FAS Demo and FAS Documentation
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-22 20:15:07 +01:00
Moritz Warning
ae3b4d086c pass time by value for format_time()
Signed-off-by: Moritz Warning <moritzwarning@web.de>
2018-08-22 20:24:32 +02:00
Rob White
d33efaa5b7 Remove outdated FAS demo etc folder
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-22 14:15:11 +01:00
Rob White
982ba429c9 Merge pull request #268 from nodogsplash/ForwardAuthentication
Forward Authentication Service (FAS) Integration.
2018-08-22 00:31:16 +01:00
Rob White
baa68c8456 output binauth configuration on startup
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-20 16:17:22 +02:00
Rob White
c2df82e4aa fix indentation
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-20 16:17:22 +02:00
Rob White
77fe80002a lowercase fw_mark variables and change default value format
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-20 16:17:22 +02:00
Rob White
2a429eb7dc update FAS documentation
Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-20 16:17:22 +02:00
Rob White
b52e5cb91d integrate support for Forward Authentication Service (FAS)
This implements redirection to an external authentication
service in place of splash.html.

It introduces four new options:

1. fasport - if set, enables FAS redirection and the value is
the port used for access.

2. fasremoteip - if set is the ip address of the FAS, defaults
to the NDS gateway address for the case of FAS running locally to NDS.

3. faspath - the path on FAS to the login page. Default "/"

4. fas_secure_enabled - if set to "1", the client token is not
revealed and it is the responsibility of the FAS to request
this from NDS. If set to "0", the client token is passed in
clear text in the query string to the FAS.

Firewall settings are automatically configured for access to the FAS.

Binauth can also be configured at the same time to allow a local
script to be called on authentication.

Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-20 16:16:41 +02:00
Moritz Warning
1c198c9d46 fix binauth script to exit with != 0 if authentication is denied 2018-08-17 13:57:07 +02:00
Moritz Warning
aee251f09f minor doc fixes 2018-08-17 12:30:47 +02:00
Moritz Warning
1fe83e0684 remove one arp table lookup by passing the mac around calls 2018-08-16 16:24:54 +02:00
Moritz Warning
b3f1b1ed8b Merge branch 'master' of github.com:nodogsplash/nodogsplash 2018-08-16 14:26:35 +02:00
Moritz Warning
5aa86fa82e make dpkg-buildpackage happy 2018-08-16 14:23:48 +02:00
Moritz Warning
ee0c8eeffd do not mention the nodogsplash2 package 2018-08-16 13:45:39 +02:00
Moritz Warning
4a9856d7f6 fix doc syntax and update tested OpenWrt version 2018-08-11 17:22:54 +02:00
Moritz Warning
91aaebee43 update debian manpage 2018-08-11 17:21:06 +02:00
Moritz Warning
c9eb394680 improve binauth text again 2018-08-11 12:04:22 +02:00
Moritz Warning
9fc668f2cd Merge branch 'master' of github.com:nodogsplash/nodogsplash 2018-08-11 11:04:38 +02:00
Moritz Warning
4ac21334b4 add/improve loglevel/binauth documentation 2018-08-11 11:04:06 +02:00
Rob White
e1f6cf4df4 ndsctl status idle timeouts in minutes
Fix - Ndsctl status erroneously reported the idle timeouts as seconds (s) instead of minutes (m)

Signed-off-by: Rob White <rob@blue-wave.net>
2018-08-09 19:57:25 +01:00
Moritz Warning
e9710b4101 update debian changelog 2018-08-09 18:59:48 +02:00
Moritz Warning
0a25c63be1 more style fixes 2018-08-08 21:42:49 +02:00
Moritz Warning
85009630e5 used wrong file descriptor 2018-08-08 21:42:31 +02:00
Moritz Warning
2c87c16533 enable optimization by default 2018-08-08 21:22:40 +02:00