Merge branch 'master' into 0.16

2025-03-01 10:36:34 +00:00 · 2017-01-06 14:30:13 +00:00
parent e6de26736b 8916f6f829
commit e73216d4c1
27 changed files with 354 additions and 160 deletions
--- a/red/api/index.js
+++ b/red/api/index.js
@@ -87,6 +87,16 @@ function init(_server,_runtime) {
        if (!settings.disableEditor) {
            ui.init(runtime);
            var editorApp = express();
+            if (settings.requireHttps === true) {
+                editorApp.enable('trust proxy');
+                editorApp.use(function (req, res, next) {
+                    if (req.secure) {
+                        next();
+                    } else {
+                        res.redirect('https://' + req.headers.host + req.originalUrl);
+                    }
+                });
+            }
            editorApp.get("/",ensureRuntimeStarted,ui.ensureSlash,ui.editor);
            editorApp.get("/icons/:icon",ui.icon);
            theme.init(runtime);