[Fix] proxy: CLI port passing, cookie loosening

Author: sebastien

src/py/extra/services/proxy.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 from ..model import Service
 from ..http.model import HTTPRequest, HTTPResponse
+from ..http.parser import iparseCookie, formatCookie
 from ..decorators import on
 from ..server import run
 from ..client import HTTPClient
@@ -54,11 +55,12 @@ class ProxyTarget(NamedTuple):
 	timeout: float = 2.0  # Default backend response timeout
 
 
+# TODO: Abstract headers pre-processing and post-processing
 class ProxyService(Service):
 	def __init__(self, target: ProxyTarget, *, prefix: str | None = None):
 		super().__init__(prefix=prefix)
 		self.target: ProxyTarget = target
-		info(f"Proxy service {self.prefix or ""} to {target.uri}")
+		info(f"Proxy service {self.prefix or "/"} to {target.uri}")
 
 	@on(
 		GET="{path:any}",
@@ -97,7 +99,7 @@ async def proxy(self, request: HTTPRequest, path: str) -> HTTPResponse:
 		# Now we do the request
 		res: HTTPResponse | None = None
 		req_path: str = f"{uri.path or ""}{path}" if self.prefix else path
-		info(f"Proxying {path} to {self.target.uri}")
+		info(f"Proxying {path} to {uri.host}{req_path}")
 		async for atom in HTTPClient.Request(
 			host=uri.host or "localhost",
 			path=req_path,
@@ -121,16 +123,17 @@ async def proxy(self, request: HTTPRequest, path: str) -> HTTPResponse:
 					del res.headers.headers[name]
 			updated_headers: dict[str, str] = {}
 			# SEE: https://stackoverflow.com/questions/46288437/set-cookies-for-cross-origin-requests
-			# for name, value in res.headers.headers.items():
-			# 	match name:
-			# 		# We loosen the cookies
-			# 		case "Set-Cookie":
-			# 			# FIXME: This is super brittle
-			# 			updated_headers[name] = (
-			# 				value.replace("Secure; ", "")
-			# 				.replace("SameSite=Strict; ", "SameSite=Lax; ")
-			# 				.replace("HTTPOnly", "")
-			# 			).strip(";")
+			for name, value in res.headers.headers.items():
+				match name:
+					# We loosen the cookies so that they flow
+					case "Set-Cookie":
+						cookies = []
+						for cookie in iparseCookie(value):
+							if cookie.key in ("Secure", "HTTPOnly"):
+								continue
+							elif cookie.value == "Secure":
+								cookies.append(cookie._replace(value="Lax"))
+						updated_headers[name] = formatCookie(cookies)
 			res.headers.headers.update(updated_headers)
 			return (
 				setCORSHeaders(res, origin=request.getHeader("Origin"))
@@ -192,19 +195,11 @@ def main(args: list[str]) -> None:
 	# If args is None, it defaults to sys.argv[1:]
 	options = parser.parse_args(args=args)
 
-	# The positional arguments are now in options.url
-	# No need for len(args) == 0 check as nargs='+' handles it by raising an error
-	# if no URL is provided.
-	# If you want to handle it gracefully without exiting, you might need a try-except
-	# around parse_args or check options.url after parsing.
-	# For now, we assume argparse's default error handling is sufficient.
-
 	components: list[Service] = []
 	for url in options.url:
 		lc = url.split("=", 1)
 		prefix, target = (None, url) if len(lc) == 1 else lc
 		uri = URI.Parse(target)
-		print(uri.asDict())
 		if not uri.host:
 			raise RuntimeError(f"URI has no host: {url}")
 		components.append(
@@ -217,9 +212,11 @@ def main(args: list[str]) -> None:
 			)
 		)
 
+	# TODO: If proxy services start with /, this is pointless.
 	if options.files:
 		components.append(FileService(options.files))
-	return run(*components)
+
+	return run(*components, port=options.port)
 
 
 if __name__ == "__main__":