ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-24 07:06:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

check hooks are enabled before firing

Browse Source
This commit is contained in:
Grant Limberg 2023-10-31 12:16:26 -07:00
parent 0088cef2fc
commit 2fd50b104c
No known key found for this signature in database
GPG Key ID: 8F2F97D3BE8D7735
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
controller/PostgreSQL.cpp
View File

@ -1436,7 +1436,21 @@ void PostgreSQL::commitThread()
w.commit(); w.commit();
if (_smee != NULL && isNewMember) { if (_smee != NULL && isNewMember) {
notifyNewMember(networkId, memberId); pqxx::row row = w.exec_params1(
"SELECT "
" count(h.hook_id) "
"FROM "
" ztc_hook h "
" INNER JOIN ztc_org o ON o.org_id = h.org_id "
" INNER JOIN ztc_network n ON n.owner_id = o.owner_id "
" WHERE "
"n.id = $1 ",
networkId
);
int64_t hookCount = row[0].as<int64_t>();
if (hookCount > 0) {
notifyNewMember(networkId, memberId);
}
} }
const uint64_t nwidInt = OSUtils::jsonIntHex(config["nwid"], 0ULL); const uint64_t nwidInt = OSUtils::jsonIntHex(config["nwid"], 0ULL);