MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-25 14:45:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed connection problem, server relay crash.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2019-10-16 10:19:45 -07:00
parent 98d81ba631
commit b0f44862ff
6 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MeshCentralServer.njsproj
View File

@ -126,7 +126,7 @@
<Compile Include="public\scripts\agent-desktop-0.0.2.js" /> <Compile Include="public\scripts\agent-desktop-0.0.2.js" />
<Compile Include="public\scripts\amt-desktop-0.0.2.js" /> <Compile Include="public\scripts\amt-desktop-0.0.2.js" />
<Compile Include="public\scripts\amt-ider-ws-0.0.1.js" /> <Compile Include="public\scripts\amt-ider-ws-0.0.1.js" />
<Compile Include="public\scripts\agent-redir-ws-0.1.0.js" /> <Compile Include="public\scripts\agent-redir-ws-0.1.1.js" />
<Compile Include="public\scripts\amt-redir-ws-0.1.0.js" /> <Compile Include="public\scripts\amt-redir-ws-0.1.0.js" />
<Compile Include="public\scripts\amt-script-0.2.0.js" /> <Compile Include="public\scripts\amt-script-0.2.0.js" />
<Compile Include="public\scripts\amt-setupbin-0.1.0.js" /> <Compile Include="public\scripts\amt-setupbin-0.1.0.js" />

3
meshrelay.js
View File

@ -27,6 +27,9 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
if (rcookie.ruserid != null) { obj.ruserid = rcookie.ruserid; } if (rcookie.ruserid != null) { obj.ruserid = rcookie.ruserid; }
} }
// Check connection id
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; }
// If there is no authentication, drop this connection // If there is no authentication, drop this connection
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; } 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; }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.4.2-p", "version": "0.4.2-q",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",

0
public/scripts/agent-redir-ws-0.1.0.js → public/scripts/agent-redir-ws-0.1.1.js
View File

2
views/default-mobile.handlebars
View File

@ -9,7 +9,7 @@
<link rel="shortcut icon" type="image/x-icon" href="{{{domainurl}}}favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="{{{domainurl}}}favicon.ico" />
<script type="text/javascript" src="scripts/common-0.0.1.js"></script> <script type="text/javascript" src="scripts/common-0.0.1.js"></script>
<script type="text/javascript" src="scripts/meshcentral.js"></script> <script type="text/javascript" src="scripts/meshcentral.js"></script>
<script type="text/javascript" src="scripts/agent-redir-ws-0.1.0.js"></script> <script type="text/javascript" src="scripts/agent-redir-ws-0.1.1.js"></script>
<script type="text/javascript" src="scripts/agent-desktop-0.0.2.js"></script> <script type="text/javascript" src="scripts/agent-desktop-0.0.2.js"></script>
<script type="text/javascript" src="scripts/amt-0.2.0.js"></script> <script type="text/javascript" src="scripts/amt-0.2.0.js"></script>
<script type="text/javascript" src="scripts/amt-redir-ws-0.1.0.js"></script> <script type="text/javascript" src="scripts/amt-redir-ws-0.1.0.js"></script>

2
views/default.handlebars
View File

@ -22,7 +22,7 @@
<script type="text/javascript" src="scripts/zlib-crc32.js"></script> <script type="text/javascript" src="scripts/zlib-crc32.js"></script>
<script type="text/javascript" src="scripts/amt-redir-ws-0.1.0.js"></script> <script type="text/javascript" src="scripts/amt-redir-ws-0.1.0.js"></script>
<script type="text/javascript" src="scripts/amt-wsman-ws-0.2.0.js"></script> <script type="text/javascript" src="scripts/amt-wsman-ws-0.2.0.js"></script>
<script type="text/javascript" src="scripts/agent-redir-ws-0.1.0.js"></script> <script type="text/javascript" src="scripts/agent-redir-ws-0.1.1.js"></script>
<script type="text/javascript" src="scripts/agent-redir-rtc-0.1.0.js"></script> <script type="text/javascript" src="scripts/agent-redir-rtc-0.1.0.js"></script>
<script type="text/javascript" src="scripts/agent-desktop-0.0.2.js"></script> <script type="text/javascript" src="scripts/agent-desktop-0.0.2.js"></script>
<script type="text/javascript" src="scripts/qrcode.min.js"></script> <script type="text/javascript" src="scripts/qrcode.min.js"></script>