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

Author: noelpc03

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

@@ -49,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

@@ -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