Merge branch 'main' of github.com:mpg-age-bioinformatics/myapp

Author: jorgeboucas

config.py

@@ -50,6 +50,7 @@ class Config(object):
     COMMIT = commit
     ADMINS = os.environ.get('ADMINS').split(",") or ['[email protected]']
     PREAUTH = os.environ.get('PREAUTH') or False
+    WHITELISTED_IPS = os.environ.get('WHITELISTED_IPS') or ""
 
     # PRIVATE_APPS = os.environ.get('PRIVATE_APPS') or None
 

myapp/routes/_utils.py

@@ -46,15 +46,19 @@ def password_check(password):
     lowercase_error = re.search(r"[a-z]", password) is None
 
     # searching for symbols
-    symbol_error = re.search(r"[ !#$%&'()*+,-./[\\\]^_`{|}~"+r'"]', password) is None
+    symbol_error = re.search(r"[ !#$%&'()*@+,-./[\\\]^_`{|}~"+r'"]', password) is None
 
     # overall result
     password_ok = not ( length_error or digit_error or uppercase_error or lowercase_error or symbol_error )
 
-    if length_error or digit_error :
-        pass_type="weak"
-    elif uppercase_error or lowercase_error or symbol_error:
-        pass_type="medium"
+    if length_error :
+        pass_type="short"
+    elif digit_error:
+        pass_type="digit_none"
+    elif uppercase_error or lowercase_error:
+        pass_type="case_none"
+    elif symbol_error:
+        pass_type="symbol_none"
     else:
         pass_type="strong"   
 

myapp/routes/register.py

@@ -188,10 +188,14 @@ def check_logged(pathname):
     prevent_initial_call=True)
 def check_pass_power(passA):
     passdic=password_check(passA)
-    if passdic["passtype"] == "weak":
-        return dbc.Alert( "please use a strong password" ,color="danger")
-    elif passdic["passtype"] == "medium":
-        return dbc.Alert( "please use a strong password" ,color="warning")
+    if passdic["passtype"] == "short":
+        return dbc.Alert( "password is too short" ,color="danger")
+    elif passdic["passtype"] == "digit_none":
+        return dbc.Alert( "password must contain at least one digit" ,color="warning")
+    elif passdic["passtype"] == "case_none":
+        return dbc.Alert( "password must contain at least one lowercase and uppercase letter" ,color="warning")
+    elif passdic["passtype"] == "symbol_none":
+        return dbc.Alert( "password must contain at least one symbol" ,color="warning")
     elif passdic["passtype"] == "strong":
         return dbc.Alert( "strong password" ,id="alert-auto", color="success",is_open=True, duration=1500)
 

requirements.txt

@@ -70,3 +70,5 @@ Werkzeug==2.2.2
 wheel==0.38.4
 wrapt==1.14.1
 WTForms==3.0.1
+biopython==1.84
+reportlab==4.2.5