diff --git a/agents/hashagents.txt b/agents/hashagents.txt index ca682991..1fb581a1 100644 --- a/agents/hashagents.txt +++ b/agents/hashagents.txt @@ -1,31 +1,37 @@ 3: MeshService-signed.exe -0F25C0DE5CD3D42FBE9D2F9DD730B1CA5D05031987F83C0FFE822C02E3D7A4C0AF6B66757AC6D2FFC8A1146F4D20E567 +668565D572C579C6685E04C98A8D70AA049104D144FC1786024DB379B0CAF4E8746275F479A5DB4BF1826D99875BF8A4 4: MeshService64-signed.exe -E00D9E1869EB0E3F44A414C182525B5CBD8722507809F3659CFA4C1C7FA30ED1263B0D897926FC71CA5F02A45B7A7F13 +C4D64FEE7819054821DC5286802860155924FED0DBA06B59D98CA44CA94339CB41665928040D63D49C243F2E8F51EB18 5: meshagent_x86 -F536D20FCEB2D7F053B147FE85B8442A3D699F0C19B64ED4381C8A07D188AF7DFAD9D56CF74BC4A46AE28E5A23F4DE7F +94D0C5C0BCC5ACC7BE287A3B3939CE9A3E3F5DF07E9E75A862C6BE92E8CB43C16D5B20509394369ADA57957E59C248EE 6: meshagent_x86-64 -889D962344C8E4614BC80255172CEA8568A715910DA9344CC7431D9DAF10FC6B2DF3BC4D22C03ED53EB43D68253FAC9E +FA9769DBC05DD65397A1436C5AE974A7ACB35105AA64C76152991C372AEAEAD337545D9BB5A043BBD7C24E2DDECDE11E 9: meshagent_arm -BCAA992A024DC7768BEBC6AD5E99EC186028D6C619178BB60E8FFA16A6D5EBF48A22069735CFFAF64EFB294E71AFCE20 +47F742E82E568BCDA16CC064541C645931E59E1105947878D4226EED396C65FD4B35038D5FF823229D6AEA3C900827B7 7: meshagent_mips -C8C3B000B1FFFE96632F4CE0FE0DADA7516C80243B029FDBF080F46C2E5B0DB2E6E563BB7E9AE2B429E26CDE1F59DF65 +A0EC31C93D68DAE121E84165B78F937BE273B547C9F30D7A0C8BF74F71D2EF67F38FABEB70FDD47C853B5B90EE26F514 13: meshagent_pogo -21E528DE8E0D416AE71F3376BF0DEA48927DB6C1D975542EEE6050F2B0F850A2E16E410D4E9FB6068F66C1B28A3A06AB +9E2F8AD343ECEC7736A48490614126F6C5B05F7E032DB4279BBAF4429B92AC6A018C2ABBAA06895D9FB2783F3AC06D56 15: meshagent_poky -246A7853A64F85F9E183BE5E2CC75793124C13DA36273EF1B7DECFD8847219CAD44D016F5D1DD5BA6A4C32525FF43893 +6A0ABB9C1F1AC226761A062B6DE80F05FAF23C471FA61A729DEADEB3E9B36AE253E3592158CFF4A52490CFBA0F8B461F +16: meshagent_osx-x86-64 +3A432DC09A960BEDAFB54ECCE87B26B1213291755EFE2BE48F649E8407E19767EB0969F314984BFDB03715E2F0154A82 18: meshagent_poky64 -BF5E6021C4FE6F8DDF95D115A70AD29336725256FC6862AF95A7ED56CA3F0D646EBEA4590FD7D24F110B29B50D9820C8 +A63CC0E62FD8DDF049C296F65EC903016D4131C32B1053ABA5779C4ED7785BBCD03C086A994A75EE94449C251991BA03 19: meshagent_x86_nokvm -1EEDABFE53E01851E8020C36D3A4ED30F6DC401ACBC46B790E69E97943EA7D0A707C91C535805D57EC79A32968EF5E3C +6CEA489A5E7E06235881A6E233A200D8DD4CAF573C24488F2DB89CE19F1A3C95EC51D2035D530AA5C5DAF7C86C5267CA 20: meshagent_x86-64_nokvm -BB1CB2114ACFDCFB675FFACB81F617B4027906AD1E00CA23BEA9AC1A72F405DA334E1C9647BE86B7A2607E015B4A4D0A +EF7ACE466B23F704536994A797E1D6E2A552F6C9493BCD17DFC23089944B7902BAD301A917A530A03004D5EF543D3B86 24: meshagent_arm-linaro -60256F2EB118C55E6DF3DF136794CE2876171065ABE1060766D1A5816503C22766A1082018BB458B13F2755850854202 +36AA82452C4E50E32B5398B190421A93C87AC5FB42A431C0CBED47FBD54FA8429F5CB413A1FD3AE75881C97BDEBA3C59 25: meshagent_armhf -FDADFEE1BDE863048B9047274A95533C96EDF73B1082C77E088742B6B5B6E28562D8CB1E32AEA0F7EE79942D8EDAB0D9 +6811DA87477E7672A65671A86D326F1C0DD1DDE88E5CB6AD7B0B177F623B7D9534EF7455E543EF1AC762131CBF973015 26: meshagent_arm64 -B2AE36166473EB345DF28832F43B8B8CD8110DE916E9504534A5CA68A061275962CE747E829018061D41F0F918890687 +773E6C57DB28B799192A11EA624B57DFB08C2BE37276F2927A4FFC080242C04CA8B2EF79B4D95F1BA28BA694ADEEA75E 27: meshagent_armhf2 -33FE42753F164F3899809E2E5C981E91D46979E5F39B4AC4E86D0ADCB7632D3AD8FAE73443DD984CFB85114658F4348D +6306E41CE4B017153B11B7E1022AFA29E2586EA02F9561E369A77938F6A65AE094E53DB0E4B0852CF91FC5D362D90F21 +28: meshagent_mips24kc +2E15EEDD9682ADDDDD90D46CB4ADA441C5B0A40DC7D513BA02CC0331B44EC5B35C92708B3E3595F5E65FF0799CF66764 +30: meshagent_freebsd_x86-64 +1C9C1801F169E55C0CD6751DED44271D5B92C3F912DF7954E0E06AEEA841810D233E476BAD558772BF609C58206A44CB diff --git a/agents/meshagent_arm b/agents/meshagent_arm index 7aff08c7..0db3ab08 100644 Binary files a/agents/meshagent_arm and b/agents/meshagent_arm differ diff --git a/agents/meshagent_arm-linaro b/agents/meshagent_arm-linaro index 21109453..c9fe2597 100644 Binary files a/agents/meshagent_arm-linaro and b/agents/meshagent_arm-linaro differ diff --git a/agents/meshagent_mips b/agents/meshagent_mips index 15dd6435..7a091261 100644 Binary files a/agents/meshagent_mips and b/agents/meshagent_mips differ diff --git a/agents/meshagent_mips24kc b/agents/meshagent_mips24kc index f69dd2c0..fdf8d1fb 100644 Binary files a/agents/meshagent_mips24kc and b/agents/meshagent_mips24kc differ diff --git a/agents/meshagent_pogo b/agents/meshagent_pogo index badd1f1b..badca16b 100644 Binary files a/agents/meshagent_pogo and b/agents/meshagent_pogo differ diff --git a/agents/meshagent_poky b/agents/meshagent_poky index 82e92fee..21f3e200 100644 Binary files a/agents/meshagent_poky and b/agents/meshagent_poky differ diff --git a/agents/meshagent_poky64 b/agents/meshagent_poky64 index e6d66cb9..0a9a59ce 100644 Binary files a/agents/meshagent_poky64 and b/agents/meshagent_poky64 differ diff --git a/agents/meshagent_x86 b/agents/meshagent_x86 index 85c4973b..17b56ead 100644 Binary files a/agents/meshagent_x86 and b/agents/meshagent_x86 differ diff --git a/agents/meshagent_x86-64 b/agents/meshagent_x86-64 index fcf82c88..1762e73a 100644 Binary files a/agents/meshagent_x86-64 and b/agents/meshagent_x86-64 differ diff --git a/agents/meshagent_x86-64_nokvm b/agents/meshagent_x86-64_nokvm index 5673d75e..f7d0459d 100644 Binary files a/agents/meshagent_x86-64_nokvm and b/agents/meshagent_x86-64_nokvm differ diff --git a/agents/meshagent_x86_nokvm b/agents/meshagent_x86_nokvm index af17115e..2abe92fb 100644 Binary files a/agents/meshagent_x86_nokvm and b/agents/meshagent_x86_nokvm differ diff --git a/agents/meshcore.js b/agents/meshcore.js index bb39a380..a3abb688 100644 --- a/agents/meshcore.js +++ b/agents/meshcore.js @@ -779,7 +779,7 @@ function createMeshCore(agent) { // Perform manual server TLS certificate checking based on the certificate hash given by the server. woptions.rejectUnauthorized = 0; - woptions.checkServerIdentity = function checkServerIdentity(certs) { if ((checkServerIdentity.servertlshash != null) && (checkServerIdentity.servertlshash != certs[0].fingerprint.split(':').join('').toLowerCase())) { throw new Error('BadCert') } } + woptions.checkServerIdentity = function checkServerIdentity(certs) { if ((checkServerIdentity.servertlshash != null) && (checkServerIdentity.servertlshash != certs[0].digest.split(':').join('').toLowerCase())) { throw new Error('BadCert') } } woptions.checkServerIdentity.servertlshash = data.servertlshash; //sendConsoleText(JSON.stringify(woptions)); @@ -1170,7 +1170,7 @@ function createMeshCore(agent) { // Perform manual server TLS certificate checking based on the certificate hash given by the server. agentFileHttpOptions.rejectUnauthorized = 0; - agentFileHttpOptions.checkServerIdentity = function checkServerIdentity(certs) { if ((checkServerIdentity.servertlshash != null) && (checkServerIdentity.servertlshash != certs[0].fingerprint.split(':').join('').toLowerCase())) { throw new Error('BadCert') } } + agentFileHttpOptions.checkServerIdentity = function checkServerIdentity(certs) { if ((checkServerIdentity.servertlshash != null) && (checkServerIdentity.servertlshash != certs[0].digest.split(':').join('').toLowerCase())) { throw new Error('BadCert') } } agentFileHttpOptions.checkServerIdentity.servertlshash = data.servertlshash; if (agentFileHttpOptions == null) return; diff --git a/meshuser.js b/meshuser.js index ff5b5a15..b562f991 100644 --- a/meshuser.js +++ b/meshuser.js @@ -1330,12 +1330,10 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use // Add server TLS cert hash var tlsCertHash = null; - /* if (parent.parent.args.ignoreagenthashcheck !== true) { - tlsCertHash = parent.webCertificateHashs[domain.id]; + tlsCertHash = parent.webCertificateFullHashs[domain.id]; if (tlsCertHash != null) { command.servertlshash = Buffer.from(tlsCertHash, 'binary').toString('hex'); } } - */ // Add user consent messages command.soptions = {}; diff --git a/webserver.js b/webserver.js index f69aa91a..ffa30b02 100644 --- a/webserver.js +++ b/webserver.js @@ -3218,12 +3218,10 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { // Instruct one of more agents to download a URL to a given local drive location. var tlsCertHash = null; - /* if (parent.args.ignoreagenthashcheck !== true) { - tlsCertHash = obj.webCertificateHashs[cmd.domain.id]; + tlsCertHash = obj.webCertificateFullHashs[cmd.domain.id]; if (tlsCertHash != null) { tlsCertHash = Buffer.from(tlsCertHash, 'binary').toString('hex'); } } - */ for (var i in cmd.nodeids) { obj.GetNodeWithRights(cmd.domain, cmd.user, cmd.nodeids[i], function (node, rights, visible) { if ((node == null) || ((rights & 8) == 0) || (visible == false)) return; // We don't have remote control rights to this device