HTTP: Content-Type other than application/json is a 415 client error.
Also Fixed up formatting following code review.
This commit is contained in:
parent
cd829c7042
commit
94ba9b6642
@ -14,6 +14,7 @@ from mopidy import core, models
|
|||||||
from mopidy.compat import urllib
|
from mopidy.compat import urllib
|
||||||
from mopidy.internal import encoding, jsonrpc
|
from mopidy.internal import encoding, jsonrpc
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@ -167,9 +168,9 @@ class JsonRpcHandler(tornado.web.RequestHandler):
|
|||||||
self.finish()
|
self.finish()
|
||||||
|
|
||||||
def post(self):
|
def post(self):
|
||||||
content_type = self.request.headers.get("Content-Type", '')
|
content_type = self.request.headers.get('Content-Type', '')
|
||||||
if content_type != 'application/json':
|
if content_type != 'application/json':
|
||||||
self.set_status(406, 'Content-Type must be application/json')
|
self.set_status(415, 'Content-Type must be application/json')
|
||||||
return
|
return
|
||||||
|
|
||||||
data = self.request.body
|
data = self.request.body
|
||||||
@ -198,13 +199,13 @@ class JsonRpcHandler(tornado.web.RequestHandler):
|
|||||||
|
|
||||||
def options(self):
|
def options(self):
|
||||||
origin = self.request.headers.get('Origin', None)
|
origin = self.request.headers.get('Origin', None)
|
||||||
if not check_origin(origin, self.request.headers,
|
if not check_origin(
|
||||||
self.origin_whitelist):
|
origin, self.request.headers, self.origin_whitelist):
|
||||||
self.set_status(403, 'Access denied for origin %s' % origin)
|
self.set_status(403, 'Access denied for origin %s' % origin)
|
||||||
return
|
return
|
||||||
|
|
||||||
self.set_header("Access-Control-Allow-Origin", "%s" % origin)
|
self.set_header('Access-Control-Allow-Origin', '%s' % origin)
|
||||||
self.set_header("Access-Control-Allow-Headers", "Content-Type")
|
self.set_header('Access-Control-Allow-Headers', 'Content-Type')
|
||||||
self.set_status(204)
|
self.set_status(204)
|
||||||
self.finish()
|
self.finish()
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user