itCode cleanup. - blck - ephemeral pastebin/url shortener	Err	parazyd.org	70
hgit clone https://git.parazyd.org/blck	URL:https://git.parazyd.org/blck	parazyd.org	70
1Log	/git/blck/log.gph	parazyd.org	70
1Files	/git/blck/files.gph	parazyd.org	70
1Refs	/git/blck/refs.gph	parazyd.org	70
1README	/git/blck/file/README.md.gph	parazyd.org	70
1LICENSE	/git/blck/file/LICENSE.gph	parazyd.org	70
i---	Err	parazyd.org	70
1commit 430635cec5facbe40db9d6b69774c3165d68af76	/git/blck/commit/430635cec5facbe40db9d6b69774c3165d68af76.gph	parazyd.org	70
1parent b3476a0a1b7343d98ad082e24ee19e3b47cba313	/git/blck/commit/b3476a0a1b7343d98ad082e24ee19e3b47cba313.gph	parazyd.org	70
hAuthor: parazyd <parazyd@dyne.org>	URL:mailto:parazyd@dyne.org	parazyd.org	70
iDate:   Tue,  9 Feb 2021 11:09:29 +0100	Err	parazyd.org	70
i	Err	parazyd.org	70
iCode cleanup.	Err	parazyd.org	70
i	Err	parazyd.org	70
iDiffstat:	Err	parazyd.org	70
i  M blck.py                             |      25 +++++++++++--------------	Err	parazyd.org	70
i	Err	parazyd.org	70
i1 file changed, 11 insertions(+), 14 deletions(-)	Err	parazyd.org	70
i---	Err	parazyd.org	70
1diff --git a/blck.py b/blck.py	/git/blck/file/blck.py.gph	parazyd.org	70
it@@ -4,7 +4,7 @@	Err	parazyd.org	70
i 	Err	parazyd.org	70
i from io import BytesIO	Err	parazyd.org	70
i from os import remove, rename	Err	parazyd.org	70
i-from os.path import join, isfile	Err	parazyd.org	70
i+from os.path import isfile	Err	parazyd.org	70
i from random import choice	Err	parazyd.org	70
i from string import ascii_uppercase, ascii_lowercase	Err	parazyd.org	70
i 	Err	parazyd.org	70
it@@ -15,7 +15,7 @@ import magic	Err	parazyd.org	70
i bp = Blueprint('blck', __name__, template_folder='templates')	Err	parazyd.org	70
i 	Err	parazyd.org	70
i @bp.route("/", methods=['GET', 'POST'])	Err	parazyd.org	70
i-def main():	Err	parazyd.org	70
i+def index():	Err	parazyd.org	70
i     if request.method == 'GET':	Err	parazyd.org	70
i         return render_template('index.html', root=args.r)	Err	parazyd.org	70
i     return short(request.files)	Err	parazyd.org	70
it@@ -41,23 +41,20 @@ def short(c):	Err	parazyd.org	70
i 	Err	parazyd.org	70
i     s = genid()	Err	parazyd.org	70
i     f = c['c']	Err	parazyd.org	70
i-    f.save(join('files', s))	Err	parazyd.org	70
i+    f.save(safe_join('files', s))	Err	parazyd.org	70
i 	Err	parazyd.org	70
i-    mimetype = None	Err	parazyd.org	70
i-    if f.mimetype:	Err	parazyd.org	70
i-        mimetype = f.mimetype	Err	parazyd.org	70
i-    else:	Err	parazyd.org	70
i-        mimetype = magic.from_file(join('files', s), mime=True)	Err	parazyd.org	70
i+    mimetype = f.mimetype	Err	parazyd.org	70
i+    if not mimetype:	Err	parazyd.org	70
i+        mimetype = magic.from_file(safe_join('files', s), mime=True)	Err	parazyd.org	70
i 	Err	parazyd.org	70
i     if mimetype:	Err	parazyd.org	70
i-        t = s	Err	parazyd.org	70
i-        s = s + '.' + mimetype.split('/')[1]	Err	parazyd.org	70
i-        rename(join('files', t), join('files', s))	Err	parazyd.org	70
i+        t, s = s, '.'.join([s, mimetype.split('/')[1]])	Err	parazyd.org	70
i+        rename(safe_join('files', t), safe_join('files', s))	Err	parazyd.org	70
i 	Err	parazyd.org	70
i     if request.headers.get('X-Forwarded-Proto') == 'https':	Err	parazyd.org	70
i-        return request.url_root.replace('http://', 'https://') + \	Err	parazyd.org	70
i-                   args.r.lstrip('/') + s +'\n'	Err	parazyd.org	70
i-    return request.url_root + args.r.lstrip('/') + s + '\n'	Err	parazyd.org	70
i+        return ''.join([request.url_root.replace('http://', 'https://'),	Err	parazyd.org	70
i+                        args.r.lstrip('/'), s, '\n'])	Err	parazyd.org	70
i+    return ''.join([request.url_root + args.r.lstrip('/'), s, '\n'])	Err	parazyd.org	70
i 	Err	parazyd.org	70
i 	Err	parazyd.org	70
i def genid(size=4, chars=ascii_uppercase + ascii_lowercase):	Err	parazyd.org	70
.