ppss-auth 0.11.1.1__tar.gz → 0.11.2.0__tar.gz

{ppss_auth-0.11.1.1/ppss_auth.egg-info → ppss_auth-0.11.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ppss_auth
-Version: 0.11.1.1
+Version: 0.11.2.0
 Summary: simple auth scheme for pyramid, based on Mako template and sqlalchemy backend
 Home-page: https://bitbucket.org/pingpongstars/ppss_auth/src/master/
 Author: pdepmcp
@@ -23,6 +23,7 @@ Requires-Dist: alembic
 Requires-Dist: cryptography
 Requires-Dist: pyotp
 Requires-Dist: qrcode
+Requires-Dist: requests
 
 This package aims to give and easy pluggable module to provide authentication and user maintennance in a Pyramid web application.
 It relies the Pyramid+SQLAlchemy+Mako stack. Implementation for other template languages is on the roadmap.

{ppss_auth-0.11.1.1 → ppss_auth-0.11.2.0}/ppss_auth/constants.py

@@ -160,3 +160,6 @@ class Conf():
         cls.issuer2fa = settings.get("ppss_auth.issuer2fa", None)
         cls.enable2fatpl = settings.get("ppss_auth.enable2fatpl", cls.tplpath('enable2fa'))
         cls.verify2fatpl = settings.get("ppss_auth.verify2fatpl", cls.tplpath('verify2fa'))
+        # turnstile captcha
+        cls.turnstile_sitekey = settings.get("ppss_auth.turnstile_sitekey", None)
+        cls.turnstile_secretkey = settings.get("ppss_auth.turnstile_secretkey", None)

{ppss_auth-0.11.1.1 → ppss_auth-0.11.2.0}/ppss_auth/templates/login.jinja2

@@ -18,6 +18,10 @@
                 <br/>
                 <input class="form-control" type="password" name="password" autocomplete="off" placeholder="{{_('password',domain='ppss_auth')}}">
                 <br/>
+                {% if isCaptchaEnabled: %}
+                <script src="https://challenges.cloudflare.com/turnstile/v0/api.js" async defer></script>
+                <div class="cf-turnstile" data-sitekey="{{ppsauthconf.turnstile_sitekey}}"></div>
+                {% endif %}
                 {% if email_is_required %}
                 <p>{{_('Forgot password ?',domain='ppss_auth')}}    
                 <a href="{{request.route_url('ppss:user:recoverpassword')}}">{{_('recover',domain='ppss_auth')}}</a></p>

{ppss_auth-0.11.1.1 → ppss_auth-0.11.2.0}/ppss_auth/templates/login.mako

@@ -16,6 +16,10 @@
                 <br/>
                 <input class="form-control" type="password" name="password" autocomplete="off" placeholder="${_('password', domain='ppss_auth')}" class="form-control">
                 <br/>
+                % if isCaptchaEnabled:
+                <script src="https://challenges.cloudflare.com/turnstile/v0/api.js" async defer></script>
+                <div class="cf-turnstile" data-sitekey="${ppsauthconf.turnstile_sitekey}"></div>
+                % endif
                 % if email_is_required:
                 <p>${_('Forgot password ?',domain='ppss_auth')}   
                 <a href="${request.route_url('ppss:user:recoverpassword')}">${_('recover',domain='ppss_auth')}</a></p>

{ppss_auth-0.11.1.1 → ppss_auth-0.11.2.0}/ppss_auth/views/auth.py

@@ -5,6 +5,7 @@ import secrets
 
 import pyotp
 import qrcode
+import requests
 from ppss_auth.ppss_auth_utils.emailclient import sendConfirmEmailUseCase, sendPasswordResetEmailUseCase
 from ppss_auth.ppss_auth_utils.password import getPasswordDigest
 
@@ -112,6 +113,24 @@ class AuthController():
             user = PPSsuser.byId(userid,self.request.dbsession)
         return user
 
+    def isCaptchaEnabled(self) -> bool:
+        if Conf.turnstile_sitekey and Conf.turnstile_secretkey:
+            return True
+        else:
+            return False
+        
+    def verifyCaptcha(self,token) -> bool:
+        try:
+            r = requests.post('https://challenges.cloudflare.com/turnstile/v0/siteverify', data={
+                'secret': Conf.turnstile_secretkey,
+                'response': token
+            })
+            r.raise_for_status()
+            return r.json()['success']
+        except Exception as e:
+            l.exception("Captcha api call failed")
+            return False
+
     def __init__(self,request:Request):
         request.response.headers["X-Frame-Options"] = "DENY"
         request.response.headers["Content-Security-Policy"] = "frame-ancestors 'none';"
@@ -148,7 +167,8 @@ class AuthController():
             'activeaction' : activeaction,
             'bc': Conf.bootstrapClasses,
             'ppsauthconf':Conf,
-            'msg':""
+            'msg':"",
+            'isCaptchaEnabled': self.isCaptchaEnabled(),
         }
 
     def logloginattempt(self,user,validity,username):
@@ -191,6 +211,14 @@ class AuthController():
         if r.POST:
             username = r.params.get("username",u"")
             password = r.params.get("password",u"")
+            if self.isCaptchaEnabled():
+                captcha = r.params.get("cf-turnstile-response",u"")
+                if not captcha:
+                    self.retdict["msg"] = "Captcha is required."
+                    return self.retdict
+                if self.verifyCaptcha(captcha) == False:
+                    self.retdict["msg"] = "Captcha verification failed."
+                    return self.retdict
             superuser = False
             res = None
             l.info("Login attempt: u={username}".format(username=username))

{ppss_auth-0.11.1.1 → ppss_auth-0.11.2.0/ppss_auth.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ppss_auth
-Version: 0.11.1.1
+Version: 0.11.2.0
 Summary: simple auth scheme for pyramid, based on Mako template and sqlalchemy backend
 Home-page: https://bitbucket.org/pingpongstars/ppss_auth/src/master/
 Author: pdepmcp
@@ -23,6 +23,7 @@ Requires-Dist: alembic
 Requires-Dist: cryptography
 Requires-Dist: pyotp
 Requires-Dist: qrcode
+Requires-Dist: requests
 
 This package aims to give and easy pluggable module to provide authentication and user maintennance in a Pyramid web application.
 It relies the Pyramid+SQLAlchemy+Mako stack. Implementation for other template languages is on the roadmap.

{ppss_auth-0.11.1.1 → ppss_auth-0.11.2.0}/ppss_auth.egg-info/requires.txt

@@ -6,3 +6,4 @@ alembic
 cryptography
 pyotp
 qrcode
+requests

{ppss_auth-0.11.1.1 → ppss_auth-0.11.2.0}/setup.py

@@ -9,7 +9,7 @@ changelog = open(os.path.join(here, "README.md"), "r").read()
 
 setup(
     name="ppss_auth",
-    version="0.11.1.1",
+    version="0.11.2.0",
     description="simple auth scheme for pyramid, based on Mako template and sqlalchemy backend",
     long_description=readme + "\n\n\n" + changelog,
     long_description_content_type="text/markdown",
@@ -35,7 +35,8 @@ setup(
         "alembic",
         "cryptography",
         "pyotp",
-        "qrcode"
+        "qrcode",
+        "requests"
     ],
     # packages=['src/test1'],
     packages=find_packages(),