Fix scanner force-scanning

RELEASE.md

@@ -1,5 +1,9 @@
 # RELEASE NOTES
 
+## v1.14.1 - Scanner Fixes
+
+* Fix force-scanning bug in scanner introduced in last release by @uzlonewolf in https://github.com/jasonacox/tinytuya/pull/511.
+
 ## v1.14.0 - Command Line Updates
 
 * PyPI 1.14.0 rewrite of main to use argparse and add additional options by @uzlonewolf in https://github.com/jasonacox/tinytuya/pull/503

tinytuya/core.py

@@ -123,7 +123,7 @@
 # Colorama terminal color capability for all platforms
 init()
 
-version_tuple = (1, 14, 0)
+version_tuple = (1, 14, 1)
 version = __version__ = "%d.%d.%d" % version_tuple
 __author__ = "jasonacox"
 
@@ -1654,6 +1654,7 @@ def add_dps_to_request(self, dp_indicies):
             self.dps_to_request.update({str(index): None for index in dp_indicies})
 
     def set_version(self, version): # pylint: disable=W0621
+        version = float(version)
         self.version = version
         self.version_str = "v" + str(version)
         self.version_bytes = str(version).encode('latin1')

tinytuya/scanner.py

@@ -164,6 +164,7 @@ def __init__( self, ip, deviceinfo, options, debug ):
         self.timeo = 0
         self.resets = 0
         self.step = FSCAN_NOT_STARTED
+        self.try_v35_with_v34 = False
         self.cur_key = None
         self.hard_time_limit = time.time() + 30
         self.initial_connect_retries = options['retries']
@@ -275,6 +276,11 @@ def v34_negotiate_sess_key_start( self ):
             print('v3.4/5 trying key', self.ip, self.device.real_local_key)
         step1 = self.device._negotiate_session_key_generate_step_1()
         self.sock.sendall( self.device._encode_message( step1 ) )
+        if self.try_v35_with_v34 and self.device.version == 3.4:
+            self.device.version = 3.5
+            step1 = self.device._negotiate_session_key_generate_step_1()
+            self.sock.sendall( self.device._encode_message( step1 ) )
+            self.device.version = 3.4
         if self.debug:
             print('v3.4/5 session key neg start, debug ip', self.ip)
 
@@ -297,6 +303,8 @@ def __init__( self, ip, deviceinfo, options, debug ):
         self.retries = 0
         self.keygen = None
         self.brute_force_data = []
+        self.try_v35_with_v34 = True
+        self.v34_connect_ok = False
 
         self.connect()
 
@@ -334,7 +342,7 @@ def timeout( self, forced=False ):
                 print('ForceScannedDevice: Debug sock', self.ip, 'connect timed out!')
         elif self.step == FSCAN_INITIAL_CONNECT:
             if self.debug:
-                print('ForceScannedDevice: Debug sock', self.ip, 'socket send failed,', 'no data received' if forced else 'receive timed out')
+                print('ForceScannedDevice: Debug sock', self.ip, 'socket send failed,', 'no data received,' if forced else 'receive timed out,', 'current retry:', self.retries)
             if self.retries < 2:
                 self.retries += 1
                 self.connect()
@@ -366,8 +374,9 @@ def timeout( self, forced=False ):
                     self.remove = True
                 else:
                     self.connect()
-        elif self.step == FSCAN_v34_BRUTE_FORCE_ACTIVE: # or self.step == FSCAN_v33_BRUTE_FORCE_ACTIVE or self.step == FSCAN_v31_BRUTE_FORCE_ACTIVE:
-            if not forced:
+                    self.v34_connect_ok = False
+        elif self.step == FSCAN_v34_BRUTE_FORCE_ACTIVE:
+            if( (not forced) and (not self.v34_connect_ok) ):
                 # actual timeout, connect failed
                 if self.retries < 2:
                     self.retries += 1
@@ -382,6 +391,7 @@ def timeout( self, forced=False ):
                 return
             # brute-forcing the key
             self.v3x_brute_force_try_next_key()
+            self.v34_connect_ok = False
         elif self.step == FSCAN_v31_BRUTE_FORCE_ACTIVE:
             # brute-forcing the key
             self.v3x_brute_force_try_next_key()
@@ -418,6 +428,8 @@ def write_data( self ):
         #  'False' when connection was made but then closed
         #  The IP address when the connection is still open
         addr = self.get_peer()
+        if self.debug:
+            print('ForceScannedDevice: device', self.ip, 'addr is:', addr)
         if addr is None:
             # refused
             self.close()
@@ -435,6 +447,7 @@ def write_data( self ):
         #self.timeo = time.time() + self.options['data_timeout']
         self.timeo = time.time() + 1.5
         self.found = True
+        self.v34_connect_ok = True
 
         if len(self.send_queue) > 0:
             self.sock.sendall( self.device._encode_message( self.send_queue[0] ) )
@@ -502,15 +515,31 @@ def read_data( self ):
         if self.debug:
             print('ForceScannedDevice:', self.ip, 'got step', self.step, 'data:', data )
 
-        if len(data) ==	0:
+        if len(data) == 0:
             self.timeout( True )
             return
 
         while len(data):
             try:
-                prefix_offset = data.find(tinytuya.PREFIX_BIN)
-                if prefix_offset > 0:
-                    data = data[prefix_offset:]
+                if self.deviceinfo['version'] == 3.5:
+                    prefix_offset = data.find(tinytuya.PREFIX_6699_BIN)
+                    if prefix_offset > 0:
+                        data = data[prefix_offset:]
+                else:
+                    prefix_offset = data.find(tinytuya.PREFIX_BIN)
+                    if prefix_offset >= 0:
+                        data = data[prefix_offset:]
+                        self.try_v35_with_v34 = False
+                    elif self.try_v35_with_v34 and self.deviceinfo['version'] == 3.4:
+                        prefix_offset = data.find(tinytuya.PREFIX_6699_BIN)
+                        if prefix_offset >= 0:
+                            if self.debug:
+                                print('ForceScannedDevice: device is v3.5!')
+                            data = data[prefix_offset:]
+                            self.try_v35_with_v34 = False
+                            self.deviceinfo['version'] = 3.5
+                            self.device.set_version(3.5)
+                            self.ver_found = True
                 hmac_key = self.device.local_key if self.deviceinfo['version'] >= 3.4 else None
                 msg = tinytuya.unpack_message(data, hmac_key=hmac_key)
             except:
@@ -668,7 +697,7 @@ def brute_force_v3x_data( self ):
                 self.brute_force_found_key()
                 return True
 
-        self.brute_force_data =	[]
+        self.brute_force_data = []
         return False
 
     def v3x_brute_force_try_next_key( self ):
@@ -794,7 +823,7 @@ def write_data( self ):
         self.write = False
 
         try:
-	    # connected, send the query
+            # connected, send the query
             if self.device.version >= 3.4 :
                 # self.device.real_local_key, self.device.local_key
                 self.v34_negotiate_sess_key_start()
@@ -899,7 +928,7 @@ def _generate_ip(networks, verbose, term):
         if tinytuya.IS_PY2 and type(netblock) == str:
             netblock = netblock.decode('latin1')
         try:
-            network = ipaddress.ip_network(netblock)
+            network = ipaddress.ip_network(netblock, strict=False)
             log.debug("Starting brute force network scan %s", network)
         except:
             log.debug("Unable to get network for %r, ignoring", netblock)
@@ -1129,8 +1158,24 @@ def tuyaLookup(deviceid):
         if verbose:
             print(term.subbold + "    Option: " + term.dim + "Network force scanning requested.\n")
 
-        fstype = type(forcescan)
-        if fstype != list and fstype != tuple:
+        # argparse gives us a list of lists
+        # the inner list is empty [[]] when no address specified
+        add_connected = True
+        if isinstance( forcescan, list ) or isinstance( forcescan, tuple ):
+            for ip in forcescan:
+                if isinstance( ip, list ) or isinstance( ip, tuple ):
+                    for ip2 in ip:
+                        networks.append( ip2 )
+                        add_connected = False
+                else:
+                    networks.append( ip )
+                    add_connected = False
+
+        if isinstance( forcescan, str ) or isinstance( forcescan, bytes ):
+            networks.append( forcescan )
+            add_connected = False
+
+        if add_connected:
             if not NETIFLIBS:
                 print(term.alert +
                       '    NOTE: netifaces module not available, multi-interface machines will be limited.\n'
@@ -1151,9 +1196,6 @@ def tuyaLookup(deviceid):
                 if not networks:
                     print(term.alert + 'No networks to force-scan, exiting.' + term.normal)
                     return None
-        else:
-            for ip in forcescan:
-                networks.append( ip )
 
     if snapshot:
         for ip in snapshot:
@@ -1162,6 +1204,9 @@ def tuyaLookup(deviceid):
         snapshot = []
 
     if networks:
+        if verbose:
+            log.debug("Force-scanning networks: %r", networks)
+
         scan_ips = _generate_ip( networks, verbose, term )
         ip_scan = ip_scan_running = True
         if discover: