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

Expire the previous JWT on update if HTTP root is set

Browse source 
* Required for Tautulli/Tautulli-Issues#255
This commit is contained in:
JonnyWong16 2020-06-24 14:04:07 -07:00
parent ff887d9948
commit 48f846da40
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/interfaces/default/login.html
View file

@ -24,7 +24,7 @@
<!-- ICONS --> <!-- ICONS -->
<!-- Android --> <!-- Android -->
<link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.0.5" crossorigin="use-credentials> <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.0.5" crossorigin="use-credentials">
<meta name="theme-color" content="#282a2d"> <meta name="theme-color" content="#282a2d">
<!-- Apple --> <!-- Apple -->
<link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.0.5"> <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.0.5">

8
plexpy/config.py
View file

@ -943,4 +943,10 @@ class Config(object):
if plexpy.DOCKER: if plexpy.DOCKER:
self.PLEXPY_AUTO_UPDATE = 0 self.PLEXPY_AUTO_UPDATE = 0
self.CONFIG_VERSION == 15 self.CONFIG_VERSION = 15
if self.CONFIG_VERSION == 15:
if self.HTTP_ROOT and self.HTTP_ROOT != '/':
self.JWT_UPDATE_SECRET = True
self.CONFIG_VERSION = 16

6
plexpy/webauth.py
View file

@ -296,10 +296,14 @@ class AuthController(object):
self.on_logout(payload['user'], payload['user_group']) self.on_logout(payload['user'], payload['user_group'])
jwt_cookie = str(JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID) jwt_cookie = str(JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID)
cherrypy.response.cookie[jwt_cookie] = 'expire' cherrypy.response.cookie[jwt_cookie] = ''
cherrypy.response.cookie[jwt_cookie]['expires'] = 0 cherrypy.response.cookie[jwt_cookie]['expires'] = 0
cherrypy.response.cookie[jwt_cookie]['path'] = plexpy.HTTP_ROOT.rstrip('/') or '/' cherrypy.response.cookie[jwt_cookie]['path'] = plexpy.HTTP_ROOT.rstrip('/') or '/'
if plexpy.HTTP_ROOT != '/':
# Aslo expire the JWT on the root path
cherrypy.response.headers['Set-Cookie'] = jwt_cookie + '=""; expires=Thu, 01 Jan 1970 12:00:00 GMT; path=/'
cherrypy.request.login = None cherrypy.request.login = None
if redirect_uri: if redirect_uri: