Skip to content

Fixes for [SSL: DH_KEY_TOO_SMALL] and "can only concatenate str not int" crashes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gallarda wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes for [SSL: DH_KEY_TOO_SMALL] and "can only concatenate str not int" crashes #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions greenwavereality/greenwavereality.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import xmltodict
import urllib3

requests.packages.urllib3.util.ssl_.DEFAULT_CIPHERS += 'HIGH:!DH:!aNULL'

def grab_xml(host, token=None):
"""Grab XML data from Gateway, returned as a dict."""
Expand All @@ -28,7 +29,7 @@ def set_brightness(host, did, value, token=None):
scheme = "http"
token = "1234567890"
url = (
scheme + '://' + host + '/gwr/gop.php?cmd=DeviceSendCommand&data=<gip><version>1</version><token>' + token + '</token><did>' + did + '</did><value>' + str(
scheme + '://' + host + '/gwr/gop.php?cmd=DeviceSendCommand&data=<gip><version>1</version><token>' + token + '</token><did>' + str(did) + '</did><value>' + str(
value) + '</value><type>level</type></gip>&fmt=xml')
response = requests.get(url, verify=False)
if response.status_code == '200':
Expand All @@ -55,7 +56,7 @@ def turn_on(host, did, token=None):
scheme = "http"
token = "1234567890"
url = (
scheme + '://' + host + '/gwr/gop.php?cmd=DeviceSendCommand&data=<gip><version>1</version><token>' + token + '</token><did>' + did + '</did><value>1</value></gip>&fmt=xml')
scheme + '://' + host + '/gwr/gop.php?cmd=DeviceSendCommand&data=<gip><version>1</version><token>' + token + '</token><did>' + str(did) + '</did><value>1</value></gip>&fmt=xml')
response = requests.get(url, verify=False)
if response.status_code == '200':
return True
Expand All @@ -72,7 +73,7 @@ def turn_off(host, did, token=None):
scheme = "http"
token = "1234567890"
url = (
scheme + '://' + host + '/gwr/gop.php?cmd=DeviceSendCommand&data=<gip><version>1</version><token>' + token + '</token><did>' + did + '</did><value>0</value></gip>&fmt=xml')
scheme + '://' + host + '/gwr/gop.php?cmd=DeviceSendCommand&data=<gip><version>1</version><token>' + token + '</token><did>' + str(did) + '</did><value>0</value></gip>&fmt=xml')
response = requests.get(url, verify=False)
if response.status_code == '200':
return True
Expand Down Expand Up @@ -103,4 +104,4 @@ def grab_bulbs(host, token=None):
for room in xml:
for device in room['device']:
bulbs[int(device['did'])] = device
return bulbs
return bulbs