Repository: mandiant/capa
File: capa/features/extractors/dnfile/helpers.py (Python)

Code before:
    for rid, nestedclass in iter_dotnet_table(pe, dnfile.mdtable.NestedClass.number):
        assert isinstance(nestedclass, dnfile.mdtable.NestedClassRow)
        nested_class_table[nestedclass.NestedClass.row_index] = nestedclass.EnclosingClass.row_index

    return nested_class_table

def typedef_helper(index, nested_class_table, typedef_class_table, typedef_name, name):
    # Append the current typeref name
    typedef_name.append(name)
    
    while nested_class_table[index] in nested_class_table:
        name = typedef_class_table[nested_class_table[index]-1].TypeName
        typedef_name.append(name)
        index = nested_class_table[index]
        
    # Document the root enclosing details
    enclosing_name = typedef_class_table[nested_class_table[index]-1].TypeName
    typedef_name.append(enclosing_name)
    namespace = typedef_class_table[nested_class_table[index]-1].TypeNamespace
    
    return namespace, tuple(typedef_name[::-1])

def typeref_helper(index, typeref_table, typeref_name, name):
    # Not appending the current typeref name to avoid potential duplicate
    
    while type(typeref_table[index - 1].ResolutionScope.table) is dnfile.mdtable.TypeRef:
        # Recursively call helper function with enclosing typeref details
        typeref_name.append(name)
        name = typeref_table[index - 1].TypeName
        index = typeref_table[index - 1].ResolutionScope.row_index
    
    # Document the root enclosing details
    typeref_name.append(typeref_table[index - 1].TypeName)
    namespace = typeref_table[index - 1].TypeNamespace
     
    return namespace, tuple(typeref_name[::-1])
    
def get_dotnet_types(pe: dnfile.dnPE) -> Iterator[DnType]:
    """get .NET types from TypeDef and TypeRef tables"""
    nested_class_table = get_nested_class_table(pe)
    typedef_class_table = pe.net.mdtables.tables.get(dnfile.mdtable.TypeDef.number, [])
    
    for rid, typedef in iter_dotnet_table(pe, dnfile.mdtable.TypeDef.number):
        assert isinstance(typedef, dnfile.mdtable.TypeDefRow)

        typedef_name = []
        typedefname = (typedef.TypeName,)
        typedefnamespace = typedef.TypeNamespace
        if rid in nested_class_table:
            typedefnamespace, typedefname = typedef_helper(rid, nested_class_table, typedef_class_table, typedef_name, typedef.TypeName)
        

Review comment (refactor):
Can we move the `typeref_table` resolution to this function instead of passing it as an argument? This will clean up the caller.

Code after:

    if index in nested_class_table:
        typedef_name = []
        name = typedef.TypeName

        # Append the current typedef name
        typedef_name.append(name)

        while nested_class_table[index] in nested_class_table:
            # Iterate through the typedef table to resolve the nested name
            table_row = get_dotnet_table_row(pe, dnfile.mdtable.TypeDef.number, nested_class_table[index])
            if table_row is None:
                return typedef.TypeNamespace, tuple(typedef_name[::-1])

            name = table_row.TypeName
            typedef_name.append(name)
            index = nested_class_table[index]

        # Document the root enclosing details
        table_row = get_dotnet_table_row(pe, dnfile.mdtable.TypeDef.number, nested_class_table[index])
        if table_row is None:
            return typedef.TypeNamespace, tuple(typedef_name[::-1])

        enclosing_name = table_row.TypeName
        typedef_name.append(enclosing_name)

        return table_row.TypeNamespace, tuple(typedef_name[::-1])

    else:
        return typedef.TypeNamespace, (typedef.TypeName,)


def resolve_nested_typeref_name(
    index: int, typeref: dnfile.mdtable.TypeRefRow, pe: dnfile.dnPE
) -> Tuple[str, Tuple[str, ...]]:
    """Resolves all nested TypeRef class names. Returns the namespace as a str and the nested TypeRef name as a tuple"""
    # If the ResolutionScope decodes to a typeRef type then it is nested
    if isinstance(typeref.ResolutionScope.table, dnfile.mdtable.TypeRef):
        typeref_name = []
        name = typeref.TypeName
        # Not appending the current typeref name to avoid potential duplicate

        # Validate index
        table_row = get_dotnet_table_row(pe, dnfile.mdtable.TypeRef.number, index)
        if table_row is None:
            return typeref.TypeNamespace, (typeref.TypeName,)

        while isinstance(table_row.ResolutionScope.table, dnfile.mdtable.TypeRef):
            # Iterate through the typeref table to resolve the nested name
            typeref_name.append(name)
            name = table_row.TypeName