Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make OPDS report an HTTP error if the user-level search expression is not valid.

Browse Source
This commit is contained in:
Charles Haley 2017-08-20 12:33:18 +02:00
parent da46a3c438
commit 9dcc4167e9
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/srv/errors.py
View File

@ -58,6 +58,12 @@ class HTTPForbidden(HTTPSimpleResponse):
HTTPSimpleResponse.__init__(self, httplib.FORBIDDEN, http_message, close_connection, log=log) HTTPSimpleResponse.__init__(self, httplib.FORBIDDEN, http_message, close_connection, log=log)
class HTTPInternalServerError(HTTPSimpleResponse):
def __init__(self, http_message='', close_connection=True, log=None):
HTTPSimpleResponse.__init__(self, httplib.INTERNAL_SERVER_ERROR, http_message, close_connection, log=log)
class BookNotFound(HTTPNotFound): class BookNotFound(HTTPNotFound):
def __init__(self, book_id, db): def __init__(self, book_id, db):

6
src/calibre/srv/handler.py
View File

@ -118,8 +118,10 @@ class Context(object):
raise raise
return frozenset() return frozenset()
def get_categories(self, request_data, db, sort='name', first_letter_sort=True, vl=''): def get_categories(self, request_data, db, sort='name', first_letter_sort=True,
restrict_to_ids = self.get_effective_book_ids(db, request_data, vl) vl='', report_parse_errors=False):
restrict_to_ids = self.get_effective_book_ids(db, request_data, vl,
report_parse_errors=report_parse_errors)
key = restrict_to_ids, sort, first_letter_sort key = restrict_to_ids, sort, first_letter_sort
with self.lock: with self.lock:
cache = self.library_broker.category_caches[db.server_library_id] cache = self.library_broker.category_caches[db.server_library_id]

14
src/calibre/srv/opds.py
View File

@ -20,8 +20,9 @@ from calibre.library.comments import comments_to_html
from calibre import guess_type, prepare_string_for_xml as xml from calibre import guess_type, prepare_string_for_xml as xml
from calibre.utils.icu import sort_key from calibre.utils.icu import sort_key
from calibre.utils.date import as_utc, timestampfromdt, is_date_undefined from calibre.utils.date import as_utc, timestampfromdt, is_date_undefined
from calibre.utils.search_query_parser import ParseException
from calibre.srv.errors import HTTPNotFound from calibre.srv.errors import HTTPNotFound, HTTPInternalServerError
from calibre.srv.routes import endpoint from calibre.srv.routes import endpoint
from calibre.srv.utils import get_library_data, http_date, Offsets from calibre.srv.utils import get_library_data, http_date, Offsets
@ -381,8 +382,9 @@ class RequestContext(object):
def last_modified(self): def last_modified(self):
return self.db.last_modified() return self.db.last_modified()
def get_categories(self): def get_categories(self, report_parse_errors=False):
return self.ctx.get_categories(self.rd, self.db) return self.ctx.get_categories(self.rd, self.db,
report_parse_errors=report_parse_errors)
def search(self, query): def search(self, query):
return self.ctx.search(self.rd, self.db, query) return self.ctx.search(self.rd, self.db, query)
@ -470,7 +472,11 @@ def get_navcatalog(request_context, which, page_url, up_url, offset=0):
def opds(ctx, rd): def opds(ctx, rd):
rc = RequestContext(ctx, rd) rc = RequestContext(ctx, rd)
db = rc.db db = rc.db
categories = rc.get_categories() try:
categories = rc.get_categories(report_parse_errors=True)
except ParseException as p:
raise HTTPInternalServerError(p.msg)
category_meta = db.field_metadata category_meta = db.field_metadata
cats = [ cats = [
(_('Newest'), _('Date'), 'Onewest'), (_('Newest'), _('Date'), 'Onewest'),