Skip to content

Commit

Permalink
👽 Replace deprecated defusedxml.lxml module usage
Browse files Browse the repository at this point in the history
  • Loading branch information
sergei-maertens committed Feb 12, 2024
1 parent 24758de commit d61c56a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
17 changes: 17 additions & 0 deletions digid_eherkenning/_xml.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
"""
XML parsing with DTD/Entities blocking.
Inspired by https://github.com/mvantellingen/python-zeep/pull/1179/ as their solution
for the deprecated defusedxml.lxml module and the defaults applied in defusedxml.lxml.
"""
from lxml.etree import XMLParser, parse as _parse


def parse(source):
"""
Parse an LXML etree from source without resolving entities.
Resolving entities is a security risk, which is why we disable it.
"""
parser = XMLParser(resolve_entities=False)
return _parse(source, parser)
3 changes: 1 addition & 2 deletions digid_eherkenning/saml2/eherkenning.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
from django.urls import reverse
from django.utils import timezone

from defusedxml.lxml import tostring
from furl.furl import furl
from lxml.builder import ElementMaker
from lxml.etree import Element
from lxml.etree import Element, tostring
from OpenSSL import crypto

from ..choices import AssuranceLevels
Expand Down
3 changes: 2 additions & 1 deletion digid_eherkenning/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

from django.conf import settings

from defusedxml.lxml import parse
from lxml import etree

from ._xml import parse


def get_client_ip(request):
x_forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR")
Expand Down

0 comments on commit d61c56a

Please sign in to comment.