@@ -399,6 +399,8 @@ def process(self, context, data):
399399 Default interface for microservices. Process the input data for
400400 the input context.
401401 """
402+ session_id = lu .get_session_id (context .state )
403+
402404 issuer = data .auth_info .issuer
403405 requester = data .requester
404406 config = self .config .get (requester ) or self .config ["default" ]
@@ -408,13 +410,13 @@ def process(self, context, data):
408410 "issuer" : issuer ,
409411 "config" : self ._filter_config (config ),
410412 }
411- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
413+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
412414 logger .debug (logline )
413415
414416 # Ignore this SP entirely if so configured.
415417 if config ["ignore" ]:
416418 msg = "Ignoring SP {}" .format (requester )
417- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
419+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
418420 logger .info (logline )
419421 return super ().process (context , data )
420422
@@ -439,7 +441,7 @@ def process(self, context, data):
439441 if filter_value
440442 ]
441443 msg = {"message" : "Search filters" , "filter_values" : filter_values }
442- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
444+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
443445 logger .debug (logline )
444446
445447 # Initialize an empty LDAP record. The first LDAP record found using
@@ -453,7 +455,7 @@ def process(self, context, data):
453455 "message" : "LDAP server host" ,
454456 "server host" : connection .server .host ,
455457 }
456- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
458+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
457459 logger .debug (logline )
458460
459461 for filter_val in filter_values :
@@ -463,7 +465,7 @@ def process(self, context, data):
463465 "message" : "LDAP query with constructed search filter" ,
464466 "search filter" : search_filter ,
465467 }
466- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
468+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
467469 logger .debug (logline )
468470
469471 attributes = (
@@ -485,14 +487,14 @@ def process(self, context, data):
485487 exp_msg = "Caught unhandled exception: {}" .format (err )
486488
487489 if exp_msg :
488- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = exp_msg )
490+ logline = lu .LOG_FMT .format (id = session_id , message = exp_msg )
489491 logger .error (logline )
490492 return super ().process (context , data )
491493
492494 if not results :
493495 msg = "Querying LDAP server: No results for {}."
494496 msg = msg .format (filter_val )
495- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
497+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
496498 logger .debug (logline )
497499 continue
498500
@@ -502,10 +504,10 @@ def process(self, context, data):
502504 responses = connection .get_response (results )[0 ]
503505
504506 msg = "Done querying LDAP server"
505- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
507+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
506508 logger .debug (logline )
507509 msg = "LDAP server returned {} records" .format (len (responses ))
508- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
510+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
509511 logger .info (logline )
510512
511513 # For now consider only the first record found (if any).
@@ -514,7 +516,7 @@ def process(self, context, data):
514516 msg = "LDAP server returned {} records using search filter"
515517 msg = msg + " value {}"
516518 msg = msg .format (len (responses ), filter_val )
517- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
519+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
518520 logger .warning (logline )
519521 record = responses [0 ]
520522 break
@@ -524,7 +526,7 @@ def process(self, context, data):
524526 if config ["clear_input_attributes" ]:
525527 msg = "Clearing values for these input attributes: {}"
526528 msg = msg .format (data .attributes )
527- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
529+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
528530 logger .debug (logline )
529531 data .attributes = {}
530532
@@ -549,7 +551,7 @@ def process(self, context, data):
549551 "DN" : record ["dn" ],
550552 "attributes" : record ["attributes" ],
551553 }
552- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
554+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
553555 logger .debug (logline )
554556
555557 # Populate attributes as configured.
@@ -573,11 +575,11 @@ def process(self, context, data):
573575 # may use it if required.
574576 context .decorate (KEY_FOUND_LDAP_RECORD , record )
575577 msg = "Added record {} to context" .format (record )
576- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
578+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
577579 logger .debug (logline )
578580 else :
579581 msg = "No record found in LDAP so no attributes will be added"
580- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
582+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
581583 logger .warning (logline )
582584 on_ldap_search_result_empty = config ["on_ldap_search_result_empty" ]
583585 if on_ldap_search_result_empty :
@@ -592,11 +594,11 @@ def process(self, context, data):
592594 encoded_idp_entity_id ,
593595 )
594596 msg = "Redirecting to {}" .format (url )
595- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
597+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
596598 logger .info (logline )
597599 return Redirect (url )
598600
599601 msg = "Returning data.attributes {}" .format (data .attributes )
600- logline = lu .LOG_FMT .format (id = lu . get_session_id ( context . state ) , message = msg )
602+ logline = lu .LOG_FMT .format (id = session_id , message = msg )
601603 logger .debug (logline )
602604 return super ().process (context , data )
0 commit comments