Skip to content
This repository was archived by the owner on Dec 6, 2023. It is now read-only.

Commit 667faa0

Browse files
author
mpgn
committed
Add catch for kerberos use-kcache option
1 parent f50b5fe commit 667faa0

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

cme/protocols/ldap.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from impacket.smb import SMB_DIALECT
1818
from impacket.dcerpc.v5.samr import UF_ACCOUNTDISABLE, UF_DONT_REQUIRE_PREAUTH, UF_TRUSTED_FOR_DELEGATION, UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION
1919
from impacket.krb5.kerberosv5 import sendReceive, KerberosError, getKerberosTGT, getKerberosTGS, SessionKeyDecryptionError
20-
from impacket.krb5.types import KerberosTime, Principal
20+
from impacket.krb5.types import KerberosTime, Principal, KerberosException
2121
from impacket.ldap import ldap as ldap_impacket
2222
from impacket.krb5 import constants
2323
from impacket.ldap import ldapasn1 as ldapasn1_impacket
@@ -324,7 +324,7 @@ def kerberos_login(self, domain, username, password = '', ntlm_hash = '', aesKey
324324
str(error)),
325325
color='magenta' if error in ldap_error_status else 'red')
326326
return False
327-
except KeyError as e:
327+
except (KeyError, KerberosException) as e:
328328
self.logger.error(u'{}\\{}{} {}'.format(self.domain,
329329
self.username,
330330
" from ccache" if useCache

cme/protocols/smb.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
from impacket.dcerpc.v5.samr import SID_NAME_USE
2121
from impacket.dcerpc.v5.dtypes import MAXIMUM_ALLOWED
2222
from impacket.krb5.kerberosv5 import SessionKeyDecryptionError
23+
from impacket.krb5.types import KerberosException
2324
from cme.connection import *
2425
from cme.logger import CMEAdapter
2526
from cme.servers.smb import CMESMBServer
@@ -393,7 +394,7 @@ def kerberos_login(self, domain, username, password = '', ntlm_hash = '', aesKey
393394
""),
394395
color='yellow')
395396
return False
396-
except FileNotFoundError as e:
397+
except (FileNotFoundError, KerberosException) as e:
397398
self.logger.error('CCache Error: {}'.format(e))
398399
return False
399400
except (SessionError, Exception) as e:

0 commit comments

Comments
 (0)