bumper/__init__.py

@@ -7,6 +7,7 @@ from .xmppserver import XMPPServer
 import asyncio
 import contextvars
 import time
+from datetime import datetime, timedelta
 import platform
 import os
 import logging
@@ -22,6 +23,7 @@ server_cert = "./certs/cert.pem"
 server_key = "./certs/key.pem"
 
 use_auth = False
+token_validity_seconds = 3600 #1 hour
 
 # Logs
 bumperlog = logging.getLogger("bumper")
@@ -63,16 +65,12 @@ class BumperUser(object):
     def __init__(self, userid=""):
         self.userid = userid
         self.devices = []
-        self.tokens = []
-        self.authcodes = []
         self.bots = []
 
     def asdict(self):
         return {
             "userid": self.userid,
             "devices": self.devices,
-            "tokens": self.tokens,
-            "authcodes": self.authcodes,
             "bots": self.bots,            
         }        
 
@@ -88,7 +86,12 @@ def user_add(userid):
 def user_get(userid):
     users = db_get().table('users')
     User = Query()
-    return users.get(User.userid == userid)    
+    return users.get(User.userid == userid)
+    
+def user_by_deviceid(deviceid):
+    users = db_get().table('users')
+    User = Query()
+    return users.get(User.devices.any([deviceid]))
 
 def user_full_upsert(user):
     users = db_get().table('users')
@@ -135,47 +138,52 @@ def user_remove_bot(userid, did):
     
     users.upsert({'bots': userbots}, User.userid == userid)  
    
+def user_get_tokens(userid):
+    tokens = db_get().table('tokens')    
+    return tokens.search((Query().userid == userid))    
+
+def user_get_token(userid, token):
+    tokens = db_get().table('tokens')    
+    return tokens.get((Query().userid == userid) & (Query().token == token))        
 
 def user_add_token(userid, token):
-    users = db_get().table('users')
+    tokens = db_get().table('tokens')    
-    User = Query()        
+    tmptoken = tokens.get((Query().userid == userid) & (Query().token == token))
-    user = users.get(User.userid == userid)
+    if not tmptoken:
-    usertokens = list(user['tokens'])
+        tokens.insert({'userid':userid, 'token':token, 'expiration':"{}".format(datetime.now() + timedelta(seconds=token_validity_seconds))})        
-    if not token in usertokens:
+
-        usertokens.append(token)
+def user_revoke_all_tokens(userid):
-    
+    tokens = db_get().table('tokens')
-    users.upsert({'tokens': usertokens}, User.userid == userid)  
+    tsearch = tokens.search(Query().userid == userid)
+    for i in tsearch:
+        tokens.remove(doc_ids=[i.doc_id])
+
+def user_revoke_expired_tokens(userid):
+    tokens = db_get().table('tokens')
+    tsearch = tokens.search(Query().userid == userid)
+    for i in tsearch:
+        bumperlog.debug("Checking expiration of token {}: Is Current Time: {} >= Expiration: {}".format(i['token'],datetime.fromisoformat(i['expiration']), datetime.now()))
+        if datetime.now() >= datetime.fromisoformat(i['expiration']):
+            bumperlog.debug("Removing token {} due to expiration".format(i['token']))
+            tokens.remove(doc_ids=[i.doc_id])        
 
 def user_revoke_token(userid, token):
-    users = db_get().table('users')
+    tokens = db_get().table('tokens')    
-    User = Query()        
+    tmptoken = tokens.get((Query().userid == userid) & (Query().token == token))
-    user = users.get(User.userid == userid)
+    if tmptoken:
-    usertokens = list(user['tokens'])
+        tokens.remove(doc_ids=[tmptoken.doc_id])           
-    if token in usertokens:
-        usertokens.remove(token)
-    
-    users.upsert({'tokens': usertokens}, User.userid == userid)          
 
-def user_add_authcode(userid, authcode):
+def user_add_authcode(userid, token, authcode):
-    users = db_get().table('users')
+    tokens = db_get().table('tokens')    
-    User = Query()        
+    tmptoken = tokens.get((Query().userid == userid) & (Query().token == token))
-    user = users.get(User.userid == userid)
+    if tmptoken:        
-    userauthcodes = list(user['authcodes'])
+        tokens.upsert({'authcode': authcode}, ((Query().userid == userid) & (Query().token == token)))
-    if not authcode in userauthcodes:
-        userauthcodes.append(authcode)
-    
-    users.upsert({'authcodes': userauthcodes}, User.userid == userid)        
-
-def user_revoke_authcode(userid, authcode):
-    users = db_get().table('users')
-    User = Query()        
-    user = users.get(User.userid == userid)
-    userauthcodes = list(user['authcodes'])
-    if authcode in userauthcodes:
-        userauthcodes.remove(authcode)
-    
-    users.upsert({'authcodes': userauthcodes}, User.userid == userid)    
 
+def user_revoke_authcode(userid, token, authcode):
+    tokens = db_get().table('tokens')    
+    tmptoken = tokens.get((Query().userid == userid) & (Query().token == token))
+    if tmptoken:
+        tokens.upsert({'authcode': ''}, ((Query().userid == userid) & (Query().token == token)))
 
 class VacBotDevice(object):
     def __init__(
@@ -228,12 +236,28 @@ class VacBotClient(object):
 
 
 def check_authcode(uid, authcode):
-    users = bumper_users_var.get()
+    bumperlog.debug("Checking for authcode: {}".format(authcode))
-    for user in users:
+    tokens = db_get().table('tokens')    
-        if uid == "fuid_{}".format(user.userid) and authcode in user.authcodes:
+    tmpauth = tokens.get(
-            return True
+        (Query().authcode == authcode) & #Match authcode
+        ((Query().userid == uid.replace("fuid_","")) | (Query().userid == "fuid_{}".format(uid))) #Userid with or without fuid_
+    )       
+    if tmpauth:
+        return True
+    
+    return False    
 
-    return False
+def check_token(uid, token):
+    bumperlog.debug("Checking for token: {}".format(token))
+    tokens = db_get().table('tokens')    
+    tmpauth = tokens.get(
+        (Query().token == token) & #Match token
+        ((Query().userid == uid.replace("fuid_","")) | (Query().userid == "fuid_{}".format(uid))) #Userid with or without fuid_
+    )       
+    if tmpauth:
+        return True
+    
+    return False        
 
 
 def bot_add(sn, did, devclass, resource, company):

bumper/confserver.py

@@ -185,64 +185,26 @@ class ConfServer:
                 if (
                     not user_devid == ""
                 ):  # Performing basic "auth" using devid, super insecure
-                    users = bumper.db_get().table('users').all()
+                    user = bumper.user_by_deviceid(user_devid)
-                    for user in users:
+                    if "checkLogin" in request.path:                    
-                        if user_devid in user['devices']:                            
+                        self.check_token(countrycode, user, request.query["accessToken"])
-                            if "checkLogin" in request.path:
+                    else:    
-                                if request.query[
+                        #Deactivate old tokens and authcodes
-                                    "accessToken"
+                        bumper.user_revoke_expired_tokens(user['userid'])
-                                ] in user['tokens'] and request.query[
+                            
-                                    "uid"
+                        body = {
-                                ] == "fuid_{}".format(
+                            "code": bumper.RETURN_API_SUCCESS,
-                                    user['userid']
+                            "data": {
-                                ):
+                                "accessToken": self.generate_token(user),  # generate a new token
-
+                                "country": countrycode,
-                                    body = {
+                                "email": "null@null.com",
-                                        "code": bumper.RETURN_API_SUCCESS,
+                                "uid": "fuid_{}".format(user['userid']),
-                                        "data": {
+                                "username": "fusername_{}".format(user['userid']),
-                                            "accessToken": request.query["accessToken"],
+                            },
-                                            "country": countrycode,
+                            "msg": "操作成功",
-                                            "email": "null@null.com",
+                            "time": bumper.get_milli_time(time.time()),
-                                            "uid": "fuid_{}".format(user['userid']),
+                        }
-                                            "username": "fusername_{}".format(
+                        return web.json_response(body)                            
-                                                user['userid']
-                                            ),
-                                        },
-                                        "msg": "操作成功",
-                                        "time": bumper.get_milli_time(time.time()),
-                                    }
-                                    return web.json_response(body)
-                                
-                                else:
-                                    body = {
-                                        "code": bumper.ERR_TOKEN_INVALID,
-                                        "data": None,
-                                        "msg": "当前密码错误",
-                                        "time": bumper.get_milli_time(time.time()),
-                                    }
-                                    return web.json_response(body)
-                            else:    
-
-                                #Deactivate old tokens and authcodes
-                                for token in user['tokens']:
-                                    bumper.user_revoke_token(user['userid'], token) 
-
-                                for authcode in user['authcodes']:
-                                    bumper.user_revoke_authcode(user['userid'], authcode)                          
-                                    
-                                body = {
-                                    "code": bumper.RETURN_API_SUCCESS,
-                                    "data": {
-                                        "accessToken": self.generate_token(user),  # generate a new token
-                                        "country": countrycode,
-                                        "email": "null@null.com",
-                                        "uid": "fuid_{}".format(user['userid']),
-                                        "username": "fusername_{}".format(user['userid']),
-                                    },
-                                    "msg": "操作成功",
-                                    "time": bumper.get_milli_time(time.time()),
-                                }
-                                return web.json_response(body)                            
 
                 body = {
                     "code": bumper.ERR_USER_NOT_ACTIVATED,
@@ -261,14 +223,44 @@ class ConfServer:
         except Exception as e:
             confserverlog.exception("{}".format(e))
 
+
+    def check_token(self, countrycode, user, token):
+        if (
+            bumper.check_token(user['userid'], token)
+        ):                                            
+            body = {
+                "code": bumper.RETURN_API_SUCCESS,
+                "data": {
+                    "accessToken": token,
+                    "country": countrycode,
+                    "email": "null@null.com",
+                    "uid": "fuid_{}".format(user['userid']),
+                    "username": "fusername_{}".format(
+                        user['userid']
+                    ),
+                },
+                "msg": "操作成功",
+                "time": bumper.get_milli_time(time.time()),
+            }
+            return web.json_response(body)
+        
+        else:
+            body = {
+                "code": bumper.ERR_TOKEN_INVALID,
+                "data": None,
+                "msg": "当前密码错误",
+                "time": bumper.get_milli_time(time.time()),
+            }
+            return web.json_response(body)            
+
     def generate_token(self, user):
         tmpaccesstoken = uuid.uuid4().hex
         bumper.user_add_token(user['userid'],tmpaccesstoken)   
         return tmpaccesstoken
 
-    def generate_authcode(self, countrycode, user):
+    def generate_authcode(self, user, countrycode, token):
         tmpauthcode = "{}_{}".format(countrycode, uuid.uuid4().hex)
-        bumper.user_add_authcode(user['userid'], tmpauthcode)    
+        bumper.user_add_authcode(user['userid'], token, tmpauthcode)    
         return tmpauthcode
 
 
@@ -276,11 +268,11 @@ class ConfServer:
         try:
             user_devid = devid
             countrycode = country
-            users = bumper.db_get().table('users').all()
+            user = bumper.user_by_deviceid(user_devid)
             bots = bumper.db_get().table('bots').all()            
             
-            if len(users) > 0: #Default to user 0
+            if user: #Default to user 0
-                tmpuser = users[0]
+                tmpuser = user
                 bumper.user_add_device(tmpuser['userid'], user_devid)
             else:
                 bumper.user_add("tmpuser") #Add a new user
@@ -289,28 +281,15 @@ class ConfServer:
 
             for bot in bots: #Add all bots to the user
                 bumper.user_add_bot(tmpuser['userid'], bot['did'])
-
+                        
             if "checkLogin" in request.path: #If request was to check a token do so
-                if request.query["accessToken"] in tmpuser['tokens']:                                
+                checkToken = self.check_token(countrycode, user, request.query["accessToken"])                                       
-                    return {
+                isGood = json.loads(checkToken.text)
-                        "code": bumper.RETURN_API_SUCCESS,
+                if isGood['code'] == "0000":                
-                        "data": {
+                    return isGood
-                            "accessToken": request.query["accessToken"],  # Random chars 32 length
+            
-                            "country": countrycode,
-                            "email": "null@null.com",
-                            "uid": "fuid_{}".format(tmpuser['userid']),
-                            "username": "fusername_{}".format(tmpuser['userid']),
-                        },
-                        "msg": "操作成功",
-                        "time": bumper.get_milli_time(time.time()),
-                    }                   
-
             #Deactivate old tokens and authcodes
-            for token in tmpuser['tokens']:
+            bumper.user_revoke_expired_tokens(tmpuser['userid'])                       
-                bumper.user_revoke_token(tmpuser['userid'], token) 
-
-            for authcode in tmpuser['authcodes']:
-                bumper.user_revoke_authcode(tmpuser['userid'], authcode)                 
 
             body = {
                 "code": bumper.RETURN_API_SUCCESS,
@@ -334,22 +313,13 @@ class ConfServer:
         try:
             user_devid = request.match_info.get("devid", "")
             if not user_devid == "":
-                
+                user = bumper.user_by_deviceid(user_devid)
-                users = bumper.db_get().table('users').all()
+                if user:            
-                for user in users:
+                    if (
-                    if user_devid in user['devices']:
+                        bumper.check_token(user['userid'], request.query["accessToken"])                    
-                        if (
+                    ):
-                            request.query["uid"] == "fuid_{}".format(user['userid'])
+                        #Deactivate old tokens and authcodes
-                            and request.query["accessToken"] in user['tokens']
+                        bumper.user_revoke_token(user['userid'], request.query["accessToken"])                            
-                        ):
-                            #Deactivate old tokens and authcodes
-                            for token in user['tokens']:
-                                bumper.user_revoke_token(user['userid'], token) 
-                                #bumper.user_revoke_token(user['userid'],request.query["accessToken"])                            
-                            
-                            for authcode in user['authcodes']:
-                                bumper.user_revoke_authcode(user['userid'], authcode)   
-                            
 
             body = {
                 "code": bumper.RETURN_API_SUCCESS,
@@ -368,24 +338,26 @@ class ConfServer:
 
             user_devid = request.match_info.get("devid", "")
             if not user_devid == "":
-                users = bumper.db_get().table('users').all()
+                user = bumper.user_by_deviceid(user_devid)                                
-                if len(users) > 0:
+                if user:
-                    for user in users:
+                    token = bumper.user_get_token(user['userid'], request.query["accessToken"])
-                        if (
+                    if token:
-                            user_devid in user['devices']
+                        authcode = ""
-                            and request.query["accessToken"] in user['tokens']
+                        if not 'authcode' in token:
-                        ):
+                            authcode = self.generate_authcode(user, request.match_info.get("country", "us"), request.query["accessToken"])
-                           
+                        else:
-                            body = {
+                            authcode = token['authcode']
-                                "code": bumper.RETURN_API_SUCCESS,
+                        
-                                "data": {
+                        body = {
-                                    "authCode": self.generate_authcode(request.match_info.get("country", "us"), user),
+                            "code": bumper.RETURN_API_SUCCESS,
-                                    "ecovacsUid": request.query["uid"],
+                            "data": {
-                                },
+                                "authCode": authcode,
-                                "msg": "操作成功",
+                                "ecovacsUid": request.query["uid"],
-                                "time": bumper.get_milli_time(time.time()),
+                            },
-                            }
+                            "msg": "操作成功",
-                            return web.json_response(body)
+                            "time": bumper.get_milli_time(time.time()),
+                        }
+                        return web.json_response(body)
 
             body = {
                 "code": bumper.ERR_TOKEN_INVALID,
@@ -560,21 +532,18 @@ class ConfServer:
                     }
                 elif service == "EcoUpdate":
                     body = {"result": "ok", "ip": "47.88.66.164", "port": 8005}
+            
             elif todo == "loginByItToken":
-
+                if (
-                users = bumper.db_get().table('users').all()
+                    bumper.check_authcode(postbody["userId"], postbody["token"])
-                for user in users:
+                ):
-                    if (
+                    body = {
-                        postbody["userId"] == "fuid_{}".format(user['userid'])
+                        "resource": postbody["resource"],
-                        and postbody["token"] in user['authcodes']
+                        "result": "ok",
-                    ):
+                        "todo": "result",
-                        body = {
+                        "token": postbody["token"],
-                            "resource": postbody["resource"],
+                        "userId": postbody["userId"],
-                            "result": "ok",
+                    }
-                            "todo": "result",
-                            "token": postbody["token"],
-                            "userId": postbody["userId"],
-                        }
 
             elif todo == "GetDeviceList":
                 body = {"devices": bumper.db_get().table('bots').all(), "result": "ok", "todo": "result"}