Differential D229

Strip off jsonp jquery arguments so they don't interfere with the results query.
ClosedPublic
Actions

Authored by ralph on Sep 8 2014, 8:05 PM.

Details

Reviewers
tflink
jskladan
Commits
rRSDBd6ebe6f294e1: Strip off jsonp jquery arguments so they don't interfere with the results query.
Summary

More problems found with the JSONP stuff (which will be used by bodhi2 some day).

Take these two URLs, for instance:

The first one works as expected The second one gets the jsonp format
correctly wrapped around it, but the 'callback' argument is retained and is
gumming up the normal results processing in api_v1.py.

This patch strips it out of the flask.request.args werkzeug MultiDict.

Test Plan

Try to curl the second URL.

Diff Detail

Repository
rRSDB resultsdb
Branch
more-jsonp-bugfixes
Lint
No Linters Available
Unit
No Unit Test Coverage
ralph retitled this revision from to Strip off jsonp jquery arguments so they don't interfere with the results query..Sep 8 2014, 8:05 PM
ralph updated this object.
ralph edited the test plan for this revision. (Show Details)
ralph added reviewers: tflink, jskladan.
jskladan accepted this revision.Sep 9 2014, 7:50 AM
This revision is now accepted and ready to land.Sep 9 2014, 7:50 AM
tflink accepted this revision.Sep 9 2014, 2:52 PM
ralph closed this revision.Sep 9 2014, 8:23 PM

Revision Contents

PathPackages
Mresultsdb/__init__.py (6 lines)

Diff 647

View Options

resultsdb/__init__.py

Show All 39 Lines
40# make sure app behaves when behind a proxy 40​# make sure app behaves when behind a proxy
41app.wsgi_app = proxy.ReverseProxied(app.wsgi_app) 41​app.wsgi_app = proxy.ReverseProxied(app.wsgi_app)
42 42​
43# Monkey patch Flask's "jsonify" to also handle JSONP 43​# Monkey patch Flask's "jsonify" to also handle JSONP
44original_jsonify = flask.jsonify 44​original_jsonify = flask.jsonify
45 45​
46def jsonify_with_jsonp(*args, **kwargs): 46​def jsonify_with_jsonp(*args, **kwargs):
47 response = original_jsonify(*args, **kwargs) 47​ response = original_jsonify(*args, **kwargs)
48 callback = flask.request.args.get('callback') 48​ callback = flask.request.args.pop('callback')
49 49​
50 if callback: 50​ if callback:
51 callback = callback[0] 51​ callback = callback[0]
52 response.mimetype = 'application/javascript' 52​ response.mimetype = 'application/javascript'
53 response.set_data('%s(%s);' % (callback, response.get_data())) 53​ response.set_data('%s(%s);' % (callback, response.get_data()))
54 54​
55​ # Also, strip off the '_' used as a timestamp by jquery to get
56​ # around any caching.
57​ _ = flask.request.args.pop('_')
58​
55 return response 59​ return response
56 60​
57flask.jsonify = jsonify_with_jsonp 61​flask.jsonify = jsonify_with_jsonp
58 62​
59# Load default config, then override that with a config file 63​# Load default config, then override that with a config file
60if os.getenv('PROD') == 'true': 64​if os.getenv('PROD') == 'true':
61 default_config_obj = 'resultsdb.config.ProductionConfig' 65​ default_config_obj = 'resultsdb.config.ProductionConfig'
62 default_config_file = '/etc/resultsdb/settings.py' 66​ default_config_file = '/etc/resultsdb/settings.py'
▲ Show 20 Lines • Show All 81 Lines • Show Last 20 Lines