@@ -219,8 +219,8 @@ def for_me(conditions, myself):
219
219
220
220
221
221
def authn_response (conf , return_addrs , outstanding_queries = None , timeslack = 0 ,
222
- asynchop = True , allow_unsolicited = False ,
223
- want_assertions_signed = False , conv_info = None ):
222
+ asynchop = True , allow_unsolicited = False ,
223
+ want_assertions_signed = False , conv_info = None ):
224
224
sec = security_context (conf )
225
225
if not timeslack :
226
226
try :
@@ -237,7 +237,7 @@ def authn_response(conf, return_addrs, outstanding_queries=None, timeslack=0,
237
237
238
238
# comes in over SOAP so synchronous
239
239
def attribute_response (conf , return_addrs , timeslack = 0 , asynchop = False ,
240
- test = False , conv_info = None ):
240
+ test = False , conv_info = None ):
241
241
sec = security_context (conf )
242
242
if not timeslack :
243
243
try :
@@ -254,7 +254,7 @@ class StatusResponse(object):
254
254
msgtype = "status_response"
255
255
256
256
def __init__ (self , sec_context , return_addrs = None , timeslack = 0 ,
257
- request_id = 0 , asynchop = True , conv_info = None ):
257
+ request_id = 0 , asynchop = True , conv_info = None ):
258
258
self .sec = sec_context
259
259
self .return_addrs = return_addrs
260
260
@@ -431,7 +431,7 @@ class LogoutResponse(StatusResponse):
431
431
msgtype = "logout_response"
432
432
433
433
def __init__ (self , sec_context , return_addrs = None , timeslack = 0 ,
434
- asynchop = True , conv_info = None ):
434
+ asynchop = True , conv_info = None ):
435
435
StatusResponse .__init__ (self , sec_context , return_addrs , timeslack ,
436
436
asynchop = asynchop , conv_info = conv_info )
437
437
self .signature_check = self .sec .correctly_signed_logout_response
@@ -441,7 +441,7 @@ class NameIDMappingResponse(StatusResponse):
441
441
msgtype = "name_id_mapping_response"
442
442
443
443
def __init__ (self , sec_context , return_addrs = None , timeslack = 0 ,
444
- request_id = 0 , asynchop = True , conv_info = None ):
444
+ request_id = 0 , asynchop = True , conv_info = None ):
445
445
StatusResponse .__init__ (self , sec_context , return_addrs , timeslack ,
446
446
request_id , asynchop , conv_info = conv_info )
447
447
self .signature_check = self .sec \
@@ -452,7 +452,7 @@ class ManageNameIDResponse(StatusResponse):
452
452
msgtype = "manage_name_id_response"
453
453
454
454
def __init__ (self , sec_context , return_addrs = None , timeslack = 0 ,
455
- request_id = 0 , asynchop = True , conv_info = None ):
455
+ request_id = 0 , asynchop = True , conv_info = None ):
456
456
StatusResponse .__init__ (self , sec_context , return_addrs , timeslack ,
457
457
request_id , asynchop , conv_info = conv_info )
458
458
self .signature_check = self .sec .correctly_signed_manage_name_id_response
@@ -467,11 +467,11 @@ class AuthnResponse(StatusResponse):
467
467
msgtype = "authn_response"
468
468
469
469
def __init__ (self , sec_context , attribute_converters , entity_id ,
470
- return_addrs = None , outstanding_queries = None ,
471
- timeslack = 0 , asynchop = True , allow_unsolicited = False ,
472
- test = False , allow_unknown_attributes = False ,
473
- want_assertions_signed = False , want_response_signed = False ,
474
- conv_info = None , ** kwargs ):
470
+ return_addrs = None , outstanding_queries = None ,
471
+ timeslack = 0 , asynchop = True , allow_unsolicited = False ,
472
+ test = False , allow_unknown_attributes = False ,
473
+ want_assertions_signed = False , want_response_signed = False ,
474
+ conv_info = None , ** kwargs ):
475
475
476
476
StatusResponse .__init__ (self , sec_context , return_addrs , timeslack ,
477
477
asynchop = asynchop , conv_info = conv_info )
@@ -525,6 +525,7 @@ def loads(self, xmldata, decode=True, origxml=None):
525
525
except AttributeError :
526
526
pass
527
527
elif self .allow_unsolicited :
528
+ # Should check that I haven't seen this before
528
529
pass
529
530
else :
530
531
logger .exception (
@@ -821,7 +822,7 @@ def _assertion(self, assertion, verified=False):
821
822
raise
822
823
823
824
def decrypt_assertions (self , encrypted_assertions , decr_txt , issuer = None ,
824
- verified = False ):
825
+ verified = False ):
825
826
""" Moves the decrypted assertion from the encrypted assertion to a
826
827
list.
827
828
@@ -1143,8 +1144,8 @@ class AuthnQueryResponse(AuthnResponse):
1143
1144
msgtype = "authn_query_response"
1144
1145
1145
1146
def __init__ (self , sec_context , attribute_converters , entity_id ,
1146
- return_addrs = None , timeslack = 0 , asynchop = False , test = False ,
1147
- conv_info = None ):
1147
+ return_addrs = None , timeslack = 0 , asynchop = False , test = False ,
1148
+ conv_info = None ):
1148
1149
AuthnResponse .__init__ (self , sec_context , attribute_converters ,
1149
1150
entity_id , return_addrs , timeslack = timeslack ,
1150
1151
asynchop = asynchop , test = test ,
@@ -1162,8 +1163,8 @@ class AttributeResponse(AuthnResponse):
1162
1163
msgtype = "attribute_response"
1163
1164
1164
1165
def __init__ (self , sec_context , attribute_converters , entity_id ,
1165
- return_addrs = None , timeslack = 0 , asynchop = False , test = False ,
1166
- conv_info = None ):
1166
+ return_addrs = None , timeslack = 0 , asynchop = False , test = False ,
1167
+ conv_info = None ):
1167
1168
AuthnResponse .__init__ (self , sec_context , attribute_converters ,
1168
1169
entity_id , return_addrs , timeslack = timeslack ,
1169
1170
asynchop = asynchop , test = test ,
@@ -1180,8 +1181,8 @@ class AuthzResponse(AuthnResponse):
1180
1181
msgtype = "authz_decision_response"
1181
1182
1182
1183
def __init__ (self , sec_context , attribute_converters , entity_id ,
1183
- return_addrs = None , timeslack = 0 , asynchop = False ,
1184
- conv_info = None ):
1184
+ return_addrs = None , timeslack = 0 , asynchop = False ,
1185
+ conv_info = None ):
1185
1186
AuthnResponse .__init__ (self , sec_context , attribute_converters ,
1186
1187
entity_id , return_addrs , timeslack = timeslack ,
1187
1188
asynchop = asynchop , conv_info = conv_info )
@@ -1195,8 +1196,8 @@ class ArtifactResponse(AuthnResponse):
1195
1196
msgtype = "artifact_response"
1196
1197
1197
1198
def __init__ (self , sec_context , attribute_converters , entity_id ,
1198
- return_addrs = None , timeslack = 0 , asynchop = False , test = False ,
1199
- conv_info = None ):
1199
+ return_addrs = None , timeslack = 0 , asynchop = False , test = False ,
1200
+ conv_info = None ):
1200
1201
AuthnResponse .__init__ (self , sec_context , attribute_converters ,
1201
1202
entity_id , return_addrs , timeslack = timeslack ,
1202
1203
asynchop = asynchop , test = test ,
@@ -1208,9 +1209,9 @@ def __init__(self, sec_context, attribute_converters, entity_id,
1208
1209
1209
1210
1210
1211
def response_factory (xmlstr , conf , return_addrs = None , outstanding_queries = None ,
1211
- timeslack = 0 , decode = True , request_id = 0 , origxml = None ,
1212
- asynchop = True , allow_unsolicited = False ,
1213
- want_assertions_signed = False , conv_info = None ):
1212
+ timeslack = 0 , decode = True , request_id = 0 , origxml = None ,
1213
+ asynchop = True , allow_unsolicited = False ,
1214
+ want_assertions_signed = False , conv_info = None ):
1214
1215
sec_context = security_context (conf )
1215
1216
if not timeslack :
1216
1217
try :
@@ -1254,7 +1255,7 @@ class AssertionIDResponse(object):
1254
1255
msgtype = "assertion_id_response"
1255
1256
1256
1257
def __init__ (self , sec_context , attribute_converters , timeslack = 0 ,
1257
- ** kwargs ):
1258
+ ** kwargs ):
1258
1259
1259
1260
self .sec = sec_context
1260
1261
self .timeslack = timeslack
0 commit comments