openstack/deb-python-pysaml2
Code Issues Proposed changes

Prevent sigve from leaking file descriptors.

Browse Source 
After using open() function it is important to always close the file
handler. There are 3 spots in sigver.py where files were opened and
never closed. Following commit introduces new function 'read_file' that
utilized 'with' keyword, hence ensuring the file will always be closed.
This commit is contained in:
Marek Denis
2014-09-12 13:21:28 +02:00
committed by Marek Denis
parent 4e90463dd0
commit fba25be477
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/saml2/sigver.py
View File

@@ -106,6 +106,11 @@ class CertificateError(SigverError):
pass pass
def read_file(*args, **kwargs):
with open(*args, **kwargs) as handler:
return handler.read()
def rm_xmltag(statement): def rm_xmltag(statement):
try: try:
_t = statement.startswith(XMLTAG) _t = statement.startswith(XMLTAG)
@@ -540,7 +545,7 @@ def pem_format(key):
def import_rsa_key_from_file(filename): def import_rsa_key_from_file(filename):
return RSA.importKey(open(filename, 'r').read()) return RSA.importKey(read_file(filename, 'r'))
def parse_xmlsec_output(output): def parse_xmlsec_output(output):
@@ -648,11 +653,13 @@ def read_cert_from_file(cert_file, cert_type):
:param cert_type: The certificate type :param cert_type: The certificate type
:return: A base64 encoded certificate as a string or the empty string :return: A base64 encoded certificate as a string or the empty string
""" """
if not cert_file: if not cert_file:
return "" return ""
if cert_type == "pem": if cert_type == "pem":
line = open(cert_file).read().split("\n") line = read_file(cert_file).split("\n")
if line[0] == "-----BEGIN CERTIFICATE-----": if line[0] == "-----BEGIN CERTIFICATE-----":
line = line[1:] line = line[1:]
elif line[0] == "-----BEGIN PUBLIC KEY-----": elif line[0] == "-----BEGIN PUBLIC KEY-----":
@@ -672,7 +679,7 @@ def read_cert_from_file(cert_file, cert_type):
return "".join(line) return "".join(line)
if cert_type in ["der", "cer", "crt"]: if cert_type in ["der", "cer", "crt"]:
data = open(cert_file).read() data = read_file(cert_file)
return base64.b64encode(str(data)) return base64.b64encode(str(data))