Add DNSHostname to NetAddress mssgs#1329

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

Closed
a-mpch wants to merge 1 commit into from
Closed

Add DNSHostname to NetAddress mssgs #1329

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
54 changes: 43 additions & 11 deletions lightning/src/ln/msgs.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ use core::fmt;
use core::fmt::Debug;
use io::{self, Read};
use io_extras::read_to_end;
use std::convert::TryFrom;

use util::events::MessageSendEventsProvider;
use util::logger;
Expand DownExpand Up@@ -434,6 +435,12 @@ pub enum NetAddress {
/// The port on which the node is listening
port: u16,
},
DNSHostname {
/// The dns hostname on which the node is listening, length hostname len

@TheBlueMattTheBlueMattMar 22, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/, length hostname len //?

hostname: String,
/// The port on which the node is listening
port: u16,
}
}
impl NetAddress {
/// Gets the ID of this address type. Addresses in node_announcement messages should be sorted
Expand All@@ -444,6 +451,7 @@ impl NetAddress {
&NetAddress::IPv6 {..} => { 2 },
&NetAddress::OnionV2(_) => { 3 },
&NetAddress::OnionV3 {..} => { 4 },
&NetAddress::DNSHostname {..} => { 5 },
}
}

Expand All@@ -454,11 +462,14 @@ impl NetAddress {
&NetAddress::IPv6 { .. } => { 18 },
&NetAddress::OnionV2(_) => { 12 },
&NetAddress::OnionV3 { .. } => { 37 },
&NetAddress::DNSHostname { ref hostname, .. } => {
return (1 + hostname.len() + 2) as u16
}
}
}

/// The maximum length of any address descriptor, not including the 1-byte type
pub(crate) const MAX_LEN: u16 = 37;
pub(crate) const MAX_LEN: u16 = 258;
}

impl Writeable for NetAddress {
Expand All@@ -485,6 +496,11 @@ impl Writeable for NetAddress {
version.write(writer)?;
port.write(writer)?;
}
&NetAddress::DNSHostname { ref hostname, ref port } => {
5u8.write(writer)?;
hostname.write(writer)?;

@TheBlueMattTheBlueMattMar 22, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default String write writes a two-byte length, whereas we need one here. You'll need to manually write the string. That said, you may actually want to use a different type, given we're required to write out hostnames in ASCII, and the tight size length, we'll want to enforce that on users.

port.write(writer)?;
}
}
Ok(())
}
Expand DownExpand Up@@ -515,6 +531,13 @@ impl Readable for Result<NetAddress, u8> {
port: Readable::read(reader)?,
}))
},
5 => {
Readable::read(reader)?;
Ok(Ok(NetAddress::DNSHostname {
hostname: Readable::read(reader)?,

@TheBlueMattTheBlueMattMar 22, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should enforce the ASCII-ness of the string here.

port: Readable::read(reader)?,
}))
},
_ => return Ok(Err(byte)),
}
}
Expand DownExpand Up@@ -1956,7 +1979,7 @@ mod tests {
do_encoding_channel_announcement(true, true);
}

fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, excess_address_data: bool, excess_data: bool) {
fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, dns_hostname: bool, excess_address_data: bool, excess_data: bool) {
let secp_ctx = Secp256k1::new();
let (privkey_1, pubkey_1) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
let sig_1 = get_sig_on!(privkey_1, secp_ctx, String::from("01010101010101010101010101010101"));
Expand DownExpand Up@@ -1992,6 +2015,12 @@ mod tests {
port: 9735
});
}
if dns_hostname {
addresses.push(msgs::NetAddress::DNSHostname {
hostname: String::from("somehostname"),
port: 9735
});
}
let mut addr_len = 0;
for addr in &addresses {
addr_len += addr.len() + 1;
Expand DownExpand Up@@ -2032,6 +2061,9 @@ mod tests {
if onionv3 {
target_value.append(&mut hex::decode("04fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
}
if dns_hostname {
target_value.append(&mut hex::decode("05fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
}
if excess_address_data {
target_value.append(&mut hex::decode("216c280b5395a2546e7e4b2663e04f811622f15a4f92e83aa2e92ba2a573c139142c54ae63072a1ec1ee7dc0c04bde5c847806172aa05c92c22ae8e308d1d269").unwrap());
}
Expand All@@ -2043,15 +2075,15 @@ mod tests {

#[test]
fn encoding_node_announcement() {
do_encoding_node_announcement(true, true, true, true, true, true, true);
do_encoding_node_announcement(false, false, false, false, false, false, false);
do_encoding_node_announcement(false, true, false, false, false, false, false);
do_encoding_node_announcement(false, false, true, false, false, false, false);
do_encoding_node_announcement(false, false, false, true, false, false, false);
do_encoding_node_announcement(false, false, false, false, true, false, false);
do_encoding_node_announcement(false, false, false, false, false, true, false);
do_encoding_node_announcement(false, true, false, true, false, true, false);
do_encoding_node_announcement(false, false, true, false, true, false, false);
do_encoding_node_announcement(true, true, true, true, true, true, true, true);
do_encoding_node_announcement(false, false, false, false, false, false, false, false);
do_encoding_node_announcement(false, true, false, false, false, false, false, false);
do_encoding_node_announcement(false, false, true, false, false, false, false, false);
do_encoding_node_announcement(false, false, false, true, false, false, false, false);
do_encoding_node_announcement(false, false, false, false, true, false, false, false);
do_encoding_node_announcement(false, false, false, false, false, true, false, false);
do_encoding_node_announcement(false, true, false, true, false, false, true, false);
do_encoding_node_announcement(false, false, true, false, true, false, false, false);
}

fn do_encoding_channel_update(direction: bool, disable: bool, htlc_maximum_msat: bool, excess_data: bool) {
Expand Down
, '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
Add DNSHostname to NetAddress mssgs#1329

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

 Closed

a-mpch
wants to merge
1
commit into

from

 Closed


Add DNSHostname to NetAddress mssgs
#1329
 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


54 changes: 43 additions & 11 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ use core::fmt;
use core::fmt::Debug;
use io::{self, Read};
use io_extras::read_to_end;
use std::convert::TryFrom;

use util::events::MessageSendEventsProvider;
use util::logger;
Expand DownExpand Up@@ -434,6 +435,12 @@ pub enum NetAddress {
 /// The port on which the node is listening
 port: u16,
	},
	DNSHostname {
 /// The dns hostname on which the node is listening, length hostname len 
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/, length hostname len //?
 hostname: String,
 /// The port on which the node is listening
 port: u16,
	}
}
impl NetAddress {
	/// Gets the ID of this address type. Addresses in node_announcement messages should be sorted
Expand All@@ -444,6 +451,7 @@ impl NetAddress {
 &NetAddress::IPv6 {..} => { 2 },
 &NetAddress::OnionV2(_) => { 3 },
 &NetAddress::OnionV3 {..} => { 4 },
 &NetAddress::DNSHostname {..} => { 5 },
 }
	}

Expand All@@ -454,11 +462,14 @@ impl NetAddress {
 &NetAddress::IPv6 { .. } => { 18 },
 &NetAddress::OnionV2(_) => { 12 },
 &NetAddress::OnionV3 { .. } => { 37 },
 &NetAddress::DNSHostname { ref hostname, .. } => {
 return (1 + hostname.len() + 2) as u16
 }
 }
	}

	/// The maximum length of any address descriptor, not including the 1-byte type
	pub(crate) const MAX_LEN: u16 = 37;
	pub(crate) const MAX_LEN: u16 = 258;
}

impl Writeable for NetAddress {
Expand All@@ -485,6 +496,11 @@ impl Writeable for NetAddress {
 version.write(writer)?;
 port.write(writer)?;
 }
 &NetAddress::DNSHostname { ref hostname, ref port } => {
 5u8.write(writer)?;
 hostname.write(writer)?;
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default String write writes a two-byte length, whereas we need one here. You'll need to manually write the string. That said, you may actually want to use a different type, given we're required to write out hostnames in ASCII, and the tight size length, we'll want to enforce that on users.
 port.write(writer)?;
 }
 }
 Ok(())
	}
Expand DownExpand Up@@ -515,6 +531,13 @@ impl Readable for Result<NetAddress, u8> {
 port: Readable::read(reader)?,
 }))
 },
 5 => {
 Readable::read(reader)?;
 Ok(Ok(NetAddress::DNSHostname {
 hostname: Readable::read(reader)?,
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should enforce the ASCII-ness of the string here.
 port: Readable::read(reader)?,
 }))
 },
 _ => return Ok(Err(byte)),
 }
	}
Expand DownExpand Up@@ -1956,7 +1979,7 @@ mod tests {
 do_encoding_channel_announcement(true, true);
	}

	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, excess_address_data: bool, excess_data: bool) {
	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, dns_hostname: bool, excess_address_data: bool, excess_data: bool) {
 let secp_ctx = Secp256k1::new();
 let (privkey_1, pubkey_1) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
 let sig_1 = get_sig_on!(privkey_1, secp_ctx, String::from("01010101010101010101010101010101"));
Expand DownExpand Up@@ -1992,6 +2015,12 @@ mod tests {
 port: 9735
 });
 }
 if dns_hostname {
 addresses.push(msgs::NetAddress::DNSHostname {
 hostname: String::from("somehostname"),
 port: 9735
 });
 }
 let mut addr_len = 0;
 for addr in &addresses {
 addr_len += addr.len() + 1;
Expand DownExpand Up@@ -2032,6 +2061,9 @@ mod tests {
 if onionv3 {
 target_value.append(&mut hex::decode("04fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if dns_hostname {
 target_value.append(&mut hex::decode("05fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if excess_address_data {
 target_value.append(&mut hex::decode("216c280b5395a2546e7e4b2663e04f811622f15a4f92e83aa2e92ba2a573c139142c54ae63072a1ec1ee7dc0c04bde5c847806172aa05c92c22ae8e308d1d269").unwrap());
 }
Expand All@@ -2043,15 +2075,15 @@ mod tests {

	#[test]
	fn encoding_node_announcement() {
 do_encoding_node_announcement(true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false);
 do_encoding_node_announcement(false, true, false, true, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false);
 do_encoding_node_announcement(true, true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, true, false, true, false, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false, false);
	}

	fn do_encoding_channel_update(direction: bool, disable: bool, htlc_maximum_msat: bool, excess_data: bool) {
Expand Down

, '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
Add DNSHostname to NetAddress mssgs#1329

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

 Closed

a-mpch
wants to merge
1
commit into

from

 Closed


Add DNSHostname to NetAddress mssgs
#1329
 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


54 changes: 43 additions & 11 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ use core::fmt;
use core::fmt::Debug;
use io::{self, Read};
use io_extras::read_to_end;
use std::convert::TryFrom;

use util::events::MessageSendEventsProvider;
use util::logger;
Expand DownExpand Up@@ -434,6 +435,12 @@ pub enum NetAddress {
 /// The port on which the node is listening
 port: u16,
	},
	DNSHostname {
 /// The dns hostname on which the node is listening, length hostname len 
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/, length hostname len //?
 hostname: String,
 /// The port on which the node is listening
 port: u16,
	}
}
impl NetAddress {
	/// Gets the ID of this address type. Addresses in node_announcement messages should be sorted
Expand All@@ -444,6 +451,7 @@ impl NetAddress {
 &NetAddress::IPv6 {..} => { 2 },
 &NetAddress::OnionV2(_) => { 3 },
 &NetAddress::OnionV3 {..} => { 4 },
 &NetAddress::DNSHostname {..} => { 5 },
 }
	}

Expand All@@ -454,11 +462,14 @@ impl NetAddress {
 &NetAddress::IPv6 { .. } => { 18 },
 &NetAddress::OnionV2(_) => { 12 },
 &NetAddress::OnionV3 { .. } => { 37 },
 &NetAddress::DNSHostname { ref hostname, .. } => {
 return (1 + hostname.len() + 2) as u16
 }
 }
	}

	/// The maximum length of any address descriptor, not including the 1-byte type
	pub(crate) const MAX_LEN: u16 = 37;
	pub(crate) const MAX_LEN: u16 = 258;
}

impl Writeable for NetAddress {
Expand All@@ -485,6 +496,11 @@ impl Writeable for NetAddress {
 version.write(writer)?;
 port.write(writer)?;
 }
 &NetAddress::DNSHostname { ref hostname, ref port } => {
 5u8.write(writer)?;
 hostname.write(writer)?;
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default String write writes a two-byte length, whereas we need one here. You'll need to manually write the string. That said, you may actually want to use a different type, given we're required to write out hostnames in ASCII, and the tight size length, we'll want to enforce that on users.
 port.write(writer)?;
 }
 }
 Ok(())
	}
Expand DownExpand Up@@ -515,6 +531,13 @@ impl Readable for Result<NetAddress, u8> {
 port: Readable::read(reader)?,
 }))
 },
 5 => {
 Readable::read(reader)?;
 Ok(Ok(NetAddress::DNSHostname {
 hostname: Readable::read(reader)?,
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should enforce the ASCII-ness of the string here.
 port: Readable::read(reader)?,
 }))
 },
 _ => return Ok(Err(byte)),
 }
	}
Expand DownExpand Up@@ -1956,7 +1979,7 @@ mod tests {
 do_encoding_channel_announcement(true, true);
	}

	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, excess_address_data: bool, excess_data: bool) {
	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, dns_hostname: bool, excess_address_data: bool, excess_data: bool) {
 let secp_ctx = Secp256k1::new();
 let (privkey_1, pubkey_1) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
 let sig_1 = get_sig_on!(privkey_1, secp_ctx, String::from("01010101010101010101010101010101"));
Expand DownExpand Up@@ -1992,6 +2015,12 @@ mod tests {
 port: 9735
 });
 }
 if dns_hostname {
 addresses.push(msgs::NetAddress::DNSHostname {
 hostname: String::from("somehostname"),
 port: 9735
 });
 }
 let mut addr_len = 0;
 for addr in &addresses {
 addr_len += addr.len() + 1;
Expand DownExpand Up@@ -2032,6 +2061,9 @@ mod tests {
 if onionv3 {
 target_value.append(&mut hex::decode("04fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if dns_hostname {
 target_value.append(&mut hex::decode("05fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if excess_address_data {
 target_value.append(&mut hex::decode("216c280b5395a2546e7e4b2663e04f811622f15a4f92e83aa2e92ba2a573c139142c54ae63072a1ec1ee7dc0c04bde5c847806172aa05c92c22ae8e308d1d269").unwrap());
 }
Expand All@@ -2043,15 +2075,15 @@ mod tests {

	#[test]
	fn encoding_node_announcement() {
 do_encoding_node_announcement(true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false);
 do_encoding_node_announcement(false, true, false, true, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false);
 do_encoding_node_announcement(true, true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, true, false, true, false, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false, false);
	}

	fn do_encoding_channel_update(direction: bool, disable: bool, htlc_maximum_msat: bool, excess_data: bool) {
Expand Down

, '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
Add DNSHostname to NetAddress mssgs#1329

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

 Closed

a-mpch
wants to merge
1
commit into

from

 Closed


Add DNSHostname to NetAddress mssgs
#1329
 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


54 changes: 43 additions & 11 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ use core::fmt;
use core::fmt::Debug;
use io::{self, Read};
use io_extras::read_to_end;
use std::convert::TryFrom;

use util::events::MessageSendEventsProvider;
use util::logger;
Expand DownExpand Up@@ -434,6 +435,12 @@ pub enum NetAddress {
 /// The port on which the node is listening
 port: u16,
	},
	DNSHostname {
 /// The dns hostname on which the node is listening, length hostname len 
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/, length hostname len //?
 hostname: String,
 /// The port on which the node is listening
 port: u16,
	}
}
impl NetAddress {
	/// Gets the ID of this address type. Addresses in node_announcement messages should be sorted
Expand All@@ -444,6 +451,7 @@ impl NetAddress {
 &NetAddress::IPv6 {..} => { 2 },
 &NetAddress::OnionV2(_) => { 3 },
 &NetAddress::OnionV3 {..} => { 4 },
 &NetAddress::DNSHostname {..} => { 5 },
 }
	}

Expand All@@ -454,11 +462,14 @@ impl NetAddress {
 &NetAddress::IPv6 { .. } => { 18 },
 &NetAddress::OnionV2(_) => { 12 },
 &NetAddress::OnionV3 { .. } => { 37 },
 &NetAddress::DNSHostname { ref hostname, .. } => {
 return (1 + hostname.len() + 2) as u16
 }
 }
	}

	/// The maximum length of any address descriptor, not including the 1-byte type
	pub(crate) const MAX_LEN: u16 = 37;
	pub(crate) const MAX_LEN: u16 = 258;
}

impl Writeable for NetAddress {
Expand All@@ -485,6 +496,11 @@ impl Writeable for NetAddress {
 version.write(writer)?;
 port.write(writer)?;
 }
 &NetAddress::DNSHostname { ref hostname, ref port } => {
 5u8.write(writer)?;
 hostname.write(writer)?;
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default String write writes a two-byte length, whereas we need one here. You'll need to manually write the string. That said, you may actually want to use a different type, given we're required to write out hostnames in ASCII, and the tight size length, we'll want to enforce that on users.
 port.write(writer)?;
 }
 }
 Ok(())
	}
Expand DownExpand Up@@ -515,6 +531,13 @@ impl Readable for Result<NetAddress, u8> {
 port: Readable::read(reader)?,
 }))
 },
 5 => {
 Readable::read(reader)?;
 Ok(Ok(NetAddress::DNSHostname {
 hostname: Readable::read(reader)?,
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should enforce the ASCII-ness of the string here.
 port: Readable::read(reader)?,
 }))
 },
 _ => return Ok(Err(byte)),
 }
	}
Expand DownExpand Up@@ -1956,7 +1979,7 @@ mod tests {
 do_encoding_channel_announcement(true, true);
	}

	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, excess_address_data: bool, excess_data: bool) {
	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, dns_hostname: bool, excess_address_data: bool, excess_data: bool) {
 let secp_ctx = Secp256k1::new();
 let (privkey_1, pubkey_1) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
 let sig_1 = get_sig_on!(privkey_1, secp_ctx, String::from("01010101010101010101010101010101"));
Expand DownExpand Up@@ -1992,6 +2015,12 @@ mod tests {
 port: 9735
 });
 }
 if dns_hostname {
 addresses.push(msgs::NetAddress::DNSHostname {
 hostname: String::from("somehostname"),
 port: 9735
 });
 }
 let mut addr_len = 0;
 for addr in &addresses {
 addr_len += addr.len() + 1;
Expand DownExpand Up@@ -2032,6 +2061,9 @@ mod tests {
 if onionv3 {
 target_value.append(&mut hex::decode("04fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if dns_hostname {
 target_value.append(&mut hex::decode("05fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if excess_address_data {
 target_value.append(&mut hex::decode("216c280b5395a2546e7e4b2663e04f811622f15a4f92e83aa2e92ba2a573c139142c54ae63072a1ec1ee7dc0c04bde5c847806172aa05c92c22ae8e308d1d269").unwrap());
 }
Expand All@@ -2043,15 +2075,15 @@ mod tests {

	#[test]
	fn encoding_node_announcement() {
 do_encoding_node_announcement(true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false);
 do_encoding_node_announcement(false, true, false, true, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false);
 do_encoding_node_announcement(true, true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, true, false, true, false, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false, false);
	}

	fn do_encoding_channel_update(direction: bool, disable: bool, htlc_maximum_msat: bool, excess_data: bool) {
Expand Down

, '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
Add DNSHostname to NetAddress mssgs#1329

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

 Closed

a-mpch
wants to merge
1
commit into

from

 Closed


Add DNSHostname to NetAddress mssgs
#1329
 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


54 changes: 43 additions & 11 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ use core::fmt;
use core::fmt::Debug;
use io::{self, Read};
use io_extras::read_to_end;
use std::convert::TryFrom;

use util::events::MessageSendEventsProvider;
use util::logger;
Expand DownExpand Up@@ -434,6 +435,12 @@ pub enum NetAddress {
 /// The port on which the node is listening
 port: u16,
	},
	DNSHostname {
 /// The dns hostname on which the node is listening, length hostname len 
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/, length hostname len //?
 hostname: String,
 /// The port on which the node is listening
 port: u16,
	}
}
impl NetAddress {
	/// Gets the ID of this address type. Addresses in node_announcement messages should be sorted
Expand All@@ -444,6 +451,7 @@ impl NetAddress {
 &NetAddress::IPv6 {..} => { 2 },
 &NetAddress::OnionV2(_) => { 3 },
 &NetAddress::OnionV3 {..} => { 4 },
 &NetAddress::DNSHostname {..} => { 5 },
 }
	}

Expand All@@ -454,11 +462,14 @@ impl NetAddress {
 &NetAddress::IPv6 { .. } => { 18 },
 &NetAddress::OnionV2(_) => { 12 },
 &NetAddress::OnionV3 { .. } => { 37 },
 &NetAddress::DNSHostname { ref hostname, .. } => {
 return (1 + hostname.len() + 2) as u16
 }
 }
	}

	/// The maximum length of any address descriptor, not including the 1-byte type
	pub(crate) const MAX_LEN: u16 = 37;
	pub(crate) const MAX_LEN: u16 = 258;
}

impl Writeable for NetAddress {
Expand All@@ -485,6 +496,11 @@ impl Writeable for NetAddress {
 version.write(writer)?;
 port.write(writer)?;
 }
 &NetAddress::DNSHostname { ref hostname, ref port } => {
 5u8.write(writer)?;
 hostname.write(writer)?;
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default String write writes a two-byte length, whereas we need one here. You'll need to manually write the string. That said, you may actually want to use a different type, given we're required to write out hostnames in ASCII, and the tight size length, we'll want to enforce that on users.
 port.write(writer)?;
 }
 }
 Ok(())
	}
Expand DownExpand Up@@ -515,6 +531,13 @@ impl Readable for Result<NetAddress, u8> {
 port: Readable::read(reader)?,
 }))
 },
 5 => {
 Readable::read(reader)?;
 Ok(Ok(NetAddress::DNSHostname {
 hostname: Readable::read(reader)?,
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should enforce the ASCII-ness of the string here.
 port: Readable::read(reader)?,
 }))
 },
 _ => return Ok(Err(byte)),
 }
	}
Expand DownExpand Up@@ -1956,7 +1979,7 @@ mod tests {
 do_encoding_channel_announcement(true, true);
	}

	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, excess_address_data: bool, excess_data: bool) {
	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, dns_hostname: bool, excess_address_data: bool, excess_data: bool) {
 let secp_ctx = Secp256k1::new();
 let (privkey_1, pubkey_1) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
 let sig_1 = get_sig_on!(privkey_1, secp_ctx, String::from("01010101010101010101010101010101"));
Expand DownExpand Up@@ -1992,6 +2015,12 @@ mod tests {
 port: 9735
 });
 }
 if dns_hostname {
 addresses.push(msgs::NetAddress::DNSHostname {
 hostname: String::from("somehostname"),
 port: 9735
 });
 }
 let mut addr_len = 0;
 for addr in &addresses {
 addr_len += addr.len() + 1;
Expand DownExpand Up@@ -2032,6 +2061,9 @@ mod tests {
 if onionv3 {
 target_value.append(&mut hex::decode("04fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if dns_hostname {
 target_value.append(&mut hex::decode("05fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if excess_address_data {
 target_value.append(&mut hex::decode("216c280b5395a2546e7e4b2663e04f811622f15a4f92e83aa2e92ba2a573c139142c54ae63072a1ec1ee7dc0c04bde5c847806172aa05c92c22ae8e308d1d269").unwrap());
 }
Expand All@@ -2043,15 +2075,15 @@ mod tests {

	#[test]
	fn encoding_node_announcement() {
 do_encoding_node_announcement(true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false);
 do_encoding_node_announcement(false, true, false, true, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false);
 do_encoding_node_announcement(true, true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, true, false, true, false, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false, false);
	}

	fn do_encoding_channel_update(direction: bool, disable: bool, htlc_maximum_msat: bool, excess_data: bool) {
Expand Down

, '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
Add DNSHostname to NetAddress mssgs#1329

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

 Closed

a-mpch
wants to merge
1
commit into

from

 Closed


Add DNSHostname to NetAddress mssgs
#1329
 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


54 changes: 43 additions & 11 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ use core::fmt;
use core::fmt::Debug;
use io::{self, Read};
use io_extras::read_to_end;
use std::convert::TryFrom;

use util::events::MessageSendEventsProvider;
use util::logger;
Expand DownExpand Up@@ -434,6 +435,12 @@ pub enum NetAddress {
 /// The port on which the node is listening
 port: u16,
	},
	DNSHostname {
 /// The dns hostname on which the node is listening, length hostname len 
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/, length hostname len //?
 hostname: String,
 /// The port on which the node is listening
 port: u16,
	}
}
impl NetAddress {
	/// Gets the ID of this address type. Addresses in node_announcement messages should be sorted
Expand All@@ -444,6 +451,7 @@ impl NetAddress {
 &NetAddress::IPv6 {..} => { 2 },
 &NetAddress::OnionV2(_) => { 3 },
 &NetAddress::OnionV3 {..} => { 4 },
 &NetAddress::DNSHostname {..} => { 5 },
 }
	}

Expand All@@ -454,11 +462,14 @@ impl NetAddress {
 &NetAddress::IPv6 { .. } => { 18 },
 &NetAddress::OnionV2(_) => { 12 },
 &NetAddress::OnionV3 { .. } => { 37 },
 &NetAddress::DNSHostname { ref hostname, .. } => {
 return (1 + hostname.len() + 2) as u16
 }
 }
	}

	/// The maximum length of any address descriptor, not including the 1-byte type
	pub(crate) const MAX_LEN: u16 = 37;
	pub(crate) const MAX_LEN: u16 = 258;
}

impl Writeable for NetAddress {
Expand All@@ -485,6 +496,11 @@ impl Writeable for NetAddress {
 version.write(writer)?;
 port.write(writer)?;
 }
 &NetAddress::DNSHostname { ref hostname, ref port } => {
 5u8.write(writer)?;
 hostname.write(writer)?;
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default String write writes a two-byte length, whereas we need one here. You'll need to manually write the string. That said, you may actually want to use a different type, given we're required to write out hostnames in ASCII, and the tight size length, we'll want to enforce that on users.
 port.write(writer)?;
 }
 }
 Ok(())
	}
Expand DownExpand Up@@ -515,6 +531,13 @@ impl Readable for Result<NetAddress, u8> {
 port: Readable::read(reader)?,
 }))
 },
 5 => {
 Readable::read(reader)?;
 Ok(Ok(NetAddress::DNSHostname {
 hostname: Readable::read(reader)?,
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should enforce the ASCII-ness of the string here.
 port: Readable::read(reader)?,
 }))
 },
 _ => return Ok(Err(byte)),
 }
	}
Expand DownExpand Up@@ -1956,7 +1979,7 @@ mod tests {
 do_encoding_channel_announcement(true, true);
	}

	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, excess_address_data: bool, excess_data: bool) {
	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, dns_hostname: bool, excess_address_data: bool, excess_data: bool) {
 let secp_ctx = Secp256k1::new();
 let (privkey_1, pubkey_1) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
 let sig_1 = get_sig_on!(privkey_1, secp_ctx, String::from("01010101010101010101010101010101"));
Expand DownExpand Up@@ -1992,6 +2015,12 @@ mod tests {
 port: 9735
 });
 }
 if dns_hostname {
 addresses.push(msgs::NetAddress::DNSHostname {
 hostname: String::from("somehostname"),
 port: 9735
 });
 }
 let mut addr_len = 0;
 for addr in &addresses {
 addr_len += addr.len() + 1;
Expand DownExpand Up@@ -2032,6 +2061,9 @@ mod tests {
 if onionv3 {
 target_value.append(&mut hex::decode("04fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if dns_hostname {
 target_value.append(&mut hex::decode("05fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if excess_address_data {
 target_value.append(&mut hex::decode("216c280b5395a2546e7e4b2663e04f811622f15a4f92e83aa2e92ba2a573c139142c54ae63072a1ec1ee7dc0c04bde5c847806172aa05c92c22ae8e308d1d269").unwrap());
 }
Expand All@@ -2043,15 +2075,15 @@ mod tests {

	#[test]
	fn encoding_node_announcement() {
 do_encoding_node_announcement(true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false);
 do_encoding_node_announcement(false, true, false, true, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false);
 do_encoding_node_announcement(true, true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, true, false, true, false, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false, false);
	}

	fn do_encoding_channel_update(direction: bool, disable: bool, htlc_maximum_msat: bool, excess_data: bool) {
Expand Down

, '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
Add DNSHostname to NetAddress mssgs#1329

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

 Closed

a-mpch
wants to merge
1
commit into

from

 Closed


Add DNSHostname to NetAddress mssgs
#1329
 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


54 changes: 43 additions & 11 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ use core::fmt;
use core::fmt::Debug;
use io::{self, Read};
use io_extras::read_to_end;
use std::convert::TryFrom;

use util::events::MessageSendEventsProvider;
use util::logger;
Expand DownExpand Up@@ -434,6 +435,12 @@ pub enum NetAddress {
 /// The port on which the node is listening
 port: u16,
	},
	DNSHostname {
 /// The dns hostname on which the node is listening, length hostname len 
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/, length hostname len //?
 hostname: String,
 /// The port on which the node is listening
 port: u16,
	}
}
impl NetAddress {
	/// Gets the ID of this address type. Addresses in node_announcement messages should be sorted
Expand All@@ -444,6 +451,7 @@ impl NetAddress {
 &NetAddress::IPv6 {..} => { 2 },
 &NetAddress::OnionV2(_) => { 3 },
 &NetAddress::OnionV3 {..} => { 4 },
 &NetAddress::DNSHostname {..} => { 5 },
 }
	}

Expand All@@ -454,11 +462,14 @@ impl NetAddress {
 &NetAddress::IPv6 { .. } => { 18 },
 &NetAddress::OnionV2(_) => { 12 },
 &NetAddress::OnionV3 { .. } => { 37 },
 &NetAddress::DNSHostname { ref hostname, .. } => {
 return (1 + hostname.len() + 2) as u16
 }
 }
	}

	/// The maximum length of any address descriptor, not including the 1-byte type
	pub(crate) const MAX_LEN: u16 = 37;
	pub(crate) const MAX_LEN: u16 = 258;
}

impl Writeable for NetAddress {
Expand All@@ -485,6 +496,11 @@ impl Writeable for NetAddress {
 version.write(writer)?;
 port.write(writer)?;
 }
 &NetAddress::DNSHostname { ref hostname, ref port } => {
 5u8.write(writer)?;
 hostname.write(writer)?;
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default String write writes a two-byte length, whereas we need one here. You'll need to manually write the string. That said, you may actually want to use a different type, given we're required to write out hostnames in ASCII, and the tight size length, we'll want to enforce that on users.
 port.write(writer)?;
 }
 }
 Ok(())
	}
Expand DownExpand Up@@ -515,6 +531,13 @@ impl Readable for Result<NetAddress, u8> {
 port: Readable::read(reader)?,
 }))
 },
 5 => {
 Readable::read(reader)?;
 Ok(Ok(NetAddress::DNSHostname {
 hostname: Readable::read(reader)?,
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should enforce the ASCII-ness of the string here.
 port: Readable::read(reader)?,
 }))
 },
 _ => return Ok(Err(byte)),
 }
	}
Expand DownExpand Up@@ -1956,7 +1979,7 @@ mod tests {
 do_encoding_channel_announcement(true, true);
	}

	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, excess_address_data: bool, excess_data: bool) {
	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, dns_hostname: bool, excess_address_data: bool, excess_data: bool) {
 let secp_ctx = Secp256k1::new();
 let (privkey_1, pubkey_1) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
 let sig_1 = get_sig_on!(privkey_1, secp_ctx, String::from("01010101010101010101010101010101"));
Expand DownExpand Up@@ -1992,6 +2015,12 @@ mod tests {
 port: 9735
 });
 }
 if dns_hostname {
 addresses.push(msgs::NetAddress::DNSHostname {
 hostname: String::from("somehostname"),
 port: 9735
 });
 }
 let mut addr_len = 0;
 for addr in &addresses {
 addr_len += addr.len() + 1;
Expand DownExpand Up@@ -2032,6 +2061,9 @@ mod tests {
 if onionv3 {
 target_value.append(&mut hex::decode("04fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if dns_hostname {
 target_value.append(&mut hex::decode("05fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if excess_address_data {
 target_value.append(&mut hex::decode("216c280b5395a2546e7e4b2663e04f811622f15a4f92e83aa2e92ba2a573c139142c54ae63072a1ec1ee7dc0c04bde5c847806172aa05c92c22ae8e308d1d269").unwrap());
 }
Expand All@@ -2043,15 +2075,15 @@ mod tests {

	#[test]
	fn encoding_node_announcement() {
 do_encoding_node_announcement(true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false);
 do_encoding_node_announcement(false, true, false, true, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false);
 do_encoding_node_announcement(true, true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, true, false, true, false, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false, false);
	}

	fn do_encoding_channel_update(direction: bool, disable: bool, htlc_maximum_msat: bool, excess_data: bool) {
Expand Down

, '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
Add DNSHostname to NetAddress mssgs#1329

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

 Closed

a-mpch
wants to merge
1
commit into

from

 Closed


Add DNSHostname to NetAddress mssgs
#1329
 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


54 changes: 43 additions & 11 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ use core::fmt;
use core::fmt::Debug;
use io::{self, Read};
use io_extras::read_to_end;
use std::convert::TryFrom;

use util::events::MessageSendEventsProvider;
use util::logger;
Expand DownExpand Up@@ -434,6 +435,12 @@ pub enum NetAddress {
 /// The port on which the node is listening
 port: u16,
	},
	DNSHostname {
 /// The dns hostname on which the node is listening, length hostname len 
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/, length hostname len //?
 hostname: String,
 /// The port on which the node is listening
 port: u16,
	}
}
impl NetAddress {
	/// Gets the ID of this address type. Addresses in node_announcement messages should be sorted
Expand All@@ -444,6 +451,7 @@ impl NetAddress {
 &NetAddress::IPv6 {..} => { 2 },
 &NetAddress::OnionV2(_) => { 3 },
 &NetAddress::OnionV3 {..} => { 4 },
 &NetAddress::DNSHostname {..} => { 5 },
 }
	}

Expand All@@ -454,11 +462,14 @@ impl NetAddress {
 &NetAddress::IPv6 { .. } => { 18 },
 &NetAddress::OnionV2(_) => { 12 },
 &NetAddress::OnionV3 { .. } => { 37 },
 &NetAddress::DNSHostname { ref hostname, .. } => {
 return (1 + hostname.len() + 2) as u16
 }
 }
	}

	/// The maximum length of any address descriptor, not including the 1-byte type
	pub(crate) const MAX_LEN: u16 = 37;
	pub(crate) const MAX_LEN: u16 = 258;
}

impl Writeable for NetAddress {
Expand All@@ -485,6 +496,11 @@ impl Writeable for NetAddress {
 version.write(writer)?;
 port.write(writer)?;
 }
 &NetAddress::DNSHostname { ref hostname, ref port } => {
 5u8.write(writer)?;
 hostname.write(writer)?;
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default String write writes a two-byte length, whereas we need one here. You'll need to manually write the string. That said, you may actually want to use a different type, given we're required to write out hostnames in ASCII, and the tight size length, we'll want to enforce that on users.
 port.write(writer)?;
 }
 }
 Ok(())
	}
Expand DownExpand Up@@ -515,6 +531,13 @@ impl Readable for Result<NetAddress, u8> {
 port: Readable::read(reader)?,
 }))
 },
 5 => {
 Readable::read(reader)?;
 Ok(Ok(NetAddress::DNSHostname {
 hostname: Readable::read(reader)?,
@TheBlueMattTheBlueMattMar 22, 2022

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should enforce the ASCII-ness of the string here.
 port: Readable::read(reader)?,
 }))
 },
 _ => return Ok(Err(byte)),
 }
	}
Expand DownExpand Up@@ -1956,7 +1979,7 @@ mod tests {
 do_encoding_channel_announcement(true, true);
	}

	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, excess_address_data: bool, excess_data: bool) {
	fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, dns_hostname: bool, excess_address_data: bool, excess_data: bool) {
 let secp_ctx = Secp256k1::new();
 let (privkey_1, pubkey_1) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
 let sig_1 = get_sig_on!(privkey_1, secp_ctx, String::from("01010101010101010101010101010101"));
Expand DownExpand Up@@ -1992,6 +2015,12 @@ mod tests {
 port: 9735
 });
 }
 if dns_hostname {
 addresses.push(msgs::NetAddress::DNSHostname {
 hostname: String::from("somehostname"),
 port: 9735
 });
 }
 let mut addr_len = 0;
 for addr in &addresses {
 addr_len += addr.len() + 1;
Expand DownExpand Up@@ -2032,6 +2061,9 @@ mod tests {
 if onionv3 {
 target_value.append(&mut hex::decode("04fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if dns_hostname {
 target_value.append(&mut hex::decode("05fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e00020102607").unwrap());
 }
 if excess_address_data {
 target_value.append(&mut hex::decode("216c280b5395a2546e7e4b2663e04f811622f15a4f92e83aa2e92ba2a573c139142c54ae63072a1ec1ee7dc0c04bde5c847806172aa05c92c22ae8e308d1d269").unwrap());
 }
Expand All@@ -2043,15 +2075,15 @@ mod tests {

	#[test]
	fn encoding_node_announcement() {
 do_encoding_node_announcement(true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false);
 do_encoding_node_announcement(false, true, false, true, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false);
 do_encoding_node_announcement(true, true, true, true, true, true, true, true);
 do_encoding_node_announcement(false, false, false, false, false, false, false, false);
 do_encoding_node_announcement(false, true, false, false, false, false, false, false);
 do_encoding_node_announcement(false, false, true, false, false, false, false, false);
 do_encoding_node_announcement(false, false, false, true, false, false, false, false);
 do_encoding_node_announcement(false, false, false, false, true, false, false, false);
 do_encoding_node_announcement(false, false, false, false, false, true, false, false);
 do_encoding_node_announcement(false, true, false, true, false, false, true, false);
 do_encoding_node_announcement(false, false, true, false, true, false, false, false);
	}

	fn do_encoding_channel_update(direction: bool, disable: bool, htlc_maximum_msat: bool, excess_data: bool) {
Expand Down