update

Author: trevor-e

src/launchpad/parsers/apple/macho_parser.py

@@ -11,7 +11,7 @@
 import lief
 import sentry_sdk
 
-from launchpad.size.models.apple import CodeSignatureInfo, DyldInfo, LinkEditInfo
+from launchpad.size.models.apple import LinkEditInfo
 
 from ...utils.logging import get_logger
 from .binary_utils import parse_null_terminated_strings
@@ -299,57 +299,63 @@ def find_symbol(addr: int) -> lief.Symbol | None:
 
         return symbols
 
-    @sentry_sdk.trace
-    def extract_dyld_info(self) -> DyldInfo:
-        """Extract DYLD information from LC_DYLD_INFO load commands."""
-        dyld_chained_fixups = self.binary.dyld_chained_fixups
-        dyld_exports_trie = self.binary.dyld_exports_trie
-        return DyldInfo(
-            chained_fixups_size=(dyld_chained_fixups.data_size if dyld_chained_fixups else 0),
-            export_trie_size=dyld_exports_trie.data_size if dyld_exports_trie else 0,
-        )
-
-    @sentry_sdk.trace
-    def extract_code_signature_info(self) -> CodeSignatureInfo | None:
-        """Extract code signature information from LC_CODE_SIGNATURE load command."""
-        if not self.binary.has_code_signature:
-            return None
-
-        cs = self.binary.code_signature
-        return CodeSignatureInfo(
-            size=cs.data_size,
-            offset=cs.data_offset,
-        )
-
     @sentry_sdk.trace
     def extract_linkedit_info(self) -> LinkEditInfo:
-        """Extract __LINKEDIT segment component sizes from load commands."""
+        """Extract all __LINKEDIT segment component sizes from load commands.
+
+        Consolidates symbol tables, DYLD info, code signature, and segment size into one structure.
+        """
         symbol_table_size = 0
         string_table_size = 0
         function_starts_size = 0
         segment_size = 0
+        chained_fixups_size = 0
+        export_trie_size = 0
+        code_signature_size = 0
+        code_signature_offset = 0
 
+        # Determine if binary is 64-bit (nlist_64 is 16 bytes, nlist is 12 bytes)
         is_64bit = self.binary.header.magic in [
             lief.MachO.MACHO_TYPES.MAGIC_64,
             lief.MachO.MACHO_TYPES.CIGAM_64,
         ]
         entry_size = 16 if is_64bit else 12
 
+        # Extract from load commands
         for cmd in self.binary.commands:
             if isinstance(cmd, lief.MachO.SymbolCommand):
+                # LC_SYMTAB: symbol table + string table
                 symbol_table_size = cmd.numberof_symbols * entry_size
                 string_table_size = cmd.strings_size
             elif isinstance(cmd, lief.MachO.FunctionStarts):
+                # LC_FUNCTION_STARTS
                 function_starts_size = cmd.data_size
 
+        # Extract DYLD info
+        dyld_chained_fixups = self.binary.dyld_chained_fixups
+        dyld_exports_trie = self.binary.dyld_exports_trie
+        chained_fixups_size = dyld_chained_fixups.data_size if dyld_chained_fixups else 0
+        export_trie_size = dyld_exports_trie.data_size if dyld_exports_trie else 0
+
+        # Extract code signature
+        if self.binary.has_code_signature:
+            cs = self.binary.code_signature
+            code_signature_size = cs.data_size
+            code_signature_offset = cs.data_offset
+
+        # Get __LINKEDIT segment size
         for segment in self.binary.segments:
             if segment.name == "__LINKEDIT":
                 segment_size = segment.file_size
                 break
 
         return LinkEditInfo(
+            segment_size=segment_size,
             symbol_table_size=symbol_table_size,
             string_table_size=string_table_size,
             function_starts_size=function_starts_size,
-            segment_size=segment_size,
+            chained_fixups_size=chained_fixups_size,
+            export_trie_size=export_trie_size,
+            code_signature_size=code_signature_size,
+            code_signature_offset=code_signature_offset,
         )

src/launchpad/size/analyzers/apple.py

@@ -439,8 +439,6 @@ def _analyze_binary(
         objc_method_names = parser.parse_objc_method_names()
         segments = self._extract_segments_info(parser.binary)
         load_commands = self._extract_load_commands_info(parser.binary)
-        dyld_info = parser.extract_dyld_info()
-        code_signature_info = parser.extract_code_signature_info()
         linkedit_info = parser.extract_linkedit_info()
 
         symbol_info = None
@@ -498,10 +496,8 @@ def _analyze_binary(
             segments=segments,
             load_commands=load_commands,
             header_size=parser.get_header_size(),
-            dyld_info=dyld_info,
             dwarf_relocations=dwarf_relocations,
             strippable_symbols_size=strippable_symbols_size,
-            code_signature_info=code_signature_info,
             linkedit_info=linkedit_info,
         )
 

src/launchpad/size/models/apple.py

@@ -127,29 +127,29 @@ class LoadCommandInfo:
 
 
 @dataclass
-class DyldInfo:
-    """DYLD-specific information extracted from related DYLD load commands."""
-
-    chained_fixups_size: int = 0
-    export_trie_size: int = 0
-
-
-@dataclass
-class CodeSignatureInfo:
-    """Code signature information extracted from LC_CODE_SIGNATURE load command."""
-
-    size: int = 0
-    offset: int = 0
+class LinkEditInfo:
+    """Link edit segment components extracted from various load commands in __LINKEDIT.
 
+    Consolidates all __LINKEDIT segment data including symbol tables, DYLD info, and code signature.
+    """
 
-@dataclass
-class LinkEditInfo:
-    """Link edit segment components extracted from various load commands in __LINKEDIT."""
+    # Segment
+    segment_size: int = 0
 
+    # Symbol tables (from LC_SYMTAB)
     symbol_table_size: int = 0
     string_table_size: int = 0
+
+    # Debugging (from LC_FUNCTION_STARTS)
     function_starts_size: int = 0
-    segment_size: int = 0
+
+    # DYLD (from LC_DYLD_CHAINED_FIXUPS, LC_DYLD_EXPORTS_TRIE)
+    chained_fixups_size: int = 0
+    export_trie_size: int = 0
+
+    # Code signing (from LC_CODE_SIGNATURE)
+    code_signature_size: int = 0
+    code_signature_offset: int = 0
 
 
 @dataclass
@@ -168,10 +168,8 @@ class MachOBinaryAnalysis:
     swift_metadata: SwiftMetadata | None = None
     symbol_info: SymbolInfo | None = None
     header_size: int = 0
-    dyld_info: DyldInfo | None = None
     dwarf_relocations: DwarfRelocationsData | None = None
     strippable_symbols_size: int = 0
-    code_signature_info: CodeSignatureInfo | None = None
     linkedit_info: LinkEditInfo | None = None
 
 

src/launchpad/size/treemap/macho_element_builder.py

@@ -510,79 +510,78 @@ def _build_linkedit_children(self, binary_analysis: MachOBinaryAnalysis) -> List
         """
         linkedit_children: List[TreemapElement] = []
 
-        # Add link edit components (symbol table, string table, function starts)
         le = binary_analysis.linkedit_info
-        if le is not None:
-            if le.string_table_size > 0:
-                linkedit_children.append(
-                    TreemapElement(
-                        name="String Table",
-                        size=le.string_table_size,
-                        type=TreemapType.EXECUTABLES,
-                        path=None,
-                        is_dir=False,
-                        children=[],
-                    )
+        if le is None:
+            return linkedit_children
+
+        # Add symbol table and string table
+        if le.string_table_size > 0:
+            linkedit_children.append(
+                TreemapElement(
+                    name="String Table",
+                    size=le.string_table_size,
+                    type=TreemapType.EXECUTABLES,
+                    path=None,
+                    is_dir=False,
+                    children=[],
                 )
+            )
 
-            if le.symbol_table_size > 0:
-                linkedit_children.append(
-                    TreemapElement(
-                        name="Symbol Table",
-                        size=le.symbol_table_size,
-                        type=TreemapType.EXECUTABLES,
-                        path=None,
-                        is_dir=False,
-                        children=[],
-                    )
+        if le.symbol_table_size > 0:
+            linkedit_children.append(
+                TreemapElement(
+                    name="Symbol Table",
+                    size=le.symbol_table_size,
+                    type=TreemapType.EXECUTABLES,
+                    path=None,
+                    is_dir=False,
+                    children=[],
                 )
+            )
 
-            if le.function_starts_size > 0:
-                linkedit_children.append(
-                    TreemapElement(
-                        name="Function Starts",
-                        size=le.function_starts_size,
-                        type=TreemapType.EXECUTABLES,
-                        path=None,
-                        is_dir=False,
-                        children=[],
-                    )
+        if le.function_starts_size > 0:
+            linkedit_children.append(
+                TreemapElement(
+                    name="Function Starts",
+                    size=le.function_starts_size,
+                    type=TreemapType.EXECUTABLES,
+                    path=None,
+                    is_dir=False,
+                    children=[],
                 )
+            )
 
-        # Add DYLD info children
-        di = binary_analysis.dyld_info
-        if di is not None:
-            if di.chained_fixups_size > 0:
-                linkedit_children.append(
-                    TreemapElement(
-                        name="Chained Fixups",
-                        size=di.chained_fixups_size,
-                        type=TreemapType.DYLD,
-                        path=None,
-                        is_dir=False,
-                        children=[],
-                    )
+        # Add DYLD info
+        if le.chained_fixups_size > 0:
+            linkedit_children.append(
+                TreemapElement(
+                    name="Chained Fixups",
+                    size=le.chained_fixups_size,
+                    type=TreemapType.DYLD,
+                    path=None,
+                    is_dir=False,
+                    children=[],
                 )
+            )
 
-            if di.export_trie_size > 0:
-                linkedit_children.append(
-                    TreemapElement(
-                        name="Export Trie",
-                        size=di.export_trie_size,
-                        type=TreemapType.DYLD,
-                        path=None,
-                        is_dir=False,
-                        children=[],
-                    )
+        if le.export_trie_size > 0:
+            linkedit_children.append(
+                TreemapElement(
+                    name="Export Trie",
+                    size=le.export_trie_size,
+                    type=TreemapType.DYLD,
+                    path=None,
+                    is_dir=False,
+                    children=[],
                 )
+            )
 
         # Add code signature
-        cs = binary_analysis.code_signature_info
-        if cs is not None and cs.size > 0:
+        if le.code_signature_size > 0:
             linkedit_children.append(
                 TreemapElement(
                     name="Code Signature",
-                    size=cs.size,
+                    size=le.code_signature_size,
                     type=TreemapType.CODE_SIGNATURE,
                     path=None,
                     is_dir=False,