Merge pull request #4027 from ckan/4022-jsonp-content-type

[#4022] use javascript content-type for jsonp responses
ckan · Feb 26, 2018 · 832e013 · 832e013
2 parents a53b7f3 + 1c64d3c
commit 832e013
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/ckan/controllers/api.py b/ckan/controllers/api.py
@@ -38,6 +38,7 @@
     'text': 'text/plain;charset=utf-8',
     'html': 'text/html;charset=utf-8',
     'json': 'application/json;charset=utf-8',
+    'javascript': 'application/javascript;charset=utf-8',
 }
 
 
@@ -99,6 +100,7 @@ def _finish(self, status_int, response_data=None,
                 # escape callback to remove '<', '&', '>' chars
                 callback = cgi.escape(request.params['callback'])
                 response_msg = self._wrap_jsonp(callback, response_msg)
+                response.headers['Content-Type'] = CONTENT_TYPES['javascript']
         return response_msg
 
     def _finish_ok(self, response_data=None,

diff --git a/ckan/tests/controllers/test_api.py b/ckan/tests/controllers/test_api.py
@@ -278,6 +278,19 @@ def test_jsonp_works_on_get_requests(self):
         eq_(sorted(res_dict['result']),
             sorted([dataset1['name'], dataset2['name']]))
 
+    def test_jsonp_returns_javascript_content_type(self):
+        url = url_for(
+            controller='api',
+            action='action',
+            logic_function='status_show',
+            ver='/3')
+        app = self._get_test_app()
+        res = app.get(
+            url=url,
+            params={'callback': 'my_callback'},
+        )
+        assert_in('application/javascript', res.headers.get('Content-Type'))
+
     def test_jsonp_does_not_work_on_post_requests(self):
 
         dataset1 = factories.Dataset()

diff --git a/ckan/views/api.py b/ckan/views/api.py
@@ -23,6 +23,7 @@
     u'text': u'text/plain;charset=utf-8',
     u'html': u'text/html;charset=utf-8',
     u'json': u'application/json;charset=utf-8',
+    u'javascript': u'application/javascript;charset=utf-8',
 }
 
 API_REST_DEFAULT_VERSION = 1
@@ -69,6 +70,7 @@ def _finish(status_int, response_data=None,
             # escape callback to remove '<', '&', '>' chars
             callback = cgi.escape(request.args[u'callback'])
             response_msg = _wrap_jsonp(callback, response_msg)
+            headers[u'Content-Type'] = CONTENT_TYPES[u'javascript']
     return make_response((response_msg, status_int, headers))