Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix confidence/horizontal acc, add mac address #85

Merged
merged 4 commits into from
Nov 20, 2024
Merged

fix confidence/horizontal acc, add mac address #85

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f45b972
fix confidance/horizontal acc, add mac address
Philip2809 Nov 20, 2024
a4b7532
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Nov 20, 2024
263cd5b
fix commit errors
Philip2809 Nov 20, 2024
78d472b
Nitpicking
malmeloo Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix confidance/horizontal acc, add mac address
  • Loading branch information
@Philip2809
Philip2809 committed Nov 20, 2024
commit f45b9723f73e05ea80060870f6e41e737fb52a1a
8 changes: 7 additions & 1 deletion findmy/keys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from cryptography.hazmat.primitives.asymmetric import ec
from typing_extensions import override

from .util import crypto
from .util import crypto, parsers


class KeyType(Enum):
Expand Down Expand Up @@ -70,6 +70,12 @@ def adv_key_bytes(self) -> bytes:
def adv_key_b64(self) -> str:
"""Return the advertised (public) key as a base64-encoded string."""
return base64.b64encode(self.adv_key_bytes).decode("ascii")

@property
def mac_address(self) -> str:
"""Get the mac address from the public key."""
first_hex = self.adv_key_bytes[0] | 0b11000000
return parsers.format_hex_byte(first_hex) + ":" + ":".join([parsers.format_hex_byte(x) for x in self.adv_key_bytes[1:6]])

@property
@override
Expand Down
14 changes: 11 additions & 3 deletions findmy/reports/reports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,14 @@ def timestamp(self) -> datetime:
"""The `datetime` when this report was recorded by a device."""
timestamp_int = int.from_bytes(self._payload[0:4], "big") + (60 * 60 * 24 * 11323)
return datetime.fromtimestamp(timestamp_int, tz=timezone.utc).astimezone()

@property
def confidence(self) -> int:
"""Confidence of the location of this report. Int between 1 and 3"""
# If the payload length is 88, the confidence is the 5th byte, otherwise it's the 6th byte
if (len(self._payload) == 88):
return self.payload[4]
return self.payload[5]

@property
def latitude(self) -> float:
Expand All @@ -145,10 +153,10 @@ def longitude(self) -> float:
return struct.unpack(">i", lon_bytes)[0] / 10000000

@property
def confidence(self) -> int:
"""Confidence of the location of this report."""
def horizontal_accuracy(self) -> int:
"""Horizontal accuracy of the location of this report."""
if not self.is_decrypted:
msg = "Confidence is unavailable while the report is encrypted."
msg = "Horizontal accuracy is unavailable while the report is encrypted."
raise RuntimeError(msg)
assert self._decrypted_data is not None

Expand Down
3 changes: 3 additions & 0 deletions findmy/util/parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ def decode_plist(data: bytes) -> Any: # noqa: ANN401
data = plist_header + data

return plistlib.loads(data)

def format_hex_byte(byte):
return f'{byte:02x}'.upper()
Loading