ticket parsing making fields optional

postfix · Dec 2, 2019 · ddbfda3 · ddbfda3
1 parent b794ebe
commit ddbfda3
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/pypykatz/commons/kerberosticket.py b/pypykatz/commons/kerberosticket.py
@@ -127,17 +127,23 @@ def to_asn1(self):
 	def parse(kerberos_ticket, reader, sysinfo, type = None):
 		kt = KerberosTicket()
 		kt.type = type
-		kt.ServiceName_type = kerberos_ticket.ServiceName.read(reader).NameType
-		kt.ServiceName = kerberos_ticket.ServiceName.read(reader).read(reader)
-		kt.DomainName = kerberos_ticket.DomainName.read_string(reader)
+		if kerberos_ticket.ServiceName.read(reader):
+			kt.ServiceName_type = kerberos_ticket.ServiceName.read(reader).NameType
+			kt.ServiceName = kerberos_ticket.ServiceName.read(reader).read(reader)
+		if kerberos_ticket.DomainName:
+			kt.DomainName = kerberos_ticket.DomainName.read_string(reader)
 		if kerberos_ticket.TargetName.read(reader):
 			kt.ETargetName = kerberos_ticket.TargetName.read(reader).read(reader)
 			kt.ETargetName_type = kerberos_ticket.TargetName.read(reader).NameType 
-		kt.TargetDomainName = kerberos_ticket.TargetDomainName.read_string(reader) 
-		kt.EClientName = kerberos_ticket.ClientName.read(reader).read(reader)
-		kt.EClientName_type = kerberos_ticket.ClientName.read(reader).NameType
-		kt.AltTargetDomainName = kerberos_ticket.AltTargetDomainName.read_string(reader)
-		kt.Description = kerberos_ticket.Description.read_string(reader)
+		if kerberos_ticket.TargetDomainName:
+			kt.TargetDomainName = kerberos_ticket.TargetDomainName.read_string(reader) 
+		if kerberos_ticket.ClientName:
+			kt.EClientName = kerberos_ticket.ClientName.read(reader).read(reader)
+			kt.EClientName_type = kerberos_ticket.ClientName.read(reader).NameType
+		if kerberos_ticket.AltTargetDomainName:
+			kt.AltTargetDomainName = kerberos_ticket.AltTargetDomainName.read_string(reader)
+		if kerberos_ticket.Description:
+			kt.Description = kerberos_ticket.Description.read_string(reader)
 
 		kt.StartTime = filetime_to_dt(kerberos_ticket.StartTime)
 		kt.EndTime = filetime_to_dt(kerberos_ticket.EndTime)