From a66bd9b59570b2e57e1bf11e230167d97ee0582e Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Wed, 7 Apr 2021 10:27:25 -0700
Subject: [PATCH] Added no-cache to MPS HTTP responses for #2462

---
 mpsserver.js                    | 6 +++---
 views/default-mobile.handlebars | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mpsserver.js b/mpsserver.js
index f548baf2..d9bffe16 100644
--- a/mpsserver.js
+++ b/mpsserver.js
@@ -1234,7 +1234,7 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
                 if ((filestats == null) || (typeof filestats.size != 'number') || (filestats.size <= 0)) {
                     responseCode = 404; responseType = 'text/html'; responseData = 'File not found';
                 } else {
-                    this.write('HTTP/1.1 200 OK\r\n' + hostHeader + 'Content-Type: ' + responseType + '\r\nConnection: keep-alive\r\nContent-Length: ' + filestats.size + '\r\n\r\n');
+                    this.write('HTTP/1.1 200 OK\r\n' + hostHeader + 'Content-Type: ' + responseType + '\r\nConnection: keep-alive\r\nCache-Control: no-cache\r\nContent-Length: ' + filestats.size + '\r\n\r\n');
                     if (directives[0] == 'GET') { obj.fs.createReadStream(cookie.f, { flags: 'r' }).pipe(this); }
                     delete this.xdata;
                     return;
@@ -1259,7 +1259,7 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
                         if ((filestats == null) || (typeof filestats.size != 'number') || (filestats.size <= 0)) {
                             responseCode = 404; responseType = 'text/html'; responseData = 'File not found';
                         } else {
-                            this.write('HTTP/1.1 200 OK\r\n' + hostHeader + 'Content-Type: ' + responseType + '\r\nConnection: keep-alive\r\nContent-Length: ' + filestats.size + '\r\n\r\n');
+                            this.write('HTTP/1.1 200 OK\r\n' + hostHeader + 'Content-Type: ' + responseType + '\r\nConnection: keep-alive\r\nCache-Control: no-cache\r\nContent-Length: ' + filestats.size + '\r\n\r\n');
                             if (directives[0] == 'GET') {
                                 obj.fs.createReadStream(r.file, { flags: 'r' }).pipe(this);
                                 if (typeof r.maxserve == 'number') { r.maxserve--; if (r.maxserve == 0) { delete obj.httpResponses[directives[1]]; } } // Check if this entry was server the maximum amount of times.
@@ -1274,7 +1274,7 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
                 responseData = 'Invalid request';
             }
         }
-        this.write('HTTP/1.1 ' + responseCode + ' OK\r\n' + hostHeader + 'Connection: keep-alive\r\nContent-Type: ' + responseType + '\r\nContent-Length: ' + responseData.length + '\r\n\r\n');
+        this.write('HTTP/1.1 ' + responseCode + ' OK\r\n' + hostHeader + 'Connection: keep-alive\r\nCache-Control: no-cache\r\nContent-Type: ' + responseType + '\r\nContent-Length: ' + responseData.length + '\r\n\r\n');
         this.write(responseData);
         delete this.xdata;
     }
diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars
index c599d014..8acc4e9e 100644
--- a/views/default-mobile.handlebars
+++ b/views/default-mobile.handlebars
@@ -3471,7 +3471,7 @@
             ) { menus.push({ n: "Desktop", f: 'setupDeviceMenu(1)' }); }
 
             if ((currentDevicePanel != 5) &&
-                (urlargs.term == 1) &&
+                //(urlargs.term == 1) &&
                 (currentNode != null) &&
                 ((meshrights & 8) || (meshrights & 256)) && ((meshrights == 0xFFFFFFFF) || ((meshrights & 65536) == 0)) &&
                 (((currentNode.agent == null) && ((typeof currentNode.intelamt.sku !== 'number') || ((currentNode.intelamt.sku & 8) != 0))) || (currentNode.agent && (currentNode.agent.caps & 2)))