nostr/strfry
1
0
Fork 0
mirror of https://github.com/hoytech/strfry.git synced 2025-06-16 08:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

more work on error messages

Browse Source
This commit is contained in:
Doug Hoyte
2024-09-05 14:16:02 -04:00
parent 378f4dac73
commit 4bb2a785d2
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/apps/relay/RelayIngester.cpp
View File

@ -31,7 +31,7 @@ void RelayServer::runIngester(ThreadPool<MsgIngester>::Thread &thr) {
try { try {
ingesterProcessEvent(txn, msg->connId, msg->ipAddr, secpCtx, arr[1], writerMsgs); ingesterProcessEvent(txn, msg->connId, msg->ipAddr, secpCtx, arr[1], writerMsgs);
} catch (std::exception &e) { } catch (std::exception &e) {
sendOKResponse(msg->connId, arr[1].at("id").is_string() ? arr[1].at("id").get_string() : "?", sendOKResponse(msg->connId, arr[1].is_object() && arr[1].at("id").is_string() ? arr[1].at("id").get_string() : "?",
false, std::string("invalid: ") + e.what()); false, std::string("invalid: ") + e.what());
if (cfg().relay__logging__invalidEvents) LI << "Rejected invalid event: " << e.what(); if (cfg().relay__logging__invalidEvents) LI << "Rejected invalid event: " << e.what();
} }
@ -134,10 +134,12 @@ void RelayServer::ingesterProcessReq(lmdb::txn &txn, uint64_t connId, const tao:
void RelayServer::ingesterProcessClose(lmdb::txn &txn, uint64_t connId, const tao::json::value &arr) { void RelayServer::ingesterProcessClose(lmdb::txn &txn, uint64_t connId, const tao::json::value &arr) {
if (arr.get_array().size() != 2) throw herr("arr too small/big"); if (arr.get_array().size() != 2) throw herr("arr too small/big");
tpReqWorker.dispatch(connId, MsgReqWorker{MsgReqWorker::RemoveSub{connId, SubId(arr[1].get_string())}}); tpReqWorker.dispatch(connId, MsgReqWorker{MsgReqWorker::RemoveSub{connId, SubId(jsonGetString(arr[1], "CLOSE subscription id was not a string"))}});
} }
void RelayServer::ingesterProcessNegentropy(lmdb::txn &txn, Decompressor &decomp, uint64_t connId, const tao::json::value &arr) { void RelayServer::ingesterProcessNegentropy(lmdb::txn &txn, Decompressor &decomp, uint64_t connId, const tao::json::value &arr) {
const auto &subscriptionStr = jsonGetString(arr[1], "NEG-OPEN subscription id was not a string");
if (arr.at(0) == "NEG-OPEN") { if (arr.at(0) == "NEG-OPEN") {
if (arr.get_array().size() < 4) throw herr("negentropy query missing elements"); if (arr.get_array().size() < 4) throw herr("negentropy query missing elements");
@ -146,7 +148,7 @@ void RelayServer::ingesterProcessNegentropy(lmdb::txn &txn, Decompressor &decomp
auto filterJson = arr.at(2); auto filterJson = arr.at(2);
NostrFilterGroup filter = NostrFilterGroup::unwrapped(filterJson, maxFilterLimit); NostrFilterGroup filter = NostrFilterGroup::unwrapped(filterJson, maxFilterLimit);
Subscription sub(connId, jsonGetString(arr[1], "NEG-OPEN subscription id was not a string"), std::move(filter)); Subscription sub(connId, subscriptionStr, std::move(filter));
if (filterJson.is_object()) { if (filterJson.is_object()) {
filterJson.get_object().erase("since"); filterJson.get_object().erase("since");
@ -154,14 +156,14 @@ void RelayServer::ingesterProcessNegentropy(lmdb::txn &txn, Decompressor &decomp
} }
std::string filterStr = tao::json::to_string(filterJson); std::string filterStr = tao::json::to_string(filterJson);
std::string negPayload = from_hex(arr.at(3).get_string()); std::string negPayload = from_hex(jsonGetString(arr.at(3), "negentropy payload not a string"));
tpNegentropy.dispatch(connId, MsgNegentropy{MsgNegentropy::NegOpen{std::move(sub), std::move(filterStr), std::move(negPayload)}}); tpNegentropy.dispatch(connId, MsgNegentropy{MsgNegentropy::NegOpen{std::move(sub), std::move(filterStr), std::move(negPayload)}});
} else if (arr.at(0) == "NEG-MSG") { } else if (arr.at(0) == "NEG-MSG") {
std::string negPayload = from_hex(arr.at(2).get_string()); std::string negPayload = from_hex(jsonGetString(arr.at(2), "negentropy payload not a string"));
tpNegentropy.dispatch(connId, MsgNegentropy{MsgNegentropy::NegMsg{connId, SubId(arr[1].get_string()), std::move(negPayload)}}); tpNegentropy.dispatch(connId, MsgNegentropy{MsgNegentropy::NegMsg{connId, SubId(subscriptionStr), std::move(negPayload)}});
} else if (arr.at(0) == "NEG-CLOSE") { } else if (arr.at(0) == "NEG-CLOSE") {
tpNegentropy.dispatch(connId, MsgNegentropy{MsgNegentropy::NegClose{connId, SubId(arr[1].get_string())}}); tpNegentropy.dispatch(connId, MsgNegentropy{MsgNegentropy::NegClose{connId, SubId(subscriptionStr)}});
} else { } else {
throw herr("unknown command"); throw herr("unknown command");
} }

4
src/events.cpp
View File

@ -36,8 +36,8 @@ std::string nostrJsonToPackedEvent(const tao::json::value &v) {
auto tagVal = tag.size() >= 2 ? jsonGetString(tag.at(1), "tag val was not a string") : ""; auto tagVal = tag.size() >= 2 ? jsonGetString(tag.at(1), "tag val was not a string") : "";
if (tagName == "e" || tagName == "p") { if (tagName == "e" || tagName == "p") {
if (tagVal.size() != 64) throw herr("unexpected size for fixed-size tag: ", tagName);
tagVal = from_hex(tagVal, false); tagVal = from_hex(tagVal, false);
if (tagVal.size() != 32) throw herr("unexpected size for fixed-size tag");
tagBuilder.add(tagName[0], tagVal); tagBuilder.add(tagName[0], tagVal);
} else if (tagName == "expiration") { } else if (tagName == "expiration") {
@ -135,6 +135,8 @@ void verifyEventTimestamp(PackedEventView packed) {
void parseAndVerifyEvent(const tao::json::value &origJson, secp256k1_context *secpCtx, bool verifyMsg, bool verifyTime, std::string &packedStr, std::string &jsonStr) { void parseAndVerifyEvent(const tao::json::value &origJson, secp256k1_context *secpCtx, bool verifyMsg, bool verifyTime, std::string &packedStr, std::string &jsonStr) {
if (!origJson.is_object()) throw herr("event is not an object");
packedStr = nostrJsonToPackedEvent(origJson); packedStr = nostrJsonToPackedEvent(origJson);
PackedEventView packed(packedStr); PackedEventView packed(packedStr);
if (verifyTime) verifyEventTimestamp(packed); if (verifyTime) verifyEventTimestamp(packed);