Fixed connection problem, server relay crash.
Ylian Saint-Hilaire committed
Oct 16, 2019 at 10:19 UTC
b0f44862ffe583bccf7157eb155438f74fd02265
6 files changed
+7
-4
MeshCentralServer.njsproj
+1
-1
@@ -126,7 +126,7 @@
126
<Compile Include="public\scripts\agent-desktop-0.0.2.js" />
127
<Compile Include="public\scripts\amt-desktop-0.0.2.js" />
128
<Compile Include="public\scripts\amt-ider-ws-0.0.1.js" />
129
- <Compile Include="public\scripts\agent-redir-ws-0.1.0.js" />
129
+ <Compile Include="public\scripts\agent-redir-ws-0.1.1.js" />
130
<Compile Include="public\scripts\amt-redir-ws-0.1.0.js" />
131
<Compile Include="public\scripts\amt-script-0.2.0.js" />
132
<Compile Include="public\scripts\amt-setupbin-0.1.0.js" />
meshrelay.js
+3
@@ -27,6 +27,9 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
27
if (rcookie.ruserid != null) { obj.ruserid = rcookie.ruserid; }
28
}
29
30
+ // Check connection id
31
+ if (obj.id == null) { try { ws.close(); parent.parent.debug('relay', 'Relay: Connection with no id (' + cleanRemoteAddr(req.ip) + ')'); } catch (e) { console.log(e); } return; }
32
+
33
// If there is no authentication, drop this connection
34
if ((obj.id.startsWith('meshmessenger/') == false) && (obj.user == null) && (obj.ruserid == null)) { try { ws.close(); parent.parent.debug('relay', 'Relay: Connection with no authentication (' + cleanRemoteAddr(req.ip) + ')'); } catch (e) { console.log(e); } return; }
35
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.4.2-p",
3
+ "version": "0.4.2-q",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
public/scripts/agent-redir-ws-0.1.1.js
renamed
views/default-mobile.handlebars
+1
-1
@@ -9,7 +9,7 @@
9
<link rel="shortcut icon" type="image/x-icon" href="{{{domainurl}}}favicon.ico" />
10
<script type="text/javascript" src="scripts/common-0.0.1.js"></script>
11
<script type="text/javascript" src="scripts/meshcentral.js"></script>
12
- <script type="text/javascript" src="scripts/agent-redir-ws-0.1.0.js"></script>
12
+ <script type="text/javascript" src="scripts/agent-redir-ws-0.1.1.js"></script>
13
<script type="text/javascript" src="scripts/agent-desktop-0.0.2.js"></script>
14
<script type="text/javascript" src="scripts/amt-0.2.0.js"></script>
15
<script type="text/javascript" src="scripts/amt-redir-ws-0.1.0.js"></script>
views/default.handlebars
+1
-1
@@ -22,7 +22,7 @@
22
<script type="text/javascript" src="scripts/zlib-crc32.js"></script>
23
<script type="text/javascript" src="scripts/amt-redir-ws-0.1.0.js"></script>
24
<script type="text/javascript" src="scripts/amt-wsman-ws-0.2.0.js"></script>
25
- <script type="text/javascript" src="scripts/agent-redir-ws-0.1.0.js"></script>
25
+ <script type="text/javascript" src="scripts/agent-redir-ws-0.1.1.js"></script>
26
<script type="text/javascript" src="scripts/agent-redir-rtc-0.1.0.js"></script>
27
<script type="text/javascript" src="scripts/agent-desktop-0.0.2.js"></script>
28
<script type="text/javascript" src="scripts/qrcode.min.js"></script>