github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-12 00:06:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Send PMS token in header instead of in uri

Browse source
This commit is contained in:
JonnyWong16 2016-05-11 22:01:11 -07:00
parent 1e5153d69e
commit c14053a199
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plexpy/http_handler.py
View file

@ -72,16 +72,16 @@ class HTTPHandler(object):
token_string = '' token_string = ''
if not no_token: if not no_token:
if uri.find('?') > 0: if headers:
token_string = '&X-Plex-Token=' + self.token headers.update({'X-Plex-Token': self.token})
else: else:
token_string = '?X-Plex-Token=' + self.token headers = {'X-Plex-Token': self.token}
try: try:
if headers: if headers:
handler.request(request_type, uri + token_string, headers=headers) handler.request(request_type, uri, headers=headers)
else: else:
handler.request(request_type, uri + token_string) handler.request(request_type, uri)
response = handler.getresponse() response = handler.getresponse()
request_status = response.status request_status = response.status
request_content = response.read() request_content = response.read()

8
plexpy/web_socket.py
View file

@ -58,7 +58,9 @@ def run():
# Set authentication token (if one is available) # Set authentication token (if one is available)
if plexpy.CONFIG.PMS_TOKEN: if plexpy.CONFIG.PMS_TOKEN:
uri += '?X-Plex-Token=' + plexpy.CONFIG.PMS_TOKEN header = ["X-Plex-Token: %s" % plexpy.CONFIG.PMS_TOKEN]
else:
header = []
global ws_reconnect global ws_reconnect
ws_reconnect = False ws_reconnect = False
@ -69,7 +71,7 @@ def run():
while not ws_connected and reconnects <= 15: while not ws_connected and reconnects <= 15:
try: try:
logger.info(u"PlexPy WebSocket :: Opening%s websocket, connection attempt %s." % (secure, str(reconnects + 1))) logger.info(u"PlexPy WebSocket :: Opening%s websocket, connection attempt %s." % (secure, str(reconnects + 1)))
ws = create_connection(uri) ws = create_connection(uri, header=header)
reconnects = 0 reconnects = 0
ws_connected = True ws_connected = True
logger.info(u"PlexPy WebSocket :: Ready") logger.info(u"PlexPy WebSocket :: Ready")
@ -94,7 +96,7 @@ def run():
logger.warn(u"PlexPy WebSocket :: Connection has closed, reconnecting...") logger.warn(u"PlexPy WebSocket :: Connection has closed, reconnecting...")
try: try:
ws = create_connection(uri) ws = create_connection(uri, header=header)
except IOError, e: except IOError, e:
logger.info(u"PlexPy WebSocket :: %s." % e) logger.info(u"PlexPy WebSocket :: %s." % e)