release: v0.6.11

* Forces text encoding on checksum generation

Co-Authored-by: Lauren-D <[email protected]>

CHANGES.rst

@@ -16,6 +16,10 @@
 
 Changes
 =======
+Version 0.6.11 (released 2021-08-17)
+**Bug fix:**
+* Forces text encoding on checksum generation
+
 Version 0.6.10 (released 2021-08-09)
 **Minor change:**
 * Improves server logging.

invenio_sip2/api.py

@@ -104,16 +104,16 @@ def __str__(self):
             new_message += str(fixed_field)
 
         for idx, variable_field in enumerate(self.variable_fields):
-            if idx != 0:
-                new_message += '|'
             new_message += str(variable_field)
+            new_message += '|'
 
         if acs_system.is_error_detection_enabled:
             if self.sequence_number:
                 new_message += f'AY{self.sequence_number}'
+            new_message += 'AZ'
             if not self.checksum:
                 self.checksum = generate_checksum(new_message)
-            new_message += f'AZ{self.checksum}'
+            new_message += self.checksum
         new_message += self.line_terminator
         self.message_text = new_message
         return self.message_text

invenio_sip2/utils.py

@@ -121,12 +121,9 @@ def generate_checksum(message):
     :param message: SIP2 string message
     :returns checksum string
     """
-    # Calculate CRC
-    checksum = 0
-    for n in range(0, len(message)):
-        checksum = checksum + ord(message[n:n + 1])
-    crc = format((-checksum & 0xFFFF), 'X')
-    return crc
+    # Calculate checksum
+    checksum = sum([b for b in message.encode(acs_system.text_encoding)])
+    return format((-checksum & 0xFFFF), 'X')
 
 
 def verify_checksum(message_str):

invenio_sip2/version.py

@@ -23,4 +23,4 @@
 
 from __future__ import absolute_import, print_function
 
-__version__ = '0.6.10'
+__version__ = '0.6.11'

tests/test_actions.py

@@ -43,7 +43,7 @@ def test_sip2_login_failed(app, dummy_client, failed_login_message):
             Message(request=failed_login_message),
             client=dummy_client
     )
-    assert str(response) == '940AY0AZFE99\r'
+    assert str(response) == '940AY0AZFDFE\r'
 
 
 def test_sip2_login(app, dummy_client, login_message):
@@ -52,7 +52,7 @@ def test_sip2_login(app, dummy_client, login_message):
         Message(request=login_message),
         client=dummy_client
     )
-    assert str(response) == '941AY1AZFE97\r'
+    assert str(response) == '941AY1AZFDFC\r'
 
 
 def test_sip2_system_status(app, dummy_client, system_status_message):