ports: esp32: otto: call ping

danieledapo · danieledapo · commit 20abe9409514 · 2018-01-08T22:03:10.000+01:00
diff --git a/ports/esp32/dump_settings.py b/ports/esp32/dump_settings.py
@@ -11,6 +11,9 @@
 def _str_setting(val):
     return "'''{}'''".format(val)
 
+def _bytes_setting(val):
+    return "b'''{}'''".format(val)
+
 def _int_setting(val):
     return str(int(val))
 
@@ -26,6 +29,8 @@ def _int_setting(val):
 )
 
 BACOTTO_SETTINGS = (
+    ('BACOTTO_OTP_SECRET', _bytes_setting),
+    ('BACOTTO_SERIAL', _str_setting),
     ('BACOTTO_URL', _str_setting),
 )
 
diff --git a/ports/esp32/modules/otp.py b/ports/esp32/modules/otp.py
@@ -8,7 +8,7 @@ class OTP(object):
     """
     Base class for OTP handlers.
     """
-    def __init__(self, s, digits=6, digest=hashlib.sha256):
+    def __init__(self, s, digits=6, digest=hashlib.sha1):
         """
         :param s: secret in base32 format
         :type s: str
diff --git a/ports/esp32/modules/otto.py b/ports/esp32/modules/otto.py
@@ -1,5 +1,6 @@
 import settings
 import network
+import otp
 import urequests
 import utime
 
@@ -32,12 +33,18 @@ def wlan_disconnect():
     return sta_if.isconnected()
 
 
-def call_bacotto():
-    resp = urequests.get(settings.BACOTTO_URL)
-    print('Wow! Bacotto replied:', resp.text)
+def call_bacotto(otp_gen):
+    totp_tok = otp_gen.totp(utime.time(), interval=30)
+
+    resp = urequests.get(settings.BACOTTO_URL + '/ping', params={
+        'otp': totp_tok,
+        'serial': settings.BACOTTO_SERIAL,
+    })
+    print('Wow! Bacotto replied:', resp.status_code, resp.text)
 
 
 def run():
+    otp_gen = otp.OTP(settings.BACOTTO_OTP_SECRET)
     sntp_setup = False
 
     while True:
@@ -51,7 +58,7 @@ def run():
                     sntp_setup = True
 
                 print('current timestamp:', utime.time())
-                call_bacotto()
+                call_bacotto(otp_gen)
             except Exception as e:
                 print(e)
                 utime.sleep_ms(1000)
diff --git a/ports/esp32/modules/urequests.py b/ports/esp32/modules/urequests.py
@@ -34,7 +34,7 @@ def json(self):
         return ujson.loads(self.content)
 
 
-def request(method, url, data=None, json=None, headers={}, stream=None):
+def request(method, url, params={}, data=None, json=None, headers={}):
     try:
         proto, dummy, host, path = url.split("/", 3)
     except ValueError:
@@ -55,43 +55,53 @@ def request(method, url, data=None, json=None, headers={}, stream=None):
     ai = usocket.getaddrinfo(host, port)
     addr = ai[0][-1]
 
+    if len(params) > 0:
+        # TODO: add proper serialization
+        path += '?' + '&'.join([k + '=' + params[k] for k in params.keys()])
+
     s = usocket.socket()
     try:
         s.connect(addr)
         if proto == "https:":
             s = ussl.wrap_socket(s, server_hostname=host)
+
         s.write(b"%s /%s HTTP/1.0\r\n" % (method, path))
         if not "Host" in headers:
             s.write(b"Host: %s\r\n" % host)
+
         # Iterate over keys to avoid tuple alloc
         for k in headers:
             s.write(k)
             s.write(b": ")
             s.write(headers[k])
             s.write(b"\r\n")
+
         if json is not None:
             assert data is None
             import ujson
             data = ujson.dumps(json)
+
         if data:
             s.write(b"Content-Length: %d\r\n" % len(data))
+
         s.write(b"\r\n")
         if data:
             s.write(data)
 
         l = s.readline()
         protover, status, msg = l.split(None, 2)
         status = int(status)
-        #print(protover, status, msg)
+
         while True:
             l = s.readline()
             if not l or l == b"\r\n":
                 break
-            #print(l)
+
             if l.startswith(b"Transfer-Encoding:"):
                 if b"chunked" in l:
                     raise ValueError("Unsupported " + l)
-            elif l.startswith(b"Location:") and not 200 <= status <= 299:
+
+            elif not (200 <= status <= 299) and l.startswith(b"Location:"):
                 raise NotImplementedError("Redirects not yet supported")
     except OSError:
         s.close()

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`	`def _str_setting(val):`
`12`	`12`	`return "'''{}'''".format(val)`
`13`	`13`
	`14`	`+def _bytes_setting(val):`
	`15`	`+ return "b'''{}'''".format(val)`
	`16`	`+`
`14`	`17`	`def _int_setting(val):`
`15`	`18`	`return str(int(val))`
`16`	`19`
`@@ -26,6 +29,8 @@ def _int_setting(val):`
`26`	`29`	`)`
`27`	`30`
`28`	`31`	`BACOTTO_SETTINGS = (`
	`32`	`+ ('BACOTTO_OTP_SECRET', _bytes_setting),`
	`33`	`+ ('BACOTTO_SERIAL', _str_setting),`
`29`	`34`	`('BACOTTO_URL', _str_setting),`
`30`	`35`	`)`
`31`	`36`