Merge pull request #474 from terrestris/fix-client-sec

Make client accessible for authenticated users only
terrestris · Feb 24, 2022 · 559aa73 · 559aa73
2 parents 7a61b3f + fb20347
commit 559aa73
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/shogun-boot/src/main/java/de/terrestris/shogun/boot/config/BootWebSecurityConfig.java b/shogun-boot/src/main/java/de/terrestris/shogun/boot/config/BootWebSecurityConfig.java
@@ -49,8 +49,7 @@ protected void customHttpConfiguration(HttpSecurity http) throws Exception {
                     "/swagger-ui/**",
                     "/webjars/springfox-swagger-ui/**",
                     "/swagger-resources/**",
-                    "/v2/api-docs",
-                    "/client/**"
+                    "/v2/api-docs"
                 )
                     .permitAll()
                 .antMatchers(

diff --git a/shogun-boot/src/main/resources/templates/admin-client-config.js b/shogun-boot/src/main/resources/templates/admin-client-config.js
@@ -17,11 +17,11 @@ var shogunApplicationConfig = {
   appPrefix: '/admin',
   path: {
     base: 'https://localhost',
-    configBase: '/formconfigs',
     swagger: '/v2/api-docs',
     user: '/users',
     layer: '/layers',
     imageFile: '/imagefiles',
+    application: '/applications',
     appInfo: '/info/app',
     auth: {
       login: '/auth/login',
@@ -39,9 +39,6 @@ var shogunApplicationConfig = {
     evictCache: '/cache/evict',
     metrics: '/actuator/metrics'
   },
-  models: [
-    'Application'
-  ],
   dashboard: {
     news: {
       visible: false
@@ -64,16 +61,16 @@ var shogunApplicationConfig = {
       applications: {
         visible: true,
         schemas: {
-          clientConfig: 'IhkApplicationClientConfig',
-          layerTree: 'SHOGunLayerTree',
-          layerConfig: 'LayerConfig'
+          clientConfig: 'DefaultApplicationClientConfig',
+          layerTree: 'DefaultLayerTree',
+          layerConfig: 'DefaultApplicationLayerConfig'
         }
       },
       layers: {
         visible: true,
         schemas: {
-          clientConfig: 'SHOGunLayerClientConfig',
-          sourceConfig: 'SHOGunLayerSourceConfig',
+          clientConfig: 'DefaultLayerClientConfig',
+          sourceConfig: 'DefaultLayerSourceConfig',
           features: 'GeoJsonObject'
         }
       },

diff --git a/shogun-boot/src/main/resources/templates/index.html b/shogun-boot/src/main/resources/templates/index.html
@@ -125,7 +125,7 @@ <h3>GIS client</h3>
             Give me maps! This shows an exemplary map client consuming the application context of SHOGun.
           </p>
           <a href="./client" class="icon-link">
-            Open
+            Open <i class="fas fa-lock"></i>
           </a>
         </div>
         <div class="feature col">