public static peel_onion method on OnionMessenger#2599

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

Merged
TheBlueMatt merged 1 commit into from
Oct 18, 2023
Merged

public static peel_onion method on OnionMessenger #2599

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
188 changes: 111 additions & 77 deletions lightning/src/onion_message/messenger.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,6 +246,14 @@ pub trait CustomOnionMessageHandler {
fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, msgs::DecodeError>;
}

/// A processed incoming onion message, containing either a Forward (another onion message)
/// or a Receive payload with decrypted contents.
pub enum PeeledOnion<CM: CustomOnionMessageContents> {
/// Forwarded onion, with the next node id and a new onion
Forward(PublicKey, msgs::OnionMessage),
/// Received onion message, with decrypted contents, path_id, and reply path
Receive(OnionMessageContents<CM>, Option<[u8; 32]>, Option<BlindedPath>)
}

/// Create an onion message with contents `message` to the destination of `path`.
/// Returns (introduction_node_id, onion_msg)
Expand DownExpand Up@@ -304,6 +312,101 @@ where
}))
}

/// Decode one layer of an incoming onion message
/// Returns either a Forward (another onion message), or Receive (decrypted content)
pub fn peel_onion<NS: Deref, L: Deref, CMH: Deref>(
node_signer: NS, secp_ctx: &Secp256k1<secp256k1::All>, logger: L, custom_handler: CMH,
msg: &msgs::OnionMessage,
) -> Result<PeeledOnion<<<CMH>::Target as CustomOnionMessageHandler>::CustomMessage>, ()>
where
NS::Target: NodeSigner,
L::Target: Logger,
CMH::Target: CustomOnionMessageHandler,
{
let control_tlvs_ss = match node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
Ok(ss) => ss,
Err(e) => {
log_error!(logger, "Failed to retrieve node secret: {:?}", e);
return Err(());
}
};
let onion_decode_ss = {
let blinding_factor = {
let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
hmac.input(control_tlvs_ss.as_ref());
Hmac::from_engine(hmac).into_inner()
};
match node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
{
Ok(ss) => ss.secret_bytes(),
Err(()) => {
log_trace!(logger, "Failed to compute onion packet shared secret");
return Err(());
}
}
};
match onion_utils::decode_next_untagged_hop(
onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
(control_tlvs_ss, custom_handler.deref(), logger.deref())
) {
Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
}, None)) => {
Ok(PeeledOnion::Receive(message, path_id, reply_path))
},
Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
next_node_id, next_blinding_override
})), Some((next_hop_hmac, new_packet_bytes)))) => {
// TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
// blinded hop and this onion message is destined for us. In this situation, we should keep
// unwrapping the onion layers to get to the final payload. Since we don't have the option
// of creating blinded paths with dummy hops currently, we should be ok to not handle this
// for now.
let new_pubkey = match onion_utils::next_hop_pubkey(&secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
Ok(pk) => pk,
Err(e) => {
log_trace!(logger, "Failed to compute next hop packet pubkey: {}", e);
return Err(())
}
};
let outgoing_packet = Packet {
version: 0,
public_key: new_pubkey,
hop_data: new_packet_bytes,
hmac: next_hop_hmac,
};
let onion_message = msgs::OnionMessage {
blinding_point: match next_blinding_override {
Some(blinding_point) => blinding_point,
None => {
match onion_utils::next_hop_pubkey(
&secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
) {
Ok(bp) => bp,
Err(e) => {
log_trace!(logger, "Failed to compute next blinding point: {}", e);
return Err(())
}
}
}
},
onion_routing_packet: outgoing_packet,
};

Ok(PeeledOnion::Forward(next_node_id, onion_message))
},
Err(e) => {
log_trace!(logger, "Errored decoding onion message packet: {:?}", e);
Err(())
},
_ => {
log_trace!(logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
Err(())
},
}
}

impl<ES: Deref, NS: Deref, L: Deref, MR: Deref, OMH: Deref, CMH: Deref>
OnionMessenger<ES, NS, L, MR, OMH, CMH>
where
Expand DownExpand Up@@ -457,40 +560,13 @@ where
/// soon we'll delegate the onion message to a handler that can generate invoices or send
/// payments.
fn handle_onion_message(&self, _peer_node_id: &PublicKey, msg: &msgs::OnionMessage) {
let control_tlvs_ss = match self.node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
Ok(ss) => ss,
Err(e) => {
log_error!(self.logger, "Failed to retrieve node secret: {:?}", e);
return
}
};
let onion_decode_ss = {
let blinding_factor = {
let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
hmac.input(control_tlvs_ss.as_ref());
Hmac::from_engine(hmac).into_inner()
};
match self.node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
{
Ok(ss) => ss.secret_bytes(),
Err(()) => {
log_trace!(self.logger, "Failed to compute onion packet shared secret");
return
}
}
};
match onion_utils::decode_next_untagged_hop(
onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
(control_tlvs_ss, &*self.custom_handler, &*self.logger)
match peel_onion(
&*self.node_signer, &self.secp_ctx, &*self.logger, &*self.custom_handler, msg
) {
Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
}, None)) => {
Ok(PeeledOnion::Receive(message, path_id, reply_path)) => {
log_trace!(self.logger,
"Received an onion message with path_id {:02x?} and {} reply_path",
path_id, if reply_path.is_some() { "a" } else { "no" });

let response = match message {
OnionMessageContents::Offers(msg) => {
self.offers_handler.handle_message(msg)
Expand All@@ -501,50 +577,11 @@ where
.map(|msg| OnionMessageContents::Custom(msg))
},
};

if let Some(response) = response {
self.respond_with_onion_message(response, path_id, reply_path);
}
},
Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
next_node_id, next_blinding_override
})), Some((next_hop_hmac, new_packet_bytes)))) => {
// TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
// blinded hop and this onion message is destined for us. In this situation, we should keep
// unwrapping the onion layers to get to the final payload. Since we don't have the option
// of creating blinded paths with dummy hops currently, we should be ok to not handle this
// for now.
let new_pubkey = match onion_utils::next_hop_pubkey(&self.secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
Ok(pk) => pk,
Err(e) => {
log_trace!(self.logger, "Failed to compute next hop packet pubkey: {}", e);
return
}
};
let outgoing_packet = Packet {
version: 0,
public_key: new_pubkey,
hop_data: new_packet_bytes,
hmac: next_hop_hmac,
};
let onion_message = msgs::OnionMessage {
blinding_point: match next_blinding_override {
Some(blinding_point) => blinding_point,
None => {
match onion_utils::next_hop_pubkey(
&self.secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
) {
Ok(bp) => bp,
Err(e) => {
log_trace!(self.logger, "Failed to compute next blinding point: {}", e);
return
}
}
}
},
onion_routing_packet: outgoing_packet,
};

Ok(PeeledOnion::Forward(next_node_id, onion_message)) => {
let mut pending_per_peer_msgs = self.pending_messages.lock().unwrap();
if outbound_buffer_full(&next_node_id, &pending_per_peer_msgs) {
log_trace!(self.logger, "Dropping forwarded onion message to peer {:?}: outbound buffer full", next_node_id);
Expand All@@ -563,15 +600,12 @@ where
e.get_mut().push_back(onion_message);
log_trace!(self.logger, "Forwarding an onion message to peer {}", next_node_id);
}
};
}
},
Err(e) => {
log_trace!(self.logger, "Errored decoding onion message packet: {:?}", e);
},
_ => {
log_trace!(self.logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
},
};
log_error!(self.logger, "Failed to process onion message {:?}", e);
}
}
}

fn peer_connected(&self, their_node_id: &PublicKey, init: &msgs::Init, _inbound: bool) -> Result<(), ()> {
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/onion_message/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ mod packet;
mod functional_tests;

// Re-export structs so they can be imported with just the `onion_message::` module prefix.
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, PeeledOnion, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::offers::{OffersMessage, OffersMessageHandler};
pub use self::packet::Packet;
pub(crate) use self::packet::ControlTlvs;
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
public static peel_onion method on OnionMessenger#2599

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

 Merged

TheBlueMatt
merged 1 commit into

from

Oct 18, 2023
 Merged


public static peel_onion method on OnionMessenger
#2599
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


188 changes: 111 additions & 77 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,6 +246,14 @@ pub trait CustomOnionMessageHandler {
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, msgs::DecodeError>;
}

/// A processed incoming onion message, containing either a Forward (another onion message)
/// or a Receive payload with decrypted contents.
pub enum PeeledOnion<CM: CustomOnionMessageContents> {
	/// Forwarded onion, with the next node id and a new onion
	Forward(PublicKey, msgs::OnionMessage),
	/// Received onion message, with decrypted contents, path_id, and reply path
	Receive(OnionMessageContents<CM>, Option<[u8; 32]>, Option<BlindedPath>)
}

/// Create an onion message with contents `message` to the destination of `path`.
/// Returns (introduction_node_id, onion_msg)
Expand DownExpand Up@@ -304,6 +312,101 @@ where
	}))
}

/// Decode one layer of an incoming onion message
/// Returns either a Forward (another onion message), or Receive (decrypted content)
pub fn peel_onion<NS: Deref, L: Deref, CMH: Deref>(
	node_signer: NS, secp_ctx: &Secp256k1<secp256k1::All>, logger: L, custom_handler: CMH,
	msg: &msgs::OnionMessage,
) -> Result<PeeledOnion<<<CMH>::Target as CustomOnionMessageHandler>::CustomMessage>, ()>
where
	NS::Target: NodeSigner,
	L::Target: Logger,
	CMH::Target: CustomOnionMessageHandler,
{
	let control_tlvs_ss = match node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(logger, "Failed to retrieve node secret: {:?}", e);
 return Err(());
 }
	};
	let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(logger, "Failed to compute onion packet shared secret");
 return Err(());
 }
 }
	};
	match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, custom_handler.deref(), logger.deref())
	) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path))
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(logger, "Failed to compute next hop packet pubkey: {}", e);
 return Err(())
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(logger, "Failed to compute next blinding point: {}", e);
 return Err(())
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message))
 },
 Err(e) => {
 log_trace!(logger, "Errored decoding onion message packet: {:?}", e);
 Err(())
 },
 _ => {
 log_trace!(logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 Err(())
 },
	}
}

impl<ES: Deref, NS: Deref, L: Deref, MR: Deref, OMH: Deref, CMH: Deref>
OnionMessenger<ES, NS, L, MR, OMH, CMH>
where
Expand DownExpand Up@@ -457,40 +560,13 @@ where
	/// soon we'll delegate the onion message to a handler that can generate invoices or send
	/// payments.
	fn handle_onion_message(&self, _peer_node_id: &PublicKey, msg: &msgs::OnionMessage) {
 let control_tlvs_ss = match self.node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(self.logger, "Failed to retrieve node secret: {:?}", e);
 return
 }
 };
 let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match self.node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(self.logger, "Failed to compute onion packet shared secret");
 return
 }
 }
 };
 match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, &*self.custom_handler, &*self.logger)
 match peel_onion(
 &*self.node_signer, &self.secp_ctx, &*self.logger, &*self.custom_handler, msg
 ) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path)) => {
 log_trace!(self.logger,
 "Received an onion message with path_id {:02x?} and {} reply_path",
 path_id, if reply_path.is_some() { "a" } else { "no" });

 let response = match message {
 OnionMessageContents::Offers(msg) => {
 self.offers_handler.handle_message(msg)
Expand All@@ -501,50 +577,11 @@ where
 .map(|msg| OnionMessageContents::Custom(msg))
 },
 };

 if let Some(response) = response {
 self.respond_with_onion_message(response, path_id, reply_path);
 }
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&self.secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next hop packet pubkey: {}", e);
 return
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &self.secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next blinding point: {}", e);
 return
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message)) => {
 let mut pending_per_peer_msgs = self.pending_messages.lock().unwrap();
 if outbound_buffer_full(&next_node_id, &pending_per_peer_msgs) {
 log_trace!(self.logger, "Dropping forwarded onion message to peer {:?}: outbound buffer full", next_node_id);
Expand All@@ -563,15 +600,12 @@ where
 e.get_mut().push_back(onion_message);
 log_trace!(self.logger, "Forwarding an onion message to peer {}", next_node_id);
 }
 };
 }
 },
 Err(e) => {
 log_trace!(self.logger, "Errored decoding onion message packet: {:?}", e);
 },
 _ => {
 log_trace!(self.logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 },
 };
 log_error!(self.logger, "Failed to process onion message {:?}", e);
 }
 }
	}

	fn peer_connected(&self, their_node_id: &PublicKey, init: &msgs::Init, _inbound: bool) -> Result<(), ()> {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/onion_message/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ mod packet;
mod functional_tests;

// Re-export structs so they can be imported with just the `onion_message::` module prefix.
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, PeeledOnion, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::offers::{OffersMessage, OffersMessageHandler};
pub use self::packet::Packet;
pub(crate) use self::packet::ControlTlvs;

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
public static peel_onion method on OnionMessenger#2599

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

 Merged

TheBlueMatt
merged 1 commit into

from

Oct 18, 2023
 Merged


public static peel_onion method on OnionMessenger
#2599
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


188 changes: 111 additions & 77 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,6 +246,14 @@ pub trait CustomOnionMessageHandler {
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, msgs::DecodeError>;
}

/// A processed incoming onion message, containing either a Forward (another onion message)
/// or a Receive payload with decrypted contents.
pub enum PeeledOnion<CM: CustomOnionMessageContents> {
	/// Forwarded onion, with the next node id and a new onion
	Forward(PublicKey, msgs::OnionMessage),
	/// Received onion message, with decrypted contents, path_id, and reply path
	Receive(OnionMessageContents<CM>, Option<[u8; 32]>, Option<BlindedPath>)
}

/// Create an onion message with contents `message` to the destination of `path`.
/// Returns (introduction_node_id, onion_msg)
Expand DownExpand Up@@ -304,6 +312,101 @@ where
	}))
}

/// Decode one layer of an incoming onion message
/// Returns either a Forward (another onion message), or Receive (decrypted content)
pub fn peel_onion<NS: Deref, L: Deref, CMH: Deref>(
	node_signer: NS, secp_ctx: &Secp256k1<secp256k1::All>, logger: L, custom_handler: CMH,
	msg: &msgs::OnionMessage,
) -> Result<PeeledOnion<<<CMH>::Target as CustomOnionMessageHandler>::CustomMessage>, ()>
where
	NS::Target: NodeSigner,
	L::Target: Logger,
	CMH::Target: CustomOnionMessageHandler,
{
	let control_tlvs_ss = match node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(logger, "Failed to retrieve node secret: {:?}", e);
 return Err(());
 }
	};
	let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(logger, "Failed to compute onion packet shared secret");
 return Err(());
 }
 }
	};
	match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, custom_handler.deref(), logger.deref())
	) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path))
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(logger, "Failed to compute next hop packet pubkey: {}", e);
 return Err(())
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(logger, "Failed to compute next blinding point: {}", e);
 return Err(())
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message))
 },
 Err(e) => {
 log_trace!(logger, "Errored decoding onion message packet: {:?}", e);
 Err(())
 },
 _ => {
 log_trace!(logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 Err(())
 },
	}
}

impl<ES: Deref, NS: Deref, L: Deref, MR: Deref, OMH: Deref, CMH: Deref>
OnionMessenger<ES, NS, L, MR, OMH, CMH>
where
Expand DownExpand Up@@ -457,40 +560,13 @@ where
	/// soon we'll delegate the onion message to a handler that can generate invoices or send
	/// payments.
	fn handle_onion_message(&self, _peer_node_id: &PublicKey, msg: &msgs::OnionMessage) {
 let control_tlvs_ss = match self.node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(self.logger, "Failed to retrieve node secret: {:?}", e);
 return
 }
 };
 let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match self.node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(self.logger, "Failed to compute onion packet shared secret");
 return
 }
 }
 };
 match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, &*self.custom_handler, &*self.logger)
 match peel_onion(
 &*self.node_signer, &self.secp_ctx, &*self.logger, &*self.custom_handler, msg
 ) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path)) => {
 log_trace!(self.logger,
 "Received an onion message with path_id {:02x?} and {} reply_path",
 path_id, if reply_path.is_some() { "a" } else { "no" });

 let response = match message {
 OnionMessageContents::Offers(msg) => {
 self.offers_handler.handle_message(msg)
Expand All@@ -501,50 +577,11 @@ where
 .map(|msg| OnionMessageContents::Custom(msg))
 },
 };

 if let Some(response) = response {
 self.respond_with_onion_message(response, path_id, reply_path);
 }
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&self.secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next hop packet pubkey: {}", e);
 return
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &self.secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next blinding point: {}", e);
 return
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message)) => {
 let mut pending_per_peer_msgs = self.pending_messages.lock().unwrap();
 if outbound_buffer_full(&next_node_id, &pending_per_peer_msgs) {
 log_trace!(self.logger, "Dropping forwarded onion message to peer {:?}: outbound buffer full", next_node_id);
Expand All@@ -563,15 +600,12 @@ where
 e.get_mut().push_back(onion_message);
 log_trace!(self.logger, "Forwarding an onion message to peer {}", next_node_id);
 }
 };
 }
 },
 Err(e) => {
 log_trace!(self.logger, "Errored decoding onion message packet: {:?}", e);
 },
 _ => {
 log_trace!(self.logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 },
 };
 log_error!(self.logger, "Failed to process onion message {:?}", e);
 }
 }
	}

	fn peer_connected(&self, their_node_id: &PublicKey, init: &msgs::Init, _inbound: bool) -> Result<(), ()> {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/onion_message/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ mod packet;
mod functional_tests;

// Re-export structs so they can be imported with just the `onion_message::` module prefix.
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, PeeledOnion, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::offers::{OffersMessage, OffersMessageHandler};
pub use self::packet::Packet;
pub(crate) use self::packet::ControlTlvs;

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
public static peel_onion method on OnionMessenger#2599

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

 Merged

TheBlueMatt
merged 1 commit into

from

Oct 18, 2023
 Merged


public static peel_onion method on OnionMessenger
#2599
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


188 changes: 111 additions & 77 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,6 +246,14 @@ pub trait CustomOnionMessageHandler {
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, msgs::DecodeError>;
}

/// A processed incoming onion message, containing either a Forward (another onion message)
/// or a Receive payload with decrypted contents.
pub enum PeeledOnion<CM: CustomOnionMessageContents> {
	/// Forwarded onion, with the next node id and a new onion
	Forward(PublicKey, msgs::OnionMessage),
	/// Received onion message, with decrypted contents, path_id, and reply path
	Receive(OnionMessageContents<CM>, Option<[u8; 32]>, Option<BlindedPath>)
}

/// Create an onion message with contents `message` to the destination of `path`.
/// Returns (introduction_node_id, onion_msg)
Expand DownExpand Up@@ -304,6 +312,101 @@ where
	}))
}

/// Decode one layer of an incoming onion message
/// Returns either a Forward (another onion message), or Receive (decrypted content)
pub fn peel_onion<NS: Deref, L: Deref, CMH: Deref>(
	node_signer: NS, secp_ctx: &Secp256k1<secp256k1::All>, logger: L, custom_handler: CMH,
	msg: &msgs::OnionMessage,
) -> Result<PeeledOnion<<<CMH>::Target as CustomOnionMessageHandler>::CustomMessage>, ()>
where
	NS::Target: NodeSigner,
	L::Target: Logger,
	CMH::Target: CustomOnionMessageHandler,
{
	let control_tlvs_ss = match node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(logger, "Failed to retrieve node secret: {:?}", e);
 return Err(());
 }
	};
	let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(logger, "Failed to compute onion packet shared secret");
 return Err(());
 }
 }
	};
	match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, custom_handler.deref(), logger.deref())
	) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path))
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(logger, "Failed to compute next hop packet pubkey: {}", e);
 return Err(())
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(logger, "Failed to compute next blinding point: {}", e);
 return Err(())
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message))
 },
 Err(e) => {
 log_trace!(logger, "Errored decoding onion message packet: {:?}", e);
 Err(())
 },
 _ => {
 log_trace!(logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 Err(())
 },
	}
}

impl<ES: Deref, NS: Deref, L: Deref, MR: Deref, OMH: Deref, CMH: Deref>
OnionMessenger<ES, NS, L, MR, OMH, CMH>
where
Expand DownExpand Up@@ -457,40 +560,13 @@ where
	/// soon we'll delegate the onion message to a handler that can generate invoices or send
	/// payments.
	fn handle_onion_message(&self, _peer_node_id: &PublicKey, msg: &msgs::OnionMessage) {
 let control_tlvs_ss = match self.node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(self.logger, "Failed to retrieve node secret: {:?}", e);
 return
 }
 };
 let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match self.node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(self.logger, "Failed to compute onion packet shared secret");
 return
 }
 }
 };
 match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, &*self.custom_handler, &*self.logger)
 match peel_onion(
 &*self.node_signer, &self.secp_ctx, &*self.logger, &*self.custom_handler, msg
 ) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path)) => {
 log_trace!(self.logger,
 "Received an onion message with path_id {:02x?} and {} reply_path",
 path_id, if reply_path.is_some() { "a" } else { "no" });

 let response = match message {
 OnionMessageContents::Offers(msg) => {
 self.offers_handler.handle_message(msg)
Expand All@@ -501,50 +577,11 @@ where
 .map(|msg| OnionMessageContents::Custom(msg))
 },
 };

 if let Some(response) = response {
 self.respond_with_onion_message(response, path_id, reply_path);
 }
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&self.secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next hop packet pubkey: {}", e);
 return
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &self.secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next blinding point: {}", e);
 return
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message)) => {
 let mut pending_per_peer_msgs = self.pending_messages.lock().unwrap();
 if outbound_buffer_full(&next_node_id, &pending_per_peer_msgs) {
 log_trace!(self.logger, "Dropping forwarded onion message to peer {:?}: outbound buffer full", next_node_id);
Expand All@@ -563,15 +600,12 @@ where
 e.get_mut().push_back(onion_message);
 log_trace!(self.logger, "Forwarding an onion message to peer {}", next_node_id);
 }
 };
 }
 },
 Err(e) => {
 log_trace!(self.logger, "Errored decoding onion message packet: {:?}", e);
 },
 _ => {
 log_trace!(self.logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 },
 };
 log_error!(self.logger, "Failed to process onion message {:?}", e);
 }
 }
	}

	fn peer_connected(&self, their_node_id: &PublicKey, init: &msgs::Init, _inbound: bool) -> Result<(), ()> {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/onion_message/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ mod packet;
mod functional_tests;

// Re-export structs so they can be imported with just the `onion_message::` module prefix.
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, PeeledOnion, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::offers::{OffersMessage, OffersMessageHandler};
pub use self::packet::Packet;
pub(crate) use self::packet::ControlTlvs;

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
public static peel_onion method on OnionMessenger#2599

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

 Merged

TheBlueMatt
merged 1 commit into

from

Oct 18, 2023
 Merged


public static peel_onion method on OnionMessenger
#2599
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


188 changes: 111 additions & 77 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,6 +246,14 @@ pub trait CustomOnionMessageHandler {
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, msgs::DecodeError>;
}

/// A processed incoming onion message, containing either a Forward (another onion message)
/// or a Receive payload with decrypted contents.
pub enum PeeledOnion<CM: CustomOnionMessageContents> {
	/// Forwarded onion, with the next node id and a new onion
	Forward(PublicKey, msgs::OnionMessage),
	/// Received onion message, with decrypted contents, path_id, and reply path
	Receive(OnionMessageContents<CM>, Option<[u8; 32]>, Option<BlindedPath>)
}

/// Create an onion message with contents `message` to the destination of `path`.
/// Returns (introduction_node_id, onion_msg)
Expand DownExpand Up@@ -304,6 +312,101 @@ where
	}))
}

/// Decode one layer of an incoming onion message
/// Returns either a Forward (another onion message), or Receive (decrypted content)
pub fn peel_onion<NS: Deref, L: Deref, CMH: Deref>(
	node_signer: NS, secp_ctx: &Secp256k1<secp256k1::All>, logger: L, custom_handler: CMH,
	msg: &msgs::OnionMessage,
) -> Result<PeeledOnion<<<CMH>::Target as CustomOnionMessageHandler>::CustomMessage>, ()>
where
	NS::Target: NodeSigner,
	L::Target: Logger,
	CMH::Target: CustomOnionMessageHandler,
{
	let control_tlvs_ss = match node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(logger, "Failed to retrieve node secret: {:?}", e);
 return Err(());
 }
	};
	let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(logger, "Failed to compute onion packet shared secret");
 return Err(());
 }
 }
	};
	match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, custom_handler.deref(), logger.deref())
	) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path))
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(logger, "Failed to compute next hop packet pubkey: {}", e);
 return Err(())
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(logger, "Failed to compute next blinding point: {}", e);
 return Err(())
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message))
 },
 Err(e) => {
 log_trace!(logger, "Errored decoding onion message packet: {:?}", e);
 Err(())
 },
 _ => {
 log_trace!(logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 Err(())
 },
	}
}

impl<ES: Deref, NS: Deref, L: Deref, MR: Deref, OMH: Deref, CMH: Deref>
OnionMessenger<ES, NS, L, MR, OMH, CMH>
where
Expand DownExpand Up@@ -457,40 +560,13 @@ where
	/// soon we'll delegate the onion message to a handler that can generate invoices or send
	/// payments.
	fn handle_onion_message(&self, _peer_node_id: &PublicKey, msg: &msgs::OnionMessage) {
 let control_tlvs_ss = match self.node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(self.logger, "Failed to retrieve node secret: {:?}", e);
 return
 }
 };
 let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match self.node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(self.logger, "Failed to compute onion packet shared secret");
 return
 }
 }
 };
 match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, &*self.custom_handler, &*self.logger)
 match peel_onion(
 &*self.node_signer, &self.secp_ctx, &*self.logger, &*self.custom_handler, msg
 ) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path)) => {
 log_trace!(self.logger,
 "Received an onion message with path_id {:02x?} and {} reply_path",
 path_id, if reply_path.is_some() { "a" } else { "no" });

 let response = match message {
 OnionMessageContents::Offers(msg) => {
 self.offers_handler.handle_message(msg)
Expand All@@ -501,50 +577,11 @@ where
 .map(|msg| OnionMessageContents::Custom(msg))
 },
 };

 if let Some(response) = response {
 self.respond_with_onion_message(response, path_id, reply_path);
 }
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&self.secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next hop packet pubkey: {}", e);
 return
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &self.secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next blinding point: {}", e);
 return
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message)) => {
 let mut pending_per_peer_msgs = self.pending_messages.lock().unwrap();
 if outbound_buffer_full(&next_node_id, &pending_per_peer_msgs) {
 log_trace!(self.logger, "Dropping forwarded onion message to peer {:?}: outbound buffer full", next_node_id);
Expand All@@ -563,15 +600,12 @@ where
 e.get_mut().push_back(onion_message);
 log_trace!(self.logger, "Forwarding an onion message to peer {}", next_node_id);
 }
 };
 }
 },
 Err(e) => {
 log_trace!(self.logger, "Errored decoding onion message packet: {:?}", e);
 },
 _ => {
 log_trace!(self.logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 },
 };
 log_error!(self.logger, "Failed to process onion message {:?}", e);
 }
 }
	}

	fn peer_connected(&self, their_node_id: &PublicKey, init: &msgs::Init, _inbound: bool) -> Result<(), ()> {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/onion_message/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ mod packet;
mod functional_tests;

// Re-export structs so they can be imported with just the `onion_message::` module prefix.
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, PeeledOnion, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::offers::{OffersMessage, OffersMessageHandler};
pub use self::packet::Packet;
pub(crate) use self::packet::ControlTlvs;

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
public static peel_onion method on OnionMessenger#2599

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

 Merged

TheBlueMatt
merged 1 commit into

from

Oct 18, 2023
 Merged


public static peel_onion method on OnionMessenger
#2599
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


188 changes: 111 additions & 77 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,6 +246,14 @@ pub trait CustomOnionMessageHandler {
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, msgs::DecodeError>;
}

/// A processed incoming onion message, containing either a Forward (another onion message)
/// or a Receive payload with decrypted contents.
pub enum PeeledOnion<CM: CustomOnionMessageContents> {
	/// Forwarded onion, with the next node id and a new onion
	Forward(PublicKey, msgs::OnionMessage),
	/// Received onion message, with decrypted contents, path_id, and reply path
	Receive(OnionMessageContents<CM>, Option<[u8; 32]>, Option<BlindedPath>)
}

/// Create an onion message with contents `message` to the destination of `path`.
/// Returns (introduction_node_id, onion_msg)
Expand DownExpand Up@@ -304,6 +312,101 @@ where
	}))
}

/// Decode one layer of an incoming onion message
/// Returns either a Forward (another onion message), or Receive (decrypted content)
pub fn peel_onion<NS: Deref, L: Deref, CMH: Deref>(
	node_signer: NS, secp_ctx: &Secp256k1<secp256k1::All>, logger: L, custom_handler: CMH,
	msg: &msgs::OnionMessage,
) -> Result<PeeledOnion<<<CMH>::Target as CustomOnionMessageHandler>::CustomMessage>, ()>
where
	NS::Target: NodeSigner,
	L::Target: Logger,
	CMH::Target: CustomOnionMessageHandler,
{
	let control_tlvs_ss = match node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(logger, "Failed to retrieve node secret: {:?}", e);
 return Err(());
 }
	};
	let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(logger, "Failed to compute onion packet shared secret");
 return Err(());
 }
 }
	};
	match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, custom_handler.deref(), logger.deref())
	) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path))
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(logger, "Failed to compute next hop packet pubkey: {}", e);
 return Err(())
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(logger, "Failed to compute next blinding point: {}", e);
 return Err(())
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message))
 },
 Err(e) => {
 log_trace!(logger, "Errored decoding onion message packet: {:?}", e);
 Err(())
 },
 _ => {
 log_trace!(logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 Err(())
 },
	}
}

impl<ES: Deref, NS: Deref, L: Deref, MR: Deref, OMH: Deref, CMH: Deref>
OnionMessenger<ES, NS, L, MR, OMH, CMH>
where
Expand DownExpand Up@@ -457,40 +560,13 @@ where
	/// soon we'll delegate the onion message to a handler that can generate invoices or send
	/// payments.
	fn handle_onion_message(&self, _peer_node_id: &PublicKey, msg: &msgs::OnionMessage) {
 let control_tlvs_ss = match self.node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(self.logger, "Failed to retrieve node secret: {:?}", e);
 return
 }
 };
 let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match self.node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(self.logger, "Failed to compute onion packet shared secret");
 return
 }
 }
 };
 match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, &*self.custom_handler, &*self.logger)
 match peel_onion(
 &*self.node_signer, &self.secp_ctx, &*self.logger, &*self.custom_handler, msg
 ) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path)) => {
 log_trace!(self.logger,
 "Received an onion message with path_id {:02x?} and {} reply_path",
 path_id, if reply_path.is_some() { "a" } else { "no" });

 let response = match message {
 OnionMessageContents::Offers(msg) => {
 self.offers_handler.handle_message(msg)
Expand All@@ -501,50 +577,11 @@ where
 .map(|msg| OnionMessageContents::Custom(msg))
 },
 };

 if let Some(response) = response {
 self.respond_with_onion_message(response, path_id, reply_path);
 }
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&self.secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next hop packet pubkey: {}", e);
 return
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &self.secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next blinding point: {}", e);
 return
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message)) => {
 let mut pending_per_peer_msgs = self.pending_messages.lock().unwrap();
 if outbound_buffer_full(&next_node_id, &pending_per_peer_msgs) {
 log_trace!(self.logger, "Dropping forwarded onion message to peer {:?}: outbound buffer full", next_node_id);
Expand All@@ -563,15 +600,12 @@ where
 e.get_mut().push_back(onion_message);
 log_trace!(self.logger, "Forwarding an onion message to peer {}", next_node_id);
 }
 };
 }
 },
 Err(e) => {
 log_trace!(self.logger, "Errored decoding onion message packet: {:?}", e);
 },
 _ => {
 log_trace!(self.logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 },
 };
 log_error!(self.logger, "Failed to process onion message {:?}", e);
 }
 }
	}

	fn peer_connected(&self, their_node_id: &PublicKey, init: &msgs::Init, _inbound: bool) -> Result<(), ()> {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/onion_message/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ mod packet;
mod functional_tests;

// Re-export structs so they can be imported with just the `onion_message::` module prefix.
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, PeeledOnion, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::offers::{OffersMessage, OffersMessageHandler};
pub use self::packet::Packet;
pub(crate) use self::packet::ControlTlvs;

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
public static peel_onion method on OnionMessenger#2599

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

 Merged

TheBlueMatt
merged 1 commit into

from

Oct 18, 2023
 Merged


public static peel_onion method on OnionMessenger
#2599
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


188 changes: 111 additions & 77 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,6 +246,14 @@ pub trait CustomOnionMessageHandler {
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, msgs::DecodeError>;
}

/// A processed incoming onion message, containing either a Forward (another onion message)
/// or a Receive payload with decrypted contents.
pub enum PeeledOnion<CM: CustomOnionMessageContents> {
	/// Forwarded onion, with the next node id and a new onion
	Forward(PublicKey, msgs::OnionMessage),
	/// Received onion message, with decrypted contents, path_id, and reply path
	Receive(OnionMessageContents<CM>, Option<[u8; 32]>, Option<BlindedPath>)
}

/// Create an onion message with contents `message` to the destination of `path`.
/// Returns (introduction_node_id, onion_msg)
Expand DownExpand Up@@ -304,6 +312,101 @@ where
	}))
}

/// Decode one layer of an incoming onion message
/// Returns either a Forward (another onion message), or Receive (decrypted content)
pub fn peel_onion<NS: Deref, L: Deref, CMH: Deref>(
	node_signer: NS, secp_ctx: &Secp256k1<secp256k1::All>, logger: L, custom_handler: CMH,
	msg: &msgs::OnionMessage,
) -> Result<PeeledOnion<<<CMH>::Target as CustomOnionMessageHandler>::CustomMessage>, ()>
where
	NS::Target: NodeSigner,
	L::Target: Logger,
	CMH::Target: CustomOnionMessageHandler,
{
	let control_tlvs_ss = match node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(logger, "Failed to retrieve node secret: {:?}", e);
 return Err(());
 }
	};
	let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(logger, "Failed to compute onion packet shared secret");
 return Err(());
 }
 }
	};
	match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, custom_handler.deref(), logger.deref())
	) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path))
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(logger, "Failed to compute next hop packet pubkey: {}", e);
 return Err(())
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(logger, "Failed to compute next blinding point: {}", e);
 return Err(())
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message))
 },
 Err(e) => {
 log_trace!(logger, "Errored decoding onion message packet: {:?}", e);
 Err(())
 },
 _ => {
 log_trace!(logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 Err(())
 },
	}
}

impl<ES: Deref, NS: Deref, L: Deref, MR: Deref, OMH: Deref, CMH: Deref>
OnionMessenger<ES, NS, L, MR, OMH, CMH>
where
Expand DownExpand Up@@ -457,40 +560,13 @@ where
	/// soon we'll delegate the onion message to a handler that can generate invoices or send
	/// payments.
	fn handle_onion_message(&self, _peer_node_id: &PublicKey, msg: &msgs::OnionMessage) {
 let control_tlvs_ss = match self.node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(self.logger, "Failed to retrieve node secret: {:?}", e);
 return
 }
 };
 let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match self.node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(self.logger, "Failed to compute onion packet shared secret");
 return
 }
 }
 };
 match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, &*self.custom_handler, &*self.logger)
 match peel_onion(
 &*self.node_signer, &self.secp_ctx, &*self.logger, &*self.custom_handler, msg
 ) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path)) => {
 log_trace!(self.logger,
 "Received an onion message with path_id {:02x?} and {} reply_path",
 path_id, if reply_path.is_some() { "a" } else { "no" });

 let response = match message {
 OnionMessageContents::Offers(msg) => {
 self.offers_handler.handle_message(msg)
Expand All@@ -501,50 +577,11 @@ where
 .map(|msg| OnionMessageContents::Custom(msg))
 },
 };

 if let Some(response) = response {
 self.respond_with_onion_message(response, path_id, reply_path);
 }
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&self.secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next hop packet pubkey: {}", e);
 return
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &self.secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next blinding point: {}", e);
 return
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message)) => {
 let mut pending_per_peer_msgs = self.pending_messages.lock().unwrap();
 if outbound_buffer_full(&next_node_id, &pending_per_peer_msgs) {
 log_trace!(self.logger, "Dropping forwarded onion message to peer {:?}: outbound buffer full", next_node_id);
Expand All@@ -563,15 +600,12 @@ where
 e.get_mut().push_back(onion_message);
 log_trace!(self.logger, "Forwarding an onion message to peer {}", next_node_id);
 }
 };
 }
 },
 Err(e) => {
 log_trace!(self.logger, "Errored decoding onion message packet: {:?}", e);
 },
 _ => {
 log_trace!(self.logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 },
 };
 log_error!(self.logger, "Failed to process onion message {:?}", e);
 }
 }
	}

	fn peer_connected(&self, their_node_id: &PublicKey, init: &msgs::Init, _inbound: bool) -> Result<(), ()> {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/onion_message/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ mod packet;
mod functional_tests;

// Re-export structs so they can be imported with just the `onion_message::` module prefix.
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, PeeledOnion, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::offers::{OffersMessage, OffersMessageHandler};
pub use self::packet::Packet;
pub(crate) use self::packet::ControlTlvs;

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
public static peel_onion method on OnionMessenger#2599

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

 Merged

TheBlueMatt
merged 1 commit into

from

Oct 18, 2023
 Merged


public static peel_onion method on OnionMessenger
#2599
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


188 changes: 111 additions & 77 deletions
lightning/src/onion_message/messenger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,6 +246,14 @@ pub trait CustomOnionMessageHandler {
	fn read_custom_message<R: io::Read>(&self, message_type: u64, buffer: &mut R) -> Result<Option<Self::CustomMessage>, msgs::DecodeError>;
}

/// A processed incoming onion message, containing either a Forward (another onion message)
/// or a Receive payload with decrypted contents.
pub enum PeeledOnion<CM: CustomOnionMessageContents> {
	/// Forwarded onion, with the next node id and a new onion
	Forward(PublicKey, msgs::OnionMessage),
	/// Received onion message, with decrypted contents, path_id, and reply path
	Receive(OnionMessageContents<CM>, Option<[u8; 32]>, Option<BlindedPath>)
}

/// Create an onion message with contents `message` to the destination of `path`.
/// Returns (introduction_node_id, onion_msg)
Expand DownExpand Up@@ -304,6 +312,101 @@ where
	}))
}

/// Decode one layer of an incoming onion message
/// Returns either a Forward (another onion message), or Receive (decrypted content)
pub fn peel_onion<NS: Deref, L: Deref, CMH: Deref>(
	node_signer: NS, secp_ctx: &Secp256k1<secp256k1::All>, logger: L, custom_handler: CMH,
	msg: &msgs::OnionMessage,
) -> Result<PeeledOnion<<<CMH>::Target as CustomOnionMessageHandler>::CustomMessage>, ()>
where
	NS::Target: NodeSigner,
	L::Target: Logger,
	CMH::Target: CustomOnionMessageHandler,
{
	let control_tlvs_ss = match node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(logger, "Failed to retrieve node secret: {:?}", e);
 return Err(());
 }
	};
	let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(logger, "Failed to compute onion packet shared secret");
 return Err(());
 }
 }
	};
	match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, custom_handler.deref(), logger.deref())
	) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path))
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(logger, "Failed to compute next hop packet pubkey: {}", e);
 return Err(())
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(logger, "Failed to compute next blinding point: {}", e);
 return Err(())
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message))
 },
 Err(e) => {
 log_trace!(logger, "Errored decoding onion message packet: {:?}", e);
 Err(())
 },
 _ => {
 log_trace!(logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 Err(())
 },
	}
}

impl<ES: Deref, NS: Deref, L: Deref, MR: Deref, OMH: Deref, CMH: Deref>
OnionMessenger<ES, NS, L, MR, OMH, CMH>
where
Expand DownExpand Up@@ -457,40 +560,13 @@ where
	/// soon we'll delegate the onion message to a handler that can generate invoices or send
	/// payments.
	fn handle_onion_message(&self, _peer_node_id: &PublicKey, msg: &msgs::OnionMessage) {
 let control_tlvs_ss = match self.node_signer.ecdh(Recipient::Node, &msg.blinding_point, None) {
 Ok(ss) => ss,
 Err(e) => {
 log_error!(self.logger, "Failed to retrieve node secret: {:?}", e);
 return
 }
 };
 let onion_decode_ss = {
 let blinding_factor = {
 let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
 hmac.input(control_tlvs_ss.as_ref());
 Hmac::from_engine(hmac).into_inner()
 };
 match self.node_signer.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
 Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
 {
 Ok(ss) => ss.secret_bytes(),
 Err(()) => {
 log_trace!(self.logger, "Failed to compute onion packet shared secret");
 return
 }
 }
 };
 match onion_utils::decode_next_untagged_hop(
 onion_decode_ss, &msg.onion_routing_packet.hop_data[..], msg.onion_routing_packet.hmac,
 (control_tlvs_ss, &*self.custom_handler, &*self.logger)
 match peel_onion(
 &*self.node_signer, &self.secp_ctx, &*self.logger, &*self.custom_handler, msg
 ) {
 Ok((Payload::Receive::<<<CMH as Deref>::Target as CustomOnionMessageHandler>::CustomMessage> {
 message, control_tlvs: ReceiveControlTlvs::Unblinded(ReceiveTlvs { path_id }), reply_path,
 }, None)) => {
 Ok(PeeledOnion::Receive(message, path_id, reply_path)) => {
 log_trace!(self.logger,
 "Received an onion message with path_id {:02x?} and {} reply_path",
 path_id, if reply_path.is_some() { "a" } else { "no" });

 let response = match message {
 OnionMessageContents::Offers(msg) => {
 self.offers_handler.handle_message(msg)
Expand All@@ -501,50 +577,11 @@ where
 .map(|msg| OnionMessageContents::Custom(msg))
 },
 };

 if let Some(response) = response {
 self.respond_with_onion_message(response, path_id, reply_path);
 }
 },
 Ok((Payload::Forward(ForwardControlTlvs::Unblinded(ForwardTlvs {
 next_node_id, next_blinding_override
 })), Some((next_hop_hmac, new_packet_bytes)))) => {
 // TODO: we need to check whether `next_node_id` is our node, in which case this is a dummy
 // blinded hop and this onion message is destined for us. In this situation, we should keep
 // unwrapping the onion layers to get to the final payload. Since we don't have the option
 // of creating blinded paths with dummy hops currently, we should be ok to not handle this
 // for now.
 let new_pubkey = match onion_utils::next_hop_pubkey(&self.secp_ctx, msg.onion_routing_packet.public_key, &onion_decode_ss) {
 Ok(pk) => pk,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next hop packet pubkey: {}", e);
 return
 }
 };
 let outgoing_packet = Packet {
 version: 0,
 public_key: new_pubkey,
 hop_data: new_packet_bytes,
 hmac: next_hop_hmac,
 };
 let onion_message = msgs::OnionMessage {
 blinding_point: match next_blinding_override {
 Some(blinding_point) => blinding_point,
 None => {
 match onion_utils::next_hop_pubkey(
 &self.secp_ctx, msg.blinding_point, control_tlvs_ss.as_ref()
 ) {
 Ok(bp) => bp,
 Err(e) => {
 log_trace!(self.logger, "Failed to compute next blinding point: {}", e);
 return
 }
 }
 }
 },
 onion_routing_packet: outgoing_packet,
 };

 Ok(PeeledOnion::Forward(next_node_id, onion_message)) => {
 let mut pending_per_peer_msgs = self.pending_messages.lock().unwrap();
 if outbound_buffer_full(&next_node_id, &pending_per_peer_msgs) {
 log_trace!(self.logger, "Dropping forwarded onion message to peer {:?}: outbound buffer full", next_node_id);
Expand All@@ -563,15 +600,12 @@ where
 e.get_mut().push_back(onion_message);
 log_trace!(self.logger, "Forwarding an onion message to peer {}", next_node_id);
 }
 };
 }
 },
 Err(e) => {
 log_trace!(self.logger, "Errored decoding onion message packet: {:?}", e);
 },
 _ => {
 log_trace!(self.logger, "Received bogus onion message packet, either the sender encoded a final hop as a forwarding hop or vice versa");
 },
 };
 log_error!(self.logger, "Failed to process onion message {:?}", e);
 }
 }
	}

	fn peer_connected(&self, their_node_id: &PublicKey, init: &msgs::Init, _inbound: bool) -> Result<(), ()> {
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/onion_message/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ mod packet;
mod functional_tests;

// Re-export structs so they can be imported with just the `onion_message::` module prefix.
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::messenger::{CustomOnionMessageContents, CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, PeeledOnion, SendError, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
pub use self::offers::{OffersMessage, OffersMessageHandler};
pub use self::packet::Packet;
pub(crate) use self::packet::ControlTlvs;