Browse Source

Fix imports and unicode handling for Python3

python3-support
Sebastian Lohff 3 years ago
parent
commit
0e33743293
  1. 40
      servefile

40
servefile

@ -14,7 +14,6 @@ import base64 @@ -14,7 +14,6 @@ import base64
import cgi
import datetime
import mimetypes
import urllib
import os
import re
import select
@ -27,10 +26,12 @@ import time @@ -27,10 +26,12 @@ import time
try:
import BaseHTTPServer
import SocketServer
from urllib import quote, unquote
except ImportError:
# both have different names in python3
import http.server as BaseHTTPServer
import socketserver as SocketServer
from urllib.parse import quote, unquote
# only activate SSL if available
HAVE_SSL = False
@ -56,7 +57,7 @@ class FileBaseHandler(BaseHTTPServer.BaseHTTPRequestHandler): @@ -56,7 +57,7 @@ class FileBaseHandler(BaseHTTPServer.BaseHTTPRequestHandler):
Returns True if a redirect was issued. """
if not fileName:
fileName = self.fileName
if urllib.unquote(self.path) != "/" + fileName:
if unquote(self.path) != "/" + fileName:
self.send_response(302)
self.send_header('Location', '/' + fileName)
self.end_headers()
@ -346,12 +347,12 @@ class DirListingHandler(FileBaseHandler): @@ -346,12 +347,12 @@ class DirListingHandler(FileBaseHandler):
<p>The requestet URL %s was not found on this server</p>
<p><a href="/">Back to /</a>
</body>
</html>""" % self.escapeHTML(urllib.unquote(self.path))
</html>""" % self.escapeHTML(unquote(self.path))
self.send_header("Content-Length", str(len(errorMsg)))
self.send_header('Connection', 'close')
self.end_headers()
if not head:
self.wfile.write(errorMsg)
self.wfile.write(errorMsg.encode())
def escapeHTML(self, htmlstr):
entities = [("<", "&lt;"), (">", "&gt;")]
@ -378,7 +379,7 @@ class DirListingHandler(FileBaseHandler): @@ -378,7 +379,7 @@ class DirListingHandler(FileBaseHandler):
<td class="size">%s</td>
<td class="type">%s</td>
</tr>
""" % (urllib.quote(item), item, lastModified, fileSize, fileType))
""" % (quote(item), item, lastModified, fileSize, fileType))
def sendDirectoryListing(self, path, head):
""" Generate a directorylisting for path and send it """
@ -414,7 +415,7 @@ class DirListingHandler(FileBaseHandler): @@ -414,7 +415,7 @@ class DirListingHandler(FileBaseHandler):
</tr>
</thead>
<tbody>
""" % {'path': os.path.normpath(urllib.unquote(self.path))}
""" % {'path': os.path.normpath(unquote(self.path))}
footer = """</tbody></table></div>
<div class="footer"><a href="http://seba-geek.de/stuff/servefile/">servefile %(version)s</a></div>
<script>
@ -540,7 +541,7 @@ class DirListingHandler(FileBaseHandler): @@ -540,7 +541,7 @@ class DirListingHandler(FileBaseHandler):
self.send_header("Content-Length", str(len(listing)))
self.send_header('Connection', 'close')
self.end_headers()
self.wfile.write(listing)
self.wfile.write(listing.encode())
def convertSize(self, size):
for ext in "KMGT":
@ -552,7 +553,7 @@ class DirListingHandler(FileBaseHandler): @@ -552,7 +553,7 @@ class DirListingHandler(FileBaseHandler):
return (size, ext.strip())
def getCleanPath(self):
urlPath = os.path.normpath(urllib.unquote(self.path)).strip("/")
urlPath = os.path.normpath(unquote(self.path)).strip("/")
path = os.path.join(self.targetDir, urlPath)
return path
@ -594,7 +595,8 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler): @@ -594,7 +595,8 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler):
length = self.getContentLength()
if length < 0:
return
ctype = self.headers.getheader('Content-Type')
print(self.headers)
ctype = self.headers.get('Content-Type')
# check for multipart/form-data.
if not (ctype and ctype.lower().startswith("multipart/form-data")):
@ -615,7 +617,7 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler): @@ -615,7 +617,7 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler):
return
# write file down to disk, send a 200 afterwards
target = open(destFileName, "w")
target = open(destFileName, "wb")
bytesLeft = length
while bytesLeft > 0:
bytesToRead = min(self.blockSize, bytesLeft)
@ -638,7 +640,7 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler): @@ -638,7 +640,7 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler):
if length < 0:
return
fileName = urllib.unquote(self.path)
fileName = unquote(self.path)
if fileName == "/":
# if no filename was given we have to generate one
fileName = str(time.time())
@ -685,7 +687,7 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler): @@ -685,7 +687,7 @@ class FilePutter(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Content-Length', str(len(msg)))
self.send_header('Connection', 'close')
self.end_headers()
self.wfile.write(msg)
self.wfile.write(msg.encode())
def getTargetName(self, fname):
""" Generate a clean and secure filename.
@ -831,7 +833,7 @@ class ServeFile(): @@ -831,7 +833,7 @@ class ServeFile():
# we couldn't find any ip address
proc = None
if proc:
ips = proc.stdout.read().strip().split("\n")
ips = proc.stdout.read().decode().strip().split("\n")
# filter out ips we are not listening on
if not self.listenIPv6:
@ -877,7 +879,7 @@ class ServeFile(): @@ -877,7 +879,7 @@ class ServeFile():
for ip in self.getIPs() + ["127.0.0.1", "::1"]:
altNames.append("IP:%s" % ip)
altNames.append("DNS:localhost")
ext = crypto.X509Extension("subjectAltName", False, ",".join(altNames))
ext = crypto.X509Extension(b"subjectAltName", False, (",".join(altNames)).encode())
req.add_extensions([ext])
req.set_pubkey(pkey)
@ -901,8 +903,8 @@ class ServeFile(): @@ -901,8 +903,8 @@ class ServeFile():
self.key = pkey
print("done.")
print("SHA1 fingerprint:", cert.digest("sha1"))
print("MD5 fingerprint:", cert.digest("md5"))
print("SHA1 fingerprint:", cert.digest("sha1").decode())
print("MD5 fingerprint:", cert.digest("md5").decode())
def _getCert(self):
return self.cert
@ -913,7 +915,7 @@ class ServeFile(): @@ -913,7 +915,7 @@ class ServeFile():
def setAuth(self, user, password, realm=None):
if not user or not password:
raise ServeFileException("User and password both need to be at least one character.")
self.auth = base64.b64encode("%s:%s" % (user, password))
self.auth = base64.b64encode(("%s:%s" % (user, password)).encode()).decode()
self.authrealm = realm
def _createServer(self, handler, withv6=False):
@ -975,7 +977,7 @@ class ServeFile(): @@ -975,7 +977,7 @@ class ServeFile():
else:
pwPart = ""
if self.auth:
pwPart = base64.b64decode(self.auth) + "@"
pwPart = base64.b64decode(self.auth).decode() + "@"
for ip in ips:
if ":" in ip:
ip = "[%s]" % ip
@ -1091,7 +1093,7 @@ class AuthenticationHandler(): @@ -1091,7 +1093,7 @@ class AuthenticationHandler():
errorMsg = "<html><head><title>401 - Unauthorized</title></head><body><h1>401 - Unauthorized</h1></body></html>"
self.send_header("Content-Length", str(len(errorMsg)))
self.end_headers()
self.wfile.write(errorMsg)
self.wfile.write(errorMsg.encode())
def main():

Loading…
Cancel
Save