add license

LICENSE

@@ -0,0 +1,15 @@
+ISC License
+
+Copyright (c) 2019, iou1name <iou1name@steelbea.me>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

quest/static/quest.css

@@ -18,6 +18,9 @@ h3 {
 	margin-right: auto;
 }
 
+#content {
+	padding-left: 0;
+}
 #questPane {
 	float: left;
 	box-sizing: border-box;

quest/tools.py

@@ -5,6 +5,7 @@ Some miscellaneous tools and helper functions. Primarily for quests.
 import os
 import re
 import json
+import time
 import hashlib
 
 import magic
@@ -27,32 +28,40 @@ def download_img(url):
 	type, and saves it to file with the hash as filename. Returns a
 	URL to image.
 	"""
-	# TODO: file size limits
+	# TODO: external server
-	# https://stackoverflow.com/questions/22346158/
+	timeout = 10 # TODO: put in settings
-	# TODO: prevent overwriting
+	url = url.replace('..', '') # TODO: why is this here?
-	url = url.replace('..', '')
 	if url.startswith(settings.IMG_SVR_URL):
 		if '/' not in url.replace(settings.IMG_SVR_URL, ''):
 			return url
 	try:
-		res = requests.get(url)
+		with requests.get(url, stream=True) as r:
-		res.raise_for_status()
+			r.raise_for_status()
-		mime = magic.from_buffer(res.content, mime=True)
+			data = b''
+			start_time = time.time()
+			for chunk in r.iter_content(102400):
+				if time.time() - start_time > timeout:
+					raise ValueError('TIMEOUT_REACHED')
+				data += chunk
+				if len(data) > 4*1024*1024: # TODO: put in settings
+					raise ValueError('RESPONSE_TOO_LARGE')
+		mime = magic.from_buffer(data, mime=True)
 		assert mime in ALLOWED_MIMES
 		h = hashlib.sha256()
-		h.update(res.content)
+		h.update(data)
 		fname = h.hexdigest()
 		fname += "." + mime.partition("/")[2]
 		with open(os.path.join(IMG_DIR, fname), "wb") as file:
-			for chunk in res.iter_content(100000):
+			file.write(data)
-				file.write(chunk)
 		return settings.IMG_SVR_URL + fname
 	except requests.exceptions.RequestException:
 		return "INVALID_URL"
 	except AssertionError:
 		return "INVALID_MIME_TYPE"
+	except ValueError as e:
+		return str(e)
 	except Exception as e:
-		print(e)
+		print(e) # TODO: log this
 		return "UNKNOWN_ERROR"
 
 
@@ -66,18 +75,19 @@ def handle_img(text, limit=5):
 	# TODO: handle webms
 	urls = re.findall(
 		r"""\[img(?: title=['"](.*)['"])?\](.*)\[\/img\]""",
-		text.replace('<br', '\n')
+		text.replace('<br>', '\n')
 	)
 	urls = urls[:limit]
 
 	for match_pair in urls:
-		title, ext_url = match_pair
+		title, external_url = match_pair
-		int_url = download_img(ext_url)
+		internal_url = download_img(external_url)
-		if int_url in ["INVALID_URL", "INVALID_MIME_TYPE", "UNKNOWN_ERROR"]:
+		if not internal_url.startswith("http"): # download errored
-			text = re.sub(r"\[img.*?\[\/img\]", ext_url, text, 1)
+			# TODO: error message?
+			text = re.sub(r"\[img.*?\[\/img\]", external_url, text, 1)
 		if not title:
-			title = os.path.basename(ext_url)
+			title = os.path.basename(external_url)
-		img_tag = f'<img src="{int_url}" title="{title}">'
+		img_tag = f'<img src="{internal_url}" title="{title}">'
 
 		text = re.sub(r"\[img.*?\[\/img\]", img_tag, text, 1)
 

static/base.css

@@ -100,4 +100,5 @@ a:hover {
 	flex: auto;
 	overflow: auto;
 	overflow-wrap: break-word;
+	padding-left: 5%;
 }