Wk 10 done

Author: Mark Charlton

Assessment/Wk10/security_checker.py

@@ -7,6 +7,7 @@
 import json 
 import time 
 import sys 
+import getpass as gp
 
 sys.path.append(os.path.abspath('..\\inc\\'))
 
@@ -27,18 +28,33 @@ class User:
     loggedin = 0
 
     def __init__(self, username):
-        self.username=username
+        self.username=username.upper()
         if username in a_users.keys():
             self.passwordhash=a_users[username]
         else:
             self.passwordhash=""
 
-        if username in a_lockout.keys():
-            if time.time() < a_lockout[username]["r"]:
+        if self.username in a_lockout.keys():
+            self.lockouts= a_lockout[self.username]["a"]
+            if time.time() < a_lockout[self.username]["r"]:
                 self.locked=1
-                self.lockout_release = a_lockout[username]["r"]
-                self.lockouts= a_lockout[username]["a"]
+                self.lockout_release = a_lockout[self.username]["r"]
 
+    def __str__(self):
+        ret_str=""
+        ret_str += "User: " + self.username + "\n"
+        if self.passwordhash == "":
+            ret_str += "Password: <not set>\n"
+        else:
+            ret_str += "Password: <set>\n"
+        if self.locked == 1:
+            ret_str += f"{s.REDON}Account is locked out until {self.lockout_release_str()}{s.COLOUROFF}\n"
+            ret_str += f"Account has been locked out {self.lockouts} times.\n"
+        else: 
+            ret_str += f'Account is unlocked and active\n'
+        return ret_str
+
+
 
     def check_password_complexity(self, password):
         valid_pass = 1
@@ -50,11 +66,11 @@ def check_password_complexity(self, password):
                     valid_pass = 0
             if self.allow_spaces == 0:
                 if " " in password:
-                    s_err += f"* No spaces"
+                    s_err += f"* No spaces\n"
                     valid_pass = 0
             if self.allow_leading_number == 0:
                 if password[0].isdigit():
-                    s_err += f"* Cannot begin with a number"
+                    s_err += f"* Cannot begin with a number\n"
                     valid_pass = 0     
         except: 
             pass
@@ -80,8 +96,7 @@ def hash_password(self,password):
     def verify_password(self,provided_password):
         f_return = False
         if self.is_locked_out():
-            t_release = time.strftime("%d/%m/%Y %H:%M:%S", time.gmtime(self.lockout_release))
-            print ( f"Sorry your account is locked out until {t_release}.\nPlease try again later")
+            print ( f"{s.REDON}Sorry your account is locked out until {self.lockout_release_str()}{s.COLOUROFF}.\nPlease try again later")
         else:
             salt = self.passwordhash[:64]
             pwdhash = hashlib.pbkdf2_hmac('sha512', 
@@ -94,7 +109,7 @@ def verify_password(self,provided_password):
             if f_return==True:
                 self.loggedin = 1
             elif f_return == False:
-                print ( "Sorry that username / password combination wasn't recognised. \nPlease try again")
+                print ( f"{s.REDON}Sorry that username / password combination wasn't recognised.{s.COLOUROFF} \nPlease try again")
                 self.attempts += 1
                 if self.attempts >= self.attempt_limit:
                     # reset attempts
@@ -109,6 +124,9 @@ def verify_password(self,provided_password):
 
         return f_return
 
+    def lockout_release_str(self):
+         return time.strftime("%d/%m/%Y %H:%M:%S", time.gmtime(self.lockout_release))
+
     def is_locked_out(self):
         f_locked=0
         if self.locked == 1:
@@ -151,20 +169,22 @@ def write_file():
 #print (a_users)
 
 while True:
-    print ( "Password Verifier 2000 " )
+    print ( f"\n\n{s.ORANGEON}Password Verifier 2000{s.COLOUROFF}" )
     print ( "-----------------------")
     print ( "1. New User" )
     print ( "2. Existing User" )
     print ( "3. Print Users" )
+    print ( "4. Dump Current User Object" )
     print ( "0. Exit" )
     print ( "-----------------------")
     print ( "" )
-    i_menu = h.get_int("Please enter your selection",1,3)
+    i_menu = h.get_int("Please enter your selection",1,4)
 
     if i_menu == 0:
+        print ( f"\nThank you for using {s.ORANGEON}Password Verifier 2000{s.COLOUROFF}\n" )
         break
     elif i_menu == 1:
-        s_usr = input( "Please enter your username [Enter to quit]: ")
+        s_usr = input( "Please enter your username [Enter to quit]: ").upper()
         if s_usr=="":
             break 
 
@@ -177,10 +197,10 @@ def write_file():
 
         while True: 
                 print ( f"Please enter a password for new user {s_usr}")
-                s_p_1 = input ( "Please enter the new password: ")
+                s_p_1 = gp.getpass ( "Please enter the new password [Enter to abort]: ")
                 if s_p_1 == "":
                     break
-                s_p_2 = input ( "Please re-enter the new password: ")
+                s_p_2 = gp.getpass ( "Please re-enter the new password: ")
 
                 if s_p_1 == s_p_2:
                     if usr.check_password_complexity(s_p_1) == 1:
@@ -196,14 +216,15 @@ def write_file():
                     print (f"{s.REDON}Passwords do not match.{s.COLOUROFF}\nPlease try again")
     elif i_menu == 2:
 
-        s_usr = input( "Please enter your username [Enter to quit]: ")
+        s_usr = input( "Please enter your username [Enter to quit]: ").upper()
         if s_usr=="":
             break 
 
-        print ( f"Welcome back {s_usr}.")
         if s_usr in a_users.keys():
             usr = User(s_usr)
-
+            
+            print ( f"\n{s.GREENON}Welcome back {s_usr}.{s.COLOUROFF}\n")
+            
             if usr.is_locked_out():
                 t_release = time.strftime("%d/%m/%Y %H:%M:%S", time.gmtime(usr.lockout_release))
                 print ( f"{s.REDON}Sorry your account is locked out until {t_release}.{s.COLOUROFF}\nPlease try again later")
@@ -212,16 +233,19 @@ def write_file():
             else:
                 f_loggedin=0
                 while usr.locked == 0 and usr.loggedin == 0: 
-                    s_pwd_try = input ( f"Please enter password for user {usr.username}: " )
+                    s_pwd_try = gp.getpass ( f"Please enter password for user {usr.username}: " )
                     if usr.verify_password(s_pwd_try) == True:
                         break
 
                 if usr.loggedin == 1:
                     print ( f"{s.GREENON}Welcome to the Password Verifier 2000.{s.COLOUROFF}\n{s.ORANGEON}You successfully entered your username and password!{s.COLOUROFF}" )
+                    time.sleep ( 1 )
                 else: 
-                    print ( f"{s.REDON}{s.REVON}Password attempts limit exceeded.{s.REVOFF}{s.COLOUROFF} \nYour account has been locked for 60 seconds." )
+                    print ( f"{s.REDON}{s.REVON}Password attempts limit exceeded.{s.REVOFF}{s.COLOUROFF} \nYour account has been locked for {(usr.lockout_period * usr.lockouts)} seconds." )
+                    time.sleep ( 1 )
         else:
-            print ( f"{s.REDON}Username not found. Please try again{s.COLOUROFF}" )
+            print ( f"\n{s.REDON}Username not found. Please try again{s.COLOUROFF}\n" )
+            time.sleep (1)
 
     elif i_menu == 3:
         print ("System Users")
@@ -231,10 +255,24 @@ def write_file():
             usr = User(this_user)
             if usr.is_locked_out():
                 s_colour = s.REDON
+                s_timeout = f" on lockout {usr.lockouts} until {usr.lockout_release_str()} "
             else:
                 s_colour = s.GREENON
+                s_timeout = ""
 
-            print ( f"{s_colour}{usr.username}{s.COLOUROFF}" )
+            print ( f"{s_colour}{usr.username}{s.COLOUROFF} " + s_timeout)
 
         print ("------------")
         print ( "" )
+    elif i_menu == 4:
+        try:
+            print ("\nCurrent User Object")
+            print ("-------------------")
+            
+            print (usr)
+        except Exception as e: 
+            #print ( str(e))
+            print ( "No current user object" )
+            time.sleep ( 1 )
+        finally:
+            print ("")

Assessment/Wk10/security_checker_invalid.jpg

@@ -1 +1,7 @@
-{"Dave": "319bc54aaa80ec8196f6b21a8477dee75dbd7858d29020b3c5ebb88201799ddf53ff15de17ad0ccff87705bb8890858a7905d510735c5a3e2b2276628847c4ecba3715dccd25531eae9e5203370dca763586cb4ccc326da4683f5b64453692af"}
+{"DAVE": "51214d41b029cd2a12598dba89cfa6577370c1d81f9f2da2c20c64a6ced7e0fd91a695e7e588568c3cf06630c730e263f3d157aae6351845088d9b397a830a13aa0fb2d01e5bec1a1fc8c98a3d0d34b67375730f09724001bbb4c936b6df8bc1", 
+"FRED": "294b2bb0d081c3f45c69ef82519979797b818fd55be4244ddea05d79ba50029c163da60b0126ebf526edd4ab2fa26b35ddb76fff8d670eecf3218171e1c8977a7e984b5e33e75913ce36c663d26c4fd87a16a73ffec816769fb1afe2396fd5a1", 
+"SARAH": "f4f1eef95155204e1e9a737e4d93bc0319737ee38d59d5d3c4bc71ed75ad01df58842a73fc22574b34ebe816b7e65def02bd1a026b6929b46fc9861877c0b8e40148bed90bbc29d12565652e27c486fba1ef31870c2f1ec2f000d126d39e8e44", 
+"STEVE": "4a537753fa60cd4efad32e535062c08df6901102c7ff009cae6ac612865aa344eb10c12af6a8f37606d8daa7878d34cc780b9ca99fbfb70c24a1f1b32bb8157f2017f976f6ad807df5d5d68d2906fa85cdd1de61fb6b9eef57999fd5f76b3a4f", 
+"ROGER": "4260fd11f54c8c963331121fe9821ca94ee38bc980fedd37f9ac638f0910833b303e20ccacdda25f1f05f83efa9c7c61a76f2e5dfb514ecf6bcfdba9679c6211be2b07ce9609ee34a14999d698813e921b37837fa3c5ea82b67fe8b44adbaff9", 
+"RACH": "1a9dacdd164e959372fc61f4de2ddafb61c099dbe1b15780eedc3713c3df64682c258f594d2009102f8f9e28cdd44df6e573467f3403c4e9c6c8c6a58d885a4d34c082691a07050cb06abb2638718413f2ef1483743b59c3ab53dddaba272f83", 
+"HELEN": "b991c34f6af98481d4b17672b1cd46c265bdcc7f3e551e8ec4f55640120666d1de38758c17217d5bd0bbbe34e334a23801b55cfa5232dbe7030f2586fdcb5dae9f77ed0e7f8e5c3988d0df872581aa7aaa65dbe66b0685a55dd4fd74bc570806"}

Assessment/Wk10/security_checker_invalid_2.jpg

@@ -0,0 +1,6 @@
+beryllium 4 9.012
+magnesium 12 24.305
+calcium 20 20.078
+strontium 38 87.62
+barium 56 137.327
+radium 88 226

Assessment/Wk10/security_checker_users.json

@@ -0,0 +1,10 @@
+Sunt nobis quos quam neque nam sit suscipit dignissimos, minima laborum soluta mollitia reiciendis deserunt necessitatibus ratione cum, aliquid quibusdam itaque, nobis dolores debitis autem aliquid?
+Enim veritatis accusantium deserunt ab earum eveniet mollitia quas omnis commodi quisquam, natus quaerat omnis ut voluptatem aliquam, nihil ut sapiente suscipit cupiditate totam quas a debitis aliquam, quis corporis laboriosam, iste fugit cupiditate consequatur laudantium nulla soluta provident rerum a.
+Labore excepturi iure quae ad dolor optio debitis illo recusandae dignissimos quo, eaque doloribus aliquid dolorum iusto rem delectus recusandae, quis sint fuga ex sapiente possimus atque dignissimos?
+Quisquam deleniti eaque sit eligendi expedita nulla ab molestiae quod fugit, facilis at cumque amet animi quod necessitatibus ab, natus molestiae reprehenderit ratione aperiam.
+Veritatis repellendus assumenda quisquam reiciendis sit beatae necessitatibus magnam saepe rem non, nemo hic voluptatum velit esse beatae quisquam consectetur, earum tenetur consectetur eveniet maiores sed dolores fugiat facere nesciunt voluptatibus beatae?
+Tempore hic veritatis pariatur odio odit perferendis porro autem distinctio obcaecati quod, blanditiis consequuntur odit tempore suscipit, asperiores magni suscipit accusantium minima repellendus in, commodi velit eligendi repudiandae dolor ut perspiciatis delectus molestias tenetur sequi accusamus?
+Nihil autem eligendi ipsam accusantium ex a voluptates ratione itaque quae, unde vel amet blanditiis quisquam ut incidunt alias velit.
+Nisi quam tempora minus dolore harum quos eveniet totam cum, nemo inventore commodi, eius atque corrupti cum ab, voluptatem illo qui laudantium ex rerum eligendi.
+Repudiandae eveniet unde itaque quod distinctio praesentium officiis quaerat maxime ipsam, eius voluptate earum eveniet voluptatum tenetur, debitis pariatur enim tempore vitae.
+Maxime porro assumenda magni perspiciatis odit ex dolor voluptates vel quisquam, veritatis est asperiores perspiciatis accusamus at, obcaecati a fuga quasi possimus natus tempora animi, eum nesciunt quis?

Assessment/Wk10/security_checker_valid.jpg

@@ -0,0 +1,14 @@
+
+from lorem_text import lorem as lt
+
+print ( "Generating Text File" )
+print ( "--------------------" )
+with open("text.txt", "w") as fh_1:
+    for i in range(10):
+        fh_1.write ( lt.sentence() + '\n' )
+
+print ( "\nReading back file contents" )
+print ( "--------------------------" )
+with open("text.txt", "r") as fh_1:
+    for line in fh_1:
+        print ( line.strip() )

Tasks/alkaline_metals.txt

@@ -0,0 +1,33 @@
+# metals
+
+import os 
+import pprint as pp
+
+def create_file():
+    if not os.path.exists(file_name):
+        with open(file_name, "w") as fh_metals:
+            fh_metals.write("beryllium 4 9.012\n")
+            fh_metals.write("magnesium 12 24.305\n")
+            fh_metals.write("calcium 20 20.078\n")
+            fh_metals.write("strontium 38 87.62\n")
+            fh_metals.write("barium 56 137.327\n")
+            fh_metals.write("radium 88 226\n")
+
+def read_file():
+    global a_metals
+    with open(file_name) as fh_metals:
+        for line in fh_metals:  
+            a_line = line.split()
+            a_line[1] =int(a_line[1])
+            a_line[2] = float(a_line[2])
+            
+            a_metals.append(a_line)
+
+file_name = "alkaline_metals.txt"
+a_metals = []
+# do it
+create_file()
+
+read_file()
+
+pp.pprint (a_metals)