|
5 | 5 | import tempfile |
6 | 6 | import json |
7 | 7 | import logging |
| 8 | +import socket |
8 | 9 | from typing import List |
9 | 10 | import pathlib |
10 | 11 | import base64 |
|
23 | 24 | class NewWebSocketHandler (WebSocketHandler): |
24 | 25 | def read_http_headers(self): |
25 | 26 | headers = {} |
26 | | - http_get = self.rfile.readline().decode().strip() |
27 | | - |
28 | | - if not http_get.upper().startswith('GET'): |
29 | | - logging.debug("Non-GET HTTP request, treating as health check: %r", http_get) |
30 | | - |
31 | | - # headers lesen |
32 | | - while True: |
33 | | - header = self.rfile.readline().decode().strip() |
34 | | - if not header: |
35 | | - break |
36 | | - try: |
37 | | - head, value = header.split(':', 1) |
38 | | - headers[head.lower().strip()] = value.strip() |
39 | | - except ValueError: |
40 | | - logging.debug("Malformed header line ignored: %r", header) |
| 27 | + try: |
| 28 | + self.connection.settimeout(10) # prevent indefinite blocking on health-check reads |
| 29 | + http_get = self.rfile.readline().decode().strip() |
| 30 | + |
| 31 | + if not http_get.upper().startswith('GET'): |
| 32 | + logging.debug("Non-GET HTTP request, treating as health check: %r", http_get) |
| 33 | + |
| 34 | + # headers lesen |
| 35 | + while True: |
| 36 | + header = self.rfile.readline().decode().strip() |
| 37 | + if not header: |
| 38 | + break |
| 39 | + try: |
| 40 | + head, value = header.split(':', 1) |
| 41 | + headers[head.lower().strip()] = value.strip() |
| 42 | + except ValueError: |
| 43 | + logging.debug("Malformed header line ignored: %r", header) |
| 44 | + except Exception as e: |
| 45 | + logging.debug("Error reading HTTP headers: %s", e) |
| 46 | + finally: |
| 47 | + self.connection.settimeout(None) # restore blocking mode for WebSocket reads |
41 | 48 | return headers |
42 | 49 |
|
43 | 50 | def handshake(self): |
44 | | - headers = self.read_http_headers() |
| 51 | + try: |
| 52 | + headers = self.read_http_headers() |
| 53 | + except Exception as e: |
| 54 | + logging.debug("handshake: failed to read headers: %s", e) |
| 55 | + headers = {} |
45 | 56 |
|
46 | 57 | if 'upgrade' in headers: |
47 | 58 | try: |
@@ -79,6 +90,11 @@ def handshake(self): |
79 | 90 | try: |
80 | 91 | with self._send_lock: |
81 | 92 | self.request.sendall(response) |
| 93 | + # Send TCP FIN so the client knows the response is complete |
| 94 | + try: |
| 95 | + self.request.shutdown(socket.SHUT_WR) |
| 96 | + except Exception: |
| 97 | + pass |
82 | 98 | except BrokenPipeError: |
83 | 99 | logging.debug("Client closed before health-check response.") |
84 | 100 | except Exception as e: |
|
0 commit comments