sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make XML parsing more tolerant re invalid chars

Browse source 
Fix #207
This commit is contained in:
Markus Unterwaditzer 2015-05-17 18:07:03 +02:00
parent 55be28c12b
commit 209648a936
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/storage/dav/test_main.py
View file

@ -13,7 +13,7 @@ from tests import EVENT_TEMPLATE, TASK_TEMPLATE, VCARD_TEMPLATE
import vdirsyncer.exceptions as exceptions import vdirsyncer.exceptions as exceptions
from vdirsyncer.storage.base import Item from vdirsyncer.storage.base import Item
from vdirsyncer.storage.dav import CaldavStorage, CarddavStorage from vdirsyncer.storage.dav import CaldavStorage, CarddavStorage, _parse_xml
from .. import StorageTests, format_item from .. import StorageTests, format_item
@ -182,3 +182,10 @@ class TestCarddavStorage(DavStorageTests):
@pytest.fixture @pytest.fixture
def item_template(self): def item_template(self):
return VCARD_TEMPLATE return VCARD_TEMPLATE
def test_broken_xml(capsys):
rv = _parse_xml(b'<h1>\x10haha</h1>')
assert rv.text == 'haha'
warnings = capsys.readouterr()[1]
assert 'partially invalid xml' in warnings.lower()

14
vdirsyncer/storage/dav.py
View file

@ -42,12 +42,18 @@ class InvalidXMLResponse(exceptions.InvalidResponse):
def _parse_xml(content): def _parse_xml(content):
try: p = etree.XMLParser(recover=True)
return etree.XML(content) rv = etree.XML(content, parser=p)
except etree.Error as e: if rv is None:
raise InvalidXMLResponse('Invalid XML encountered: {}\n' raise InvalidXMLResponse('Invalid XML encountered: {}\n'
'Double-check the URLs in your config.' 'Double-check the URLs in your config.'
.format(e)) .format(p.error_log))
if p.error_log:
dav_logger.warning('Partially invalid XML response, some of your '
'items may be corrupted. Check the debug log and '
'consider switching servers. ({})'
.format(p.error_log))
return rv
def _merge_xml(items): def _merge_xml(items):