webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-12 20:16:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,035 Commits 2 Branches 1 Tag
a0b271e4745dafb7daade5dcf4d18406daaddee9
Commit Graph

11035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
733932de74 captive: Correctly set coupon lifetime 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
9cba29f119 captive: Remember selected coupon expiry time 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
5cd9e28bc4 captive: Allow creating multiple coupons in bulk 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
58fd5dd482 captive: Reformat times 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
4f75fbfe12 captive: Cleanup coupon generation block 
No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
810198110e captive: Cleanup logo upload 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
e7d16ea553 captive: Cleanup authentication selection 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
a41fe924ae captive: Code cleanup 
No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
b7a126d9c8 captive: Allow uploading JPEG images, too 
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
e2752bfe71 captive: Save logo in /var/ipfire/captive 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
278309b9ef captive: Allow selecting the session expiry time for terms 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
297ebdd47b captive: Group settings together and create branding section 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:55:27 +01:00
Michael Tremer
827d3f61da captive: Some more CGI cleanup 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:55:27 +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
9735e1670a captive: Rename "License" mode to "Terms & Conditions" 
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
4b33d29de7 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>
 2017-09-22 18:55:27 +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
966971e589 captive: Don't compare action string 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:54:45 +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
d57e8c67bc captive-portal: Code cleanup 
No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:54:45 +01:00
Michael Tremer
11fc9575d7 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>
 2017-09-22 18:54:45 +01:00
Michael Tremer
abc41f02dd captive: Do not generally allow access to TCP/1013 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:54:45 +01:00
Michael Tremer
43834c4969 captive: Only make CGI script executable in document root 
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
Alexander Marx
59a2d9c2d5 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>
 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
Alexander Marx
6945954c44 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>
 2017-09-22 18:54:45 +01:00
Alexander Marx
1d77d1262a 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>
 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
Michael Tremer
f339af2704 Rootfile update 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:54:45 +01:00
Alexander Marx
45129439bc Captive-Portal: fix fontsize of generated voucher 
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
 2017-09-22 18:54:45 +01:00
Alexander Marx
6820454e54 Captive-Portal: Fix folder permissions 
Signed-off-by: Alexander Marx <alexander.marx@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
83ba0896f6 Captive-portal: Add directory for logo upload 
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
 2017-09-22 18:54:45 +01:00
Michael Tremer
fb1d26d1bc 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>
 2017-09-22 18:54:45 +01:00
Michael Tremer
76ece32362 captivectrl: Skip all lines that start with # 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:54:45 +01:00
Alexander Marx
07d56062a9 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>
 2017-09-22 18:54:45 +01:00
Alexander Marx
5dc32e5877 Captive-Portal: add Errormessage when wrong code is entered 
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
 2017-09-22 18:54:45 +01:00
Alexander Marx
f3802750ac Captive-Portal: fix wrong expiretime of unused vouchers 
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
 2017-09-22 18:54:45 +01:00
Alexander Marx
facfdcd040 Captive-Portal: fix voucher form 
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
 2017-09-22 18:54:45 +01:00