Skip to content

Commit 0314b25

Browse files
committed
refactor: compress Int32Serializer / UInt32Serializer
1 parent 24d60e9 commit 0314b25

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

dissect/target/helpers/nfs/nfs3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class MountParams:
125125
@dataclass
126126
class MountOK:
127127
filehandle: FileHandle3
128-
authFlavors: list[int]
128+
auth_flavors: list[int]
129129

130130

131131
@dataclass

dissect/target/helpers/sunrpc/serializer.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,17 @@ def deserialize(self, _: io.BytesIO) -> Serializable:
4545

4646

4747
class Int32Serializer(Serializer[int], Deserializer[int]):
48+
_signed = True
49+
4850
def serialize(self, i: int) -> bytes:
49-
return i.to_bytes(length=4, byteorder="big", signed=True)
51+
return i.to_bytes(length=4, byteorder="big", signed=self._signed)
5052

5153
def deserialize(self, payload: io.BytesIO) -> int:
52-
return int.from_bytes(payload.read(4), byteorder="big", signed=True)
53-
54+
return int.from_bytes(payload.read(4), byteorder="big", signed=self._signed)
5455

55-
class UInt32Serializer(Serializer[int], Deserializer[int]):
56-
def serialize(self, i: int) -> bytes:
57-
return i.to_bytes(length=4, byteorder="big", signed=False)
5856

59-
def deserialize(self, payload: io.BytesIO) -> int:
60-
return int.from_bytes(payload.read(4), byteorder="big", signed=False)
57+
class UInt32Serializer(Int32Serializer):
58+
_signed = False
6159

6260

6361
class OpaqueVarLengthSerializer(Serializer[bytes], Deserializer[bytes]):

tests/helpers/sunrpc/test_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def test_mount_call(mock_socket: MagicMock) -> None:
8787
filehandle=FileHandle3(
8888
opaque=b"\x01\x00\x07\x00\x02\x00\xec\x02\x00\x00\x00\x00\xb5g\x131&\xf1I\xed\xb8R\rx\\h8\xb4"
8989
),
90-
authFlavors=[1],
90+
auth_flavors=[1],
9191
)
9292

9393

0 commit comments

Comments
 (0)