some basic cleanup

Author: lobsterjerusalem

dotnet/dotnetgadget.go

@@ -109,7 +109,7 @@ func IsValidXML(data []byte) bool {
 	return xml.Unmarshal(data, new(interface{})) == nil
 }
 
-func CreateAxHostStateDLL(DLLBytes []byte, formatter string) (string, bool) {
+func CreateAxHostStateDLL(dllBytes []byte, formatter string) (string, bool) {
 	binaryLibrary := BinaryLibraryRecord{ID: 2, Library: "System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"}
 	className := "System.Windows.Forms.AxHost+State"
 	memberNames := []string{"PropertyBagBinary"}
@@ -119,7 +119,7 @@ func CreateAxHostStateDLL(DLLBytes []byte, formatter string) (string, bool) {
 		"PrimitiveArray",
 	}
 
-	innerNewGadget, ok := CreateDLLReflection(DLLBytes, BinaryFormatter)
+	innerNewGadget, ok := CreateDLLReflection(dllBytes, BinaryFormatter)
 	if !ok {
 		return "", false
 	}
@@ -161,11 +161,13 @@ func CreateAxHostStateDLL(DLLBytes []byte, formatter string) (string, bool) {
 		return payload, true
 	default:
 		output.PrintFrameworkError("Invalid formatter chosen, this formatter supports: 'LOSFormatter', and 'BinaryFormatter'")
+
 		return "", false
 	}
 }
 
-func CreateDLLReflection(DLLBytes []byte, formatter string) (string, bool) {
+// Serves a DLL in memory, can be used with CreateAxHostStateDLL and possibly elsewhere.
+func CreateDLLReflection(dllBytes []byte, formatter string) (string, bool) {
 	// This one is so large that it makes more sense to just build the "final" gadget as we go, so that's what is going to happen with this one.
 	var finalGadget string
 	var records []Record
@@ -200,8 +202,6 @@ func CreateDLLReflection(DLLBytes []byte, formatter string) (string, bool) {
 	var arraySingleObjectMemberValues []interface{}
 
 	/// Building inner types for the array
-	// E  | objectid    | BT |   RANK      |Lengths      | TE | AdditionalInfo
-	// 07 | 03 00 00 00 | 01 | 01 00 00 00 | 01 00 00 00 | 07 | 02
 	binaryArrayRecord := BinaryArrayRecord{
 		ObjectID:            3,
 		BinaryArrayTypeEnum: 1, // 1byte
@@ -343,9 +343,9 @@ func CreateDLLReflection(DLLBytes []byte, formatter string) (string, bool) {
 
 	// ASP ID 13
 	arraySinglePrimitiveID13 := ArraySinglePrimitiveRecord{
-		ArrayInfo:         ArrayInfo{ObjectID: 13, MemberCount: len(DLLBytes)},
+		ArrayInfo:         ArrayInfo{ObjectID: 13, MemberCount: len(dllBytes)},
 		PrimitiveTypeEnum: PrimitiveTypeEnum["Byte"],
-		Members:           string([]byte(DLLBytes)),
+		Members:           string(dllBytes),
 	}
 	records = append(records, arraySinglePrimitiveID13)
 
@@ -925,7 +925,7 @@ func CreateDLLReflection(DLLBytes []byte, formatter string) (string, bool) {
 	}
 	records = append(records, classWithIDRecordID75)
 
-	// CW O80 DONE
+	// CW O80
 	classWithIDRecordID80 := ClassWithIDRecord{
 		ObjectID:   0x4c,
 		MetadataID: 0x42,
@@ -982,7 +982,7 @@ func CreateDLLReflection(DLLBytes []byte, formatter string) (string, bool) {
 	}
 	records = append(records, arraySingleObjectID79)
 
-	//SCWMT O130
+	// SCWMT O130
 	ID130MemberNames := []string{"_a", "_b", "_c", "_d", "_e", "_f", "_g", "_h", "_i", "_j", "_k"}
 	ID130MemberTypeInfo, ok := getMemberTypeInfo([]string{"Primitive", "Primitive", "Primitive", "Primitive", "Primitive", "Primitive", "Primitive", "Primitive", "Primitive", "Primitive", "Primitive"}, ID130MemberNames, []interface{}{
 		PrimitiveTypeEnum["Int32"],
@@ -1042,6 +1042,7 @@ func CreateDLLReflection(DLLBytes []byte, formatter string) (string, bool) {
 		return finalGadget, true
 	default:
 		output.PrintFrameworkError("Invalid formatter chosen, this formatter supports: 'LOSFormatter', and 'BinaryFormatter'")
+
 		return "", false
 	}
 }

dotnet/general_types.go

@@ -28,7 +28,7 @@ func (me PrimitiveInt16) PrimToString() string {
 
 // A placeholder for lesser-used objects such as Single
 // Whatever you give it, will be placed in the stream exactly as given
-// Can't just pass a string because it will get 'processed' as a lengthPrefixedString, this avoids that
+// Can't just pass a string because it will get 'processed' as a lengthPrefixedString, this avoids that.
 func (me PrimitiveByteString) PrimToString() string {
 	return string(me)
 }
@@ -189,7 +189,7 @@ func getMemberTypeInfo(memberTypes []string, memberNames []string, additionalInf
 }
 
 // Gives us the expected expected binary string representation.
-// MemberTypeInfo output order: byteTypeEnums[]byte + []AdditionalInfo
+// MemberTypeInfo output order: byteTypeEnums[]byte + []AdditionalInfo.
 func (memberTypeInfo MemberTypeInfo) ToBin() (string, bool) {
 	dataSequence := ""
 	// build the array of binarytypeenums

dotnet/records.go

@@ -24,7 +24,7 @@ type MemberPrimitiveTypedRecord struct {
 type BinaryArrayRecord struct {
 	ObjectID            int
 	BinaryArrayTypeEnum int // 1byte
-	Rank                int // >=0
+	Rank                int
 	Lengths             []int
 	LowerBounds         []int
 	TypeEnum            int // 1byte
@@ -138,19 +138,19 @@ func (serializationHeaderRecord SerializationHeaderRecord) GetRecordType() int {
 }
 
 func (binaryLibraryRecord BinaryLibraryRecord) GetRecordType() int {
-	return RecordTypeEnumMap["BinaryLibrary"] // must be 12 for binaryLibraryRecord
+	return RecordTypeEnumMap["BinaryLibrary"]
 }
 
 func (memberReferenceRecord MemberReferenceRecord) GetRecordType() int {
-	return RecordTypeEnumMap["MemberReference"] // must be 12 for binaryLibraryRecord
+	return RecordTypeEnumMap["MemberReference"]
 }
 
 func (memberPrimitiveTypedRecord MemberPrimitiveTypedRecord) GetRecordType() int {
-	return RecordTypeEnumMap["MemberPrimitiveTyped"] // must be 12 for binaryLibraryRecord
+	return RecordTypeEnumMap["MemberPrimitiveTyped"]
 }
 
 func (objectNullRecord ObjectNullRecord) GetRecordType() int {
-	return RecordTypeEnumMap["ObjectNull"] // must be 12 for binaryLibraryRecord
+	return RecordTypeEnumMap["ObjectNull"]
 }
 
 // This one is different from the other recordbecause it usually is not processed within the 'context' of the member values, and needs to be called with information that is not present.
@@ -321,7 +321,7 @@ func (binaryArrayRecord BinaryArrayRecord) ToRecordBin() (string, bool) {
 			return "", false
 		}
 
-		typeInt, ok := addInfo.(int) // it seems these are primitive type enum values
+		typeInt, ok := addInfo.(int)
 		if ok {
 			addInfoString += string(byte(typeInt))
 
@@ -369,12 +369,6 @@ func (arraySingleObjectRecord ArraySingleObjectRecord) ToRecordBin() (string, bo
 
 			continue
 		}
-		//memberString, ok := member.(string)
-		//if ok {
-		//memberValuesString += memberString
-
-		//continue
-		//}
 	}
 
 	return recordByteString + objectIDString + memberCount + memberValuesString, true
@@ -394,6 +388,7 @@ func (objectNullMultiple256Record ObjectNullMultiple256Record) ToRecordBin() (st
 	nullCountString := string(byte((objectNullMultiple256Record.NullCount)))
 	if objectNullMultiple256Record.NullCount > 255 || objectNullMultiple256Record.NullCount < 0 {
 		output.PrintFrameworkError("Invalid value for objectNullMultiple256Record.NullCount, MUST be between 0-255 (inclusive)")
+
 		return "", false
 	}