Skip to content

added address to msg_log #86

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

Open
nikhilsamrat wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added address to msg_log #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions multicastsdk/include/marlin/multicast/DefaultMulticastClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,15 @@ class DefaultMulticastClient {
void msg_log(
core::SocketAddress taddr,
typename PubSubNodeType::ClientKey baddr,
std::array<uint8_t, 20> address,
uint64_t message_id,
core::WeakBuffer message
) {
if((message_id & LogMask::mask(message)) == 0) {
SPDLOG_INFO(
"Msg log: {}, cluster: 0x{:spn}, relay: {}",
message_id, spdlog::to_hex(baddr.data(), baddr.data()+baddr.size()), taddr.to_string()
"Msg log: {}, cluster: 0x{:spn}, relay: {}, sender: 0x{:spn}",
message_id, spdlog::to_hex(baddr.data(), baddr.data()+baddr.size()), taddr.to_string(),
spdlog::to_hex(address.data(), address.data()+20)
);
}
}
Expand Down
98 changes: 53 additions & 45 deletions pubsub/include/marlin/pubsub/PubSubNode.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,60 +972,64 @@ int PUBSUBNODETYPE::did_recv_MESSAGE(

SPDLOG_DEBUG("PUBSUBNODE did_recv_MESSAGE ### message id: {}, channel: {}", message_id, channel);

constexpr bool has_msg_log = requires(
PubSubDelegate& d
) {
d.msg_log(core::SocketAddress(), std::array<uint8_t, 20>(), message_id, bytes);
};
if constexpr(has_msg_log) {
delegate->msg_log(transport.dst_addr, beacon_map[transport.dst_addr], message_id, bytes);
bytes.cover_unsafe(10);
MessageHeaderType header = {};

auto att_opt = attester.parse_size(bytes, 0);
if(!att_opt.has_value()) {
SPDLOG_ERROR("Attestation size parse failure");
transport.close();
return -1;
}

// Send it onward
if(message_id_set.find(message_id) == message_id_set.end()) { // Deduplicate message
bytes.cover_unsafe(10);
MessageHeaderType header = {};
header.attestation_data = bytes.data();
header.attestation_size = att_opt.value();
auto res = bytes.cover(header.attestation_size);

auto att_opt = attester.parse_size(bytes, 0);
if(!att_opt.has_value()) {
SPDLOG_ERROR("Attestation size parse failure");
transport.close();
return -1;
}
if(!res) {
SPDLOG_ERROR("Attestation too long: {}", header.attestation_size);
transport.close();
return -1;
}

header.attestation_data = bytes.data();
header.attestation_size = att_opt.value();
auto res = bytes.cover(header.attestation_size);
auto wit_opt = witnesser.parse_size(bytes, 0);
if(!wit_opt.has_value()) {
SPDLOG_ERROR("Witness size parse failure");
transport.close();
return -1;
}

if(!res) {
SPDLOG_ERROR("Attestation too long: {}", header.attestation_size);
transport.close();
return -1;
}
header.witness_data = bytes.data();
header.witness_size = wit_opt.value();
res = bytes.cover(header.witness_size);

auto wit_opt = witnesser.parse_size(bytes, 0);
if(!wit_opt.has_value()) {
SPDLOG_ERROR("Witness size parse failure");
transport.close();
return -1;
}
if(!res) {
SPDLOG_ERROR("Witness too long: {}", header.witness_size);
transport.close();
return -1;
}

header.witness_data = bytes.data();
header.witness_size = wit_opt.value();
res = bytes.cover(header.witness_size);
bool verify;
std::array<uint8_t, 20> address;
std::tie(verify, address) = attester.verify(message_id, channel, bytes.data(), bytes.size(), header);

if(!res) {
SPDLOG_ERROR("Witness too long: {}", header.witness_size);
transport.close();
return -1;
}
if(!verify) {
SPDLOG_ERROR("Attestation verification failed");
transport.close();
return -1;
}

if(!attester.verify(message_id, channel, bytes.data(), bytes.size(), header)) {
SPDLOG_ERROR("Attestation verification failed");
transport.close();
return -1;
}
constexpr bool has_msg_log = requires(
PubSubDelegate& d
) {
d.msg_log(core::SocketAddress(), std::array<uint8_t, 20>(), std::array<uint8_t, 20>(), message_id, bytes);
};
if constexpr(has_msg_log) {
delegate->msg_log(transport.dst_addr, beacon_map[transport.dst_addr], address, message_id, bytes);
}

// Send it onward
if(message_id_set.find(message_id) == message_id_set.end()) { // Deduplicate message
message_id_set.insert(message_id);
message_id_events[message_id_idx].push_back(message_id);

Expand Down Expand Up @@ -1853,7 +1857,11 @@ int PUBSUBNODETYPE::cut_through_recv_bytes(
spdlog::to_hex(header.witness_data, header.witness_data + header.witness_size)
);

if(!attester.verify(message_id, channel, bytes.data() + offset, bytes.size() - offset, header)) {
bool verify;
std::array<uint8_t, 20> address;
std::tie(verify, address) = attester.verify(message_id, channel, bytes.data() + offset, bytes.size() - offset, header);

if(!verify) {
SPDLOG_ERROR("Attestation verification failed");
transport.close();
return -1;
Expand Down
55 changes: 48 additions & 7 deletions pubsub/include/marlin/pubsub/attestation/SigAttester.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,55 @@ struct SigAttester {
}

template<typename HeaderType>
bool verify(
uint64_t,
uint16_t,
uint8_t const*,
uint64_t,
HeaderType
std::tuple<bool, std::array<uint8_t, 20>> verify(
uint64_t message_id,
uint16_t channel,
uint8_t const* message_data,
uint64_t message_size,
HeaderType prev_header
) {
return true;
uint8_t hash[32];
CryptoPP::Keccak_256 hasher;
// Hash message
hasher.CalculateTruncatedDigest(hash, 32, message_data, message_size);

secp256k1_ecdsa_recoverable_signature sig;

// Parse signature
secp256k1_ecdsa_recoverable_signature_parse_compact(
ctx_verifier,
&sig,
prev_header.attestation_data + 2,
prev_header.attestation_data[66]
);

// Verify signature
std::array<uint8_t, 20> address;
secp256k1_pubkey pubkey;
{
auto res = secp256k1_ecdsa_recover(
ctx_verifier,
&pubkey,
&sig,
hash
);

if(res == 0) {
// Recovery failed
return make_tuple(false, address);
}
}

// Get address
hasher.CalculateTruncatedDigest(hash, 32, pubkey.data, 64);
// address is in hash[12..31]
for(int i=0;i<20;i++){
address[i] = hash[i+12];
}

//SPDLOG_INFO("pubkey: {}", spdlog::to_hex(pubkey.data, pubkey.data+64));

return make_tuple(true, address);
}

std::optional<uint64_t> parse_size(core::Buffer& buf, uint64_t offset = 0) {
Expand Down