Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added "keyagents" domain config option. #6190

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Added "keyagents" domain config option. #6190

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17f86d0
Added "keyagents" domain config option.
HuFlungDu Jun 19, 2024
a38f29b
Changed agentkey to a 64 byte random hex string instead of a 128 lowe…
HuFlungDu Jun 19, 2024
e3c8bb7
Added keyAgentsGrace option
HuFlungDu Jun 20, 2024
d809903
Added agentkeytimeout option to expire keys if they are not used
HuFlungDu Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Changed agentkey to a 64 byte random hex string instead of a 128 lowe… 
…rcase character string.

Also store it on the server as the sha384 hash of that string
@HuFlungDu
HuFlungDu committed Jun 19, 2024
commit a38f29b4ff941b007d4aa27e9e43c18ff026b272
26 changes: 15 additions & 11 deletions webserver.js
View file
Original file line number Diff line number Diff line change
@@ -5418,10 +5418,11 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
let connectString = 'wss://' + serverName + ':' + httpsPort + '/' + xdomain + 'agent.ashx';

if (domain.keyagents || obj.parent.config.settings.keyagents) {
let _key = getRandomLowerCase(128);
let _agentKey = { "type": "agentkey", "nodeid": null, "key": _key, "_id": `agentkey//${_key}` };
let _key = obj.crypto.randomBytes(64);
let _hash = obj.crypto.createHash('sha384').update(_key).digest("hex");
let _agentKey = { "type": "agentkey", "nodeid": null, "key": _hash, "_id": `agentkey//${_hash}` };
db.Set(_agentKey);
connectString += `?key=${_agentKey["key"]}`;
connectString += `?key=${_key.toString("hex")}`;
}
meshsettings += 'MeshServer=' + connectString + '\r\n';
} else {
@@ -5862,10 +5863,11 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
if (obj.args.lanonly != true) {
let connectString = 'wss://' + serverName + ':' + httpsPort + '/' + xdomain + 'agent.ashx';
if (domain.keyagents || obj.parent.config.settings.keyagents) {
let _key = getRandomLowerCase(128);
let _agentKey = { "type": "agentkey", "nodeid": null, "key": _key, "_id": `agentkey//${_key}` };
let _key = obj.crypto.randomBytes(64);
let _hash = obj.crypto.createHash('sha384').update(_key).digest("hex")
let _agentKey = { "type": "agentkey", "nodeid": null, "key": _hash, "_id": `agentkey//${_hash}` };
db.Set(_agentKey);
connectString += `?key=${_agentKey["key"]}`;
connectString += `?key=${_key.toString("hex")}`;
}
meshsettings += 'MeshServer=' + connectString + '\r\n';
} else {
@@ -6018,10 +6020,11 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
if (obj.args.lanonly != true) {
let connectString = 'wss://' + serverName + ':' + httpsPort + '/' + xdomain + 'agent.ashx';
if (domain.keyagents || obj.parent.config.settings.keyagents) {
let _key = getRandomLowerCase(128);
let _agentKey = { "type": "agentkey", "nodeid": null, "key": _key, "_id": `agentkey//${_key}` };
db.Set(_agentKey)
connectString += `?key=${_agentKey["key"]}`
let _key = obj.crypto.randomBytes(64);
let _hash = obj.crypto.createHash('sha384').update(_key).digest("hex")
let _agentKey = { "type": "agentkey", "nodeid": null, "key": _hash, "_id": `agentkey//${_hash}` };
db.Set(_agentKey);
connectString += `?key=${_key.toString("hex")}`;
}
meshsettings += 'MeshServer=' + connectString + '\r\n';
} else {
@@ -6914,8 +6917,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
if (req.query.key == null) {
return;
}
let _hash = obj.crypto.createHash('sha384').update(Buffer.from(req.query.key, "hex")).digest("hex")
p = new Promise((resolve, reject)=>{
db.Get(`agentkey//${req.query.key}`, (err, data)=>{
db.Get(`agentkey//${_hash}`, (err, data)=>{
if (err || data.length === 0) {
parent.debug('web', 'Got agent connection with unknown agent key ' + req.clientIp + ', holding.')
resolve({cont: false})