Skip to content

Commit f534a16

Browse files
author
Hans Hörberg
committed
Added **kwargs to make it possible for correctly_signed* method to have different parameters.
1 parent 637f89b commit f534a16

File tree

1 file changed

+32
-17
lines changed

1 file changed

+32
-17
lines changed

‎src/saml2/sigver.py

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ def __init__(self, security_context, cert_file=None, cert_type="pem",
10761076
self._verify_cert = verify_cert is True
10771077
self._security_context = security_context
10781078
self._osw = OpenSSLWrapper()
1079-
if key_file is not None:
1079+
if key_file is not None and os.path.isfile(key_file):
10801080
self._key_str = self._osw.read_str_from_file(key_file, key_type)
10811081
else:
10821082
self._key_str = ""
@@ -1382,99 +1382,114 @@ def correctly_signed_message(self, decoded_xml, msgtype, must=False,
13821382
only_valid_cert=only_valid_cert)
13831383

13841384
def correctly_signed_authn_request(self, decoded_xml, must=False,
1385-
origdoc=None, only_valid_cert=False):
1385+
origdoc=None, only_valid_cert=False,
1386+
**kwargs):
13861387
return self.correctly_signed_message(decoded_xml, "authn_request",
13871388
must, origdoc,
13881389
only_valid_cert=only_valid_cert)
13891390

13901391
def correctly_signed_authn_query(self, decoded_xml, must=False,
1391-
origdoc=None, only_valid_cert=False):
1392+
origdoc=None, only_valid_cert=False,
1393+
**kwargs):
13921394
return self.correctly_signed_message(decoded_xml, "authn_query",
13931395
must, origdoc, only_valid_cert)
13941396

13951397
def correctly_signed_logout_request(self, decoded_xml, must=False,
1396-
origdoc=None, only_valid_cert=False):
1398+
origdoc=None, only_valid_cert=False,
1399+
**kwargs):
13971400
return self.correctly_signed_message(decoded_xml, "logout_request",
13981401
must, origdoc, only_valid_cert)
13991402

14001403
def correctly_signed_logout_response(self, decoded_xml, must=False,
1401-
origdoc=None, only_valid_cert=False):
1404+
origdoc=None, only_valid_cert=False,
1405+
**kwargs):
14021406
return self.correctly_signed_message(decoded_xml, "logout_response",
14031407
must, origdoc, only_valid_cert)
14041408

14051409
def correctly_signed_attribute_query(self, decoded_xml, must=False,
1406-
origdoc=None, only_valid_cert=False):
1410+
origdoc=None, only_valid_cert=False,
1411+
**kwargs):
14071412
return self.correctly_signed_message(decoded_xml, "attribute_query",
14081413
must, origdoc, only_valid_cert)
14091414

14101415
def correctly_signed_authz_decision_query(self, decoded_xml, must=False,
14111416
origdoc=None,
1412-
only_valid_cert=False):
1417+
only_valid_cert=False,
1418+
**kwargs):
14131419
return self.correctly_signed_message(decoded_xml,
14141420
"authz_decision_query", must,
14151421
origdoc, only_valid_cert)
14161422

14171423
def correctly_signed_authz_decision_response(self, decoded_xml, must=False,
14181424
origdoc=None,
1419-
only_valid_cert=False):
1425+
only_valid_cert=False,
1426+
**kwargs):
14201427
return self.correctly_signed_message(decoded_xml,
14211428
"authz_decision_response", must,
14221429
origdoc, only_valid_cert)
14231430

14241431
def correctly_signed_name_id_mapping_request(self, decoded_xml, must=False,
14251432
origdoc=None,
1426-
only_valid_cert=False):
1433+
only_valid_cert=False,
1434+
**kwargs):
14271435
return self.correctly_signed_message(decoded_xml,
14281436
"name_id_mapping_request",
14291437
must, origdoc, only_valid_cert)
14301438

14311439
def correctly_signed_name_id_mapping_response(self, decoded_xml, must=False,
14321440
origdoc=None,
1433-
only_valid_cert=False):
1441+
only_valid_cert=False,
1442+
**kwargs):
14341443
return self.correctly_signed_message(decoded_xml,
14351444
"name_id_mapping_response",
14361445
must, origdoc, only_valid_cert)
14371446

14381447
def correctly_signed_artifact_request(self, decoded_xml, must=False,
1439-
origdoc=None, only_valid_cert=False):
1448+
origdoc=None, only_valid_cert=False,
1449+
**kwargs):
14401450
return self.correctly_signed_message(decoded_xml,
14411451
"artifact_request",
14421452
must, origdoc, only_valid_cert)
14431453

14441454
def correctly_signed_artifact_response(self, decoded_xml, must=False,
1445-
origdoc=None, only_valid_cert=False):
1455+
origdoc=None, only_valid_cert=False,
1456+
**kwargs):
14461457
return self.correctly_signed_message(decoded_xml,
14471458
"artifact_response",
14481459
must, origdoc, only_valid_cert)
14491460

14501461
def correctly_signed_manage_name_id_request(self, decoded_xml, must=False,
14511462
origdoc=None,
1452-
only_valid_cert=False):
1463+
only_valid_cert=False,
1464+
**kwargs):
14531465
return self.correctly_signed_message(decoded_xml,
14541466
"manage_name_id_request",
14551467
must, origdoc, only_valid_cert)
14561468

14571469
def correctly_signed_manage_name_id_response(self, decoded_xml, must=False,
14581470
origdoc=None,
1459-
only_valid_cert=False):
1471+
only_valid_cert=False,
1472+
**kwargs):
14601473
return self.correctly_signed_message(decoded_xml,
14611474
"manage_name_id_response", must,
14621475
origdoc, only_valid_cert)
14631476

14641477
def correctly_signed_assertion_id_request(self, decoded_xml, must=False,
14651478
origdoc=None,
1466-
only_valid_cert=False):
1479+
only_valid_cert=False,
1480+
**kwargs):
14671481
return self.correctly_signed_message(decoded_xml,
14681482
"assertion_id_request", must,
14691483
origdoc, only_valid_cert)
14701484

14711485
def correctly_signed_assertion_id_response(self, decoded_xml, must=False,
14721486
origdoc=None,
1473-
only_valid_cert=False):
1487+
only_valid_cert=False, **kwargs):
14741488
return self.correctly_signed_message(decoded_xml, "assertion", must,
14751489
origdoc, only_valid_cert)
14761490

1477-
def correctly_signed_response(self, decoded_xml, must=False, origdoc=None, require_response_signature=False):
1491+
def correctly_signed_response(self, decoded_xml, must=False, origdoc=None,only_valid_cert=False,
1492+
require_response_signature=False, **kwargs):
14781493
""" Check if a instance is correctly signed, if we have metadata for
14791494
the IdP that sent the info use that, if not use the key that are in
14801495
the message if any.

0 commit comments

Comments
 (0)