Merge branch 'main' of https://github.com/JabelResendiz/computer_networks_fall_2024

Author: JabelResendiz

src/client/__pycache__/exceptions.cpython-312.pyc

@@ -1,43 +1,3 @@
-# import argparse
-# import json
-# import sys
-# from http_client import  final_request
-# from http_response import HTTPResponse
-# from http_parser import categorize_args
-# from exceptions import InvalidHeaderFormat
-
-# def main(sys_args):
-    
-#     parser = argparse.ArgumentParser(description="HTTP Client CLI", add_help=False)
-#     parser.add_argument("-m", "--method", required=True, help="Metodo HTTP (GET,POST,DELETE)")
-#     parser.add_argument("-u", "--url", required=True, help="URL de la solicitud")
-#     parser.add_argument("-h", "--header", type=str, default="{}", help="Encabezado JSON de al solicitud (e.g., '{\"User-Agent\": \"device\"}')")
-#     parser.add_argument("-d", "--data", type=str, default="", help="Cuerpo de la solicitud")
-
-#     # Parse arguments
-#     args = parser.parse_args(categorize_args(sys_args))
-
-#     # Prepare headers from JSON string
-#     try:
-#         headers = json.loads(args.header)
-#     except json.JSONDecodeError:
-#         raise InvalidHeaderFormat("❌ Error:Formato de encabezado inválido. Por favor, proporcione un JSON válido.")
-
-#     # Make the HTTP request
-#     response: HTTPResponse = final_request(method=args.method, url=args.url, headers=headers, body=args.data)
-
-#     # Prepare output JSON format
-#     final_response = {
-#         "status": response.code,
-#         "body": response.get_body_bytes().decode('utf-8')  # Assuming body is in bytes and needs to be decoded
-#     }
-
-#      # Print output as JSON
-#     print(json.dumps(final_response, indent=2))
-
-# if __name__ == "__main__":
-#     main(sys.argv[1:])
-
 import argparse
 import json
 import sys
@@ -48,24 +8,33 @@
 
 def run_client(method, url, headers=None, body=""):
     """
-    Función que ejecuta una solicitud HTTP y devuelve la respuesta.
+    Función que ejecuta una solicitud HTTP y devuelve la respuesta formateada.
 
     :param method: Método HTTP (GET, POST, etc.)
     :param url: URL de la solicitud
     :param headers: Diccionario de encabezados HTTP
     :param body: Cuerpo de la solicitud (opcional)
-    :return: Diccionario con el código de estado y el cuerpo de la respuesta
+    :return: Respuesta HTTP formateada como string
     """
     headers = headers or {}
 
     try:
         response: HTTPResponse = final_request(method=method, url=url, headers=headers, body=body)
-        return {
-            "status": response.code,
-            "body": response.get_body_bytes().decode("utf-8")  # Decodificar el cuerpo de la respuesta
-        }
+
+        # Construcción de la respuesta en formato HTTP
+        response_text = f"HTTP/1.1 {response.code} {response.reason}\n"
+
+        # Agregar encabezados al formato
+        for key, value in response.headers.items():
+            response_text += f"{key}: {value}\n"
+
+        response_text += "\n"  # Línea vacía entre encabezados y cuerpo
+        response_text += response.get_body_bytes().decode("utf-8")  # Cuerpo de la respuesta
+
+        return response_text
     except Exception as e:
-        return {"status": "error", "body": str(e)}
+        return f"HTTP/1.1 500 Internal Server Error\nError: {str(e)}"
+
 
 def main(sys_args):
     parser = argparse.ArgumentParser(description="HTTP Client CLI", add_help=False)
@@ -80,7 +49,7 @@ def main(sys_args):
     try:
         headers = json.loads(args.header)
     except json.JSONDecodeError:
-        raise InvalidHeaderFormat("❌ Error: Invalid header format. Please provide valid JSON.")
+        raise InvalidHeaderFormat("❌ Error:Formato de encabezado inválido. Por favor, proporcione un JSON válido.")
 
     response: HTTPResponse = final_request(method=args.method, url=args.url, headers=headers, body=args.data)
 

src/client/__pycache__/http_parser.cpython-312.pyc

@@ -1,26 +1,37 @@
 import socket
+import json
+import ssl
 from http_parser import parse_http_url,parse_http_response
 from exceptions import NotConnection
 
 # GLOBAL VARIABLES
 _versionHttp = 'HTTP/1.1'
-default_port = 80
+default_http_port = 80
+default_https_port = 443
 
 class HttpClient:
 
-    def __init__(self,host, port :int, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, blocksize = 8192):
+    def __init__(self,host, port :int,use_https,timeout=socket._GLOBAL_DEFAULT_TIMEOUT, blocksize = 8192):
 
         self.host = host
         self.port = port
+        self.use_https = use_https
         self.timeout = timeout
         self.mySocket = None
         self.blocksize = blocksize
 
     # se hace uso del protocolo TCP/IP
     def connect (self):
         # se establece una conexion TCP con el servidor
-       self.mySocket = socket.create_connection((self.host,self.port),self.timeout)
+       raw_mySocket = socket.create_connection((self.host,self.port),self.timeout)
 
+       if self.use_https:
+           # si es https se envuelve el socket en una conexion TLS/SSL
+           context = ssl.create_default_context()
+           self.mySocket = context.wrap_socket(raw_mySocket,server_hostname=self.host)
+           
+       else: # si es HTTP
+           self.mySocket = raw_mySocket
 
     def request(self,method,url,body="", headers= None):
         # construye y envia una solicitud HTTP
@@ -70,8 +81,9 @@ def final_request (method="GET",url="/",headers = None,body =""):
     # extraer la informacion de la URL
     host,port,path,query = parse_http_url(url)
 
+    use_https = (port == default_https_port) or url.startswith("https://")
     # crear una instancia de HttpClient para establecer una conexion
-    conn = HttpClient(host,port)
+    conn = HttpClient(host,port,use_https)
 
     data = None
 
@@ -90,3 +102,49 @@ def final_request (method="GET",url="/",headers = None,body =""):
     # devuelve la respuesta parseada
     return data
 
+
+if __name__ == "__main__":
+    
+    # Case 1 : My API - DownTrack
+    host = "http://localhost:5217"
+    endpoint = "/api/Authentication/register"
+    
+    body = json.dumps({
+        "id":33590,
+        "name": "User_335",
+        "userName": "username_33590",
+        "email": "example3@gmail.com",
+        "password": "Password_333!",
+        "userRole": "Technician",
+        "specialty": "mechanic",
+        "salary": 19090,
+        "expYears": 10,
+        "departamentId": 1,
+        "sectionId": 1
+    })
+    
+    headers = {
+        "Content-Type": "application/json"
+    }
+    
+    response = final_request("POST", f"{host}{endpoint}", headers=headers, body=body)
+
+    print("Código de estado:", response.code)
+    print("Encabezados:", response.headers)
+    print("Cuerpo:", response.body[:500])
+
+    # Case 2: HTTPS 
+    
+    response = final_request("GET","https://reqres.in/api/users?page=2", headers={}, body="")
+    
+    print("Código de estado:", response.code)
+    print("Encabezados:", response.headers)
+    print("Cuerpo:", response.body[:500])
+
+    # Case 3: HTTPS
+    response = final_request("GET","https://jsonplaceholder.typicode.com", headers={}, body="")
+    
+    print("Código de estado:", response.code)
+    print("Encabezados:", response.headers)
+    print("Cuerpo:", response.body[:500])
+

src/client/__pycache__/http_response.cpython-312.pyc

@@ -9,39 +9,55 @@ def __init__(self, parent):
         ctk.set_default_color_theme("blue")
         self.root = parent
         self.root.title("HTTP Client")
-        self.root.geometry("600x550")
+        self.root.geometry("700x650")  # Aumentar tamaño para historial
         self.root.grid_columnconfigure(1, weight=1)
 
+        # Estilo general
+        font_style = ("Arial", 14)
+        
+        # Historial de solicitudes
+        self.history = []
+        
         # URL
-        ctk.CTkLabel(parent, text="URL:").grid(row=0, column=0, padx=10, pady=5, sticky="w")
-        self.url_entry = ctk.CTkEntry(parent, width=400)
+        ctk.CTkLabel(parent, text="🌐 URL:", font=font_style).grid(row=0, column=0, padx=10, pady=5, sticky="w")
+        self.url_entry = ctk.CTkEntry(parent, width=500, font=font_style)
         self.url_entry.grid(row=0, column=1, padx=10, pady=5, sticky="ew")
 
         # Method
-        ctk.CTkLabel(parent, text="Method:").grid(row=1, column=0, padx=10, pady=5, sticky="w")
+        ctk.CTkLabel(parent, text="📡 Method:", font=font_style).grid(row=1, column=0, padx=10, pady=5, sticky="w")
         self.method_var = ctk.StringVar(value="GET")
-        self.method_menu = ctk.CTkOptionMenu(parent, variable=self.method_var, values=["GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS", "CONNECT", "TRACE", "LINK", "UNLINK", "CUSTOM"], command=self.toggle_body_state)
+        self.method_menu = ctk.CTkOptionMenu(parent, variable=self.method_var, 
+                                             values=["GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS", "CONNECT", "TRACE", "LINK", "UNLINK", "CUSTOM"],
+                                             command=self.toggle_body_state, font=font_style)
         self.method_menu.grid(row=1, column=1, padx=10, pady=5, sticky="ew")
 
         # Headers
-        ctk.CTkLabel(parent, text="Headers (JSON):").grid(row=2, column=0, padx=10, pady=5, sticky="w")
-        self.headers_entry = ctk.CTkEntry(parent, width=400)
+        ctk.CTkLabel(parent, text="📝 Headers (JSON):", font=font_style).grid(row=2, column=0, padx=10, pady=5, sticky="w")
+        self.headers_entry = ctk.CTkTextbox(parent, width=500, height=60, font=font_style)
         self.headers_entry.grid(row=2, column=1, padx=10, pady=5, sticky="ew")
 
         # Body
-        ctk.CTkLabel(parent, text="Body (JSON):").grid(row=3, column=0, padx=10, pady=5, sticky="w")
-        self.body_text = ctk.CTkTextbox(parent, width=400, height=100)
+        ctk.CTkLabel(parent, text="📦 Body (JSON):", font=font_style).grid(row=3, column=0, padx=10, pady=5, sticky="w")
+        self.body_text = ctk.CTkTextbox(parent, width=500, height=100, font=font_style)
         self.body_text.grid(row=3, column=1, padx=10, pady=5, sticky="ew")
 
         # Send Button
-        self.send_button = ctk.CTkButton(parent, text="Send", command=self.send_request)
-        self.send_button.grid(row=4, column=1, pady=10)
+        self.send_button = ctk.CTkButton(parent, text="🚀 Send Request", command=self.send_request, font=font_style)
+        self.send_button.grid(row=4, column=1, pady=15)
 
         # Response
-        ctk.CTkLabel(parent, text="Response:").grid(row=5, column=0, padx=10, pady=5, sticky="w")
-        self.response_text = ctk.CTkTextbox(parent, width=400, height=150, state="disabled")
+        ctk.CTkLabel(parent, text="📩 Response:", font=font_style).grid(row=5, column=0, padx=10, pady=5, sticky="w")
+        self.response_text = ctk.CTkTextbox(parent, width=500, height=200, font=font_style, state="disabled")
         self.response_text.grid(row=5, column=1, padx=10, pady=5, sticky="ew")
 
+        # Historial de solicitudes
+        ctk.CTkLabel(parent, text="📜 Request History:", font=font_style).grid(row=6, column=0, padx=10, pady=5, sticky="w")
+        self.history_var = ctk.StringVar(value="No history yet")
+        self.history_menu = ctk.CTkOptionMenu(parent, variable=self.history_var, values=["No history yet"], font=font_style)
+        self.history_menu.grid(row=6, column=1, padx=10, pady=5, sticky="ew")
+        self.load_history_button = ctk.CTkButton(parent, text="🔄 Load Request", command=self.load_request, font=font_style)
+        self.load_history_button.grid(row=7, column=1, pady=10)
+        
         self.toggle_body_state("GET")
 
     def toggle_body_state(self, method):
@@ -55,29 +71,47 @@ def toggle_body_state(self, method):
     def send_request(self):
         url = self.url_entry.get()
         method = self.method_var.get()
-        headers = self.headers_entry.get()
+        headers = self.headers_entry.get("1.0", "end").strip()
         body = self.body_text.get("1.0", "end").strip()
-        
+
         try:
             headers = json.loads(headers) if headers else {}
         except json.JSONDecodeError:
-            messagebox.showerror("Error", "Headers must be valid JSON.")
+            messagebox.showerror("Error", "Headers must be valid JSON.\nExample:\n{\"Content-Type\": \"application/json\"}")
             return
-        
+
         try:
             body = json.loads(body) if body else ""
         except json.JSONDecodeError:
             messagebox.showerror("Error", "Body must be valid JSON.")
             return
-        
+
         try:
-            response = client_cli.run_client(method, url, headers, body)
+            response_text = client_cli.run_client(method, url, headers, body)
+        
+            # Guardar en historial
+            self.history.append((url, method, json.dumps(headers, indent=2), json.dumps(body, indent=2)))
+            self.history_menu.configure(values=[f"{i+1}: {h[1]} {h[0]}" for i, h in enumerate(self.history)])
+            self.history_var.set(f"{len(self.history)}: {method} {url}")
+            
             self.response_text.configure(state="normal")
             self.response_text.delete("1.0", "end")
-            self.response_text.insert("end", f"Status: {response['status']}\n\n{response['body']}")
+            self.response_text.insert("end", response_text)
             self.response_text.configure(state="disabled")
         except Exception as e:
             messagebox.showerror("Error", f"Request failed: {e}")
+    
+    def load_request(self):
+        index = int(self.history_var.get().split(":")[0]) - 1
+        if 0 <= index < len(self.history):
+            url, method, headers, body = self.history[index]
+            self.url_entry.delete(0, "end")
+            self.url_entry.insert(0, url)
+            self.method_var.set(method)
+            self.headers_entry.delete("1.0", "end")
+            self.headers_entry.insert("end", headers)
+            self.body_text.delete("1.0", "end")
+            self.body_text.insert("end", body)
 
 if __name__ == "__main__":
     root = ctk.CTk()

src/client/client_cli.py

@@ -5,15 +5,15 @@
 
 def parse_http_url(url):
     # Expresión regular para parsear la URL
-    regex = r'^(http://)?([^:/\s]+)(?::(\d+))?(/[^?\s]*)?(\?[^#\s]*)?$'
+    regex = r'^(https?://)?([^:/\s]+)(?::(\d+))?(/[^?\s]*)?(\?[^#\s]*)?$'
     match = re.match(regex, url)
 
     if not match:
         raise UrlIncorrect(f"Invalid URL: {url}")
 
     scheme = match.group(1) or "http://"  # Si no tiene esquema, asignamos "http://"
     host = match.group(2)
-    port = match.group(3) or 80  # Si no tiene puerto, asignamos el puerto por defecto 80
+    port = match.group(3) or (443 if scheme.startswith("https") else 80)   # Si no tiene puerto, asignamos el puerto por defecto 80
     path = match.group(4) or "/"  # Si no tiene path, asignamos "/"
     query = match.group(5) or ""  # Si no tiene query, dejamos como cadena vacía