mia
/
0x0
3
8
Fork 3
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

use function to format host URL

This commit is contained in:
Martin Herkt 2017-01-01 20:26:09 +01:00
parent 6de22ca8fa
commit 0c5d8690cc
No known key found for this signature in database
GPG Key ID: C24B9CD04DC6AE7F
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhost.py
View File

@ -94,6 +94,15 @@ def getpath(fn):
def geturl(p):
return url_for("get", path=p, _external=True) + "\n"
def fhost_url(scheme=None):
if not scheme:
return url_for(".fhost", _external=True).rstrip("/")
else:
return url_for(".fhost", _external=True, _scheme=scheme).rstrip("/")
def is_fhost_url(url):
return url.startswith(fhost_url()) or url.startswith(fhost_url("https"))
def shorten(url):
if len(url) > app.config["MAX_URL_LENGTH"]:
abort(414)
@ -171,10 +180,7 @@ def store_file(f, addr):
return geturl(sf.getname())
def store_url(url, addr):
fhost_url = url_for(".fhost", _external=True).rstrip("/")
fhost_url_https = url_for(".fhost", _external=True, _scheme="https").rstrip("/")
if url.startswith(fhost_url) or url.startswith(fhost_url_https):
if is_fhost_url(url):
return segfault(508)
r = requests.get(url, stream=True, verify=False)
@ -317,7 +323,7 @@ IRC on Freenode, or send an email to lachs0r@(this domain).
Please allow up to 24 hours for a response.
</pre>
""".format(url_for(".fhost", _external=True).rstrip("/"),
""".format(fhost_url(),
maxsize, str(maxsizehalf).rjust(27), str(maxsizenum).rjust(27),
maxsizeunit.rjust(54),
", ".join(app.config["FHOST_MIME_BLACKLIST"]))