sonnenbatterie 0.7.dev7__tar.gz → 0.7.dev9__tar.gz

{sonnenbatterie-0.7.dev7/sonnenbatterie.egg-info → sonnenbatterie-0.7.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sonnenbatterie
-Version: 0.7.dev7
+Version: 0.7.dev9
 Summary: "Access Sonnenbatterie REST API"
 Home-page: https://github.com/weltmeyer/python_sonnenbatterie
 Author: Jan Weltmeyer

{sonnenbatterie-0.7.dev7 → sonnenbatterie-0.7.dev9}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = sonnenbatterie
-version = 0.7.dev7
+version = 0.7.dev9
 author = Jan Weltmeyer
 description = "Access Sonnenbatterie REST API"
 long_description = file: README.md

{sonnenbatterie-0.7.dev7 → sonnenbatterie-0.7.dev9}/sonnenbatterie/sonnenbatterie.py

@@ -290,8 +290,6 @@ class AsyncSonnenBatterie:
         saltResponseCode = salt.status
 
 
-
-
         if saltResponseCode!=200: #use old variant where no salt is availlable 
             #Old path (no salt): PBKDF2 over sha512(password) + challenge → hex
             response=hashlib.pbkdf2_hmac('sha512',pw_sha512.encode('utf-8'),challenge.encode('utf-8'),7500,64).hex()
@@ -314,6 +312,16 @@ class AsyncSonnenBatterie:
             self.sb2 = AsyncSonnenBatterieV2(ip_address=self.ipaddress, api_token=self.token)
 
 
+
+    def create_response_from_values(self, username, password, challenge, salt):
+        pw_sha512_hex = hashlib.sha512(password.encode("utf-8")).hexdigest()
+        pw_bytes = pw_sha512_hex.encode("utf-8")
+        dk = hashlib.pbkdf2_hmac("sha512", pw_bytes, salt.encode("utf-8"), 7500, dklen=64)
+        derived_hex = dk.hex()
+        key = derived_hex.encode("utf-8")
+        response = hmac.new(key, challenge.encode("utf-8"), hashlib.sha256).hexdigest()
+        return response
+
     async def create_session_token_new(self):
         # Step 1: challenge
         async with self._session.get(f"{self.baseurl}challenge") as r:
@@ -330,19 +338,18 @@ class AsyncSonnenBatterie:
             r.raise_for_status()
             salt = (await r.json())["salt"]
 
-        # Step 3: derive key
-        pw_sha512_hex = hashlib.sha512(self.password.encode("utf-8")).hexdigest()
-        pw_bytes = pw_sha512_hex.encode("utf-8")
-        dk = hashlib.pbkdf2_hmac("sha512", pw_bytes, salt.encode("utf-8"), 7500, dklen=64)
-        derived_hex = dk.hex()
-
+   
         # Step 4: loop: POST /session, maybe retry with new_challenge
         for _ in range(2):
-            key = derived_hex.encode("utf-8")
-            response = hmac.new(key, challenge.encode("utf-8"), hashlib.sha256).hexdigest()
-            payload = {"user": self.username, "challenge": challenge, "response": response}
+            response = self.create_response_from_values(self.username,self.password,challenge,salt)
+            body = urlencode(payload).encode("utf-8")
+            async with self._session.post(
+                
+                url = self.baseurl+'session',
+                data = {"user":self.username,"challenge":challenge,"response":response},
+                timeout=self._timeout,
 
-            async with self._session.post(f"{self.baseurl}session", json=payload) as r:
+            ) as r:
                 txt = await r.text()
                 if r.status >= 400:
                     raise RuntimeError(
@@ -351,9 +358,7 @@ class AsyncSonnenBatterie:
                         f"Payload: {json.dumps(payload)}\n"
                         f"challenge: {challenge}\n"
                         f"salt: {salt}\n"
-                        f"pw_sha_hex: {pw_sha512_hex}\n"
-                        f"derived_hex: {derived_hex}\n"
-                        f"response_hex: {response}\n"
+                        f"response: {response}\n"
                         f"Server reply: {txt}"
                     )
                 r.raise_for_status()
@@ -365,6 +370,7 @@ class AsyncSonnenBatterie:
 
             if "authentication_token" in data and data["authentication_token"]:
                  self.token = data["authentication_token"]
+                 return
 
             raise RuntimeError(f"Unexpected /session response: {json.dumps(data)}")
 

{sonnenbatterie-0.7.dev7 → sonnenbatterie-0.7.dev9/sonnenbatterie.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sonnenbatterie
-Version: 0.7.dev7
+Version: 0.7.dev9
 Summary: "Access Sonnenbatterie REST API"
 Home-page: https://github.com/weltmeyer/python_sonnenbatterie
 Author: Jan Weltmeyer

{sonnenbatterie-0.7.dev7 → sonnenbatterie-0.7.dev9}/sonnenbatterie.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ test/test_api_v1.py
 test/test_api_v2.py
 test/test_battery_reserve.py
 test/test_battery_reserve_async.py
+test/test_login_new.py
 test/test_operating_mode.py
 test/test_operating_mode_api_v2.py
 test/test_operating_mode_async.py

sonnenbatterie-0.7.dev9/test/test_login_new.py

@@ -0,0 +1,49 @@
+
+#!/usr/bin/env python3
+# I suspect that I haven't got to grips with the way phthon does things, but soppusely this will setup the path to allod for the sonnen batteri moduel to be in a separate location
+# To me having to do this for testing seems a horrendous hack
+import asyncio
+import os
+import sys
+import time
+import json
+import sys
+import base64, binascii, hashlib, hmac, string
+script_path = os.path.realpath(os.path.dirname(__name__))
+os.chdir(script_path)
+sys.path.append("..")
+from pprint import pprint
+import hashlib
+
+# this is based on the test code by rust dust
+
+def main():
+    challenge="39bdd8a304b84c76"
+    challenge="d43aeb06a6394daa"
+    username="User"
+    password="sonnenUser3552!"
+    salt="04f8996da763b7a969b1028ee3007569eaf3a635486ddab211d512c85b9df8fb_02bbe1e15021947b232050cc88b07772"
+    testResponse=create_response_from_values(username,password,challenge,salt)
+    wantedResponse="39b5cb8cc21772b482cdbbcbd135f4a05af4974f3e1b9e4c8aa846d6e64bcc1a"
+
+
+    if testResponse==wantedResponse:
+        print("It works!")
+    else:
+        print("doesnt work :(")
+    
+    print("Response: "+testResponse)
+
+
+def create_response_from_values(username, password, challenge, salt):
+    pw_sha512_hex = hashlib.sha512(password.encode("utf-8")).hexdigest()
+    pw_bytes = pw_sha512_hex.encode("utf-8")
+    dk = hashlib.pbkdf2_hmac("sha512", pw_bytes, salt.encode("utf-8"), 7500, dklen=64)
+    derived_hex = dk.hex()
+    key = derived_hex.encode("utf-8")
+    response = hmac.new(key, challenge.encode("utf-8"), hashlib.sha256).hexdigest()
+    return response
+
+
+if __name__ == '__main__':
+  main()