Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-13 16:29:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Create separate templates and static folder, and make the web app use both of these. Yay, now we have real static resources

Browse Source
This commit is contained in:
Micah Lee 2018-03-06 02:54:12 -08:00
parent baede53632
commit ce852fc60a
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
12 changed files with 39 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MANIFEST.in
View File

@ -4,7 +4,8 @@ include BUILD.md
include share/*
include share/images/*
include share/locale/*
include share/html/*
include share/templates/*
include share/static/*
include install/onionshare.desktop
include install/onionshare.appdata.xml
include install/onionshare80.xpm

3
install/pyinstaller.spec
View File

@ -20,7 +20,8 @@ a = Analysis(
('../share/torrc_template-windows', 'share'),
('../share/images/*', 'share/images'),
('../share/locale/*', 'share/locale'),
('../share/html/*', 'share/html')
('../share/templates/*', 'share/templates'),
('../share/static/*', 'share/static')
],
hiddenimports=[],
hookspath=[],

80
onionshare/web.py
View File

@ -26,12 +26,11 @@ import queue
import socket
import sys
import tempfile
import base64
from distutils.version import LooseVersion as Version
from urllib.request import urlopen
from flask import (
Flask, Response, request, render_template_string, abort, make_response,
Flask, Response, request, render_template, abort, make_response,
__version__ as flask_version
)
@ -43,7 +42,9 @@ class Web(object):
"""
def __init__(self, debug, stay_open, gui_mode, receive_mode=False):
# The flask app
self.app = Flask(__name__)
self.app = Flask(__name__,
static_folder=common.get_resource_path('static'),
template_folder=common.get_resource_path('templates'))
# Debug mode?
if debug:
@ -88,12 +89,6 @@ class Web(object):
self.REQUEST_RATE_LIMIT = 5
self.q = queue.Queue()
# Load and base64 encode images to pass into templates
self.favicon_b64 = self.base64_image('favicon.ico')
self.logo_b64 = self.base64_image('logo.png')
self.folder_b64 = self.base64_image('web_folder.png')
self.file_b64 = self.base64_image('web_file.png')
self.slug = None
self.download_count = 0
@ -137,29 +132,18 @@ class Web(object):
# currently a download
deny_download = not self.stay_open and self.download_in_progress
if deny_download:
r = make_response(render_template_string(
open(common.get_resource_path('html/denied.html')).read(),
favicon_b64=self.favicon_b64
))
for header, value in self.security_headers:
r.headers.set(header, value)
return r
r = make_response(render_template('denied.html'))
return self.add_security_headers(r)
# If download is allowed to continue, serve download page
r = make_response(render_template_string(
open(common.get_resource_path('html/send.html')).read(),
favicon_b64=self.favicon_b64,
logo_b64=self.logo_b64,
folder_b64=self.folder_b64,
file_b64=self.file_b64,
r = make_response(render_template(
'send.html',
slug=self.slug,
file_info=self.file_info,
filename=os.path.basename(self.zip_filename),
filesize=self.zip_filesize,
filesize_human=common.human_readable_filesize(self.zip_filesize)))
for header, value in self.security_headers:
r.headers.set(header, value)
return r
return self.add_security_headers(r)
@self.app.route("/<slug_candidate>/download")
def download(slug_candidate):
@ -172,13 +156,8 @@ class Web(object):
# currently a download
deny_download = not self.stay_open and self.download_in_progress
if deny_download:
r = make_response(render_template_string(
open(common.get_resource_path('html/denied.html')).read(),
favicon_b64=self.favicon_b64
))
for header,value in self.security_headers:
r.headers.set(header, value)
return r
r = make_response(render_template('denied.html'))
return self.add_security_headers(r)
# each download has a unique id
download_id = self.download_count
@ -261,8 +240,7 @@ class Web(object):
r = Response(generate())
r.headers.set('Content-Length', self.zip_filesize)
r.headers.set('Content-Disposition', 'attachment', filename=basename)
for header,value in self.security_headers:
r.headers.set(header, value)
r = self.add_security_headers(r)
# guess content type
(content_type, _) = mimetypes.guess_type(basename, strict=False)
if content_type is not None:
@ -278,15 +256,10 @@ class Web(object):
self.check_slug_candidate(slug_candidate)
# If download is allowed to continue, serve download page
r = make_response(render_template_string(
open(common.get_resource_path('html/receive.html')).read(),
favicon_b64=self.favicon_b64,
logo_b64=self.logo_b64,
r = make_response(render_template(
'receive.html',
slug=self.slug))
for header, value in self.security_headers:
r.headers.set(header, value)
return r
return self.add_security_headers(r)
def common_routes(self):
"""
@ -306,13 +279,8 @@ class Web(object):
self.force_shutdown()
print(strings._('error_rate_limit'))
r = make_response(render_template_string(
open(common.get_resource_path('html/404.html')).read(),
favicon_b64=self.favicon_b64
), 404)
for header, value in self.security_headers:
r.headers.set(header, value)
return r
r = make_response(render_template('404.html'), 404)
return self.add_security_headers(r)
@self.app.route("/<slug_candidate>/shutdown")
def shutdown(slug_candidate):
@ -323,6 +291,14 @@ class Web(object):
self.force_shutdown()
return ""
def add_security_headers(self, r):
"""
Add security headers to a request
"""
for header, value in self.security_headers:
r.headers.set(header, value)
return r
def set_file_info(self, filenames, processed_size_callback=None):
"""
Using the list of filenames being shared, fill in details that the web
@ -362,12 +338,6 @@ class Web(object):
return True
return filename.endswith(('.html', '.htm', '.xml', '.xhtml'))
def base64_image(self, filename):
"""
Base64-encode an image file to use data URIs in the web app
"""
return base64.b64encode(open(common.get_resource_path('images/{}'.format(filename)), 'rb').read()).decode()
def add_request(self, request_type, path, data=None):
"""
Add a request to the queue, to communicate with the GUI.

3
setup.py
View File

@ -52,7 +52,8 @@ data_files=[
(os.path.join(sys.prefix, 'share/onionshare'), file_list('share')),
(os.path.join(sys.prefix, 'share/onionshare/images'), file_list('share/images')),
(os.path.join(sys.prefix, 'share/onionshare/locale'), file_list('share/locale')),
(os.path.join(sys.prefix, 'share/onionshare/html'), file_list('share/html')),
(os.path.join(sys.prefix, 'share/onionshare/templates'), file_list('share/templates')),
(os.path.join(sys.prefix, 'share/onionshare/static'), file_list('share/static'))
]
if platform.system() != 'OpenBSD':
data_files.append(('/usr/share/nautilus-python/extensions/', ['install/scripts/onionshare-nautilus.py']))

0
share/images/favicon.ico → share/static/favicon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
share/static/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

0
share/images/web_file.png → share/static/web_file.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 251 B

After

Width:  |  Height:  |  Size: 251 B

0
share/images/web_folder.png → share/static/web_folder.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 338 B

After

Width:  |  Height:  |  Size: 338 B

2
share/html/404.html → share/templates/404.html
View File

@ -2,7 +2,7 @@
<html>
<head>
<title>Error 404</title>
<link href="data:image/x-icon;base64,{{favicon_b64}}" rel="icon" type="image/x-icon" />
<link href="/static/favicon.ico" rel="icon" type="image/x-icon" />
<style type="text/css">
body {
background-color: #FFC4D5;

2
share/html/denied.html → share/templates/denied.html
View File

@ -2,7 +2,7 @@
<html>
<head>
<title>OnionShare</title>
<link href="data:image/x-icon;base64,{{favicon_b64}}" rel="icon" type="image/x-icon" />
<link href="/static/favicon.ico" rel="icon" type="image/x-icon" />
<style>
body {
background-color: #222222;

4
share/html/receive.html → share/templates/receive.html
View File

@ -2,7 +2,7 @@
<html>
<head>
<title>OnionShare</title>
<link href="data:image/x-icon;base64,{{favicon_b64}}" rel="icon" type="image/x-icon" />
<link href="/static/favicon.ico" rel="icon" type="image/x-icon" />
<style type="text/css">
.clearfix:after {
content: ".";
@ -97,7 +97,7 @@
<body>
<header class="clearfix">
<img class="logo" src="data:image/png;base64,{{logo_b64}}" title="OnionShare">
<img class="logo" src="/static/logo.png" title="OnionShare">
<h1>OnionShare</h1>
</header>

8
share/html/send.html → share/templates/send.html
View File

@ -2,7 +2,7 @@
<html>
<head>
<title>OnionShare</title>
<link href="data:image/x-icon;base64,{{favicon_b64}}" rel="icon" type="image/x-icon" />
<link href="/static/favicon.ico" rel="icon" type="image/x-icon" />
<style type="text/css">
.clearfix:after {
content: ".";
@ -105,7 +105,7 @@
<li><a class="button" href='/{{ slug }}/download'>Download Files</a></li>
</ul>
</div>
<img class="logo" src="data:image/png;base64,{{logo_b64}}" title="OnionShare">
<img class="logo" src="/static/logo.png" title="OnionShare">
<h1>OnionShare</h1>
</header>
@ -118,7 +118,7 @@
{% for info in file_info.dirs %}
<tr>
<td>
<img width="30" height="30" title="" alt="" src="data:image/png;base64,{{ folder_b64 }}" />
<img width="30" height="30" title="" alt="" src="/static/web_folder.png" />
{{ info.basename }}
</td>
<td>{{ info.size_human }}</td>
@ -128,7 +128,7 @@
{% for info in file_info.files %}
<tr>
<td>
<img width="30" height="30" title="" alt="" src="data:image/png;base64,{{ file_b64 }}" />
<img width="30" height="30" title="" alt="" src="/static/web_file.png" />
{{ info.basename }}
</td>
<td>{{ info.size_human }}</td>