CalvinBackup/mvt
1
0 Fork 0
mirror of https://github.com/mvt-project/mvt.git synced 2026-10-10 18:03:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix betterproto2 migration: update generated proto code and callers (#765)

Browse Source 
The dependency switch from betterproto to betterproto2 was incomplete.
This updates all affected files to use the betterproto2 API:

- tombstone.py: rewrite generated code to use betterproto2.field() with
  explicit TYPE_* constants, repeated/optional/group flags, and map_meta()
  for map fields
- tombstone_crashes.py: update import and fix to_dict() call to use
  keyword-only casing= argument required by betterproto2
- pyproject.toml: replace betterproto[compiler] dev dep with betterproto2-compiler
- Makefile: update protoc plugin flag to --python_betterproto2_out
This commit is contained in:
besendorf authored and GitHub committed 2026-04-07 14:09:38 +02:00
1 parent 9305c655bb
commit fd31f31aae
4 files changed
+142 -143
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile
+1 -1
View File
@@ -23,7 +23,7 @@ test-requirements:
generate-proto-parsers: generate-proto-parsers:
# Generate python parsers for protobuf files # Generate python parsers for protobuf files
PROTO_FILES=$$(find src/mvt/android/parsers/proto/ -iname "*.proto"); \ PROTO_FILES=$$(find src/mvt/android/parsers/proto/ -iname "*.proto"); \
protoc -Isrc/mvt/android/parsers/proto/ --python_betterproto_out=src/mvt/android/parsers/proto/ $$PROTO_FILES protoc -Isrc/mvt/android/parsers/proto/ --python_betterproto2_out=src/mvt/android/parsers/proto/ $$PROTO_FILES
clean: clean:
rm -rf $(PWD)/build $(PWD)/dist $(PWD)/src/mvt.egg-info rm -rf $(PWD)/build $(PWD)/dist $(PWD)/src/mvt.egg-info
pyproject.toml
+1 -1
View File
@@ -57,7 +57,7 @@ dev = [
"stix2>=3.0.1", "stix2>=3.0.1",
"ruff>=0.1.6", "ruff>=0.1.6",
"mypy>=1.7.1", "mypy>=1.7.1",
"betterproto[compiler]", "betterproto2-compiler",
] ]
[build-system] [build-system]
src/mvt/android/artifacts/tombstone_crashes.py
+2 -2
View File
@@ -7,7 +7,7 @@ import datetime
from typing import List, Optional, Union from typing import List, Optional, Union
import pydantic import pydantic
import betterproto import betterproto2
from dateutil import parser from dateutil import parser
from mvt.common.utils import convert_datetime_to_iso from mvt.common.utils import convert_datetime_to_iso
@@ -124,7 +124,7 @@ class TombstoneCrashArtifact(AndroidArtifact):
"""Parse Android tombstone crash files from a protobuf object.""" """Parse Android tombstone crash files from a protobuf object."""
tombstone_pb = Tombstone().parse(data) tombstone_pb = Tombstone().parse(data)
tombstone_dict = tombstone_pb.to_dict( tombstone_dict = tombstone_pb.to_dict(
betterproto.Casing.SNAKE, include_default_values=True casing=betterproto2.Casing.SNAKE, include_default_values=True
) )
# Add some extra metadata # Add some extra metadata
src/mvt/android/parsers/proto/tombstone.py
+138 -139
View File
@@ -1,13 +1,12 @@
# Generated by the protocol buffer compiler. DO NOT EDIT! # Generated by the protocol buffer compiler. DO NOT EDIT!
# sources: tombstone.proto # sources: tombstone.proto
# plugin: python-betterproto # plugin: python-betterproto2
from dataclasses import dataclass from dataclasses import dataclass
from typing import Dict, List
import betterproto import betterproto2
class Architecture(betterproto.Enum): class Architecture(betterproto2.Enum):
ARM32 = 0 ARM32 = 0
ARM64 = 1 ARM64 = 1
X86 = 2 X86 = 2
@@ -16,12 +15,12 @@ class Architecture(betterproto.Enum):
NONE = 5 NONE = 5
class MemoryErrorTool(betterproto.Enum): class MemoryErrorTool(betterproto2.Enum):
GWP_ASAN = 0 GWP_ASAN = 0
SCUDO = 1 SCUDO = 1
class MemoryErrorType(betterproto.Enum): class MemoryErrorType(betterproto2.Enum):
UNKNOWN = 0 UNKNOWN = 0
USE_AFTER_FREE = 1 USE_AFTER_FREE = 1
DOUBLE_FREE = 2 DOUBLE_FREE = 2
@@ -30,179 +29,179 @@ class MemoryErrorType(betterproto.Enum):
BUFFER_UNDERFLOW = 5 BUFFER_UNDERFLOW = 5
@dataclass @dataclass(eq=False, repr=False)
class CrashDetail(betterproto.Message): class CrashDetail(betterproto2.Message):
""" """
NOTE TO OEMS: If you add custom fields to this proto, do not use numbers in NOTE TO OEMS: If you add custom fields to this proto, do not use numbers in
the reserved range. the reserved range.
""" """
name: bytes = betterproto.bytes_field(1) name: "bytes" = betterproto2.field(1, betterproto2.TYPE_BYTES)
data: bytes = betterproto.bytes_field(2) data: "bytes" = betterproto2.field(2, betterproto2.TYPE_BYTES)
@dataclass @dataclass(eq=False, repr=False)
class StackHistoryBufferEntry(betterproto.Message): class StackHistoryBufferEntry(betterproto2.Message):
addr: "BacktraceFrame" = betterproto.message_field(1) addr: "BacktraceFrame | None" = betterproto2.field(1, betterproto2.TYPE_MESSAGE, optional=True)
fp: int = betterproto.uint64_field(2) fp: "int" = betterproto2.field(2, betterproto2.TYPE_UINT64)
tag: int = betterproto.uint64_field(3) tag: "int" = betterproto2.field(3, betterproto2.TYPE_UINT64)
@dataclass @dataclass(eq=False, repr=False)
class StackHistoryBuffer(betterproto.Message): class StackHistoryBuffer(betterproto2.Message):
tid: int = betterproto.uint64_field(1) tid: "int" = betterproto2.field(1, betterproto2.TYPE_UINT64)
entries: List["StackHistoryBufferEntry"] = betterproto.message_field(2) entries: "list[StackHistoryBufferEntry]" = betterproto2.field(2, betterproto2.TYPE_MESSAGE, repeated=True)
@dataclass @dataclass(eq=False, repr=False)
class Tombstone(betterproto.Message): class Tombstone(betterproto2.Message):
arch: "Architecture" = betterproto.enum_field(1) arch: "Architecture" = betterproto2.field(1, betterproto2.TYPE_ENUM, default_factory=lambda: Architecture(0))
guest_arch: "Architecture" = betterproto.enum_field(24) guest_arch: "Architecture" = betterproto2.field(24, betterproto2.TYPE_ENUM, default_factory=lambda: Architecture(0))
build_fingerprint: str = betterproto.string_field(2) build_fingerprint: "str" = betterproto2.field(2, betterproto2.TYPE_STRING)
revision: str = betterproto.string_field(3) revision: "str" = betterproto2.field(3, betterproto2.TYPE_STRING)
timestamp: str = betterproto.string_field(4) timestamp: "str" = betterproto2.field(4, betterproto2.TYPE_STRING)
pid: int = betterproto.uint32_field(5) pid: "int" = betterproto2.field(5, betterproto2.TYPE_UINT32)
tid: int = betterproto.uint32_field(6) tid: "int" = betterproto2.field(6, betterproto2.TYPE_UINT32)
uid: int = betterproto.uint32_field(7) uid: "int" = betterproto2.field(7, betterproto2.TYPE_UINT32)
selinux_label: str = betterproto.string_field(8) selinux_label: "str" = betterproto2.field(8, betterproto2.TYPE_STRING)
command_line: List[str] = betterproto.string_field(9) command_line: "list[str]" = betterproto2.field(9, betterproto2.TYPE_STRING, repeated=True)
# Process uptime in seconds. # Process uptime in seconds.
process_uptime: int = betterproto.uint32_field(20) process_uptime: "int" = betterproto2.field(20, betterproto2.TYPE_UINT32)
signal_info: "Signal" = betterproto.message_field(10) signal_info: "Signal | None" = betterproto2.field(10, betterproto2.TYPE_MESSAGE, optional=True)
abort_message: str = betterproto.string_field(14) abort_message: "str" = betterproto2.field(14, betterproto2.TYPE_STRING)
crash_details: List["CrashDetail"] = betterproto.message_field(21) crash_details: "list[CrashDetail]" = betterproto2.field(21, betterproto2.TYPE_MESSAGE, repeated=True)
causes: List["Cause"] = betterproto.message_field(15) causes: "list[Cause]" = betterproto2.field(15, betterproto2.TYPE_MESSAGE, repeated=True)
threads: Dict[int, "Thread"] = betterproto.map_field( threads: "dict[int, Thread]" = betterproto2.field(
16, betterproto.TYPE_UINT32, betterproto.TYPE_MESSAGE 16, betterproto2.TYPE_MAP, map_meta=betterproto2.map_meta(betterproto2.TYPE_UINT32, betterproto2.TYPE_MESSAGE)
) )
guest_threads: Dict[int, "Thread"] = betterproto.map_field( guest_threads: "dict[int, Thread]" = betterproto2.field(
25, betterproto.TYPE_UINT32, betterproto.TYPE_MESSAGE 25, betterproto2.TYPE_MAP, map_meta=betterproto2.map_meta(betterproto2.TYPE_UINT32, betterproto2.TYPE_MESSAGE)
) )
memory_mappings: List["MemoryMapping"] = betterproto.message_field(17) memory_mappings: "list[MemoryMapping]" = betterproto2.field(17, betterproto2.TYPE_MESSAGE, repeated=True)
log_buffers: List["LogBuffer"] = betterproto.message_field(18) log_buffers: "list[LogBuffer]" = betterproto2.field(18, betterproto2.TYPE_MESSAGE, repeated=True)
open_fds: List["FD"] = betterproto.message_field(19) open_fds: "list[FD]" = betterproto2.field(19, betterproto2.TYPE_MESSAGE, repeated=True)
page_size: int = betterproto.uint32_field(22) page_size: "int" = betterproto2.field(22, betterproto2.TYPE_UINT32)
has_been_16kb_mode: bool = betterproto.bool_field(23) has_been_16kb_mode: "bool" = betterproto2.field(23, betterproto2.TYPE_BOOL)
stack_history_buffer: "StackHistoryBuffer" = betterproto.message_field(26) stack_history_buffer: "StackHistoryBuffer | None" = betterproto2.field(26, betterproto2.TYPE_MESSAGE, optional=True)
@dataclass @dataclass(eq=False, repr=False)
class Signal(betterproto.Message): class Signal(betterproto2.Message):
number: int = betterproto.int32_field(1) number: "int" = betterproto2.field(1, betterproto2.TYPE_INT32)
name: str = betterproto.string_field(2) name: "str" = betterproto2.field(2, betterproto2.TYPE_STRING)
code: int = betterproto.int32_field(3) code: "int" = betterproto2.field(3, betterproto2.TYPE_INT32)
code_name: str = betterproto.string_field(4) code_name: "str" = betterproto2.field(4, betterproto2.TYPE_STRING)
has_sender: bool = betterproto.bool_field(5) has_sender: "bool" = betterproto2.field(5, betterproto2.TYPE_BOOL)
sender_uid: int = betterproto.int32_field(6) sender_uid: "int" = betterproto2.field(6, betterproto2.TYPE_INT32)
sender_pid: int = betterproto.int32_field(7) sender_pid: "int" = betterproto2.field(7, betterproto2.TYPE_INT32)
has_fault_address: bool = betterproto.bool_field(8) has_fault_address: "bool" = betterproto2.field(8, betterproto2.TYPE_BOOL)
fault_address: int = betterproto.uint64_field(9) fault_address: "int" = betterproto2.field(9, betterproto2.TYPE_UINT64)
# Note, may or may not contain the dump of the actual memory contents. # Note, may or may not contain the dump of the actual memory contents.
# Currently, on arm64, we only include metadata, and not the contents. # Currently, on arm64, we only include metadata, and not the contents.
fault_adjacent_metadata: "MemoryDump" = betterproto.message_field(10) fault_adjacent_metadata: "MemoryDump | None" = betterproto2.field(10, betterproto2.TYPE_MESSAGE, optional=True)
@dataclass @dataclass(eq=False, repr=False)
class HeapObject(betterproto.Message): class HeapObject(betterproto2.Message):
address: int = betterproto.uint64_field(1) address: "int" = betterproto2.field(1, betterproto2.TYPE_UINT64)
size: int = betterproto.uint64_field(2) size: "int" = betterproto2.field(2, betterproto2.TYPE_UINT64)
allocation_tid: int = betterproto.uint64_field(3) allocation_tid: "int" = betterproto2.field(3, betterproto2.TYPE_UINT64)
allocation_backtrace: List["BacktraceFrame"] = betterproto.message_field(4) allocation_backtrace: "list[BacktraceFrame]" = betterproto2.field(4, betterproto2.TYPE_MESSAGE, repeated=True)
deallocation_tid: int = betterproto.uint64_field(5) deallocation_tid: "int" = betterproto2.field(5, betterproto2.TYPE_UINT64)
deallocation_backtrace: List["BacktraceFrame"] = betterproto.message_field(6) deallocation_backtrace: "list[BacktraceFrame]" = betterproto2.field(6, betterproto2.TYPE_MESSAGE, repeated=True)
@dataclass @dataclass(eq=False, repr=False)
class MemoryError(betterproto.Message): class MemoryError(betterproto2.Message):
tool: "MemoryErrorTool" = betterproto.enum_field(1) tool: "MemoryErrorTool" = betterproto2.field(1, betterproto2.TYPE_ENUM, default_factory=lambda: MemoryErrorTool(0))
type: "MemoryErrorType" = betterproto.enum_field(2) type: "MemoryErrorType" = betterproto2.field(2, betterproto2.TYPE_ENUM, default_factory=lambda: MemoryErrorType(0))
heap: "HeapObject" = betterproto.message_field(3, group="location") heap: "HeapObject | None" = betterproto2.field(3, betterproto2.TYPE_MESSAGE, optional=True, group="location")
@dataclass @dataclass(eq=False, repr=False)
class Cause(betterproto.Message): class Cause(betterproto2.Message):
human_readable: str = betterproto.string_field(1) human_readable: "str" = betterproto2.field(1, betterproto2.TYPE_STRING)
memory_error: "MemoryError" = betterproto.message_field(2, group="details") memory_error: "MemoryError | None" = betterproto2.field(2, betterproto2.TYPE_MESSAGE, optional=True, group="details")
@dataclass @dataclass(eq=False, repr=False)
class Register(betterproto.Message): class Register(betterproto2.Message):
name: str = betterproto.string_field(1) name: "str" = betterproto2.field(1, betterproto2.TYPE_STRING)
u64: int = betterproto.uint64_field(2) u64: "int" = betterproto2.field(2, betterproto2.TYPE_UINT64)
@dataclass @dataclass(eq=False, repr=False)
class Thread(betterproto.Message): class Thread(betterproto2.Message):
id: int = betterproto.int32_field(1) id: "int" = betterproto2.field(1, betterproto2.TYPE_INT32)
name: str = betterproto.string_field(2) name: "str" = betterproto2.field(2, betterproto2.TYPE_STRING)
registers: List["Register"] = betterproto.message_field(3) registers: "list[Register]" = betterproto2.field(3, betterproto2.TYPE_MESSAGE, repeated=True)
backtrace_note: List[str] = betterproto.string_field(7) backtrace_note: "list[str]" = betterproto2.field(7, betterproto2.TYPE_STRING, repeated=True)
unreadable_elf_files: List[str] = betterproto.string_field(9) unreadable_elf_files: "list[str]" = betterproto2.field(9, betterproto2.TYPE_STRING, repeated=True)
current_backtrace: List["BacktraceFrame"] = betterproto.message_field(4) current_backtrace: "list[BacktraceFrame]" = betterproto2.field(4, betterproto2.TYPE_MESSAGE, repeated=True)
memory_dump: List["MemoryDump"] = betterproto.message_field(5) memory_dump: "list[MemoryDump]" = betterproto2.field(5, betterproto2.TYPE_MESSAGE, repeated=True)
tagged_addr_ctrl: int = betterproto.int64_field(6) tagged_addr_ctrl: "int" = betterproto2.field(6, betterproto2.TYPE_INT64)
pac_enabled_keys: int = betterproto.int64_field(8) pac_enabled_keys: "int" = betterproto2.field(8, betterproto2.TYPE_INT64)
@dataclass @dataclass(eq=False, repr=False)
class BacktraceFrame(betterproto.Message): class BacktraceFrame(betterproto2.Message):
rel_pc: int = betterproto.uint64_field(1) rel_pc: "int" = betterproto2.field(1, betterproto2.TYPE_UINT64)
pc: int = betterproto.uint64_field(2) pc: "int" = betterproto2.field(2, betterproto2.TYPE_UINT64)
sp: int = betterproto.uint64_field(3) sp: "int" = betterproto2.field(3, betterproto2.TYPE_UINT64)
function_name: str = betterproto.string_field(4) function_name: "str" = betterproto2.field(4, betterproto2.TYPE_STRING)
function_offset: int = betterproto.uint64_field(5) function_offset: "int" = betterproto2.field(5, betterproto2.TYPE_UINT64)
file_name: str = betterproto.string_field(6) file_name: "str" = betterproto2.field(6, betterproto2.TYPE_STRING)
file_map_offset: int = betterproto.uint64_field(7) file_map_offset: "int" = betterproto2.field(7, betterproto2.TYPE_UINT64)
build_id: str = betterproto.string_field(8) build_id: "str" = betterproto2.field(8, betterproto2.TYPE_STRING)
@dataclass @dataclass(eq=False, repr=False)
class ArmMTEMetadata(betterproto.Message): class ArmMTEMetadata(betterproto2.Message):
# One memory tag per granule (e.g. every 16 bytes) of regular memory. # One memory tag per granule (e.g. every 16 bytes) of regular memory.
memory_tags: bytes = betterproto.bytes_field(1) memory_tags: "bytes" = betterproto2.field(1, betterproto2.TYPE_BYTES)
@dataclass @dataclass(eq=False, repr=False)
class MemoryDump(betterproto.Message): class MemoryDump(betterproto2.Message):
register_name: str = betterproto.string_field(1) register_name: "str" = betterproto2.field(1, betterproto2.TYPE_STRING)
mapping_name: str = betterproto.string_field(2) mapping_name: "str" = betterproto2.field(2, betterproto2.TYPE_STRING)
begin_address: int = betterproto.uint64_field(3) begin_address: "int" = betterproto2.field(3, betterproto2.TYPE_UINT64)
memory: bytes = betterproto.bytes_field(4) memory: "bytes" = betterproto2.field(4, betterproto2.TYPE_BYTES)
arm_mte_metadata: "ArmMTEMetadata" = betterproto.message_field(6, group="metadata") arm_mte_metadata: "ArmMTEMetadata | None" = betterproto2.field(6, betterproto2.TYPE_MESSAGE, optional=True, group="metadata")
@dataclass @dataclass(eq=False, repr=False)
class MemoryMapping(betterproto.Message): class MemoryMapping(betterproto2.Message):
begin_address: int = betterproto.uint64_field(1) begin_address: "int" = betterproto2.field(1, betterproto2.TYPE_UINT64)
end_address: int = betterproto.uint64_field(2) end_address: "int" = betterproto2.field(2, betterproto2.TYPE_UINT64)
offset: int = betterproto.uint64_field(3) offset: "int" = betterproto2.field(3, betterproto2.TYPE_UINT64)
read: bool = betterproto.bool_field(4) read: "bool" = betterproto2.field(4, betterproto2.TYPE_BOOL)
write: bool = betterproto.bool_field(5) write: "bool" = betterproto2.field(5, betterproto2.TYPE_BOOL)
execute: bool = betterproto.bool_field(6) execute: "bool" = betterproto2.field(6, betterproto2.TYPE_BOOL)
mapping_name: str = betterproto.string_field(7) mapping_name: "str" = betterproto2.field(7, betterproto2.TYPE_STRING)
build_id: str = betterproto.string_field(8) build_id: "str" = betterproto2.field(8, betterproto2.TYPE_STRING)
load_bias: int = betterproto.uint64_field(9) load_bias: "int" = betterproto2.field(9, betterproto2.TYPE_UINT64)
@dataclass @dataclass(eq=False, repr=False)
class FD(betterproto.Message): class FD(betterproto2.Message):
fd: int = betterproto.int32_field(1) fd: "int" = betterproto2.field(1, betterproto2.TYPE_INT32)
path: str = betterproto.string_field(2) path: "str" = betterproto2.field(2, betterproto2.TYPE_STRING)
owner: str = betterproto.string_field(3) owner: "str" = betterproto2.field(3, betterproto2.TYPE_STRING)
tag: int = betterproto.uint64_field(4) tag: "int" = betterproto2.field(4, betterproto2.TYPE_UINT64)
@dataclass @dataclass(eq=False, repr=False)
class LogBuffer(betterproto.Message): class LogBuffer(betterproto2.Message):
name: str = betterproto.string_field(1) name: "str" = betterproto2.field(1, betterproto2.TYPE_STRING)
logs: List["LogMessage"] = betterproto.message_field(2) logs: "list[LogMessage]" = betterproto2.field(2, betterproto2.TYPE_MESSAGE, repeated=True)
@dataclass @dataclass(eq=False, repr=False)
class LogMessage(betterproto.Message): class LogMessage(betterproto2.Message):
timestamp: str = betterproto.string_field(1) timestamp: "str" = betterproto2.field(1, betterproto2.TYPE_STRING)
pid: int = betterproto.uint32_field(2) pid: "int" = betterproto2.field(2, betterproto2.TYPE_UINT32)
tid: int = betterproto.uint32_field(3) tid: "int" = betterproto2.field(3, betterproto2.TYPE_UINT32)
priority: int = betterproto.uint32_field(4) priority: "int" = betterproto2.field(4, betterproto2.TYPE_UINT32)
tag: str = betterproto.string_field(5) tag: "str" = betterproto2.field(5, betterproto2.TYPE_STRING)
message: str = betterproto.string_field(6) message: "str" = betterproto2.field(6, betterproto2.TYPE_STRING)