SUSE Hack Week 2023

Author: markusewalker

encrypt-passwords/README.md

@@ -11,10 +11,10 @@ This script can be ran interactively or silently, see the below to see how.
 ### Getting Started
 To utilize this script in the command-line, please follow the below workflow:
 
-(1) Clone the script into your environment.\
-(2) Make sure latest version of Python 3 is installed on the environment.\
-(3) Run the script interactively: `python3 encryptpw.py 1 -p <password>`.\
-(4) Run the script interactively: `python3 encryptpw.py 2`.
+1. Clone the script into your environment.
+2. Make sure latest version of Python 3 is installed on the environment.
+3. Run the script interactively: `python3 encryptpw.py 1 -p <password>`.
+4. Run the script interactively: `python3 encryptpw.py 2`.
 
 Additionally, this can be ran from your Python IDE of choice such as PyCharm, IDLE, Visual Studio Code, etc.
 
@@ -25,3 +25,5 @@ See below an image of the script in action:
 Included is `encryptpw_unittest.py` to check for correctness. The tests provide few, basic tests to verify the addition, subtraction, multiplication and division functions are working properly. To run in the command-line, run the following command:
 
 `python3 -m unittest encryptpw_unittest.py`
+
+![Unit-test](https://github.com/markusewalker/Misc-Python-Scripts/blob/main/encrypt-passwords/test.jpg)

encrypt-passwords/example.jpg

@@ -1,49 +1,49 @@
 #!/usr/bin/env python3
 #
 # Authored By:      Markus Walker   
-# Date Modified:    3/4/22
+# Date Modified:    1/31/23
 #
 # Description: Encrypts passwords using the Fernet cryptography method.
 
 import argparse, getpass
 from cryptography.fernet import Fernet
 
-# Function to encrypt passwords using Fernet cryptography.
 def encryption(password):
-    # Instance the Fernet class with the key variable...
     key = Fernet.generate_key()
     fernet = Fernet(key)
 
-    # Encoding to byte string before we can actually encrypt...
     new_pass = fernet.encrypt(password.encode())
 
     return new_pass
 
+def output(password, result):
+    with open("pass.txt", "w") as text_file:
+        print(f"{password}", file=text_file)
+        print(f"{result}", file=text_file)
+    text_file.close()
+    
+    print("Key and encrypted password have been saved to pass.txt")
+
 def main():
     parser = argparse.ArgumentParser(description="Encrypts user-inputted passwords using Fernet cryptography")
     parser.add_argument("mode", metavar="mode", type=int, help="runs the script in interactive or silent mode: 1 for silent, 2 for interactive. If silent, run required command-line flags")
     parser.add_argument("-p", "--password", help="password that will be encrypted")
 
     args = parser.parse_args()
 
-    # If user chooses option 1, run script silently. Else, if user chooses option 2, run script interactively.
     if args.mode == 1:
-        # Print out the initial password along with the encrypted password.
         result = encryption(args.password)
-        print(f"\nKey: {args.password}")
-        print(f"\nEncrypted Password: {result}\n")
+        output(args.password, result)
     elif args.mode == 2:
         welcome = """
 Welcome to the Encrypt Passwords tool! This will take user-inputted passwords and
 encrypt them using the Fernet cryptography method.    
 """
         print(welcome)
 
-        # Once password is received, print the key along with the encrypted password.
         password = getpass.getpass(prompt="Please enter a password that will be used as a key to encrypt: ")
         result = encryption(password)
-        print(f"\nKey: {password}")
-        print(f"\nEncrypted Password: {result}\n")
+        output(password, result)
 
 if __name__ == "__main__":
     main()

encrypt-passwords/src/encryptpw.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
 # Authored By:      Markus Walker
-# Date Modified:    3/4/22
+# Date Modified:    1/31/23
 #
 # Description: Unit test for the encrypt-passwords.py script.
 import unittest
@@ -12,6 +12,8 @@ def test_encryption(self):
         self.assertNotEqual(encryption("test"), "b'gAAAAABiItEqE3Kt4bPp0i-7wRP1_4eOlHa3fySmR0sHf7sOrLSBm8_iOVXJAwkfCW1dkTYiXZAcsP5KIxbJsACoCw0eU_sik35WcrJE6MJDujKXSdx939I='")
         self.assertNotEqual(encryption("hello"), "b'gAAAAABiItEqE3Kt4bPp0i-7wRP1_4eOlHa3fySmR0sHf7sOrLSBm8_iOVXJAwkfCW1dkTYiXZAcsP5KIxbJsACoCw0eU_sik35WcrJE6MJDujKXSdx939I='")
         self.assertNotEqual(encryption("yoyo"), "b'gAAAAABiItEqE3Kt4bPp0i-7wRP1_4eOlHa3fySmR0sHf7sOrLSBm8_iOVXJAwkfCW1dkTYiXZAcsP5KIxbJsACoCw0eU_sik35WcrJE6MJDujKXSdx939I='")
-
+    def test_output(self):
+        self.assertFalse(output("test", "b'gAAAAABiItEqE3Kt4bPp0i-7wRP1_4eOlHa3fySmR0sHf7sOrLSBm8_iOVXJAwkfCW1dkTYiXZAcsP5KIxbJsACoCw0eU_sik35WcrJE6MJDujKXSdx939I='"))
+        
 if __name__ == "__main__":
     unittest.main()

encrypt-passwords/src/encryptpw_unittest.py

@@ -8,17 +8,19 @@ This script can be ran interactively or silently using command-line arguments. T
 ### Getting Started
 To utilize this script in the command-line, please follow the below workflow:
 
-(1) Clone the script into your environment.\
-(2) Make sure latest version of Python 3 is installed on the environment.\
-(3) Run the script silently: **python3 calculator.py 1 -n1 <number> -n2 <number> -o <operation>**.\
-(4) Run the script interactively: **python3 calculator.py 2**
+1. Clone the script into your environment.
+2. Make sure latest version of Python 3 is installed on the environment.
+3. Run the script silently: `python3 calculator.py 1 -n1 <number> -n2 <number> -o <operation>`.
+4. Run the script interactively: `python3 calculator.py 2`
 
 Additionally, this can be ran from your Python IDE of choice such as PyCharm, IDLE, Visual Studio Code, etc.
 
 See below an image of the script in action:
-![Image of Calculator](https://github.com/markusewalker/Misc-Python-Scripts/blob/main/python-calculator/calculator.png)
+![Image of Calculator](https://github.com/markusewalker/Misc-Python-Scripts/blob/main/python-calculator/example.jpg)
 
-### Testing
+### Unit Testing
 Included is `calculator_unittest.py` to check for correctness. The tests provide few, basic tests to verify the addition, subtraction, multiplication and division functions are working properly. To run in the command-line, run the following command:
 
-**python3 -m unittest calculator_unittest.py**
+`python3 -m unittest calculator_unittest.py`
+
+![Unit-test](https://github.com/markusewalker/Misc-Python-Scripts/blob/main/python-calculator/test.jpg)

encrypt-passwords/test.jpg

@@ -1,17 +1,11 @@
 #!/usr/bin/env python3
 
 # Authored By: Markus Walker
-# Date Modified: 2/13/22
+# Date Modified: 1/31/23
 #
-# Descrption: Calculator written in Python 3. It provides the following
-# operations:
-#   1. Addition
-#   2. Subtraction
-#   3. Multiplication
-#   4. Division
-#   5. Remainder
-#   6. Squared
-#   7. Cubed
+# Descrption: Calculator written in Python 3. It provides the following operations:
+# addition, subtraction, multiplication, division, remainder, squared, cubed.
+
 import argparse
 
 def addition(x, y):
@@ -35,10 +29,9 @@ def squared(x, y):
 def cubed(x, y):
     return (x ** y) * x
 
-# Function to interactively run the script if the user chose option 2.
 def interactive():
     welcome = """
-    Welcome to the Python Calculator! Please find the below supported operations:
+Welcome to the Python Calculator! Please find the below supported operations:
 
     1. Addition
     2. Subtraction
@@ -48,15 +41,13 @@ def interactive():
     6. Squared
     7. Cubed
 
-    To keep it simple, this calculator takes only two numbers as input.
-    """
+To keep it simple, this calculator takes only two numbers as input.
+"""
     print(welcome)
 
-    # While loop that will check the user input for the calculator and reference appropriate function.
     while True:
         choice = input("Please enter the operation you wish to perform: ")
 
-        # Must choose a number in the range of 1-6....if not, it will throw an error.
         if choice in ("1", "2", "3", "4", "5", "6", "7"):
             num1 = float(input("Please enter the first number: "))
             num2 = float(input("Please enter the second number: "))
@@ -76,33 +67,30 @@ def interactive():
             elif choice == "7":
                 print(f"{num1} ** {num2} * {num1} =", cubed(num1, num2))
 
-            # Ask if the user wishes to continue performing calculations; end if they do not.
-            next_choice = input("Would you like to continue? Enter 'yes' or 'no': ")
-            if next_choice == "yes":
+            next_choice = input("\nWould you like to continue? Enter 'yes'|'y' or 'no'|'n': ")
+            while next_choice not in ("yes", "y", "no", "n"):
+                next_choice = input("Please enter 'yes'|'y' or 'no'|'n': ")
+            if next_choice == "yes" or next_choice == "y":
                 continue
-            elif next_choice == "no":
-                break
-            else:
-                print("Huh? Ending the program...")
+            elif next_choice == "no" or next_choice == "n":
+                print("Thank you for using the Python Calculator!")
                 break
         else:
-            print("ERROR. You must choose a number in the range 1-7. Please try again...")
+            print("You must choose a number in the range 1-7. Please try again...\n")
+            continue
 
 def main():
     parser = argparse.ArgumentParser(description="Performs the following operations: addition, subtraction, multiplication, division, remainder, squared, cubed.")
     parser.add_argument('mode', metavar='mode', type=int, help="runs the script in interactive or silent mode: 1 for silent, 2 for interactive. If silent, run the other command-line flags as well.")
     parser.add_argument("-n1", "--number1", type=int, help="first number to input")
     parser.add_argument("-n2", "--number2", type=int, help="second number to input")
-    parser.add_argument("-o", "--operation", help="operation to perform: 'add', 'sub', 'mult', 'div', 'rem', 'squ', 'cube'", action="store_true")
+    parser.add_argument("-o", "--operation", type=str, help="operation to perform: add, sub, mult, div, rem, squ, cub")
 
-    # Read in the above arguments and assign num1 and num2 to the user inputted numbers. 
     args = parser.parse_args()
     num1 = args.number1
     num2 = args.number2
 
-    # If user chooses option 1, then run in silent mode.
     if args.mode == 1:
-        # Depending on operation chose, perform the respective calculation with the two numbers.
         if args.operation == "add":
             print(f"{num1} + {num2} =", addition(num1, num2))
         elif args.operation == "sub":
@@ -117,7 +105,6 @@ def main():
             print(f"{num1} ** {num2} =", squared(num1, num2))
         elif args.operation == "cub":
             print(f"{num1} ** {num2} * {num1} =", cubed(num1, num2))
-    # If user chooses option 2, then run in interactive mode.
     elif args.mode == 2:
         interactive()
     else:

python-calculator/README.md

@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
 
 # Authored By: Markus Walker
-# Date Modified: 1/30/22
+# Date Modified: 1/31/23
 #
-# Descrption: Unit test for the calculator.py script. Several unit tests 
-# against the addition, subtraction, multiplication and division functions
-# of the calculator.py script.
+# Descrption: Unit test for the calculator.py script.
 from calculator import *
 import unittest