Fix auth flow to reflect latest changes in tenhou protocol

Author: Nihisil

project/game/ai/main.py

@@ -25,7 +25,7 @@
 
 
 class MahjongAI:
-    version = "0.5.0"
+    version = "0.5.1"
 
     agari = None
     shanten_calculator = None

project/tenhou/client.py

@@ -62,18 +62,12 @@ def authenticate(self):
 
             return True
 
-        auth_string, rating_string, new_rank_message = self.decoder.parse_hello_string(auth_message)
+        rating_string, new_rank_message = self.decoder.parse_hello_string(auth_message)
         self._rating_string = rating_string
-        if not auth_string:
-            self.logger.info("We didn't obtain auth string")
-            return False
 
         if new_rank_message:
             self.logger.info("Achieved a new rank! \n {}".format(new_rank_message))
 
-        auth_token = self.decoder.generate_auth_token(auth_string)
-
-        self._send_message('<AUTH val="{}"/>'.format(auth_token))
         self._send_message(self._pxr_tag())
 
         # sometimes tenhou send an empty tag after authentication (in tournament mode)

project/tenhou/decoder.py

@@ -31,19 +31,15 @@ class TenhouDecoder:
 
     def parse_hello_string(self, message):
         rating_string = ""
-        auth_message = ""
         new_rank_message = ""
 
-        if "auth=" in message:
-            auth_message = self.get_attribute_content(message, "auth")
-            # for NoName we don't have rating attribute
-            if "PF4=" in message:
-                rating_string = self.get_attribute_content(message, "PF4")
+        if "PF4=" in message:
+            rating_string = self.get_attribute_content(message, "PF4")
 
         if "nintei" in message:
             new_rank_message = unquote(self.get_attribute_content(message, "nintei"))
 
-        return auth_message, rating_string, new_rank_message
+        return rating_string, new_rank_message
 
     def parse_initial_values(self, message):
         """
@@ -236,56 +232,6 @@ def parse_nuki(self, data, meld):
         meld.type = MeldPrint.NUKI
         meld.tiles = [data >> 8]
 
-    def generate_auth_token(self, auth_string):
-        translation_table = [
-            63006,
-            9570,
-            49216,
-            45888,
-            9822,
-            23121,
-            59830,
-            51114,
-            54831,
-            4189,
-            580,
-            5203,
-            42174,
-            59972,
-            55457,
-            59009,
-            59347,
-            64456,
-            8673,
-            52710,
-            49975,
-            2006,
-            62677,
-            3463,
-            17754,
-            5357,
-        ]
-
-        parts = auth_string.split("-")
-        if len(parts) != 2:
-            return False
-
-        first_part = parts[0]
-        second_part = parts[1]
-        if len(first_part) != 8 or len(second_part) != 8:
-            return False
-
-        table_index = int("2" + first_part[2:8]) % (12 - int(first_part[7:8])) * 2
-
-        a = translation_table[table_index] ^ int(second_part[0:4], 16)
-        b = translation_table[table_index + 1] ^ int(second_part[4:8], 16)
-
-        postfix = format(a, "2x") + format(b, "2x")
-
-        result = first_part + "-" + postfix
-
-        return result
-
     def get_attribute_content(self, message, attribute_name):
         result = re.findall(r'{}="([^"]*)"'.format(attribute_name), message)
         return result and result[0] or None

project/tenhou/test_tenhou_decoder.py

@@ -76,25 +76,12 @@ def test_parse_log_link():
 def test_auth_message():
     decoder = TenhouDecoder()
     message = """<HELO uname="%4E%6F%4E%61%6D%65"
-                       auth="20160318-54ebe070" ratingscale=""
                        PF4="9,45,1290.90,-5184.0,69,95,129,157,71,4303,831,830,33,1761"/>"""
 
-    auth_string, rating_string, _ = decoder.parse_hello_string(message)
-
-    assert auth_string == "20160318-54ebe070"
+    rating_string, _ = decoder.parse_hello_string(message)
     assert rating_string == "9,45,1290.90,-5184.0,69,95,129,157,71,4303,831,830,33,1761"
 
 
-def test_generate_auth_token():
-    client = TenhouDecoder()
-
-    string = "20160318-54ebe070"
-    assert client.generate_auth_token(string) == "20160318-72b5ba21"
-
-    string = "20160319-5b859bb3"
-    assert client.generate_auth_token(string) == "20160319-9bc528f3"
-
-
 def test_decode_new_dora_indicator():
     decoder = TenhouDecoder()
     message = '<DORA hai="125" />'