Unicode fixes V1 (#1631)

* Fixed unicode shares not being found

* Fixed unicode SPNs not being decoded appropriately

* Fixed spn not being found in getST, fixes #1595

* Fixed unicode issues on login when using ntlmV1 fallback
Fixes #1419

examples/GetUserSPNs.py

@@ -369,7 +369,7 @@ def run(self):
                             lastLogon = str(datetime.fromtimestamp(self.getUnixTime(int(str(attribute['vals'][0])))))
                     elif str(attribute['type']) == 'servicePrincipalName':
                         for spn in attribute['vals']:
-                            SPNs.append(str(spn))
+                            SPNs.append(spn.asOctets().decode('utf-8'))
 
                 if mustCommit is True:
                     if int(userAccountControl) & UF_ACCOUNTDISABLE:

impacket/krb5/types.py

@@ -40,6 +40,7 @@
 import struct
 
 from pyasn1.codec.der import decoder
+from six import ensure_binary
 
 from . import asn1
 from . import constants
@@ -151,7 +152,7 @@ def components_to_asn1(self, name):
         strings = name.setComponentByName('name-string'
                                           ).getComponentByName('name-string')
         for i, c in enumerate(self.components):
-            strings.setComponentByPosition(i, c)
+            strings.setComponentByPosition(i, ensure_binary(c))
 
         return name
 

impacket/smb.py

@@ -58,6 +58,7 @@
 from impacket.structure import Structure
 from impacket.spnego import SPNEGO_NegTokenInit, TypesMech, SPNEGO_NegTokenResp, ASN1_OID, asn1encode, ASN1_AID
 from impacket.krb5.gssapi import KRB5_AP_REQ
+import six
 
 # For signing
 import hashlib
@@ -3501,7 +3502,8 @@ def login(self, user, password, domain = '', lmhash = '', nthash = '', ntlm_fall
                 self.login_extended(user, password, domain, lmhash, nthash, use_ntlmv2 = True)
             except:
                 # If the target OS is Windows 5.0 or Samba, let's try using NTLMv1
-                if ntlm_fallback and ((self.get_server_lanman().find('Windows 2000') != -1) or (self.get_server_lanman().find('Samba') != -1)):
+                if ntlm_fallback and ((six.ensure_binary(self.get_server_lanman()).find(b'Windows 2000') != -1) or
+                                      (six.ensure_binary(self.get_server_lanman()).find(b'Samba') != -1)):
                     self.login_extended(user, password, domain, lmhash, nthash, use_ntlmv2 = False)
                     self.__isNTLMv2 = False
                 else:

impacket/smbserver.py

@@ -42,7 +42,7 @@
 import hmac
 
 from binascii import unhexlify, hexlify, a2b_hex
-from six import PY2, b, text_type
+from six import b, ensure_str
 from six.moves import configparser, socketserver
 
 # For signing
@@ -234,6 +234,7 @@ def getShares(connId, smbServer):
 
 
 def searchShare(connId, share, smbServer):
+    share = ensure_str(share)
     config = smbServer.getServerConfig()
     if config.has_section(share):
         return dict(config.items(share))
@@ -3217,10 +3218,10 @@ def smb2Create(connId, smbServer, recvPacket):
                         else:
                             if sys.platform == 'win32':
                                 mode |= os.O_BINARY
-                            if str(pathName) in smbServer.getRegisteredNamedPipes():
+                            if ensure_str(pathName) in smbServer.getRegisteredNamedPipes():
                                 fid = PIPE_FILE_DESCRIPTOR
                                 sock = socket.socket()
-                                sock.connect(smbServer.getRegisteredNamedPipes()[str(pathName)])
+                                sock.connect(smbServer.getRegisteredNamedPipes()[ensure_str(pathName)])
                             else:
                                 fid = os.open(pathName, mode)
                     except Exception as e: