diff --git a/credentailsex.py b/credentailsex.py index 9d0b45f..9fb17fc 100644 --- a/credentailsex.py +++ b/credentailsex.py @@ -33,6 +33,8 @@ On Windows, the native WebAuthn API will be used. """ import time +import pickle + import fido2.webauthn from fido2.hid import CtapHidDevice from fido2.client import Fido2Client, WindowsClient, UserInteraction @@ -132,6 +134,7 @@ while True: pk__1 = auth_data.credential_data.public_key.get(-1) pk__2 = auth_data.credential_data.public_key.get(-2) pk__3 = auth_data.credential_data.public_key.get(-3) + pickled = pickle.dumps(credentials) import psycopg2 @@ -152,12 +155,12 @@ while True: cur = conn.cursor() # Define the SQL query for inserting data insert_query = ''' - INSERT INTO credential_data ("AAGUID", "credential_id", "pk_algo", "pk_1", "pk_3", "pk_neg1", "pk_neg2", "pk_neg3") - VALUES (%s, %s, %s, %s, %s, %s, %s, %s); + INSERT INTO credential_data ("AAGUID", "credential_id", "pk_algo", "pk_1", "pk_3", "pk_neg1", "pk_neg2", "pk_neg3", "pickled") + VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s); ''' # Execute the SQL query - cur.execute(insert_query, (aaguid, cred_id, pk_algo, pk_1, pk_3, pk__1, pk__2, pk__3)) + cur.execute(insert_query, (aaguid, cred_id, pk_algo, pk_1, pk_3, pk__1, pk__2, pk__3, pickled)) # Commit the changes conn.commit() @@ -192,114 +195,111 @@ while True: print("CREDENTIAL DATA:", auth_data.credential_data) else: - server = Fido2Server({"id": "example.com", "name": "Example RP"}, attestation="direct") - uv = "discouraged" + try: + server = Fido2Server({"id": "example.com", "name": "Example RP"}, attestation="direct") + uv = "discouraged" - # Set up a FIDO 2 client using the origin https://example.com - client = Fido2Client(dev, "https://example.com", user_interaction=CliInteraction()) + # Set up a FIDO 2 client using the origin https://example.com + client = Fido2Client(dev, "https://example.com", user_interaction=CliInteraction()) - import psycopg2 + import psycopg2 - # Replace these variables with your connection parameters - dbname = "CNSA-276-FP-DAS" - user = "FP-DEV-USER" - password = "purchase-immortal-prescribe-repave-detention-seizing-candied-antiques-episode-list" - host = "postgres.eggtech.net" + # Replace these variables with your connection parameters + dbname = "CNSA-276-FP-DAS" + user = "FP-DEV-USER" + password = "purchase-immortal-prescribe-repave-detention-seizing-candied-antiques-episode-list" + host = "postgres.eggtech.net" - # Define the SQL query for retrieving data - select_query = ''' - SELECT "AAGUID", credential_id, pk_algo, pk_1, pk_3, pk_neg1, pk_neg2, pk_neg3 - FROM credential_data - WHERE "AAGUID" = %s; - ''' + # Define the SQL query for retrieving data + select_query = ''' + SELECT "AAGUID", credential_id, pk_algo, pk_1, pk_3, pk_neg1, pk_neg2, pk_neg3, pickled + FROM credential_data + WHERE "AAGUID" = %s; + ''' - # Function to connect to the PostgreSQL database and retrieve data - def fetch_data(aaguid): - conn = None - try: - # Connect to the PostgreSQL server - conn = psycopg2.connect(dbname=dbname, user=user, password=password, host=host) - cur = conn.cursor() + # Function to connect to the PostgreSQL database and retrieve data + def fetch_data(aaguid): + conn = None + try: + # Connect to the PostgreSQL server + conn = psycopg2.connect(dbname=dbname, user=user, password=password, host=host) + cur = conn.cursor() - # Execute the SQL query - cur.execute(select_query, (gotAaguid,)) + # Execute the SQL query + cur.execute(select_query, (gotAaguid,)) - # Fetch the results - result = cur.fetchone() - if result: - data = { - "AAGUID": result[0], - "credential_id": result[1], - "pk_algo": result[2], - "pk_1": result[3], - "pk_3": result[4], - "pk_neg1": result[5], - "pk_neg2": result[6], - "pk_neg3": result[7] - } - return data - else: - print("No data found for AAGUID:", aaguid) - return None + # Fetch the results + result = cur.fetchone() + if result: + data = { + "AAGUID": result[0], + "credential_id": result[1], + "pk_algo": result[2], + "pk_1": result[3], + "pk_3": result[4], + "pk_neg1": result[5], + "pk_neg2": result[6], + "pk_neg3": result[7], + "pickled": result[8] + } + return data + else: + print("No data found for AAGUID:", aaguid) + return None - # Close communication with the database - cur.close() - except (Exception, psycopg2.DatabaseError) as error: - print(error) - finally: - if conn is not None: - conn.close() + # Close communication with the database + cur.close() + except (Exception, psycopg2.DatabaseError) as error: + print(error) + finally: + if conn is not None: + conn.close() - # Example usage: Fetch data for a specific AAGUID and store in variables - aaguid_data = fetch_data("your_specific_aaguid_here") + # Example usage: Fetch data for a specific AAGUID and store in variables + aaguid_data = fetch_data("your_specific_aaguid_here") - if aaguid_data: - # Store each piece of data into a separate variable - testa = aaguid_data["AAGUID"] - cred_id = aaguid_data["credential_id"] - pk_algo = aaguid_data["pk_algo"] - pk_1 = aaguid_data["pk_1"] - pk_3 = aaguid_data["pk_3"] - pk_neg1 = aaguid_data["pk_neg1"] - pk_neg2 = aaguid_data["pk_neg2"] - pk_neg3 = aaguid_data["pk_neg3"] - auth_data = fido2.webauthn.AttestedCredentialData(testa, cred_id, pk_algo) - # auth_data.aaguid = AAGUID - # auth_data.credential_id = cred_id - # auth_data.public_key.ALGORITHM= pk_algo - # auth_data.public_key.setdefault(1, pk_1) - # auth_data.public_key.setdefault(3, pk_3) - # auth_data.public_key.setdefault(-1, pk__1) - # auth_data.public_key.setdefault(-2, pk__2) - # auth_data.public_key.setdefault(-3,pk__3) - - credentials = [auth_data] + if aaguid_data: + # Store each piece of data into a separate variable + testa = aaguid_data["AAGUID"] + cred_id = aaguid_data["credential_id"] + pk_algo = aaguid_data["pk_algo"] + pk_1 = aaguid_data["pk_1"] + pk_3 = aaguid_data["pk_3"] + pk_neg1 = aaguid_data["pk_neg1"] + pk_neg2 = aaguid_data["pk_neg2"] + pk_neg3 = aaguid_data["pk_neg3"] + pickled = aaguid_data["pickled"] - # Prepare parameters for getAssertion - request_options, state = server.authenticate_begin(credentials, user_verification=uv) + credentials = pickle.loads(pickled) - # Authenticate the credential - result = client.get_assertion(request_options["publicKey"]) - # Only one cred in allowCredentials, only one response. - result = result.get_response(0) + # Prepare parameters for getAssertion + request_options, state = server.authenticate_begin(credentials, user_verification=uv) - # Complete authenticator - server.authenticate_complete( - state, + # Authenticate the credential + result = client.get_assertion(request_options["publicKey"]) - credentials, - result.credential_id, - result.client_data, - result.authenticator_data, - result.signature, - ) + # Only one cred in allowCredentials, only one response. + result = result.get_response(0) - print("Credential authenticated!") + # Complete authenticator + server.authenticate_complete( + state, - print("CLIENT DATA:", result.client_data) - print() - print("AUTH DATA:", result.authenticator_data) \ No newline at end of file + credentials, + result.credential_id, + result.client_data, + result.authenticator_data, + result.signature, + ) + + print("Credential authenticated!") + + print("CLIENT DATA:", result.client_data) + print() + print("AUTH DATA:", result.authenticator_data) + except Exception as e: + pass \ No newline at end of file