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

#10 better error handling for OS errors

This commit is contained in:
Michael Lazar 2020-01-12 18:55:28 -05:00
parent 416c7bcecf
commit b3b6061086
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetforce.py
View File

@ -253,6 +253,14 @@ class StaticDirectoryApplication(JetforceApplication):
filesystem_path = self.root / filename filesystem_path = self.root / filename
try:
if not os.access(filesystem_path, os.R_OK):
# File not readable
return Response(Status.NOT_FOUND, "Not Found")
except OSError:
# Filename too large, etc.
return Response(Status.NOT_FOUND, "Not Found")
if filesystem_path.is_file(): if filesystem_path.is_file():
is_cgi = str(filename).startswith(self.cgi_directory) is_cgi = str(filename).startswith(self.cgi_directory)
is_exe = os.access(filesystem_path, os.X_OK) is_exe = os.access(filesystem_path, os.X_OK)
@ -432,8 +440,8 @@ class GeminiRequestHandler:
app = self.app(environ, self.write_status) app = self.app(environ, self.write_status)
for data in app: for data in app:
await self.write_body(data) await self.write_body(data)
except Exception as e: except Exception:
self.write_status(Status.CGI_ERROR, str(e)) self.write_status(Status.CGI_ERROR, "An unexpected error occurred")
raise raise
finally: finally:
await self.close_connection() await self.close_connection()