clean version

README.md

-# Deportation de signatures ssh
-
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://gitedu.hesge.ch/jorge.leitemac/deportation-de-signatures-ssh.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://gitedu.hesge.ch/jorge.leitemac/deportation-de-signatures-ssh/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.

client.py

-import socket
-from cryptography.hazmat.primitives import serialization
-from cryptography.hazmat.backends import default_backend
-
-import sys
-import os
-
-
-# ajouter le chemin vers le répertoire libs à PYTHONPATH
-libs_path = os.path.join(os.getcwd(), 'libs')
-if libs_path not in sys.path:
-    sys.path.append(libs_path)
-
-# maintenant, vous pouvez importer votre bibliothèque
-import paramiko
-from paramiko.auth_handler import AuthHandler
-import logging
-# 
-# logging.basicConfig(level=logging.DEBUG)
-# logging.basicConfig(level=logging.ERROR)
-
-algorithm = "rsa-sha2-512"
-
-# Variables pour la connexion SSH
-hostname = '10.20.208.185'
-username = 'parallels'
-port = 22
-
-# Variables pour la connexion au deuxième dispositif
-signer_hostname = 'localhost'
-signer_port = 12349
-
-# Variables pour la clé publique
-public_key_file = 'ssh-keys/test4.pub'
-
-# Lire la clé publique au format OpenSSH
-with open(public_key_file, 'rb') as key_file:
-    public_key = serialization.load_ssh_public_key(key_file.read(), backend=default_backend())
-
-public_key_pem = public_key.public_bytes(
-    encoding=serialization.Encoding.OpenSSH,
-    format=serialization.PublicFormat.OpenSSH
-)
-
-print("Contenu de la clé publique :\n", public_key_pem.decode())
-print("Clé publique chargée :", public_key)
-
-# Créer une nouvelle instance de transport
-transport = paramiko.Transport((hostname, port))
-
-# Créer une nouvelle instance de client de signature
-# clePriv = paramiko.RSAKey.from_private_key_file('ssh-keys/test')
-
-
-# Essayer d'ouvrir la session SSH
-# def handler(title, instructions, prompt_list):
-#     signer_client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-#     signer_client.connect((signer_hostname, signer_port))
-
-#     resp = []
-#     for pr in prompt_list:
-#         print(pr)
-#         if pr[0].startswith('Password'):
-
-#             # Transmettre le défi au deuxième dispositif
-
-#             print("Envoi du défi : ", pr[0].encode())
-
-#             signer_client.sendall(pr[0].encode())
-
-#             # Attendre la réponse du deuxième dispositif
-#             signed_challenge = signer_client.recv(1024)
-
-#             print("Défi signé :", signed_challenge)
-#             # resp.append("Jdlm1209") 
-#             resp.append(signed_challenge)
-#         else:
-#             resp.append('')
-#     return resp
-
-
-print("Connexion au serveur SSH...")
-transport.connect()
-
-
-
-print("Authentification for username {}...".format(username))
-print("Veuillez valider la signature sur l'appareil d'authentification")
-# transport.auth_publickey(username, public_key, handler)
-
-try:
-    transport.auth_publickey(username, public_key)
-except paramiko.ssh_exception.AuthenticationException:
-    print("Échec de l'authentification")
-else:
-    print("Authentification réussie !")
-    
-    while True:
-        command = input(username + '@' + hostname + ':$ ')
-        if command.lower() == 'exit':
-            break
-        else:
-            channel = transport.open_session()
-            channel.exec_command(command)
-            while not channel.exit_status_ready():
-                if channel.recv_ready():
-                    output = channel.recv(4096)
-                    print(output.decode())
-
-transport.close()
-
-# transport.close()
-

gen_keys.py

-from cryptography.hazmat.primitives import serialization
-from cryptography.hazmat.primitives.asymmetric import rsa
-from cryptography.hazmat.backends import default_backend
-
-# Génération de la clé privée
-private_key = rsa.generate_private_key(
-    public_exponent=65537,
-    key_size=2048,
-    backend=default_backend()
-)
-
-# Sauvegarde de la clé privée au format PEM
-with open('private_key.pem', 'wb') as f:
-    f.write(private_key.private_bytes(
-        encoding=serialization.Encoding.PEM,
-        format=serialization.PrivateFormat.PKCS8,
-        encryption_algorithm=serialization.NoEncryption()
-    ))
-
-# Génération de la clé publique
-public_key = private_key.public_key()
-
-# Sauvegarde de la clé publique au format PEM
-with open('public_key.pem', 'wb') as f:
-    f.write(public_key.public_bytes(
-        encoding=serialization.Encoding.PEM,
-        format=serialization.PublicFormat.SubjectPublicKeyInfo
-    ))

python_custom_client/auth.py

+import socket
+from fastapi import FastAPI
+import sys
+import json
+import binascii
+import os
+import base64
+import struct
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.backends import default_backend
+import paramiko
+from paramiko.common import MSG_DISCONNECT
+import getpass
+from paramiko.ssh_exception import SSHException
+from pydantic import BaseModel
+
+with open('config.json', 'r') as f:
+    config = json.load(f)
+
+app = FastAPI()
+
+class AuthInfo(BaseModel):
+    algorithm: str
+    session_id: str
+    userauth_request: str
+    username: str
+
+class Item(BaseModel):
+    data: str
+
+class bcolors:
+    HEADER = '\033[95m'
+    OKBLUE = '\033[94m'
+    OKCYAN = '\033[96m'
+    OKGREEN = '\033[92m'
+    WARNING = '\033[93m'
+    FAIL = '\033[91m'
+    ENDC = '\033[0m'
+    BOLD = '\033[1m'
+    UNDERLINE = '\033[4m'
+
+libs_path = os.path.join(os.getcwd(), 'libs')
+if libs_path not in sys.path:
+    sys.path.append(libs_path)
+
+
+public_key_file = config['keys']['pubkey_python']
+
+with open(public_key_file, 'rb') as key_file:
+    public_key = serialization.load_ssh_public_key(key_file.read(), backend=default_backend())
+
+public_key_pem = public_key.public_bytes(
+    encoding=serialization.Encoding.OpenSSH,
+    format=serialization.PublicFormat.OpenSSH
+)
+
+public_key_bits = public_key_pem.decode().split(' ')[1]
+
+# print("Contenu de la clé publique :\n", public_key_pem.decode())
+
+def pack_string(s):
+    return struct.pack(">I", len(s)) + s
+
+def pack_byte(b):
+    return struct.pack(">B", b)
+
+def pack_boolean(b):
+    return struct.pack(">?", b)
+
+def pack_bytes(bytes_data):
+    return struct.pack(f">{len(bytes_data)}s", bytes_data)
+
+def pack_rsa_key(key):
+    return struct.pack(f">{len(bytes(key.get_base64(), 'utf-8'))}s", key.get_bits())
+
+def _get_session_blob(key, service, username, algorithm, session_id, userauth_request):
+    global public_key_bits
+    
+    m2 = b'\x00\x00\x00 '
+    m2 += pack_bytes(session_id) 
+    m2 += pack_bytes(userauth_request) 
+    m2 += pack_string(username.encode()) 
+    m2 += pack_string(service.encode())
+    m2 += pack_string("publickey".encode())
+    m2 += pack_boolean(True)
+    m2 += pack_string(algorithm.encode())
+    
+    hex_sequence = b'\x00\x00\x01\x97'
+    m2 += hex_sequence
+    rsa_key_bytes = base64.b64decode(public_key_bits)
+    m2 += pack_bytes(rsa_key_bytes) 
+
+    return m2
+
+
+# Function to sign data from ssh-agent (c)
+# Here we only sign the payload given by the agent
+@app.post("/sign2")
+def sign2(item: Item):
+    private_key_file = config['keys']['privkey_c']
+    algo = "rsa-sha2-512"   
+    mess = b''
+    keyPriv = paramiko.RSAKey.from_private_key_file(private_key_file)
+    print("Please sign the following data : " + item.data)
+    data = binascii.unhexlify(item.data)
+    signature = keyPriv.sign_ssh_data(data, algo)
+    print("Signature : " + str(signature.asbytes().hex()))
+    mess += pack_bytes(signature.asbytes()) # Assuming bits is a string
+    encoded_data = base64.b64encode(mess).decode('utf-8')
+    return {"signed_data": encoded_data}
+
+# Function to sign data from the custom paramiko client
+# Here we create the whole package of data including the signature
+@app.post("/sign/")
+def sign_info(auth_info: AuthInfo):
+    private_key_file = config['keys']['privkey_python']
+
+    # Conversion des données JSON en variables
+    algorithm = auth_info.algorithm
+    session_id = base64.b64decode(auth_info.session_id)
+    userauth_request = base64.b64decode(auth_info.userauth_request)
+    username = auth_info.username
+
+    
+    print("Demande de signature recue pour : " + username )
+    user_validation = input("Voulez vous valider la signature ? (yes/no): ")
+
+    if user_validation.lower() == 'yes' or user_validation.lower() == 'y':
+        m3 = b''
+        m3 += pack_bytes(userauth_request) 
+        m3 += pack_string(username.encode()) 
+        m3 += pack_string("ssh-connection".encode())
+        m3 += pack_string("publickey".encode())
+        m3 += pack_boolean(True) 
+        password = None
+
+        try:
+            privateKey = paramiko.RSAKey.from_private_key_file(private_key_file)
+        except SSHException:
+            password = getpass.getpass('Veuillez entrer le mot de passe de la clé privée : ')
+            privateKey = paramiko.RSAKey.from_private_key_file(private_key_file, password=password)
+
+        sessionblob = _get_session_blob(privateKey, "ssh-connection", username, algorithm, session_id, userauth_request)
+
+        m3 += pack_string(algorithm.encode()) 
+
+        hex_sequence = b'\x00\x00\x01\x97' 
+        m3 += hex_sequence
+        rsa_key_bytes = base64.b64decode(public_key_bits)
+
+        m3 += pack_bytes(rsa_key_bytes)
+        sig = privateKey.sign_ssh_data(sessionblob, algorithm)
+
+        hex_sequence2 = b'\x00\x00\x01\x94' 
+        m3 += hex_sequence2
+        m3 += pack_bytes(sig.asbytes()) 
+
+        print(m3)
+        encoded_data = base64.b64encode(m3).decode('utf-8')
+        print("encoded: ", encoded_data)
+        
+        print(bcolors.OKGREEN + "Transaction signée avec succes, la connexion sur l'appareil principal est ouverte" + bcolors.ENDC)
+        return {"message":encoded_data}
+    else:
+        print(bcolors.FAIL + "User did not validate the signature. Closing the connection..." + bcolors.ENDC)
+        return {"reject": base64.b64encode(bytes(MSG_DISCONNECT)).decode('utf-8')}
+

socket_interfacer.py → python_custom_client/client.py

@@ -4,7 +4,8 @@ from cryptography.hazmat.backends import default_backend
 
 import sys
 import os
-# ajouter le chemin vers le répertoire libs à PYTHONPATH
+
+# ajouter le chemin vers le répertoire libs
 libs_path = os.path.join(os.getcwd(), 'libs')
 if libs_path not in sys.path:
     sys.path.append(libs_path)
@@ -18,7 +19,9 @@ import paramiko
 import pexpect
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.backends import default_backend
+import json
 
+# From : https://stackoverflow.com/questions/287871/how-do-i-print-colored-text-to-the-terminal
 class bcolors:
     HEADER = '\033[95m'
     OKBLUE = '\033[94m'
@@ -30,13 +33,17 @@ class bcolors:
     BOLD = '\033[1m'
     UNDERLINE = '\033[4m'
 
+
+with open('config.json', 'r') as f:
+    config = json.load(f)
+
 def main():
     # Obtenir les informations de connexion de l'utilisateur
     host = input('Veuillez entrer l\'hôte distant : ')
     username = input('Veuillez entrer le nom d\'utilisateur : ')
     # key = paramiko.RSAKey.from_private_key_file('ssh-keys/test')
     # Variables pour la clé publique
-    public_key_file = 'ssh-keys/test4.pub'
+    public_key_file = config['keys']['pubkey']
 
     # Lire la clé publique au format OpenSSH
     with open(public_key_file, 'rb') as key_file:
@@ -69,16 +76,6 @@ def main():
     child.interact()  # pexpect offre une méthode interact() qui donne un shell interactif
 
     ssh.close()
-    # while True:
-    #     command = input(username + '@' + host + ':$ ')
-    #     if command.lower() == 'exit':
-    #         break
-    #     else:
-    #         chan.send(command + '\n')
-    #         while not chan.recv_ready():  # attendre que le serveur soit prêt
-    #             pass
-    #         output = chan.recv(4096)
-    #         print(output.decode())
 
     ssh.close()
 

python_custom_client/config.json

+{
+    "keys": {
+      "pubkey_python": "ssh-keys/python_key.pub",
+      "privkey_python": "ssh-keys/python_key",
+      "privkey_c": "ssh-keys/my_key"
+    },
+    "server": "http://192.168.1.23:8000/sign" 
+  }
\ No newline at end of file