Whip logging into shape

diff --git a/fints/client.py b/fints/client.py
index 1ae0b3fac98a8f32453a5b4d5840124ea7de699d..4eedd0b05718df7420a251b1f311e9f0b5e9e0b3 100644 (file)
--- a/fints/client.py
+++ b/fints/client.py
@@ -24,7 +24,7 @@ from .security import (
     PinTanDummyEncryptionMechanism, PinTanOneStepAuthenticationMechanism,
     PinTanTwoStepAuthenticationMechanism,
 )
-from .segments import HIBPA3, HIRMS2, HIUPA4
+from .segments import HIBPA3, HIRMG2, HIRMS2, HIUPA4
 from .segments.accounts import HISPA1, HKSPA, HKSPA1
 from .segments.auth import HKTAB, HKTAN, HKTAB4, HKTAB5, HKTAN5
 from .segments.depot import HKWPD5, HKWPD6
@@ -64,6 +64,7 @@ class FinTS3Client:
         self.selected_tan_medium = None
         self.product_name = 'pyfints'
         self.product_version = '0.2'
+        self.response_callbacks = []
         self._standing_dialog = None
 
         if set_data:
@@ -166,27 +167,77 @@ class FinTS3Client:
                 message.find_segments('HIUPD')
             )
 
+        # We'll delay calling the callback for HIRMG/3060 ("please note the warnings")
+        #  to see if any warning other than HIRMS(HKVVD)/3050 ("UPD/BPD not current; current version attached")
+        #  or HIRMS(HKVVD)/3920 ("allowed TAN methods") are present
+        # 3050 and 3920 are handled completely internally and never passed to the callback
+        # 3060 is only passed to the callbacks, if any warning/error other than 3050/3920 is present
+        self.delayed_callback_calls = []
+
+        for seg in message.find_segments(HIRMG2):
+            for response in seg.responses:
+                self._log_response(None, response)
+
+                if response.code == '3060':
+                    self.delayed_callback_calls.append( (None, response) )
+                else:
+                    self._call_callbacks(None, response)
+
+                if response.code.startswith('9'):
+                    raise Error("FinTS error response: {!r}".format(response))
+
+                self._process_response(None, response)
+
         for seg in message.find_segments(HIRMS2):
             for response in seg.responses:
-                if response.code == '3920':
-                    self.allowed_security_functions = list(response.parameters)
-                    if self.selected_security_function is None or not self.selected_security_function in self.allowed_security_functions:
-                        # Select the first available twostep security_function that we support
-                        for security_function, parameter in self.get_tan_mechanisms().items():
-                            if security_function == '999':
-                                # Skip onestep TAN
-                                continue
-                            if parameter.tan_process != '2':
-                                # Only support process variant 2 for now
-                                continue
-                            try:
-                                self.set_tan_mechanism(parameter.security_function)
-                                break
-                            except NotImplementedError:
-                                pass
-                        else:
-                            # Fall back to onestep
-                            self.set_tan_mechanism('999')
+                segment = None # FIXME: Provide segment
+
+                self._log_response(None, response)
+
+                if response.code not in ('3050', '3920'):
+                    if not response.code.startswith('0') and not response.code.startswith('1'):
+                        for cb_data in self.delayed_callback_calls:
+                            self._call_callbacks(*cb_data)
+                        self.delayed_callback_calls.clear()
+
+                    self._call_callbacks(segment, response)
+
+                self._process_response(segment, response)   
+
+    def _process_response(self, segment, response):
+        if response.code == '3920':
+            self.allowed_security_functions = list(response.parameters)
+            if self.selected_security_function is None or not self.selected_security_function in self.allowed_security_functions:
+                # Select the first available twostep security_function that we support
+                for security_function, parameter in self.get_tan_mechanisms().items():
+                    if security_function == '999':
+                        # Skip onestep TAN
+                        continue
+                    if parameter.tan_process != '2':
+                        # Only support process variant 2 for now
+                        continue
+                    try:
+                        self.set_tan_mechanism(parameter.security_function)
+                        break
+                    except NotImplementedError:
+                        pass
+                else:
+                    # Fall back to onestep
+                    self.set_tan_mechanism('999')
+
+    def _log_response(self, segment, response):
+        if response.code[0] in ('0', '1'):
+            log_target = logger.info
+        elif response.code[0] in ('3'):
+            log_target = logger.warning
+        else:
+            log_target = logger.error
+
+        log_target("Dialog response: {} - {}{}".format(
+            response.code,
+            response.text,
+            " ({!r})".format(response.parameters) if response.parameters else "")
+        )
 
     def get_sepa_accounts(self):
         """
@@ -607,6 +658,18 @@ class FinTS3Client:
             for resp in response.response_segments(seg, 'HITAB'):
                 return resp.tan_usage_option, list(resp.tan_media_list)
 
+    def add_response_callback(self, cb):
+        # FIXME document
+        self.response_callbacks.append(cb)
+
+    def remove_response_callback(self, cb):
+        # FIXME document
+        self.response_callbacks.remove(cb)
+
+    def _call_callbacks(self, *cb_data):
+        for cb in self.response_callbacks:
+            cb(*cb_data)
+
     def pause_dialog(self):
         """Pause a standing dialog and return the saved dialog state.
 

diff --git a/fints/connection.py b/fints/connection.py
index aeb35252e6fe0445cc63cb998e1b79b8922c63b6..20cba038eac720fbbbe9923fc7ce8b6d373d7a8b 100644 (file)
--- a/fints/connection.py
+++ b/fints/connection.py
@@ -1,4 +1,6 @@
 import base64
+import logging
+import io
 
 import requests
 from fints.parser import FinTS3Parser
@@ -6,6 +8,7 @@ from fints.utils import Password
 
 from .message import FinTSInstituteMessage, FinTSMessage
 
+logger = logging.getLogger(__name__)
 
 class FinTSConnectionError(Exception):
     pass
@@ -16,20 +19,23 @@ class FinTSHTTPSConnection:
         self.url = url
 
     def send(self, msg: FinTSMessage):
-        print("Sending >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
+        log_out = io.StringIO()
         with Password.protect():
-            msg.print_nested()
-        print(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
+            msg.print_nested(stream=log_out, prefix="\t")
+            logger.debug("Sending >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n{}\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n".format(log_out.getvalue()))
+            log_out.truncate(0)
+
         r = requests.post(
             self.url, data=base64.b64encode(msg.render_bytes()),
         )
+
         if r.status_code < 200 or r.status_code > 299:
             raise FinTSConnectionError('Bad status code {}'.format(r.status_code))
+
         response = base64.b64decode(r.content.decode('iso-8859-1'))
         retval = FinTSInstituteMessage(segments=response)
-        #import pprint; pprint.pprint(response)  FIXME Remove
-        print("Received <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
+
         with Password.protect():
-            retval.print_nested()
-        print("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
+            retval.print_nested(stream=log_out, prefix="\t")
+            logger.debug("Received <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n{}\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n".format(log_out.getvalue()))
         return retval