gronod/ha_ecovacs_bumper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ignore ssl to requests

Browse Source 
Added verify False to requests. Needed for work on Bumper
This commit is contained in:
Brian Martin
2019-01-31 09:46:04 -05:00
parent 1812a212e1
commit 2cfa5ec26b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sucks/__init__.py
+8 -5
View File
@@ -181,7 +181,8 @@ class EcoVacsAPI:
params = OrderedDict(args) params = OrderedDict(args)
params['requestId'] = self.md5(time.time()) params['requestId'] = self.md5(time.time())
url = (EcoVacsAPI.MAIN_URL_FORMAT + "/" + function).format(**self.meta) url = (EcoVacsAPI.MAIN_URL_FORMAT + "/" + function).format(**self.meta)
api_response = requests.get(url, self.__sign(params)) #Ignore SSL
api_response = requests.get(url, self.__sign(params), verify=False)
json = api_response.json() json = api_response.json()
_LOGGER.debug("got {}".format(json)) _LOGGER.debug("got {}".format(json))
if json['code'] == '0000': if json['code'] == '0000':
@@ -198,7 +199,8 @@ class EcoVacsAPI:
_LOGGER.debug("calling user api {} with {}".format(function, args)) _LOGGER.debug("calling user api {} with {}".format(function, args))
params = {'todo': function} params = {'todo': function}
params.update(args) params.update(args)
response = requests.post(EcoVacsAPI.USER_URL_FORMAT.format(continent=self.continent), json=params) #Ignore SSL
response = requests.post(EcoVacsAPI.USER_URL_FORMAT.format(continent=self.continent), json=params, verify=False)
json = response.json() json = response.json()
_LOGGER.debug("got {}".format(json)) _LOGGER.debug("got {}".format(json))
if json['result'] == 'ok': if json['result'] == 'ok':
@@ -221,10 +223,12 @@ class EcoVacsAPI:
url = (EcoVacsAPI.PORTAL_URL_FORMAT + "/" + api).format(continent=self.continent, **self.meta) url = (EcoVacsAPI.PORTAL_URL_FORMAT + "/" + api).format(continent=self.continent, **self.meta)
response = None response = None
if not api == self.IOTDEVMANAGERAPI: if not api == self.IOTDEVMANAGERAPI:
response = requests.post(url, json=params) #Ignore SSL
response = requests.post(url, json=params, verify=False)
else: else:
try: #IOT Device sometimes doesnt provide a response depending on command, reduce timeout to 3 to accomodate and make requests faster try: #IOT Device sometimes doesnt provide a response depending on command, reduce timeout to 3 to accomodate and make requests faster
response = requests.post(url, json=params, timeout=3) #May think about having timeout as an arg that could be provided in the future #Ignore SSL
response = requests.post(url, json=params, timeout=3, verify=False) #May think about having timeout as an arg that could be provided in the future
except requests.exceptions.ReadTimeout: except requests.exceptions.ReadTimeout:
_LOGGER.debug("call to {} failed with ReadTimeout".format(function)) _LOGGER.debug("call to {} failed with ReadTimeout".format(function))
return {} return {}
@@ -765,7 +769,6 @@ class EcoVacsMQTT(ClientMQTT):
_LOGGER.debug("EcoVacsMQTT - Subscribing to all") _LOGGER.debug("EcoVacsMQTT - Subscribing to all")
self.subscribe('iot/atr/+/' + self.vacuum['did'] + '/' + self.vacuum['class'] + '/' + self.vacuum['resource'] + '/+', qos=0) self.subscribe('iot/atr/+/' + self.vacuum['did'] + '/' + self.vacuum['class'] + '/' + self.vacuum['resource'] + '/+', qos=0)
self.ready_flag.set() self.ready_flag.set()
#def on_log(self, client, userdata, level, buf): #This is very noisy and verbose #def on_log(self, client, userdata, level, buf): #This is very noisy and verbose