Skip to content

Commit 595bdc3

Browse files
committed
Use Jinja2's autoescpae instead of bleach.clean()
1 parent c28f086 commit 595bdc3

File tree

4 files changed

+16
-31
lines changed

4 files changed

+16
-31
lines changed

frameworks/Python/klein/app.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
# -*- coding: utf-8 -*-
22

3-
import os
4-
import sys
5-
import json
6-
7-
import bleach
8-
9-
from random import randint
103
from functools import partial
4+
import json
115
from operator import attrgetter
12-
13-
from klein import Klein, run, route
6+
import os
7+
from random import randint
8+
import sys
149

1510
from jinja2 import Environment, PackageLoader
16-
17-
from sqlalchemy.ext.declarative import declarative_base
11+
from klein import Klein, run, route
1812
from sqlalchemy import create_engine, Column
19-
from sqlalchemy.types import String, Integer, Unicode
13+
from sqlalchemy.ext.declarative import declarative_base
2014
from sqlalchemy.orm import sessionmaker
15+
from sqlalchemy.types import String, Integer, Unicode
16+
2117

2218
if sys.version_info[0] == 3:
2319
xrange = range
@@ -31,7 +27,7 @@
3127
Session = sessionmaker(bind=db_engine)
3228
db_session = Session()
3329

34-
env = Environment(loader=PackageLoader("app", "templates"))
30+
env = Environment(loader=PackageLoader("app", "templates"), autoescape=True, auto_reload=False)
3531

3632
app = Klein()
3733

@@ -114,8 +110,6 @@ def fortune(request):
114110
fortunes = db_session.query(Fortune).all()
115111
fortunes.append(Fortune(id=0, message="Additional fortune added at request time."))
116112
fortunes.sort(key=attrgetter("message"))
117-
for f in fortunes:
118-
f.message = bleach.clean(f.message)
119113
template = env.get_template("fortunes.html")
120114
return template.render(fortunes=fortunes)
121115

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
klein==15.0.0
22

3-
bleach==1.4.1
43
mysqlclient==1.3.6
54
SQLAlchemy==1.0.4
65
jinja2==2.7.3

frameworks/Python/turbogears/app.py

100755100644
Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1-
import os
2-
import sys
3-
import json
41
from functools import partial
52
from operator import attrgetter
3+
import os
64
from random import randint
7-
8-
import bleach
9-
10-
from tg import expose, TGController, AppConfig
5+
import sys
6+
import json
117

128
from jinja2 import Environment, PackageLoader
13-
14-
from sqlalchemy.orm import scoped_session, sessionmaker
159
from sqlalchemy import create_engine
10+
from sqlalchemy.orm import scoped_session, sessionmaker
11+
from tg import expose, TGController, AppConfig
1612

1713
from models.Fortune import Fortune
1814
from models.World import World
1915

16+
2017
DBDRIVER = 'mysql'
2118
DBHOSTNAME = os.environ.get('DBHOST', 'localhost')
2219
DATABASE_URI = '%s://benchmarkdbuser:benchmarkdbpass@%s:3306/hello_world?charset=utf8' % (DBDRIVER, DBHOSTNAME)
@@ -25,7 +22,7 @@
2522
Session = sessionmaker(bind=db_engine)
2623
db_session = Session()
2724

28-
env = Environment(loader=PackageLoader("app", "templates"))
25+
env = Environment(loader=PackageLoader("app", "templates"), autoescape=True, auto_reload=False)
2926

3027
def getQueryNum(queryString):
3128
try:
@@ -76,14 +73,11 @@ def queries(self, queries=1):
7673
worlds = [get(rp()).serialize() for _ in xrange(num_queries)]
7774
return json.dumps(worlds)
7875

79-
8076
@expose()
8177
def fortune(self):
8278
fortunes = db_session.query(Fortune).all()
8379
fortunes.append(Fortune(id=0, message="Additional fortune added at request time."))
8480
fortunes.sort(key=attrgetter("message"))
85-
for f in fortunes:
86-
f.message = bleach.clean(f.message)
8781
template = env.get_template("fortunes.html")
8882
return template.render(fortunes=fortunes)
8983

frameworks/Python/turbogears/requirements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
tg.devtools==2.3.5
22

3-
bleach==1.4.1
4-
53
SQLAlchemy==1.0.4
64
zope.sqlalchemy==0.7.6
75
mysqlclient==1.3.6

0 commit comments

Comments
 (0)