mirror/0bin
1
0
Fork 0
mirror of https://github.com/Tygs/0bin.git synced 2023-08-10 21:13:00 +03:00
Code Issues Projects Releases Wiki Activity

Merge #19 fix

Browse Source
This commit is contained in:
Rémy HUBSCHER 2013-01-19 18:54:51 +01:00
commit d57595297e
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zerobin/routes.py
View File

@ -10,7 +10,7 @@
import os import os
import sys import sys
import thread import thread
import urlparse
from datetime import datetime, timedelta from datetime import datetime, timedelta
# add project dir and libs dir to the PYTHON PATH to ensure they are # add project dir and libs dir to the PYTHON PATH to ensure they are
@ -48,22 +48,28 @@ def faq():
@app.route('/paste/create', method='POST') @app.route('/paste/create', method='POST')
def create_paste(): def create_paste():
try:
body = urlparse.parse_qs(request.body.read(int(settings.MAX_SIZE * 1.1)))
except ValueError:
return {'status': 'error',
'message': u"Wrong data payload."}
try: try:
content = unicode(request.forms.get('content', ''), 'utf8') content = unicode(''.join(body['content']), 'utf8')
except UnicodeDecodeError: except (UnicodeDecodeError, KeyError):
return {'status': 'error', return {'status': 'error',
'message': u"Encoding error: the paste couldn't be saved."} 'message': u"Encoding error: the paste couldn't be saved."}
if '{"iv":' not in content: # reject silently non encrypted content if '{"iv":' not in content: # reject silently non encrypted content
return '' return {'status': 'error',
'message': u"Wrong data payload."}
if content: if content:
# check size of the paste. if more than settings return error # check size of the paste. if more than settings return error
# without saving paste. prevent from unusual use of the # without saving paste. prevent from unusual use of the
# system. need to be improved # system. need to be improved
if len(content) < settings.MAX_SIZE: if len(content) < settings.MAX_SIZE:
expiration = request.forms.get('expiration', u'burn_after_reading') expiration = body.get('expiration', [u'burn_after_reading'])[0]
paste = Paste(expiration=expiration, content=content) paste = Paste(expiration=expiration, content=content)
paste.save() paste.save()

4
zerobin/static/js/behavior.js
View File

@ -452,7 +452,7 @@ $('.btn-primary').live("click", function(e){
bar.set('Sending...', '95%'); bar.set('Sending...', '95%');
var data = {content: content, expiration: expiration}; var data = {content: content, expiration: expiration};
var sizebytes = zerobin.count(JSON.stringify(data)); var sizebytes = zerobin.count(JSON.stringify(data));
var oversized = sizebytes > 95000; // 100kb - the others header information var oversized = sizebytes > zerobin.max_size; // 100kb - the others header information
var readableFsize = Math.round(sizebytes / 1024); var readableFsize = Math.round(sizebytes / 1024);
var readableMaxsize = Math.round(zerobin.max_size / 1024); var readableMaxsize = Math.round(zerobin.max_size / 1024);
@ -461,7 +461,7 @@ $('.btn-primary').live("click", function(e){
$form.prop('disabled', false); $form.prop('disabled', false);
zerobin.message('error', zerobin.message('error',
('The encrypted file was <strong class="file-size">' + readableFsize + ('The encrypted file was <strong class="file-size">' + readableFsize +
'</strong>KB. You have reached the maximum size limit of 93 KB.'), '</strong>KB. You have reached the maximum size limit of '+readableMaxsize+'KB.'),
'Warning!', true); 'Warning!', true);
return; return;
} }