From c507d33656b974fb4f79826f610486ecf1c1e86f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Henryk=20Pl=C3=B6tz?= <henryk@ploetzli.ch>
Date: Thu, 6 Sep 2018 23:17:23 +0200
Subject: [PATCH] Work on flicker code/hhduc parsing, make it work with my
 Sparkasse

---
 fints/client.py      | 21 ++++++++++----------
 fints/hhd/flicker.py |  2 ++
 tests/test_hhd.py    | 47 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 tests/test_hhd.py

diff --git a/fints/client.py b/fints/client.py
index 9a96bb9..2a181c6 100644
--- a/fints/client.py
+++ b/fints/client.py
@@ -815,8 +815,6 @@ class FinTS3Client:
             yield self
         self._standing_dialog = None
 
-CHLGUC_RE = re.compile(r'(?:CHLGUC\s*(?P<UCLEN>\d{4})\s*(?P<UC>\d.*?))?CHLGTEXT\s*\d{4}(?P<TEXT>.*)$', re.I | re.S)
-
 class NeedTANResponse(NeedRetryResponse):
     def __init__(self, command_seg, tan_request, resume_method=None, tan_request_structured=False):
         self.command_seg = command_seg
@@ -856,14 +854,17 @@ class NeedTANResponse(NeedRetryResponse):
         self.challenge_hhduc = None
 
         if hasattr(self.tan_request, 'challenge_hhduc'):
-            self.challenge_hhduc = self.tan_request.challenge_hhduc
-
-        match = CHLGUC_RE.match(self.challenge_raw)
-        if match:
-            if not self.challenge_hhduc:
-                if match.group('UCLEN'):
-                    self.challenge_hhduc = match.group('UC')[:int(match.group('UCLEN'))]
-            self.challenge = match.group('TEXT').strip()
+            if self.tan_request.challenge_hhduc:
+                self.challenge_hhduc = self.tan_request.challenge_hhduc.decode('us-ascii')
+
+        if self.challenge.startswith('CHLGUC  '):
+            l = self.challenge[8:12]
+            if l.isdigit():
+                self.challenge_hhduc = self.challenge[12:(12+int(l,10))]
+                self.challenge = self.challenge[(12+int(l,10)):]
+
+        if self.challenge.startswith('CHLGTEXT'):
+            self.challenge = self.challenge[12:]
 
         if self.tan_request_structured:
             self.challenge_html = bleach.clean(
diff --git a/fints/hhd/flicker.py b/fints/hhd/flicker.py
index 81ba59c..8d3c830 100644
--- a/fints/hhd/flicker.py
+++ b/fints/hhd/flicker.py
@@ -85,6 +85,8 @@ class FlickerCode:
     def parse(self, code):
         length = LC_LENGTH_HHD14 if self.version == HHD_VERSION_14 else LC_LENGTH_HHD13
         self.lc = int(code[0:length])
+        if len(code) < length+self.lc:
+            raise ValueError("lc too large: {} + {} > {}".format(self.lc, length, len(code)))
         code = code[length:]
         code = self.startcode.parse(code)
         self.version = self.startcode.version
diff --git a/tests/test_hhd.py b/tests/test_hhd.py
new file mode 100644
index 0000000..1c97485
--- /dev/null
+++ b/tests/test_hhd.py
@@ -0,0 +1,47 @@
+import pytest
+from fints.hhd.flicker import parse, HHD_VERSION_13
+
+
+# HITAN3:
+#  'challenge' contains a HHD 1.3 code embedded in the normal text payload
+#  field.
+#  Example: 'CHLGUC  00312908881344731012345678900515,00CHLGTEXT0292Sie haben eine ...'
+#    The code in NeedTANResponse._parse_tan_challenge extracts 
+#     '2908881344731012345678900515,00'
+#    from this, as a version 1.3 code. parse() should accept it
+#    (start code: '88134473', IBAN: '1234567890', amount: '15,00')
+
+def test_flicker_hhd13():
+    flicker = parse('2908881344731012345678900515,00')
+
+    assert flicker.version == HHD_VERSION_13
+    assert flicker.lc == 29
+    assert flicker.startcode.data == '88134473'
+    assert flicker.de1.data == '1234567890'
+    assert flicker.de2.data == '15,00'
+    assert flicker.de3.data is None
+
+    assert flicker.render() == '1204881344730512345678901531352C30303B'
+
+
+# The old code in fints.hhd.flicker.clean would add a 0
+def test_flicker_hhd13_old():
+    flicker = parse('02908881344731012345678900515,00')
+
+    assert flicker.version == HHD_VERSION_13
+    assert flicker.lc == 29
+    assert flicker.startcode.data == '88134473'
+
+    assert flicker.render() == '1204881344730512345678901531352C30303B'
+
+
+# From https://github.com/willuhn/hbci4java/blob/master/test/hbci4java/secmech/FlickerTest.java
+#  Maybe we should be able to handle this and others?
+@pytest.mark.xfail
+def test_flicker_hhd13_hbci4java_1():
+    flicker = parse('CHLGUC 002624088715131306389726041,00CHLGTEXT0244 Sie h')
+
+    assert flicker.lc == 24
+    assert flicker.startcode.data == '87151313'
+
+    assert flicker.render() == '0F04871513130338972614312C30303B'
-- 
2.39.5