Commit Graph

183 Commits

Author SHA1 Message Date
a6f3613b6a More concise wording, offer a .min.js for scripts 2023-04-11 21:13:25 +10:00
8b361f89c5 Image on bot-check adn css tweak, change footers to basedflare link in template, maintenance, bot-check 2023-04-10 17:48:44 +10:00
e46b223759 add x-country code in cgi template.txt 2023-04-08 00:16:31 +10:00
37bbec9f3b add missing map 2023-04-06 22:47:21 +10:00
40da57544a Support multiple backends per domain with the help of some lua 2023-04-06 22:40:03 +10:00
35668c9b58 adjust dummytime logic and start time 2023-03-23 01:13:41 +11:00
3e75fafd38 update cgi/trace template 2023-03-23 01:09:56 +11:00
1bbc86674e remove images because they get outdated too frequently, add demo links instead 2023-03-19 13:14:57 +11:00
94567f69ff Improve appearance and affordance of challenge pages with some template and js tweaks 2023-03-19 13:07:41 +11:00
9478892614 Allow proper ssl verification for backends (With a privately managed CA of course) 2023-03-18 15:21:21 +11:00
521e4ab335 not bold h3, hide generic favicon, white bg instead off offwhite 2023-03-06 19:47:50 +11:00
5b98b5b15c simple redirect map 2023-03-04 20:18:54 +11:00
4c97df8fb1 test ssl verify none to backends 2023-03-02 22:18:25 +11:00
174e1a8234 Center errors because they dont have the same body layout as maintenance/bot-check 2023-02-18 17:37:48 +11:00
ed75048f73 finally make the errors reusable and templated 2023-02-18 17:34:10 +11:00
8dc0aef924 Merge branch 'master' into kikeflare 2023-02-18 15:15:01 +11:00
3cc7482084 Fully convert to data plane api
Change global ACL to a map to realtime update with data plane api
Change how on setartup servers are registered in lua
2023-02-18 15:14:40 +11:00
ee25821dfe Merge branch 'master' into kikeflare 2023-02-14 01:05:52 +11:00
9f95f1c9ac update maintenance template style 2023-02-14 01:05:22 +11:00
4aad3a5e8e Merge branch 'master' into kikeflare 2023-02-14 00:56:39 +11:00
5e9ac793f0 update images, make animated
update email in license, duh
2023-02-14 00:47:06 +11:00
80e966b6d4 Revert to 3 dots loader and adjust page style slightly 2023-02-14 00:07:06 +11:00
87f66479d8 - Change to using domain instead of resolving, because cloudflare blocked this even with the host header, and haproxy 2.7 appears to no longer need this 'hack'
- Fix issue with matched_expiry being 0 and breaking captcha cookie
- Spacing
2023-02-13 21:59:02 +11:00
5a15eddc4a rename 2023-02-12 21:25:01 +11:00
52ddc455c9 Merge branch 'next' into 'master'
'next' into master

Closes #21, #18, and #20

See merge request fatchan/haproxy-protection!3
2023-02-12 02:18:50 +00:00
875e9e5edd Add back dataplaneapi in anticipation of using it to control haproxy rather than haproxy-sdk runtime socket 2023-02-12 13:17:03 +11:00
8e673aaf3f Merge branch 'next' into kikeflare 2023-02-12 09:10:38 +11:00
4e3beaf66d use 2 threads at least 2023-02-12 09:09:17 +11:00
d1adb677ba fix footerlogo path 2023-02-12 09:04:16 +11:00
0b648a3ce3 maintenance page fix 2023-02-12 00:34:09 +11:00
12ff24e2d5 Merge branch 'next' into kikeflare 2023-02-11 23:50:35 +11:00
608a7bc9ef Update README & LICENSE, definitely belong here now :^) 2023-02-11 23:43:37 +11:00
f231b86544 Ability to choose between sha256 or argon2 with env var close #21 2023-02-11 23:38:59 +11:00
2089d790a2 update INSTALLATION.md 2023-02-11 21:57:03 +11:00
eb92f6c31b Add back dummy time, shorter (3000ms) 2023-02-11 21:46:29 +11:00
ef938270d8 update docker-compose with correct argon2 envs 2023-02-11 21:45:23 +11:00
9531049aa9 Update haproxy config, scripts & docker-compose to use simpler mroe organised files layout
Make cookies sent from captcha/pow response be httponly
2023-02-11 21:39:38 +11:00
9f4c8e8fbb increase the throttle from 100 -> 1 back to 10 to prevent crashing 2023-02-11 21:05:47 +11:00
1612e342ee rename BUCKET_DURATION since its now an expiry time 2023-02-11 21:05:10 +11:00
6e5cf2af31 Make cookie expiry based on issued expiry date from challenge date instead of all expiring on bucket.
Fixes potential issue of challenges being incorrect if solved right on the bucket change
Allows to solve a challenge at any time (even in the background) and not see the challenge page twice in a small period
Allows for backend to make dynamic expiry of tokens e.g make tor tokens or based on IP reputation not last as long (not implemented atm)
Close #20
2023-02-11 20:57:21 +11:00
a303689641 Close #18 make answers and redirect calls shared between tabs with localstorage to not solve and submit answer multiple times when opening multiple tabs/bookmarks, etc 2023-02-11 16:08:44 +11:00
08a966c121 Reorganise, move code to not be split between haproxy and src folder 2023-02-11 15:06:35 +11:00
0d56079960 Rename POW vars to separately argon_ for argon2 stuff, improve readme and split out INSTALLATION into separate file 2023-02-11 14:43:55 +11:00
4637df4745 add missing basedflare paths to worker and challenge includes 2023-02-11 14:22:34 +11:00
16767e0a97 Add updated maintenance.html with template vars for lf-file 2023-02-11 14:18:36 +11:00
45bc67fae4 Move everything under paths like /.basedflare/ instead of putting stuff in paths where it might conflict
Move templates to own file instead of in main lua script
Rename some stuff from "hcatpcha" to more correct "captcha" and "bot-check" because we no longer only have hcaptcha
Clean some code and add a few comments
2023-02-11 14:16:51 +11:00
43297c931a Merge branch 'master' into kikeflare 2023-01-06 19:14:21 +11:00
1c6504e83e use lua-load-per-thread as per https://cbonte.github.io/haproxy-dconv/2.6/configuration.html\#3.1-lua-load because we don't have any cross request/thread global vars to worry about 2023-01-06 19:04:02 +11:00
b593be8627 Add some reasonable limits to cookie parsing, reduce impact of possible attack 2023-01-06 19:02:20 +11:00
9f290e97f2 Merge branch 'master' into kikeflare 2022-11-06 13:43:57 +11:00