waldek
/
jetforce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add REMOTE_USER to the environ

This commit is contained in:
Michael Lazar 2019-08-28 23:52:39 -04:00
parent 82cde11a68
commit 162df04bd0
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jetforce.py
View File

@ -348,6 +348,7 @@ class GeminiRequestHandler:
self.writer: typing.Optional[asyncio.StreamWriter] = None self.writer: typing.Optional[asyncio.StreamWriter] = None
self.received_timestamp: typing.Optional[datetime.datetime] = None self.received_timestamp: typing.Optional[datetime.datetime] = None
self.remote_addr: typing.Optional[str] = None self.remote_addr: typing.Optional[str] = None
self.client_cert: typing.Optional[dict] = None
self.url: typing.Optional[urllib.parse.ParseResult] = None self.url: typing.Optional[urllib.parse.ParseResult] = None
self.status: typing.Optional[int] = None self.status: typing.Optional[int] = None
self.meta: typing.Optional[str] = None self.meta: typing.Optional[str] = None
@ -367,13 +368,14 @@ class GeminiRequestHandler:
self.reader = reader self.reader = reader
self.writer = writer self.writer = writer
self.remote_addr = writer.get_extra_info("peername")[0] self.remote_addr = writer.get_extra_info("peername")[0]
self.client_cert = writer.get_extra_info("peercert")
self.received_timestamp = datetime.datetime.utcnow() self.received_timestamp = datetime.datetime.utcnow()
try: try:
await self.parse_header() await self.parse_header()
except Exception: except Exception:
# Malformed request, throw it away and exit immediately # Malformed request, throw it away and exit immediately
self.write_status(Status.BAD_REQUEST, "Could not understand request line") self.write_status(Status.BAD_REQUEST, "Malformed request")
return await self.close_connection() return await self.close_connection()
try: try:
@ -394,21 +396,27 @@ class GeminiRequestHandler:
Variable names conform to the CGI spec defined in RFC 3875. Variable names conform to the CGI spec defined in RFC 3875.
""" """
url_parts = urllib.parse.urlparse(self.url) url_parts = urllib.parse.urlparse(self.url)
return { environ = {
"GEMINI_URL": self.url, "GEMINI_URL": self.url,
"HOSTNAME": self.server.hostname, "HOSTNAME": self.server.hostname,
"PATH_INFO": url_parts.path, "PATH_INFO": url_parts.path,
"QUERY_STRING": url_parts.query, "QUERY_STRING": url_parts.query,
"REMOTE_ADDR": self.remote_addr,
"REMOTE_HOST": self.remote_addr,
"SERVER_NAME": self.server.hostname, "SERVER_NAME": self.server.hostname,
"SERVER_PORT": str(self.server.port), "SERVER_PORT": str(self.server.port),
"SERVER_PROTOCOL": "GEMINI", "SERVER_PROTOCOL": "GEMINI",
"SERVER_SOFTWARE": f"jetforce/{__version__}", "SERVER_SOFTWARE": f"jetforce/{__version__}",
"REMOTE_ADDR": self.remote_addr,
"REMOTE_HOST": self.remote_addr,
"REMOTE_USER": "",
"REQUEST_METHOD": "GET",
} }
if self.client_cert:
subject = dict(x[0] for x in self.client_cert["subject"])
environ.update(
{"AUTH_TYPE": "CERTIFICATE", "REMOTE_USER": subject["commonName"]}
)
return environ
async def parse_header(self) -> None: async def parse_header(self) -> None:
""" """
Parse the gemini header line. Parse the gemini header line.