Merge pull request #286 from FlowFuse/apply-auth-on-static

Ensure auth middleware applied on httpStatic routes
FlowFuse · Sep 19, 2024 · ad84321 · ad84321
2 parents 27ea96b + 06d7c3f
commit ad84321
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/lib/runtimeSettings.js b/lib/runtimeSettings.js
@@ -170,12 +170,16 @@ function getSettingsFile (settings) {
         const httpStatic = []
         settings.settings.httpStatic.forEach(staticSetting => {
             staticSetting.path = path.normalize(path.join(settings.storageDir, staticSetting.path))
-            if (staticSetting.path.startsWith(settings.storageDir)) {
-                httpStatic.push(staticSetting)
+            if (staticSetting.path.startsWith(settings.storageDir) && staticSetting.root) {
+                httpStatic.push('{' +
+                    'path: ' + JSON.stringify(staticSetting.path) + ',' +
+                    'root: ' + JSON.stringify(staticSetting.root) +
+                    (authMiddlewareRequired ? ', middleware: flowforgeAuthMiddleware' : '') +
+                    '}')
             }
         })
         if (httpStatic.length > 0) {
-            projectSettings.httpStatic = httpStatic
+            projectSettings.httpStatic = '[' + httpStatic.join(', ') + ']'
         }
     }
 
@@ -375,7 +379,7 @@ module.exports = {
     },
     httpAdminCookieOptions: ${JSON.stringify(httpAdminCookieOptions)},
     ${projectSettings.uibuilder ? 'uibuilder: ' + JSON.stringify(projectSettings.uibuilder) + ',' : ''}
-    ${projectSettings.httpStatic ? 'httpStatic: ' + JSON.stringify(projectSettings.httpStatic) : ''}
+    ${projectSettings.httpStatic ? 'httpStatic: ' + projectSettings.httpStatic : ''}
 }
 `
     return settingsTemplate