[Fixes #4168] GeoNode Proxy should be using OAUTH2 Bearer Header now

GeoNode · Jan 23, 2019 · cf1b78c · cf1b78c
1 parent 0bdfa39
commit cf1b78c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/geonode/local_settings.py.geoserver.sample b/geonode/local_settings.py.geoserver.sample
@@ -118,7 +118,7 @@ GEOSERVER_PUBLIC_PORT = os.getenv(
     'GEOSERVER_PUBLIC_PORT', 8080
 )
 
-_default_public_location = 'http://{}:{}/geoserver/'.format(GEOSERVER_PUBLIC_HOST, GEOSERVER_PUBLIC_PORT) if GEOSERVER_PUBLIC_PORT else 'http://{}/geoserver/'.format(GEOSERVER_PUBLIC_HOST)
+_default_public_location = 'http://{}:{}/gs/'.format(GEOSERVER_PUBLIC_HOST, GEOSERVER_PUBLIC_PORT) if GEOSERVER_PUBLIC_PORT else 'http://{}/gs/'.format(GEOSERVER_PUBLIC_HOST)
 
 GEOSERVER_PUBLIC_LOCATION = os.getenv(
     'GEOSERVER_PUBLIC_LOCATION', _default_public_location

diff --git a/geonode/proxy/views.py b/geonode/proxy/views.py
@@ -166,13 +166,7 @@ def proxy(request, url=None, response_callback=None,
         if auth:
             headers['Authorization'] = auth
     elif access_token:
-        # TODO: Bearer is currently cutted of by Djano / GeoServer
-        if request.method in ("POST", "PUT", "DELETE"):
-            headers['Authorization'] = 'Bearer %s' % access_token
-        if 'access_token' not in locator:
-            query_separator = '&' if '?' in locator else '?'
-            locator = ('%s%saccess_token=%s' %
-                       (locator, query_separator, access_token))
+        headers['Authorization'] = 'Bearer %s' % access_token
 
     site_url = urlsplit(settings.SITEURL)
 

diff --git a/geonode/settings.py b/geonode/settings.py
@@ -744,8 +744,7 @@
 )
 
 GEOSERVER_PUBLIC_LOCATION = os.getenv(
-    #  'GEOSERVER_PUBLIC_LOCATION', urljoin(SITEURL, '/geoserver')
-    'GEOSERVER_PUBLIC_LOCATION', GEOSERVER_LOCATION
+    'GEOSERVER_PUBLIC_LOCATION', urljoin(SITEURL, '/gs/')
 )
 
 OGC_SERVER_DEFAULT_USER = os.getenv(