import 15.2.9

[ceph.git] / ceph / src / pybind / mgr / dashboard / services / auth.py

diff --git a/ceph/src/pybind/mgr/dashboard/services/auth.py b/ceph/src/pybind/mgr/dashboard/services/auth.py
index d829362e63d3c9e2312dd54b6d8021fc1f23cac2..bbb8a2ecfe11c664663f3943982d383691c0c456 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/services/auth.py
+++ b/ceph/src/pybind/mgr/dashboard/services/auth.py
@@ -63,12 +63,20 @@ class JwtManager(object):
 
     @classmethod
     def get_token_from_header(cls):
-        auth_header = cherrypy.request.headers.get('authorization')
-        if auth_header is not None:
-            scheme, params = auth_header.split(' ', 1)
-            if scheme.lower() == 'bearer':
-                return params
-        return None
+        auth_cookie_name = 'token'
+        try:
+            # use cookie
+            return cherrypy.request.cookie[auth_cookie_name].value
+        except KeyError:
+            try:
+                # fall-back: use Authorization header
+                auth_header = cherrypy.request.headers.get('authorization')
+                if auth_header is not None:
+                    scheme, params = auth_header.split(' ', 1)
+                    if scheme.lower() == 'bearer':
+                        return params
+            except IndexError:
+                return None
 
     @classmethod
     def set_user(cls, username):