jeena/woodwind
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

remove <script> tags altogether before running bleach

Browse source
This commit is contained in:
Kyle Mahan 2015-02-15 19:02:48 -08:00
parent 523a086928
commit aa87cdddbb
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
woodwind/models.py
View file

@ -2,6 +2,7 @@ import bleach
import json import json
import binascii import binascii
from .extensions import db from .extensions import db
import re
bleach.ALLOWED_TAGS += ['a', 'img', 'p', 'br', 'marquee', 'blink', bleach.ALLOWED_TAGS += ['a', 'img', 'p', 'br', 'marquee', 'blink',
@ -122,7 +123,9 @@ class Entry(db.Model):
def content_cleaned(self): def content_cleaned(self):
if self.content: if self.content:
return bleach.clean(self.content, strip=True) text = self.content
text = re.sub('<script>.*?</script>', '', text, flags=re.DOTALL)
return bleach.clean(text, strip=True)
def __repr__(self): def __repr__(self):
return '<Entry:{},{}>'.format(self.title, (self.content or '')[:140]) return '<Entry:{},{}>'.format(self.title, (self.content or '')[:140])

10
woodwind/views.py
View file

@ -131,13 +131,11 @@ def logout():
return flask.redirect(flask.url_for('.index')) return flask.redirect(flask.url_for('.index'))
@views.route('/login', methods=['GET', 'POST']) @views.route('/login', methods=['POST'])
def login(): def login():
if flask.request.method == 'POST': return micropub.authenticate(
return micropub.authenticate( flask.request.form.get('me'),
flask.request.form.get('me'), next_url=flask.request.form.get('next'))
next_url=flask.request.form.get('next'))
return flask.render_template('login.jinja2')
@views.route('/login-callback') @views.route('/login-callback')