[Minor optimizations] settings X_FRAME_OPTIONS allow localhost / add …

…geoserver local services paths to geoserver proxy
GeoNode · May 9, 2019 · 3f04769 · 3f04769
1 parent 99c548e
commit 3f04769
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/geonode/geoserver/urls.py b/geonode/geoserver/urls.py
@@ -55,9 +55,18 @@
                                              downstream_path='wps'), name='wps_endpoint'),
     url(r'^pdf', views.geoserver_proxy, dict(proxy_path='/gs/pdf',
                                              downstream_path='pdf'), name='pdf_endpoint'),
+    url(r'^(?P<workspace>[^/]*)/(?P<layername>[^/]*)/ows',
+        views.geoserver_proxy,
+        dict(proxy_path='/gs/%s' % settings.DEFAULT_WORKSPACE, downstream_path='ows')),
     url(r'^(?P<workspace>[^/]*)/(?P<layername>[^/]*)/wms',
         views.geoserver_proxy,
         dict(proxy_path='/gs/%s' % settings.DEFAULT_WORKSPACE, downstream_path='wms')),
+    url(r'^(?P<workspace>[^/]*)/(?P<layername>[^/]*)/wfs',
+        views.geoserver_proxy,
+        dict(proxy_path='/gs/%s' % settings.DEFAULT_WORKSPACE, downstream_path='wfs')),
+    url(r'^(?P<workspace>[^/]*)/(?P<layername>[^/]*)/wcs',
+        views.geoserver_proxy,
+        dict(proxy_path='/gs/%s' % settings.DEFAULT_WORKSPACE, downstream_path='wcs')),
 
     url(r'^updatelayers/$',
         views.updatelayers, name="updatelayers"),

diff --git a/geonode/settings.py b/geonode/settings.py
@@ -580,7 +580,8 @@
 SESSION_COOKIE_SECURE = False
 CSRF_COOKIE_SECURE = False
 CSRF_COOKIE_HTTPONLY = False
-X_FRAME_OPTIONS = 'DENY'
+# X_FRAME_OPTIONS = 'DENY'
+X_FRAME_OPTIONS = 'ALLOW-FROM %s' % SITEURL
 SECURE_CONTENT_TYPE_NOSNIFF = True
 SECURE_BROWSER_XSS_FILTER = True
 SECURE_SSL_REDIRECT = False

diff --git a/geonode/templates/index.html b/geonode/templates/index.html
@@ -379,7 +379,6 @@ <h5 class="cli_messagebar_head">{{ custom_theme.cookie_law_info_bar_head }}</h5>
 <script type='text/javascript'>
 /* <![CDATA[ */
 var Cli_Data = {"nn_cookie_ids":[],"cookielist":[]};
-
 /* ]]> */
 </script>
 <script type="text/javascript" src="{% static "geonode/js/cookie-law-info/cookie-law-info-public.js" %}"></script>