Merge pull request #13 from 1to5pc/main

Merge main branch to 2-password-security

Author: 1to5pc

.github/workflows/backend-test.yml

@@ -0,0 +1,39 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Python application
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest backendtest.py

README.md

@@ -1,3 +1,4 @@
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/1to5pc/python-auth/backend-test.yml?style=for-the-badge&label=Back%20End)
+![GitHub top language](https://img.shields.io/github/languages/top/1to5pc/python-auth?style=for-the-badge&logo=python)
+
 # A "simple" and easy to use python based authentication system
-## Test results:
-![Test Parmeter](https://github.com/1to5pc/python-auth/actions/workflows/python-app.yml/badge.svg)

test.py backendtest.py

@@ -1,10 +1,13 @@
 # This is the default config
-# * Not yet implemented
+# Algorithm switching not yet implemented
 # WARNING: DO NOT CHANGE ENCRYPTION ALGORITHMS AFTER INITAL SETUP. MULTIPLE ENCYRPTION STANDARDS ARE NOT SUPPORTED SIMULTANEOUSLY
+# Salt size should be in characters. '0' disables salting.
 
 [Config]
 quiet = True
-alg = sha256 # Can be either SHA256 or *bycrypt/argon2*
+alg = sha256
 
+[Salt] 
+saltSize = 8
 
 [Debugging]

config.cfg config.ini

@@ -1,3 +1,31 @@
+def configRead():
+    import configparser
+    config = configparser.ConfigParser()
+    config.read('config.ini')
+    try:
+        quiet = config['Config']['quiet']
+        quiet = quiet.lower() in ("true")
+    except KeyError:
+        quiet = False
+    try:
+        alg = config['Config']['alg']
+        alg = str(quiet).lower()
+    except KeyError:
+        print("ERROR: Algorithm not defined. Reverting to SHA256")
+        alg = 'sha256'
+    try:
+        saltSize = config['Salt']['saltSize']
+        saltSize = int(saltSize)
+    except KeyError:
+        saltSize = 8
+        print("ERROR: saltSize not defined or not integer. Reverting to 8")
+    return quiet,alg,saltSize
+
+def salter(pswd,saltsize):
+    import string
+    import secrets
+    pass
+
 def init_usrs(nUsr):
     import hashlib
     usrlist=[]
@@ -26,11 +54,14 @@ def save_users(usrlist,overWrite):
         saveFile = open("usrlist", "w")
     else:
         saveFile = open("usrlist", "a")
-    for x in range(len(usrlist)):
-        if (x-2)<len(usrlist):
-            saveFile.write(str(usrlist[x][0])+","+str(usrlist[x][1])+",")
-        else:
-            saveFile.write(str(usrlist[x][0])+","+str(usrlist[x][1]))
+    if len(usrlist)>0:
+        for x in range(len(usrlist)):
+            if (x-2)<len(usrlist):
+                saveFile.write(str(usrlist[x][0])+","+str(usrlist[x][1])+",")
+            else:
+                saveFile.write(str(usrlist[x][0])+","+str(usrlist[x][1]))
+    else:
+        saveFile.write('')
     saveFile.close()
 
 def usr_check(usrn,pswd,usrlist):
@@ -78,7 +109,7 @@ def login_init(usrname,pswd,overWrite,quiet):
         else:
             newFile=False
         while True:
-            nUsr=input("Enter the number of users to initialize: ")
+            nUsr=input("Enter the number of users to initialize ('0' Clears the database): ")
             try:
                 nUsr=int(nUsr)
                 break
@@ -87,43 +118,47 @@ def login_init(usrname,pswd,overWrite,quiet):
         if nUsr>0:
             usrlist=init_usrs(nUsr)
             save_users(usrlist,newFile)
+        elif nUsr==0:
+            save_users([],True)
     else:
         usrlist = load_users()
         Ufound,Pfound=usr_check(usrname,pswd,usrlist)
         loginSt=login_status(Ufound,Pfound,quiet)
     return loginSt
 
 
-def Auth_test():
+def Auth_test(quiet):
     import os
+    configRead()
     try:
         print("[Authentication Test]".center(os.get_terminal_size().columns))
     except OSError:
         print("[Authentication Test]")
     usr=input("Input username: ")
     pswd=input("Input password: ")
-    if input("Enable quiet mode? [y/N]").upper() == "Y":
-        quiet=True
-    else:
-        quiet=False
+#    if input("Enable quiet mode? [y/N]").upper() == "Y":
+#        quiet=True
+#    else:
+#        quiet=False
     loginSuccess=login_init(usr,pswd,False,quiet)
     print("Login success status:", loginSuccess)
 
 def main_menu():
+    quiet,alg,saltSize=configRead()
     print("\n--- Main Menu ---")
     print("0. Initialize user accounts")
     print("1. Test Authentication")
     print("2. Exit")
     choice = input("Enter your choice: ")
     if choice == '0':
-        login_init('','',True,False)
+        login_init('','',True,quiet)
     elif choice == '1':
-        Auth_test()
+        Auth_test(quiet)
     elif choice == '2':
         print("Exiting program.")
         exit()
     else:
-        print("Invalid choice. Please enter 1 or 2.")
+        print("Invalid choice. Please enter 0, 1 or 2.")
         main_menu()
 
 if __name__ == "__main__":