Commit 8e67c4b3222d87549893dc80eab27607fd8c2350
Return 404 for un-handled URLs
cel committed on 4/28/2020, 2:50:01 PMParent: 498e3731c8cc2a4d9c000c5050c68465560ed39d
Files changed
| ytdl.dpi | changed |
| ytdl.dpi | |||
|---|---|---|---|
| @@ -44,11 +44,11 @@ | |||
| 44 | 44 … | "<div><a href=/quit>quit</a></div>" + | |
| 45 | 45 … | "</body></html>").encode('utf-8')) | |
| 46 | 46 … | conn.shutdown(socket.SHUT_WR) | |
| 47 | 47 … | ||
| 48 | -def serveEcho(conn, url, uri): | ||
| 48 … | +def serve404(conn, url): | ||
| 49 | 49 … | writeHeader(conn, url, "text/plain") | |
| 50 | - conn.send(str(uri).encode('utf-8')) | ||
| 50 … | + conn.send("404 Not found".encode('utf-8')) | ||
| 51 | 51 … | conn.shutdown(socket.SHUT_WR) | |
| 52 | 52 … | ||
| 53 | 53 … | def renderThumbnail(thumb): | |
| 54 | 54 … | url = thumb.get('url') | |
| @@ -135,9 +135,9 @@ | |||
| 135 | 135 … | conn.shutdown(socket.SHUT_WR) | |
| 136 | 136 … | ||
| 137 | 137 … | def serveOpen(conn, url): | |
| 138 | 138 … | uri = urllib.parse.urlparse(url) | |
| 139 | - if uri.scheme == "dpi": return serveEcho(conn, url, uri) | ||
| 139 … | + if uri.scheme == "dpi": return serve404(conn, url) | ||
| 140 | 140 … | if uri.netloc == "" and (uri.path == "" or uri.path == "/"): | |
| 141 | 141 … | return serveHome(conn, url, uri) | |
| 142 | 142 … | if uri.scheme == "ytdl" or uri.scheme == "ydl": | |
| 143 | 143 … | if '.' in uri.netloc: | |
| @@ -149,9 +149,9 @@ | |||
| 149 | 149 … | uri.query, | |
| 150 | 150 … | uri.fragment | |
| 151 | 151 … | ))) | |
| 152 | 152 … | return serveResource(conn, url, re.sub('yt?dl:(//)?', '', url)) | |
| 153 | - return serveEcho(conn, url, uri) | ||
| 153 … | + serve404(conn, url) | ||
| 154 | 154 … | ||
| 155 | 155 … | def serveResource(conn, origUrl, url): | |
| 156 | 156 … | try: | |
| 157 | 157 … | res = ytdl.extract_info(url, download=False) | |
Built with git-ssb-web