Skip to content

Commit

Permalink
feat: add support for extracting cloud keys (#98)
Browse files Browse the repository at this point in the history
  • Loading branch information
bdraco authored Oct 21, 2024
1 parent cf7a512 commit fdc3b90
Show file tree
Hide file tree
Showing 7 changed files with 915 additions and 178 deletions.
5 changes: 0 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,3 @@ repos:
hooks:
- id: mypy
additional_dependencies: []
- repo: https://github.com/PyCQA/bandit
rev: 1.7.10
hooks:
- id: bandit
args: [-x, tests]
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ This package was created with
[Cookiecutter](https://github.com/audreyr/cookiecutter) and the
[browniebroke/cookiecutter-pypackage](https://github.com/browniebroke/cookiecutter-pypackage)
project template.

Special thanks to Piotr Machowski for the cloud key extractor basis.
59 changes: 59 additions & 0 deletions extract_tokens.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import asyncio
import pprint
from getpass import getpass

from aiohttp import ClientSession

from xiaomi_ble import XiaomiCloudTokenFetch
from xiaomi_ble.cloud import SERVERS

# Adapted from PiotrMachowski's Xiaomi-cloud-tokens-extractor
# MIT License
#
# Copyright (c) 2020 Piotr Machowski
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.


async def main(username: str, password: str, mac: str, servers: list[str]) -> None:
async with ClientSession() as session:
fetcher = XiaomiCloudTokenFetch(username, password, session)
device_info = await fetcher.get_device_info(mac, servers)
if device_info:
pprint.pprint(device_info)
return
print(f"No devices found matching the provided MAC address: {mac}.")


print("Username (email or user ID):")
username = input()
print("Password:")
password = getpass("")
print("Mac address:")
mac = input()
print(f"Server (one of: {','.join(SERVERS)}) Leave empty to check all available:")
server = input()
while server not in ["", *SERVERS]:
print(f"Invalid server provided. Valid values: {','.join(SERVERS)}")
print("Server:")
server = input()

print()

asyncio.run(main(username, password, mac, [server] if server else SERVERS))
557 changes: 384 additions & 173 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ bluetooth-data-tools = ">=0.3.1"
bleak = ">=0.19.5"
cryptography = ">=40.0.0"
pycryptodomex = ">=3.19.1"
aiohttp = ">=3.10.0"
orjson = ">=3.9.0"

[tool.poetry.extras]
docs = [
Expand Down
16 changes: 16 additions & 0 deletions src/xiaomi_ble/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
Units,
)

from .cloud import (
XiaomiCloudBLEDevice,
XiaomiCloudException,
XiaomiCloudInvalidAuthenticationException,
XiaomiCloudInvalidPasswordException,
XiaomiCloudInvalidUsernameException,
XiaomiCloudTokenFetch,
XiaomiCloudTwoFactorAuthenticationException,
)
from .devices import SLEEPY_DEVICE_MODELS
from .parser import EncryptionScheme, XiaomiBluetoothDeviceData

Expand All @@ -35,4 +44,11 @@
"SensorDeviceInfo",
"SensorValue",
"Units",
"XiaomiCloudBLEDevice",
"XiaomiCloudException",
"XiaomiCloudInvalidAuthenticationException",
"XiaomiCloudInvalidPasswordException",
"XiaomiCloudInvalidUsernameException",
"XiaomiCloudTokenFetch",
"XiaomiCloudTwoFactorAuthenticationException",
]
Loading

0 comments on commit fdc3b90

Please sign in to comment.