Skip to content

[py] refactor HtmlOnlyHandler in webserver.py to support JSON content #14705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 4, 2024
Merged

[py] refactor HtmlOnlyHandler in webserver.py to support JSON content #14705

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e27aab7
move from HtmlOnlyHandler to ExtendedHandler
navin772 Nov 2, 2024
1ea5a65
retain the `HtmlOnlyHandler` and add a new `ExtendedHandler`
navin772 Nov 2, 2024
917959a
refactor into one class only
navin772 Nov 4, 2024
24bbc14
Merge branch 'trunk' into webserver-extended-handler
navin772 Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 36 additions & 42 deletions py/test/selenium/webdriver/common/webserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,62 +59,56 @@ def updir():


class HtmlOnlyHandler(BaseHTTPRequestHandler):
"""Http handler."""
"""Handler for HTML responses and JSON files."""

def _serve_page(self, page_number):
"""Serve a dynamically generated HTML page."""
html = f"""<html><head><title>Page{page_number}</title></head>
<body>Page number <span id="pageNumber">{page_number}</span>
<p><a href="../xhtmlTest.html" target="_top">top</a></p>
</body></html>"""
return html.encode("utf-8")

def _serve_file(self, file_path):
"""Serve a file from the HTML root directory."""
with open(file_path, encoding="latin-1") as f:
return f.read().encode("utf-8")

def _send_response(self, content_type="text/html"):
"""Send a response."""
self.send_response(200)
self.send_header("Content-type", content_type)
self.end_headers()

def do_GET(self):
"""GET method handler."""
try:
path = self.path[1:].split("?")[0]
if path[:5] == "page/":
html = """<html><head><title>Page{page_number}</title></head>
<body>Page number <span id=\"pageNumber\">{page_number}</span>
<p><a href=\"../xhtmlTest.html\" target=\"_top\">top</a>
</body></html>""".format(
page_number=path[5:]
)
html = html.encode("utf-8")
file_path = os.path.join(HTML_ROOT, path)
if path.startswith("page/"):
html = self._serve_page(path[5:])
self._send_response("text/html")
self.wfile.write(html)
elif os.path.isfile(file_path):
content_type = "application/json" if file_path.endswith(".json") else "text/html"
content = self._serve_file(file_path)
self._send_response(content_type)
self.wfile.write(content)
else:
with open(os.path.join(HTML_ROOT, path), encoding="latin-1") as f:
html = f.read().encode("utf-8")
self.send_response(200)
self.send_header("Content-type", "text/html")
self.end_headers()
self.wfile.write(html)
self.send_error(404, f"File Not Found: {path}")
except OSError:
self.send_error(404, f"File Not Found: {path}")

def do_POST(self):
"""POST method handler."""
try:
remaining_bytes = int(self.headers["content-length"])
contents = ""
line = self.rfile.readline()
contents += line.decode("utf-8")
remaining_bytes -= len(line)
line = self.rfile.readline()
contents += line.decode("utf-8")
remaining_bytes -= len(line)
fn = re.findall(r'Content-Disposition.*name="upload"; filename="(.*)"', line.decode("utf-8"))
if not fn:
self.send_error(500, f"File not found. {contents}")
contents = self.rfile.read(remaining_bytes).decode("utf-8")
fn_match = re.search(r'Content-Disposition.*name="upload"; filename="(.*)"', contents)
if not fn_match:
self.send_error(500, f"File not found in content. {contents}")
return
line = self.rfile.readline()
remaining_bytes -= len(line)
contents += line.decode("utf-8")
line = self.rfile.readline()
remaining_bytes -= len(line)
contents += line.decode("utf-8")
preline = self.rfile.readline()
remaining_bytes -= len(preline)
while remaining_bytes > 0:
line = self.rfile.readline()
remaining_bytes -= len(line)
contents += line.decode("utf-8")

self.send_response(200)
self.send_header("Content-type", "text/html")
self.end_headers()

self._send_response("text/html")
self.wfile.write(
f"""<!doctype html>
{contents}
Expand Down
Loading