Thomas Lynch
80e966b6d4
Revert to 3 dots loader and adjust page style slightly
1 year ago
Thomas Lynch
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
1 year ago
Thomas Lynch
5a15eddc4a
rename
1 year ago
Thomas Lynch
52ddc455c9
Merge branch 'next' into 'master'
...
'next' into master
Closes #21 , #18 , and #20
See merge request fatchan/haproxy-protection!3
1 year ago
Thomas Lynch
875e9e5edd
Add back dataplaneapi in anticipation of using it to control haproxy rather than haproxy-sdk runtime socket
1 year ago
Thomas Lynch
4e3beaf66d
use 2 threads at least
1 year ago
Thomas Lynch
608a7bc9ef
Update README & LICENSE, definitely belong here now :^)
1 year ago
Thomas Lynch
f231b86544
Ability to choose between sha256 or argon2 with env var close #21
1 year ago
Thomas Lynch
2089d790a2
update INSTALLATION.md
1 year ago
Thomas Lynch
eb92f6c31b
Add back dummy time, shorter (3000ms)
1 year ago
Thomas Lynch
ef938270d8
update docker-compose with correct argon2 envs
1 year ago
Thomas Lynch
9531049aa9
Update haproxy config, scripts & docker-compose to use simpler mroe organised files layout
...
Make cookies sent from captcha/pow response be httponly
1 year ago
Thomas Lynch
9f4c8e8fbb
increase the throttle from 100 -> 1 back to 10 to prevent crashing
1 year ago
Thomas Lynch
1612e342ee
rename BUCKET_DURATION since its now an expiry time
1 year ago
Thomas Lynch
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
1 year ago
Thomas Lynch
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
1 year ago
Thomas Lynch
08a966c121
Reorganise, move code to not be split between haproxy and src folder
1 year ago
Thomas Lynch
0d56079960
Rename POW vars to separately argon_ for argon2 stuff, improve readme and split out INSTALLATION into separate file
1 year ago
Thomas Lynch
4637df4745
add missing basedflare paths to worker and challenge includes
1 year ago
Thomas Lynch
16767e0a97
Add updated maintenance.html with template vars for lf-file
1 year ago
Thomas Lynch
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
1 year ago
Thomas Lynch
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
1 year ago
Thomas Lynch
b593be8627
Add some reasonable limits to cookie parsing, reduce impact of possible attack
1 year ago
Thomas Lynch
9c17d5b8fc
update url lib, change default settings
2 years ago
Thomas Lynch
d61f320ba9
Dont show negative seconds
2 years ago
Thomas Lynch
c61dd4caa2
No need to div/multiply
2 years ago
Thomas Lynch
fb69c46574
Floor remaining time, remove .
2 years ago
Thomas Lynch
4dd6eec87e
Show pow speed, and estimate remaining time
2 years ago
Thomas Lynch
64e26f65b5
- Add ability to communicate with Tor control port and close circuits. Can be called from lua or as a http-request lua... call to do it based off an ACL. close #16
...
- Make POW checked before captcha in POST handler, since they both must be submittedin captcha mode, we don't want to send POST to /siteverify if they didnt even solve the POW
Other:
- Change (improve) split util to leave empty table entries for repeated delimiters
- Minor frontend script bugfix so error messages display properly in captcha mode
- Wrap submit button of noscript pow form to next line
2 years ago
Thomas Lynch
eb1dc3e378
Slightly change/improve max used cpu threads, and make tor use all that it has
2 years ago
Thomas Lynch
efe430cf3b
Add check for Webassembly support, and error if unsupported
...
Improve errors for 400/500 and failed but check post
Remove spinner when inserting error
2 years ago
Thomas Lynch
eede92d47d
Allow a bit better granularity for the difficulty. Recommend an "easier" challenge in terms of memory and iterations, but higher diff.
...
Make failed request for captcha/bot form show a little error text.
Make CHALLENGE_INCLUDES_IP "1" = on, anything else = off instead of needing to be unset.
2 years ago
Thomas Lynch
434756a7a1
If this fixes what I think it fixes, ill eat my fucking shoe
2 years ago
Thomas Lynch
b43d207847
Make cookie apply to all subdomains
2 years ago
Thomas Lynch
4716cf1be2
Improve & cleanup README, docker-compose, haproxy config
2 years ago
Thomas Lynch
84fe5037b9
Make the staggered start work properly
2 years ago
Thomas Lynch
a6b6bc1510
word-break:break-all on header which can contain long domain name
2 years ago
Thomas Lynch
fe972b0868
Remove unused times variable
2 years ago
Thomas Lynch
a50b35b65d
argon2 implementation
...
- memory and time params customisable as well as "difficulty", default 1 iteration, 6000KB, 3 difficulty.
- updated the noscript bash method to work with argon2
- works in webworkers or main thread, capped at 8 threads (doesn't seem to crash firefox anymore -- we could go higher)
2 years ago
Thomas Lynch
ea3f8bf291
Small docker improvement for better testing/development (no more 503)
2 years ago
Thomas Lynch
d019440bc0
Move POW proof checking to POST and sign a cookie there, kinda like captcha flow, so we can do a more intensive one without it happening on every request. We just check the hmac now.
...
Still TODO actually converting it to argon, but should be straightforward from this point.
Another advantage of making POW check use POST is a better noscript experience. We now provide a box and "submit" button, so they don't have to mess with setting a cookie.
2 years ago
Thomas Lynch
521f9742c1
revert back to 2 thread max again because turns out firefox didnt get better, just tor limits to 1 thread anyway
2 years ago
Thomas Lynch
614b437667
Add ability to include IPs in challenge hash generation, to lock cookies to IPs (like the pre-sig mode)
2 years ago
Thomas Lynch
20a04f23c2
Change wording for public branch
2 years ago
Thomas Lynch
e1c786a1d7
Add example snippet of how to acl/whitelist stats sockte
2 years ago
Thomas Lynch
0af1a740ab
Make captcha submission automatic and not require clicking a "submit" form button
2 years ago
Thomas Lynch
3f40192d55
Update README with new env vars
...
Remove dataplaneapi junk
2 years ago
Thomas Lynch
d115ca6f46
ref #15
2 years ago
Thomas Lynch
194c5bb96c
Check ssl_fc for whether to set captcha cookie as secure close #15
2 years ago
Thomas Lynch
3f7e48def6
update the nojs terminal script
2 years ago
