tRework fully for binary uploads. - blck - ephemeral pastebin/url shortener
HTML git clone https://git.parazyd.org/blck
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit e6fbbbeaa3b91f8cca9d0787cbef0f95746ee675
DIR parent 5a43c8c2660d8ca22a01939cf907c149f54771c8
HTML Author: parazyd <parazyd@dyne.org>
Date: Tue, 9 Feb 2021 09:03:02 +0100
Rework fully for binary uploads.
Diffstat:
M blck.py | 106 +++++++++++++------------------
1 file changed, 45 insertions(+), 61 deletions(-)
---
DIR diff --git a/blck.py b/blck.py
t@@ -2,93 +2,77 @@
# copyleft (c) 2017-2021 parazyd <parazyd@dyne.org>
# see LICENSE file for copyright and license details.
+from os import remove, rename
+from os.path import join
from random import choice
-from os import remove
from string import ascii_uppercase, ascii_lowercase
+from threading import Thread
+from time import sleep
-from flask import Flask, Blueprint, render_template, redirect, request
+from flask import (Flask, Blueprint, render_template, request,
+ send_from_directory)
+import magic
bp = Blueprint('blck', __name__, template_folder='templates')
@bp.route("/", methods=['GET', 'POST'])
def main():
- """ main routine """
- try:
- return short(request.form['url'])
- except:
- return render_template("index.html", pastebin=PASTEBIN, root=args.r)
+ if request.method == 'GET':
+ return render_template('index.html', root=args.r)
+ return short(request.files)
-@bp.route("/<urlshort>")
+@bp.route("<urlshort>")
def urlget(urlshort):
- """ returns a paste if it exists """
- try:
- with open('uris/' + urlshort, 'r') as paste:
- realurl = paste.readline()
- if EPHEMERAL:
- remove('uris/' + urlshort)
- except FileNotFoundError:
- return "could not find paste\n"
-
- cliagents = ['curl', 'Wget', '']
- if request.headers.get('User-Agent').split('/')[0] not in cliagents \
- and not PASTEBIN:
- return redirect(realurl.rstrip('\n'), code=301)
-
- return realurl
-
-
-def short(url):
- """ pasting logic """
- if not PASTEBIN:
- # taken from django
- regex = re.compile(
- r'^(?:http|ftp)s?://' # http:// or https://
- r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|'
- r'localhost|' # localhost...
- r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
- r'(?::\d+)?' # optional port
- r'(?:/?|[/?]\S+)$', re.IGNORECASE)
-
- if len(url) > 1024 or not regex.match(url):
- return "invalid url\n"
-
- if not url:
+ thread = Thread(target=del_file, args=(urlshort,))
+ thread.daemon = True
+ thread.start()
+ return send_from_directory('files', urlshort)
+
+
+def del_file(f):
+ sleep(60)
+ remove(join('files', f))
+
+
+def short(c):
+ if not c or not c['c']:
return "invalid paste\n"
- urlshort = genid()
- with open('uris/' + urlshort, 'w') as paste:
- paste.write(url + '\n')
+ s = genid()
+ f = c['c']
+ f.save(join('files', s))
- if request.headers.get('X-Forwarded-Proto') == 'https':
- return request.url_root.replace('http://', 'https://') + args.r.lstrip('/') + urlshort + '\n'
+ mimetype = None
+ if f.mimetype:
+ mimetype = f.mimetype
+ else:
+ mimetype = magic.from_file(join('files', s), mime=True)
+
+ if mimetype:
+ t = s
+ s = s + '.' + mimetype.split('/')[1]
+ rename(join('files', t), join('files', s))
- return request.url_root + args.r.lstrip('/') + urlshort + '\n'
+ if request.headers.get('X-Forwarded-Proto') == 'https':
+ return request.url_root.replace('http://', 'https://') + \
+ args.r.lstrip('/') + s +'\n'
+ return request.url_root + args.r.lstrip('/') + s + '\n'
def genid(size=4, chars=ascii_uppercase + ascii_lowercase):
- """ returns a random id for a paste """
return ''.join(choice(chars) for i in range(size))
if __name__ == '__main__':
from argparse import ArgumentParser
parser = ArgumentParser()
- parser.add_argument('--pastebin', default=False, action='store_true',
- help='Use as pastebin rather than URL shortener')
- parser.add_argument('--noephemeral', default=False, action='store_true',
- help='Do not run in ephemeral mode')
- parser.add_argument('-r', default='/', help='Application root')
- parser.add_argument('-l', default='localhost', help='Listen host')
- parser.add_argument('-p', default=5000, help='Listen port')
- parser.add_argument('-d', default=False, action='store_true', help='Debug')
+ parser.add_argument('-r', default='/', help='application root')
+ parser.add_argument('-l', default='localhost', help='listen host')
+ parser.add_argument('-p', default=13321, help='listen port')
+ parser.add_argument('-d', default=False, action='store_true', help='debug')
args = parser.parse_args()
- EPHEMERAL = not args.noephemeral
- PASTEBIN = args.pastebin
- if not PASTEBIN:
- import re
-
app = Flask(__name__)
app.register_blueprint(bp, url_prefix=args.r)