Skip to content

Avoid applying onion's channel updates in an observable way#2666

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 2 commits into from
Oct 19, 2023
Merged

Avoid applying onion's channel updates in an observable way #2666

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dffb20
Allow to verify channel updates without applying them
tnull Oct 13, 2023
1c35255
Don't apply PathFailure::ChannelUpdateMessage
tnull Oct 19, 2023
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
46 changes: 34 additions & 12 deletions lightning/src/routing/gossip.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -341,6 +341,9 @@ where U::Target: UtxoLookup, L::Target: Logger

impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
/// Handles any network updates originating from [`Event`]s.
//
/// Note that this will skip applying any [`NetworkUpdate::ChannelUpdateMessage`] to avoid
/// leaking possibly identifying information of the sender to the public network.
///
/// [`Event`]: crate::events::Event
pub fn handle_network_update(&self, network_update: &NetworkUpdate) {
Expand All@@ -349,8 +352,7 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
let short_channel_id = msg.contents.short_channel_id;
let is_enabled = msg.contents.flags & (1 << 1) != (1 << 1);
let status = if is_enabled { "enabled" } else { "disabled" };
log_debug!(self.logger, "Updating channel with channel_update from a payment failure. Channel {} is {}.", short_channel_id, status);
let _ = self.update_channel(msg);
log_debug!(self.logger, "Skipping application of a channel update from a payment failure. Channel {} is {}.", short_channel_id, status);
},
NetworkUpdate::ChannelFailure { short_channel_id, is_permanent } => {
if is_permanent {
Expand DownExpand Up@@ -1845,14 +1847,14 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
/// For an already known (from announcement) channel, update info about one of the directions
/// of the channel.
///
/// You probably don't want to call this directly, instead relying on a P2PGossipSync's
/// RoutingMessageHandler implementation to call it indirectly. This may be useful to accept
/// You probably don't want to call this directly, instead relying on a [`P2PGossipSync`]'s
/// [`RoutingMessageHandler`] implementation to call it indirectly. This may be useful to accept
/// routing messages from a source using a protocol other than the lightning P2P protocol.
///
/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
/// materially in the future will be rejected.
pub fn update_channel(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
self.update_channel_intern(&msg.contents, Some(&msg), Some(&msg.signature))
self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), false)
}

/// For an already known (from announcement) channel, update info about one of the directions
Expand All@@ -1862,10 +1864,23 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
/// materially in the future will be rejected.
pub fn update_channel_unsigned(&self, msg: &msgs::UnsignedChannelUpdate) -> Result<(), LightningError> {
self.update_channel_intern(msg, None, None)
self.update_channel_internal(msg, None, None, false)
}

fn update_channel_intern(&self, msg: &msgs::UnsignedChannelUpdate, full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>) -> Result<(), LightningError> {
/// For an already known (from announcement) channel, verify the given [`ChannelUpdate`].
///
/// This checks whether the update currently is applicable by [`Self::update_channel`].
///
/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
/// materially in the future will be rejected.
pub fn verify_channel_update(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), true)
}

fn update_channel_internal(&self, msg: &msgs::UnsignedChannelUpdate,
full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>,
only_verify: bool) -> Result<(), LightningError>
{
let chan_enabled = msg.flags & (1 << 1) != (1 << 1);

if msg.chain_hash != self.chain_hash {
Expand DownExpand Up@@ -1961,7 +1976,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
action: ErrorAction::IgnoreAndLog(Level::Debug)
})?, "channel_update");
}
channel.two_to_one = get_new_channel_info!();
if !only_verify {
channel.two_to_one = get_new_channel_info!();
}
} else {
check_update_latest!(channel.one_to_two);
if let Some(sig) = sig {
Expand All@@ -1970,7 +1987,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
action: ErrorAction::IgnoreAndLog(Level::Debug)
})?, "channel_update");
}
channel.one_to_two = get_new_channel_info!();
if !only_verify {
channel.one_to_two = get_new_channel_info!();
}
}
}
}
Expand DownExpand Up@@ -2411,6 +2430,7 @@ pub(crate) mod tests {
}

let valid_channel_update = get_signed_channel_update(|_| {}, node_1_privkey, &secp_ctx);
network_graph.verify_channel_update(&valid_channel_update).unwrap();
match gossip_sync.handle_channel_update(&valid_channel_update) {
Ok(res) => assert!(res),
_ => panic!(),
Expand DownExpand Up@@ -2513,7 +2533,8 @@ pub(crate) mod tests {

let short_channel_id;
{
// Announce a channel we will update
// Check we won't apply an update via `handle_network_update` for privacy reasons, but
// can continue fine if we manually apply it.
let valid_channel_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);
short_channel_id = valid_channel_announcement.contents.short_channel_id;
let chain_source: Option<&test_utils::TestChainSource> = None;
Expand All@@ -2524,10 +2545,11 @@ pub(crate) mod tests {
assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());

network_graph.handle_network_update(&NetworkUpdate::ChannelUpdateMessage {
msg: valid_channel_update,
msg: valid_channel_update.clone(),
});

assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_some());
assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());
network_graph.update_channel(&valid_channel_update).unwrap();
}

// Non-permanent failure doesn't touch the channel at all
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Avoid applying onion's channel updates in an observable way by tnull · Pull Request #2666 · lightningdevkit/rust-lightning · GitHub
Skip to content
Avoid applying onion's channel updates in an observable way#2666

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 2 commits into

from

Oct 19, 2023
 Merged


Avoid applying onion's channel updates in an observable way
#2666
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1dffb20

Allow to verify channel updates without applying them


tnull Oct 13, 2023
1c35255

Don't apply PathFailure::ChannelUpdateMessage


tnull Oct 19, 2023

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


46 changes: 34 additions & 12 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,6 +341,9 @@ where U::Target: UtxoLookup, L::Target: Logger

impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// Handles any network updates originating from [`Event`]s.
	//
	/// Note that this will skip applying any [`NetworkUpdate::ChannelUpdateMessage`] to avoid
	/// leaking possibly identifying information of the sender to the public network.
	///
	/// [`Event`]: crate::events::Event
	pub fn handle_network_update(&self, network_update: &NetworkUpdate) {
Expand All@@ -349,8 +352,7 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 let short_channel_id = msg.contents.short_channel_id;
 let is_enabled = msg.contents.flags & (1 << 1) != (1 << 1);
 let status = if is_enabled { "enabled" } else { "disabled" };
 log_debug!(self.logger, "Updating channel with channel_update from a payment failure. Channel {} is {}.", short_channel_id, status);
 let _ = self.update_channel(msg);
 log_debug!(self.logger, "Skipping application of a channel update from a payment failure. Channel {} is {}.", short_channel_id, status);
 },
 NetworkUpdate::ChannelFailure { short_channel_id, is_permanent } => {
 if is_permanent {
Expand DownExpand Up@@ -1845,14 +1847,14 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// For an already known (from announcement) channel, update info about one of the directions
	/// of the channel.
	///
	/// You probably don't want to call this directly, instead relying on a P2PGossipSync's
	/// RoutingMessageHandler implementation to call it indirectly. This may be useful to accept
	/// You probably don't want to call this directly, instead relying on a [`P2PGossipSync`]'s
	/// [`RoutingMessageHandler`] implementation to call it indirectly. This may be useful to accept
	/// routing messages from a source using a protocol other than the lightning P2P protocol.
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(&msg.contents, Some(&msg), Some(&msg.signature))
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), false)
	}

	/// For an already known (from announcement) channel, update info about one of the directions
Expand All@@ -1862,10 +1864,23 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel_unsigned(&self, msg: &msgs::UnsignedChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(msg, None, None)
 self.update_channel_internal(msg, None, None, false)
	}

	fn update_channel_intern(&self, msg: &msgs::UnsignedChannelUpdate, full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>) -> Result<(), LightningError> {
	/// For an already known (from announcement) channel, verify the given [`ChannelUpdate`].
	///
	/// This checks whether the update currently is applicable by [`Self::update_channel`].
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn verify_channel_update(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), true)
	}

	fn update_channel_internal(&self, msg: &msgs::UnsignedChannelUpdate,
 full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>,
 only_verify: bool) -> Result<(), LightningError>
	{
 let chan_enabled = msg.flags & (1 << 1) != (1 << 1);

 if msg.chain_hash != self.chain_hash {
Expand DownExpand Up@@ -1961,7 +1976,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.two_to_one = get_new_channel_info!();
 if !only_verify {
 channel.two_to_one = get_new_channel_info!();
 }
 } else {
 check_update_latest!(channel.one_to_two);
 if let Some(sig) = sig {
Expand All@@ -1970,7 +1987,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.one_to_two = get_new_channel_info!();
 if !only_verify {
 channel.one_to_two = get_new_channel_info!();
 }
 }
 }
 }
Expand DownExpand Up@@ -2411,6 +2430,7 @@ pub(crate) mod tests {
 }

 let valid_channel_update = get_signed_channel_update(|_| {}, node_1_privkey, &secp_ctx);
 network_graph.verify_channel_update(&valid_channel_update).unwrap();
 match gossip_sync.handle_channel_update(&valid_channel_update) {
 Ok(res) => assert!(res),
 _ => panic!(),
Expand DownExpand Up@@ -2513,7 +2533,8 @@ pub(crate) mod tests {

 let short_channel_id;
 {
 // Announce a channel we will update
 // Check we won't apply an update via `handle_network_update` for privacy reasons, but
 // can continue fine if we manually apply it.
 let valid_channel_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);
 short_channel_id = valid_channel_announcement.contents.short_channel_id;
 let chain_source: Option<&test_utils::TestChainSource> = None;
Expand All@@ -2524,10 +2545,11 @@ pub(crate) mod tests {
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());

 network_graph.handle_network_update(&NetworkUpdate::ChannelUpdateMessage {
 msg: valid_channel_update,
 msg: valid_channel_update.clone(),
 });

 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_some());
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());
 network_graph.update_channel(&valid_channel_update).unwrap();
 }

 // Non-permanent failure doesn't touch the channel at all
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Avoid applying onion's channel updates in an observable way by tnull · Pull Request #2666 · lightningdevkit/rust-lightning · GitHub
Skip to content
Avoid applying onion's channel updates in an observable way#2666

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 2 commits into

from

Oct 19, 2023
 Merged


Avoid applying onion's channel updates in an observable way
#2666
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1dffb20

Allow to verify channel updates without applying them


tnull Oct 13, 2023
1c35255

Don't apply PathFailure::ChannelUpdateMessage


tnull Oct 19, 2023

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


46 changes: 34 additions & 12 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,6 +341,9 @@ where U::Target: UtxoLookup, L::Target: Logger

impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// Handles any network updates originating from [`Event`]s.
	//
	/// Note that this will skip applying any [`NetworkUpdate::ChannelUpdateMessage`] to avoid
	/// leaking possibly identifying information of the sender to the public network.
	///
	/// [`Event`]: crate::events::Event
	pub fn handle_network_update(&self, network_update: &NetworkUpdate) {
Expand All@@ -349,8 +352,7 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 let short_channel_id = msg.contents.short_channel_id;
 let is_enabled = msg.contents.flags & (1 << 1) != (1 << 1);
 let status = if is_enabled { "enabled" } else { "disabled" };
 log_debug!(self.logger, "Updating channel with channel_update from a payment failure. Channel {} is {}.", short_channel_id, status);
 let _ = self.update_channel(msg);
 log_debug!(self.logger, "Skipping application of a channel update from a payment failure. Channel {} is {}.", short_channel_id, status);
 },
 NetworkUpdate::ChannelFailure { short_channel_id, is_permanent } => {
 if is_permanent {
Expand DownExpand Up@@ -1845,14 +1847,14 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// For an already known (from announcement) channel, update info about one of the directions
	/// of the channel.
	///
	/// You probably don't want to call this directly, instead relying on a P2PGossipSync's
	/// RoutingMessageHandler implementation to call it indirectly. This may be useful to accept
	/// You probably don't want to call this directly, instead relying on a [`P2PGossipSync`]'s
	/// [`RoutingMessageHandler`] implementation to call it indirectly. This may be useful to accept
	/// routing messages from a source using a protocol other than the lightning P2P protocol.
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(&msg.contents, Some(&msg), Some(&msg.signature))
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), false)
	}

	/// For an already known (from announcement) channel, update info about one of the directions
Expand All@@ -1862,10 +1864,23 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel_unsigned(&self, msg: &msgs::UnsignedChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(msg, None, None)
 self.update_channel_internal(msg, None, None, false)
	}

	fn update_channel_intern(&self, msg: &msgs::UnsignedChannelUpdate, full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>) -> Result<(), LightningError> {
	/// For an already known (from announcement) channel, verify the given [`ChannelUpdate`].
	///
	/// This checks whether the update currently is applicable by [`Self::update_channel`].
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn verify_channel_update(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), true)
	}

	fn update_channel_internal(&self, msg: &msgs::UnsignedChannelUpdate,
 full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>,
 only_verify: bool) -> Result<(), LightningError>
	{
 let chan_enabled = msg.flags & (1 << 1) != (1 << 1);

 if msg.chain_hash != self.chain_hash {
Expand DownExpand Up@@ -1961,7 +1976,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.two_to_one = get_new_channel_info!();
 if !only_verify {
 channel.two_to_one = get_new_channel_info!();
 }
 } else {
 check_update_latest!(channel.one_to_two);
 if let Some(sig) = sig {
Expand All@@ -1970,7 +1987,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.one_to_two = get_new_channel_info!();
 if !only_verify {
 channel.one_to_two = get_new_channel_info!();
 }
 }
 }
 }
Expand DownExpand Up@@ -2411,6 +2430,7 @@ pub(crate) mod tests {
 }

 let valid_channel_update = get_signed_channel_update(|_| {}, node_1_privkey, &secp_ctx);
 network_graph.verify_channel_update(&valid_channel_update).unwrap();
 match gossip_sync.handle_channel_update(&valid_channel_update) {
 Ok(res) => assert!(res),
 _ => panic!(),
Expand DownExpand Up@@ -2513,7 +2533,8 @@ pub(crate) mod tests {

 let short_channel_id;
 {
 // Announce a channel we will update
 // Check we won't apply an update via `handle_network_update` for privacy reasons, but
 // can continue fine if we manually apply it.
 let valid_channel_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);
 short_channel_id = valid_channel_announcement.contents.short_channel_id;
 let chain_source: Option<&test_utils::TestChainSource> = None;
Expand All@@ -2524,10 +2545,11 @@ pub(crate) mod tests {
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());

 network_graph.handle_network_update(&NetworkUpdate::ChannelUpdateMessage {
 msg: valid_channel_update,
 msg: valid_channel_update.clone(),
 });

 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_some());
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());
 network_graph.update_channel(&valid_channel_update).unwrap();
 }

 // Non-permanent failure doesn't touch the channel at all
Expand Down

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

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 2 commits into

from

Oct 19, 2023
 Merged


Avoid applying onion's channel updates in an observable way
#2666
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1dffb20

Allow to verify channel updates without applying them


tnull Oct 13, 2023
1c35255

Don't apply PathFailure::ChannelUpdateMessage


tnull Oct 19, 2023

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


46 changes: 34 additions & 12 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,6 +341,9 @@ where U::Target: UtxoLookup, L::Target: Logger

impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// Handles any network updates originating from [`Event`]s.
	//
	/// Note that this will skip applying any [`NetworkUpdate::ChannelUpdateMessage`] to avoid
	/// leaking possibly identifying information of the sender to the public network.
	///
	/// [`Event`]: crate::events::Event
	pub fn handle_network_update(&self, network_update: &NetworkUpdate) {
Expand All@@ -349,8 +352,7 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 let short_channel_id = msg.contents.short_channel_id;
 let is_enabled = msg.contents.flags & (1 << 1) != (1 << 1);
 let status = if is_enabled { "enabled" } else { "disabled" };
 log_debug!(self.logger, "Updating channel with channel_update from a payment failure. Channel {} is {}.", short_channel_id, status);
 let _ = self.update_channel(msg);
 log_debug!(self.logger, "Skipping application of a channel update from a payment failure. Channel {} is {}.", short_channel_id, status);
 },
 NetworkUpdate::ChannelFailure { short_channel_id, is_permanent } => {
 if is_permanent {
Expand DownExpand Up@@ -1845,14 +1847,14 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// For an already known (from announcement) channel, update info about one of the directions
	/// of the channel.
	///
	/// You probably don't want to call this directly, instead relying on a P2PGossipSync's
	/// RoutingMessageHandler implementation to call it indirectly. This may be useful to accept
	/// You probably don't want to call this directly, instead relying on a [`P2PGossipSync`]'s
	/// [`RoutingMessageHandler`] implementation to call it indirectly. This may be useful to accept
	/// routing messages from a source using a protocol other than the lightning P2P protocol.
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(&msg.contents, Some(&msg), Some(&msg.signature))
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), false)
	}

	/// For an already known (from announcement) channel, update info about one of the directions
Expand All@@ -1862,10 +1864,23 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel_unsigned(&self, msg: &msgs::UnsignedChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(msg, None, None)
 self.update_channel_internal(msg, None, None, false)
	}

	fn update_channel_intern(&self, msg: &msgs::UnsignedChannelUpdate, full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>) -> Result<(), LightningError> {
	/// For an already known (from announcement) channel, verify the given [`ChannelUpdate`].
	///
	/// This checks whether the update currently is applicable by [`Self::update_channel`].
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn verify_channel_update(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), true)
	}

	fn update_channel_internal(&self, msg: &msgs::UnsignedChannelUpdate,
 full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>,
 only_verify: bool) -> Result<(), LightningError>
	{
 let chan_enabled = msg.flags & (1 << 1) != (1 << 1);

 if msg.chain_hash != self.chain_hash {
Expand DownExpand Up@@ -1961,7 +1976,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.two_to_one = get_new_channel_info!();
 if !only_verify {
 channel.two_to_one = get_new_channel_info!();
 }
 } else {
 check_update_latest!(channel.one_to_two);
 if let Some(sig) = sig {
Expand All@@ -1970,7 +1987,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.one_to_two = get_new_channel_info!();
 if !only_verify {
 channel.one_to_two = get_new_channel_info!();
 }
 }
 }
 }
Expand DownExpand Up@@ -2411,6 +2430,7 @@ pub(crate) mod tests {
 }

 let valid_channel_update = get_signed_channel_update(|_| {}, node_1_privkey, &secp_ctx);
 network_graph.verify_channel_update(&valid_channel_update).unwrap();
 match gossip_sync.handle_channel_update(&valid_channel_update) {
 Ok(res) => assert!(res),
 _ => panic!(),
Expand DownExpand Up@@ -2513,7 +2533,8 @@ pub(crate) mod tests {

 let short_channel_id;
 {
 // Announce a channel we will update
 // Check we won't apply an update via `handle_network_update` for privacy reasons, but
 // can continue fine if we manually apply it.
 let valid_channel_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);
 short_channel_id = valid_channel_announcement.contents.short_channel_id;
 let chain_source: Option<&test_utils::TestChainSource> = None;
Expand All@@ -2524,10 +2545,11 @@ pub(crate) mod tests {
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());

 network_graph.handle_network_update(&NetworkUpdate::ChannelUpdateMessage {
 msg: valid_channel_update,
 msg: valid_channel_update.clone(),
 });

 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_some());
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());
 network_graph.update_channel(&valid_channel_update).unwrap();
 }

 // Non-permanent failure doesn't touch the channel at all
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Avoid applying onion's channel updates in an observable way by tnull · Pull Request #2666 · lightningdevkit/rust-lightning · GitHub
Skip to content
Avoid applying onion's channel updates in an observable way#2666

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 2 commits into

from

Oct 19, 2023
 Merged


Avoid applying onion's channel updates in an observable way
#2666
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1dffb20

Allow to verify channel updates without applying them


tnull Oct 13, 2023
1c35255

Don't apply PathFailure::ChannelUpdateMessage


tnull Oct 19, 2023

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


46 changes: 34 additions & 12 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,6 +341,9 @@ where U::Target: UtxoLookup, L::Target: Logger

impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// Handles any network updates originating from [`Event`]s.
	//
	/// Note that this will skip applying any [`NetworkUpdate::ChannelUpdateMessage`] to avoid
	/// leaking possibly identifying information of the sender to the public network.
	///
	/// [`Event`]: crate::events::Event
	pub fn handle_network_update(&self, network_update: &NetworkUpdate) {
Expand All@@ -349,8 +352,7 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 let short_channel_id = msg.contents.short_channel_id;
 let is_enabled = msg.contents.flags & (1 << 1) != (1 << 1);
 let status = if is_enabled { "enabled" } else { "disabled" };
 log_debug!(self.logger, "Updating channel with channel_update from a payment failure. Channel {} is {}.", short_channel_id, status);
 let _ = self.update_channel(msg);
 log_debug!(self.logger, "Skipping application of a channel update from a payment failure. Channel {} is {}.", short_channel_id, status);
 },
 NetworkUpdate::ChannelFailure { short_channel_id, is_permanent } => {
 if is_permanent {
Expand DownExpand Up@@ -1845,14 +1847,14 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// For an already known (from announcement) channel, update info about one of the directions
	/// of the channel.
	///
	/// You probably don't want to call this directly, instead relying on a P2PGossipSync's
	/// RoutingMessageHandler implementation to call it indirectly. This may be useful to accept
	/// You probably don't want to call this directly, instead relying on a [`P2PGossipSync`]'s
	/// [`RoutingMessageHandler`] implementation to call it indirectly. This may be useful to accept
	/// routing messages from a source using a protocol other than the lightning P2P protocol.
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(&msg.contents, Some(&msg), Some(&msg.signature))
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), false)
	}

	/// For an already known (from announcement) channel, update info about one of the directions
Expand All@@ -1862,10 +1864,23 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel_unsigned(&self, msg: &msgs::UnsignedChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(msg, None, None)
 self.update_channel_internal(msg, None, None, false)
	}

	fn update_channel_intern(&self, msg: &msgs::UnsignedChannelUpdate, full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>) -> Result<(), LightningError> {
	/// For an already known (from announcement) channel, verify the given [`ChannelUpdate`].
	///
	/// This checks whether the update currently is applicable by [`Self::update_channel`].
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn verify_channel_update(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), true)
	}

	fn update_channel_internal(&self, msg: &msgs::UnsignedChannelUpdate,
 full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>,
 only_verify: bool) -> Result<(), LightningError>
	{
 let chan_enabled = msg.flags & (1 << 1) != (1 << 1);

 if msg.chain_hash != self.chain_hash {
Expand DownExpand Up@@ -1961,7 +1976,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.two_to_one = get_new_channel_info!();
 if !only_verify {
 channel.two_to_one = get_new_channel_info!();
 }
 } else {
 check_update_latest!(channel.one_to_two);
 if let Some(sig) = sig {
Expand All@@ -1970,7 +1987,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.one_to_two = get_new_channel_info!();
 if !only_verify {
 channel.one_to_two = get_new_channel_info!();
 }
 }
 }
 }
Expand DownExpand Up@@ -2411,6 +2430,7 @@ pub(crate) mod tests {
 }

 let valid_channel_update = get_signed_channel_update(|_| {}, node_1_privkey, &secp_ctx);
 network_graph.verify_channel_update(&valid_channel_update).unwrap();
 match gossip_sync.handle_channel_update(&valid_channel_update) {
 Ok(res) => assert!(res),
 _ => panic!(),
Expand DownExpand Up@@ -2513,7 +2533,8 @@ pub(crate) mod tests {

 let short_channel_id;
 {
 // Announce a channel we will update
 // Check we won't apply an update via `handle_network_update` for privacy reasons, but
 // can continue fine if we manually apply it.
 let valid_channel_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);
 short_channel_id = valid_channel_announcement.contents.short_channel_id;
 let chain_source: Option<&test_utils::TestChainSource> = None;
Expand All@@ -2524,10 +2545,11 @@ pub(crate) mod tests {
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());

 network_graph.handle_network_update(&NetworkUpdate::ChannelUpdateMessage {
 msg: valid_channel_update,
 msg: valid_channel_update.clone(),
 });

 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_some());
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());
 network_graph.update_channel(&valid_channel_update).unwrap();
 }

 // Non-permanent failure doesn't touch the channel at all
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Avoid applying onion's channel updates in an observable way by tnull · Pull Request #2666 · lightningdevkit/rust-lightning · GitHub
Skip to content
Avoid applying onion's channel updates in an observable way#2666

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 2 commits into

from

Oct 19, 2023
 Merged


Avoid applying onion's channel updates in an observable way
#2666
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1dffb20

Allow to verify channel updates without applying them


tnull Oct 13, 2023
1c35255

Don't apply PathFailure::ChannelUpdateMessage


tnull Oct 19, 2023

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


46 changes: 34 additions & 12 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,6 +341,9 @@ where U::Target: UtxoLookup, L::Target: Logger

impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// Handles any network updates originating from [`Event`]s.
	//
	/// Note that this will skip applying any [`NetworkUpdate::ChannelUpdateMessage`] to avoid
	/// leaking possibly identifying information of the sender to the public network.
	///
	/// [`Event`]: crate::events::Event
	pub fn handle_network_update(&self, network_update: &NetworkUpdate) {
Expand All@@ -349,8 +352,7 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 let short_channel_id = msg.contents.short_channel_id;
 let is_enabled = msg.contents.flags & (1 << 1) != (1 << 1);
 let status = if is_enabled { "enabled" } else { "disabled" };
 log_debug!(self.logger, "Updating channel with channel_update from a payment failure. Channel {} is {}.", short_channel_id, status);
 let _ = self.update_channel(msg);
 log_debug!(self.logger, "Skipping application of a channel update from a payment failure. Channel {} is {}.", short_channel_id, status);
 },
 NetworkUpdate::ChannelFailure { short_channel_id, is_permanent } => {
 if is_permanent {
Expand DownExpand Up@@ -1845,14 +1847,14 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// For an already known (from announcement) channel, update info about one of the directions
	/// of the channel.
	///
	/// You probably don't want to call this directly, instead relying on a P2PGossipSync's
	/// RoutingMessageHandler implementation to call it indirectly. This may be useful to accept
	/// You probably don't want to call this directly, instead relying on a [`P2PGossipSync`]'s
	/// [`RoutingMessageHandler`] implementation to call it indirectly. This may be useful to accept
	/// routing messages from a source using a protocol other than the lightning P2P protocol.
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(&msg.contents, Some(&msg), Some(&msg.signature))
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), false)
	}

	/// For an already known (from announcement) channel, update info about one of the directions
Expand All@@ -1862,10 +1864,23 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel_unsigned(&self, msg: &msgs::UnsignedChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(msg, None, None)
 self.update_channel_internal(msg, None, None, false)
	}

	fn update_channel_intern(&self, msg: &msgs::UnsignedChannelUpdate, full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>) -> Result<(), LightningError> {
	/// For an already known (from announcement) channel, verify the given [`ChannelUpdate`].
	///
	/// This checks whether the update currently is applicable by [`Self::update_channel`].
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn verify_channel_update(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), true)
	}

	fn update_channel_internal(&self, msg: &msgs::UnsignedChannelUpdate,
 full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>,
 only_verify: bool) -> Result<(), LightningError>
	{
 let chan_enabled = msg.flags & (1 << 1) != (1 << 1);

 if msg.chain_hash != self.chain_hash {
Expand DownExpand Up@@ -1961,7 +1976,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.two_to_one = get_new_channel_info!();
 if !only_verify {
 channel.two_to_one = get_new_channel_info!();
 }
 } else {
 check_update_latest!(channel.one_to_two);
 if let Some(sig) = sig {
Expand All@@ -1970,7 +1987,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.one_to_two = get_new_channel_info!();
 if !only_verify {
 channel.one_to_two = get_new_channel_info!();
 }
 }
 }
 }
Expand DownExpand Up@@ -2411,6 +2430,7 @@ pub(crate) mod tests {
 }

 let valid_channel_update = get_signed_channel_update(|_| {}, node_1_privkey, &secp_ctx);
 network_graph.verify_channel_update(&valid_channel_update).unwrap();
 match gossip_sync.handle_channel_update(&valid_channel_update) {
 Ok(res) => assert!(res),
 _ => panic!(),
Expand DownExpand Up@@ -2513,7 +2533,8 @@ pub(crate) mod tests {

 let short_channel_id;
 {
 // Announce a channel we will update
 // Check we won't apply an update via `handle_network_update` for privacy reasons, but
 // can continue fine if we manually apply it.
 let valid_channel_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);
 short_channel_id = valid_channel_announcement.contents.short_channel_id;
 let chain_source: Option<&test_utils::TestChainSource> = None;
Expand All@@ -2524,10 +2545,11 @@ pub(crate) mod tests {
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());

 network_graph.handle_network_update(&NetworkUpdate::ChannelUpdateMessage {
 msg: valid_channel_update,
 msg: valid_channel_update.clone(),
 });

 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_some());
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());
 network_graph.update_channel(&valid_channel_update).unwrap();
 }

 // Non-permanent failure doesn't touch the channel at all
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Avoid applying onion's channel updates in an observable way by tnull · Pull Request #2666 · lightningdevkit/rust-lightning · GitHub
Skip to content
Avoid applying onion's channel updates in an observable way#2666

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 2 commits into

from

Oct 19, 2023
 Merged


Avoid applying onion's channel updates in an observable way
#2666
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1dffb20

Allow to verify channel updates without applying them


tnull Oct 13, 2023
1c35255

Don't apply PathFailure::ChannelUpdateMessage


tnull Oct 19, 2023

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


46 changes: 34 additions & 12 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,6 +341,9 @@ where U::Target: UtxoLookup, L::Target: Logger

impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// Handles any network updates originating from [`Event`]s.
	//
	/// Note that this will skip applying any [`NetworkUpdate::ChannelUpdateMessage`] to avoid
	/// leaking possibly identifying information of the sender to the public network.
	///
	/// [`Event`]: crate::events::Event
	pub fn handle_network_update(&self, network_update: &NetworkUpdate) {
Expand All@@ -349,8 +352,7 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 let short_channel_id = msg.contents.short_channel_id;
 let is_enabled = msg.contents.flags & (1 << 1) != (1 << 1);
 let status = if is_enabled { "enabled" } else { "disabled" };
 log_debug!(self.logger, "Updating channel with channel_update from a payment failure. Channel {} is {}.", short_channel_id, status);
 let _ = self.update_channel(msg);
 log_debug!(self.logger, "Skipping application of a channel update from a payment failure. Channel {} is {}.", short_channel_id, status);
 },
 NetworkUpdate::ChannelFailure { short_channel_id, is_permanent } => {
 if is_permanent {
Expand DownExpand Up@@ -1845,14 +1847,14 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// For an already known (from announcement) channel, update info about one of the directions
	/// of the channel.
	///
	/// You probably don't want to call this directly, instead relying on a P2PGossipSync's
	/// RoutingMessageHandler implementation to call it indirectly. This may be useful to accept
	/// You probably don't want to call this directly, instead relying on a [`P2PGossipSync`]'s
	/// [`RoutingMessageHandler`] implementation to call it indirectly. This may be useful to accept
	/// routing messages from a source using a protocol other than the lightning P2P protocol.
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(&msg.contents, Some(&msg), Some(&msg.signature))
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), false)
	}

	/// For an already known (from announcement) channel, update info about one of the directions
Expand All@@ -1862,10 +1864,23 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel_unsigned(&self, msg: &msgs::UnsignedChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(msg, None, None)
 self.update_channel_internal(msg, None, None, false)
	}

	fn update_channel_intern(&self, msg: &msgs::UnsignedChannelUpdate, full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>) -> Result<(), LightningError> {
	/// For an already known (from announcement) channel, verify the given [`ChannelUpdate`].
	///
	/// This checks whether the update currently is applicable by [`Self::update_channel`].
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn verify_channel_update(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), true)
	}

	fn update_channel_internal(&self, msg: &msgs::UnsignedChannelUpdate,
 full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>,
 only_verify: bool) -> Result<(), LightningError>
	{
 let chan_enabled = msg.flags & (1 << 1) != (1 << 1);

 if msg.chain_hash != self.chain_hash {
Expand DownExpand Up@@ -1961,7 +1976,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.two_to_one = get_new_channel_info!();
 if !only_verify {
 channel.two_to_one = get_new_channel_info!();
 }
 } else {
 check_update_latest!(channel.one_to_two);
 if let Some(sig) = sig {
Expand All@@ -1970,7 +1987,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.one_to_two = get_new_channel_info!();
 if !only_verify {
 channel.one_to_two = get_new_channel_info!();
 }
 }
 }
 }
Expand DownExpand Up@@ -2411,6 +2430,7 @@ pub(crate) mod tests {
 }

 let valid_channel_update = get_signed_channel_update(|_| {}, node_1_privkey, &secp_ctx);
 network_graph.verify_channel_update(&valid_channel_update).unwrap();
 match gossip_sync.handle_channel_update(&valid_channel_update) {
 Ok(res) => assert!(res),
 _ => panic!(),
Expand DownExpand Up@@ -2513,7 +2533,8 @@ pub(crate) mod tests {

 let short_channel_id;
 {
 // Announce a channel we will update
 // Check we won't apply an update via `handle_network_update` for privacy reasons, but
 // can continue fine if we manually apply it.
 let valid_channel_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);
 short_channel_id = valid_channel_announcement.contents.short_channel_id;
 let chain_source: Option<&test_utils::TestChainSource> = None;
Expand All@@ -2524,10 +2545,11 @@ pub(crate) mod tests {
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());

 network_graph.handle_network_update(&NetworkUpdate::ChannelUpdateMessage {
 msg: valid_channel_update,
 msg: valid_channel_update.clone(),
 });

 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_some());
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());
 network_graph.update_channel(&valid_channel_update).unwrap();
 }

 // Non-permanent failure doesn't touch the channel at all
Expand Down

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

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 2 commits into

from

Oct 19, 2023
 Merged


Avoid applying onion's channel updates in an observable way
#2666
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1dffb20

Allow to verify channel updates without applying them


tnull Oct 13, 2023
1c35255

Don't apply PathFailure::ChannelUpdateMessage


tnull Oct 19, 2023

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


46 changes: 34 additions & 12 deletions
lightning/src/routing/gossip.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -341,6 +341,9 @@ where U::Target: UtxoLookup, L::Target: Logger

impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// Handles any network updates originating from [`Event`]s.
	//
	/// Note that this will skip applying any [`NetworkUpdate::ChannelUpdateMessage`] to avoid
	/// leaking possibly identifying information of the sender to the public network.
	///
	/// [`Event`]: crate::events::Event
	pub fn handle_network_update(&self, network_update: &NetworkUpdate) {
Expand All@@ -349,8 +352,7 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 let short_channel_id = msg.contents.short_channel_id;
 let is_enabled = msg.contents.flags & (1 << 1) != (1 << 1);
 let status = if is_enabled { "enabled" } else { "disabled" };
 log_debug!(self.logger, "Updating channel with channel_update from a payment failure. Channel {} is {}.", short_channel_id, status);
 let _ = self.update_channel(msg);
 log_debug!(self.logger, "Skipping application of a channel update from a payment failure. Channel {} is {}.", short_channel_id, status);
 },
 NetworkUpdate::ChannelFailure { short_channel_id, is_permanent } => {
 if is_permanent {
Expand DownExpand Up@@ -1845,14 +1847,14 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// For an already known (from announcement) channel, update info about one of the directions
	/// of the channel.
	///
	/// You probably don't want to call this directly, instead relying on a P2PGossipSync's
	/// RoutingMessageHandler implementation to call it indirectly. This may be useful to accept
	/// You probably don't want to call this directly, instead relying on a [`P2PGossipSync`]'s
	/// [`RoutingMessageHandler`] implementation to call it indirectly. This may be useful to accept
	/// routing messages from a source using a protocol other than the lightning P2P protocol.
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(&msg.contents, Some(&msg), Some(&msg.signature))
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), false)
	}

	/// For an already known (from announcement) channel, update info about one of the directions
Expand All@@ -1862,10 +1864,23 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn update_channel_unsigned(&self, msg: &msgs::UnsignedChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_intern(msg, None, None)
 self.update_channel_internal(msg, None, None, false)
	}

	fn update_channel_intern(&self, msg: &msgs::UnsignedChannelUpdate, full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>) -> Result<(), LightningError> {
	/// For an already known (from announcement) channel, verify the given [`ChannelUpdate`].
	///
	/// This checks whether the update currently is applicable by [`Self::update_channel`].
	///
	/// If built with `no-std`, any updates with a timestamp more than two weeks in the past or
	/// materially in the future will be rejected.
	pub fn verify_channel_update(&self, msg: &msgs::ChannelUpdate) -> Result<(), LightningError> {
 self.update_channel_internal(&msg.contents, Some(&msg), Some(&msg.signature), true)
	}

	fn update_channel_internal(&self, msg: &msgs::UnsignedChannelUpdate,
 full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>,
 only_verify: bool) -> Result<(), LightningError>
	{
 let chan_enabled = msg.flags & (1 << 1) != (1 << 1);

 if msg.chain_hash != self.chain_hash {
Expand DownExpand Up@@ -1961,7 +1976,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.two_to_one = get_new_channel_info!();
 if !only_verify {
 channel.two_to_one = get_new_channel_info!();
 }
 } else {
 check_update_latest!(channel.one_to_two);
 if let Some(sig) = sig {
Expand All@@ -1970,7 +1987,9 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 action: ErrorAction::IgnoreAndLog(Level::Debug)
 })?, "channel_update");
 }
 channel.one_to_two = get_new_channel_info!();
 if !only_verify {
 channel.one_to_two = get_new_channel_info!();
 }
 }
 }
 }
Expand DownExpand Up@@ -2411,6 +2430,7 @@ pub(crate) mod tests {
 }

 let valid_channel_update = get_signed_channel_update(|_| {}, node_1_privkey, &secp_ctx);
 network_graph.verify_channel_update(&valid_channel_update).unwrap();
 match gossip_sync.handle_channel_update(&valid_channel_update) {
 Ok(res) => assert!(res),
 _ => panic!(),
Expand DownExpand Up@@ -2513,7 +2533,8 @@ pub(crate) mod tests {

 let short_channel_id;
 {
 // Announce a channel we will update
 // Check we won't apply an update via `handle_network_update` for privacy reasons, but
 // can continue fine if we manually apply it.
 let valid_channel_announcement = get_signed_channel_announcement(|_| {}, node_1_privkey, node_2_privkey, &secp_ctx);
 short_channel_id = valid_channel_announcement.contents.short_channel_id;
 let chain_source: Option<&test_utils::TestChainSource> = None;
Expand All@@ -2524,10 +2545,11 @@ pub(crate) mod tests {
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());

 network_graph.handle_network_update(&NetworkUpdate::ChannelUpdateMessage {
 msg: valid_channel_update,
 msg: valid_channel_update.clone(),
 });

 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_some());
 assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());
 network_graph.update_channel(&valid_channel_update).unwrap();
 }

 // Non-permanent failure doesn't touch the channel at all
Expand Down