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

Fix #1991635 [crash invalid IPv6 URL due to a missing ]](https://bugs.launchpad.net/calibre/+bug/1991635)

Browse Source
This commit is contained in:
Kovid Goyal 2022-10-09 11:40:53 +05:30
parent 104a567adc
commit c276617a0b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/calibre/ebooks/oeb/polish/check/links.py
View File

@ -14,7 +14,7 @@ from calibre.ebooks.oeb.polish.parsing import parse_html5
from calibre.ebooks.oeb.polish.replace import remove_links_to from calibre.ebooks.oeb.polish.replace import remove_links_to
from calibre.ebooks.oeb.polish.cover import get_raster_cover_name from calibre.ebooks.oeb.polish.cover import get_raster_cover_name
from calibre.ebooks.oeb.polish.utils import guess_type, actual_case_for_name, corrected_case_for_name, OEB_FONTS from calibre.ebooks.oeb.polish.utils import guess_type, actual_case_for_name, corrected_case_for_name, OEB_FONTS
from calibre.ebooks.oeb.polish.check.base import BaseError, WARN, INFO from calibre.ebooks.oeb.polish.check.base import BaseError, WARN, INFO, ERROR
from polyglot.builtins import iteritems, itervalues from polyglot.builtins import iteritems, itervalues
from polyglot.urllib import urlparse from polyglot.urllib import urlparse
from polyglot.queue import Queue, Empty from polyglot.queue import Queue, Empty
@ -33,6 +33,12 @@ class InvalidCharInLink(BadLink):
' compatibility it is best to not use these in filenames/links to files.') ' compatibility it is best to not use these in filenames/links to files.')
class MalformedURL(BadLink):
HELP = _('This URL could not be parsed.')
level = ERROR
class CaseMismatch(BadLink): class CaseMismatch(BadLink):
def __init__(self, href, corrected_name, name, lnum, col): def __init__(self, href, corrected_name, name, lnum, col):
@ -341,13 +347,18 @@ def check_links(container):
else: else:
a(DanglingLink(_('The linked resource %s does not exist') % fl(href), tname, name, lnum, col)) a(DanglingLink(_('The linked resource %s does not exist') % fl(href), tname, name, lnum, col))
else: else:
purl = urlparse(href) try:
if purl.scheme == 'file': purl = urlparse(href)
a(FileLink(_('The link %s is a file:// URL') % fl(href), name, lnum, col)) except ValueError:
elif purl.path and purl.path.startswith('/') and purl.scheme in {'', 'file'}: a(MalformedURL(_('The URL {} could not be parsed').format(href), name, lnum, col))
a(LocalLink(_('The link %s points to a file outside the book') % fl(href), name, lnum, col)) else:
elif purl.path and purl.scheme in {'', 'file'} and ':' in urlunquote(purl.path): if purl.scheme == 'file':
a(InvalidCharInLink(_('The link %s contains a : character, this will cause errors on Windows computers') % fl(href), name, lnum, col)) a(FileLink(_('The link %s is a file:// URL') % fl(href), name, lnum, col))
elif purl.path and purl.path.startswith('/') and purl.scheme in {'', 'file'}:
a(LocalLink(_('The link %s points to a file outside the book') % fl(href), name, lnum, col))
elif purl.path and purl.scheme in {'', 'file'} and ':' in urlunquote(purl.path):
a(InvalidCharInLink(
_('The link %s contains a : character, this will cause errors on Windows computers') % fl(href), name, lnum, col))
spine_docs = {name for name, linear in container.spine_names} spine_docs = {name for name, linear in container.spine_names}
spine_styles = {tname for name in spine_docs for tname in links_map[name] if container.mime_map.get(tname, None) in OEB_STYLES} spine_styles = {tname for name in spine_docs for tname in links_map[name] if container.mime_map.get(tname, None) in OEB_STYLES}