Explicit Message Padding for OnionRealm0HopData#469

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
varunsrin wants to merge 1 commit into from
Closed

Explicit Message Padding for OnionRealm0HopData #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions lightning/src/ln/msgs.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use std::error::Error;
use std::{cmp, fmt};
use std::io::Read;
use std::result::Result;
use std::marker::PhantomData;

use util::events;
use util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -610,7 +611,7 @@ pub(crate) struct OnionRealm0HopData {
pub(crate) short_channel_id: u64,
pub(crate) amt_to_forward: u64,
pub(crate) outgoing_cltv_value: u32,
// 12 bytes of 0-padding
pub(crate) padding: PhantomData<[u8; 12]>,

@jkczyzjkczyzJan 31, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's too bad RFC 2000 (rust-lang/rust#44580) isn't in the stable Rust release yet. Then we could type alias this as:

pub(crate)typeBytePadding<constN:usize> = ::std::marker::PhantomData<[u8;N]>;

So this should be fine for now.

@TheBlueMattTheBlueMattFeb 3, 2020

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 probably do something like this anyway without generic constants. PhantomData has a somewhat specific meaning in Rust (that we have a template type that we're not going to instantiate). We probably just want a new type in ser.rs like (but with better names):


pub(crate) struct PaddingData<T: Default + std::convert::AsRef<[u8]>> {
t: std::marker::PhantomData<T>,
}
impl<T: Default + std::convert::AsRef<[u8]>> Writeable for PaddingData<T> {
#[inline]
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
let nt: T = Default::default();
w.write_all(nt.as_ref())
}
}

}

mod fuzzy_internal_msgs {
Expand DownExpand Up@@ -964,7 +965,7 @@ impl Writeable for OnionRealm0HopData {
self.short_channel_id.write(w)?;
self.amt_to_forward.write(w)?;
self.outgoing_cltv_value.write(w)?;
w.write_all(&[0;12])?;
self.padding.write(w)?;
Ok(())
}
}
Expand All@@ -974,11 +975,8 @@ impl<R: Read> Readable<R> for OnionRealm0HopData {
Ok(OnionRealm0HopData {
short_channel_id: Readable::read(r)?,
amt_to_forward: Readable::read(r)?,
outgoing_cltv_value: {
let v: u32 = Readable::read(r)?;
r.read_exact(&mut [0; 12])?;
v
}
outgoing_cltv_value: Readable::read(r)?,
padding: Readable::read(r)?,
})
}
}
Expand Down
9 changes: 9 additions & 0 deletions lightning/src/ln/onion_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use secp256k1::key::{SecretKey,PublicKey};
use secp256k1::Secp256k1;
use secp256k1::ecdh::SharedSecret;
use secp256k1;
use std::marker::PhantomData;

use std::io::Cursor;
use std::sync::Arc;
Expand DownExpand Up@@ -126,6 +127,7 @@ pub(super) fn build_onion_payloads(route: &Route, starting_htlc_offset: u32) ->
short_channel_id: last_short_channel_id,
amt_to_forward: value_msat,
outgoing_cltv_value: cltv,
padding: PhantomData,
},
hmac: [0; 32],
});
Expand DownExpand Up@@ -429,6 +431,8 @@ mod tests {
use ln::router::{Route, RouteHop};
use ln::msgs;
use util::ser::Writeable;

use std::marker::PhantomData;

use hex;

Expand DownExpand Up@@ -521,6 +525,7 @@ mod tests {
short_channel_id: 0,
amt_to_forward: 0,
outgoing_cltv_value: 0,
padding: PhantomData,
},
hmac: [0; 32],
},
Expand All@@ -530,6 +535,7 @@ mod tests {
short_channel_id: 0x0101010101010101,
amt_to_forward: 0x0100000001,
outgoing_cltv_value: 0,
padding: PhantomData,
},
hmac: [0; 32],
},
Expand All@@ -539,6 +545,7 @@ mod tests {
short_channel_id: 0x0202020202020202,
amt_to_forward: 0x0200000002,
outgoing_cltv_value: 0,
padding: PhantomData,
},
hmac: [0; 32],
},
Expand All@@ -548,6 +555,7 @@ mod tests {
short_channel_id: 0x0303030303030303,
amt_to_forward: 0x0300000003,
outgoing_cltv_value: 0,
padding: PhantomData,
},
hmac: [0; 32],
},
Expand All@@ -557,6 +565,7 @@ mod tests {
short_channel_id: 0x0404040404040404,
amt_to_forward: 0x0400000004,
outgoing_cltv_value: 0,
padding: PhantomData,
},
hmac: [0; 32],
},
Expand Down
16 changes: 16 additions & 0 deletions lightning/src/util/ser.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use std::io::{Read, Write};
use std::collections::HashMap;
use std::hash::Hash;
use std::sync::Mutex;
use std::marker::PhantomData;

use secp256k1::Signature;
use secp256k1::key::{PublicKey, SecretKey};
Expand DownExpand Up@@ -208,6 +209,7 @@ macro_rules! impl_array {
impl_array!(3); // for rgb
impl_array!(4); // for IPv4
impl_array!(10); // for OnionV2
impl_array!(12); // for OnionRealm0HopData
impl_array!(16); // for IPv6
impl_array!(32); // for channel id & hmac
impl_array!(33); // for PublicKey
Expand DownExpand Up@@ -392,6 +394,20 @@ impl Writeable for PaymentHash {
}
}

impl<R: Read> Readable<R> for PhantomData<[u8; 12]> {
fn read(r: &mut R) -> Result<Self, DecodeError> {
let _buf: [u8; 12] = Readable::read(r)?;
Ok(PhantomData)
}
}

impl Writeable for PhantomData<[u8; 12]> {
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
w.write_all(&[0; 12])?;
Ok(())
}
}

impl<R: Read> Readable<R> for PaymentHash {
fn read(r: &mut R) -> Result<Self, DecodeError> {
let buf: [u8; 32] = Readable::read(r)?;
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
Explicit Message Padding for OnionRealm0HopData#469

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

varunsrin
wants to merge
1
commit into

from

 Closed


Explicit Message Padding for OnionRealm0HopData
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 5 additions & 7 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use std::error::Error;
use std::{cmp, fmt};
use std::io::Read;
use std::result::Result;
use std::marker::PhantomData;

use util::events;
use util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -610,7 +611,7 @@ pub(crate) struct OnionRealm0HopData {
	pub(crate) short_channel_id: u64,
	pub(crate) amt_to_forward: u64,
	pub(crate) outgoing_cltv_value: u32,
// 12 bytes of 0-padding
pub(crate) padding: PhantomData<[u8; 12]>,
@jkczyzjkczyzJan 31, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's too bad RFC 2000 (rust-lang/rust#44580) isn't in the stable Rust release yet. Then we could type alias this as:
pub(crate)typeBytePadding<constN:usize> = ::std::marker::PhantomData<[u8;N]>;
So this should be fine for now.
@TheBlueMattTheBlueMattFeb 3, 2020

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 probably do something like this anyway without generic constants. PhantomData has a somewhat specific meaning in Rust (that we have a template type that we're not going to instantiate). We probably just want a new type in ser.rs like (but with better names):

pub(crate) struct PaddingData<T: Default + std::convert::AsRef<[u8]>> {
t: std::marker::PhantomData<T>,
}
impl<T: Default + std::convert::AsRef<[u8]>> Writeable for PaddingData<T> {
#[inline]
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
let nt: T = Default::default();
w.write_all(nt.as_ref())
}
}

}

mod fuzzy_internal_msgs {
Expand DownExpand Up@@ -964,7 +965,7 @@ impl Writeable for OnionRealm0HopData {
 self.short_channel_id.write(w)?;
 self.amt_to_forward.write(w)?;
 self.outgoing_cltv_value.write(w)?;
w.write_all(&[0;12])?;
self.padding.write(w)?;
 Ok(())
	}
}
Expand All@@ -974,11 +975,8 @@ impl<R: Read> Readable<R> for OnionRealm0HopData {
 Ok(OnionRealm0HopData {
 short_channel_id: Readable::read(r)?,
 amt_to_forward: Readable::read(r)?,
 outgoing_cltv_value: {
 let v: u32 = Readable::read(r)?;
 r.read_exact(&mut [0; 12])?;
 v
 }
 outgoing_cltv_value: Readable::read(r)?,
 padding: Readable::read(r)?,
 })
	}
}
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use secp256k1::key::{SecretKey,PublicKey};
use secp256k1::Secp256k1;
use secp256k1::ecdh::SharedSecret;
use secp256k1;
use std::marker::PhantomData;

use std::io::Cursor;
use std::sync::Arc;
Expand DownExpand Up@@ -126,6 +127,7 @@ pub(super) fn build_onion_payloads(route: &Route, starting_htlc_offset: u32) ->
 short_channel_id: last_short_channel_id,
 amt_to_forward: value_msat,
 outgoing_cltv_value: cltv,
 padding: PhantomData,
 },
 hmac: [0; 32],
 });
Expand DownExpand Up@@ -429,6 +431,8 @@ mod tests {
	use ln::router::{Route, RouteHop};
	use ln::msgs;
	use util::ser::Writeable;

	use std::marker::PhantomData;

	use hex;

Expand DownExpand Up@@ -521,6 +525,7 @@ mod tests {
 short_channel_id: 0,
 amt_to_forward: 0,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -530,6 +535,7 @@ mod tests {
 short_channel_id: 0x0101010101010101,
 amt_to_forward: 0x0100000001,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -539,6 +545,7 @@ mod tests {
 short_channel_id: 0x0202020202020202,
 amt_to_forward: 0x0200000002,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -548,6 +555,7 @@ mod tests {
 short_channel_id: 0x0303030303030303,
 amt_to_forward: 0x0300000003,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -557,6 +565,7 @@ mod tests {
 short_channel_id: 0x0404040404040404,
 amt_to_forward: 0x0400000004,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand Down

16 changes: 16 additions & 0 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use std::io::{Read, Write};
use std::collections::HashMap;
use std::hash::Hash;
use std::sync::Mutex;
use std::marker::PhantomData;

use secp256k1::Signature;
use secp256k1::key::{PublicKey, SecretKey};
Expand DownExpand Up@@ -208,6 +209,7 @@ macro_rules! impl_array {
impl_array!(3); // for rgb
impl_array!(4); // for IPv4
impl_array!(10); // for OnionV2
impl_array!(12); // for OnionRealm0HopData
impl_array!(16); // for IPv6
impl_array!(32); // for channel id & hmac
impl_array!(33); // for PublicKey
Expand DownExpand Up@@ -392,6 +394,20 @@ impl Writeable for PaymentHash {
	}
}

impl<R: Read> Readable<R> for PhantomData<[u8; 12]> {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let _buf: [u8; 12] = Readable::read(r)?; 
 Ok(PhantomData)
	}
}

impl Writeable for PhantomData<[u8; 12]> {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
 w.write_all(&[0; 12])?;
 Ok(())
	}
}

impl<R: Read> Readable<R> for PaymentHash {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let buf: [u8; 32] = Readable::read(r)?;
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
Explicit Message Padding for OnionRealm0HopData#469

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

varunsrin
wants to merge
1
commit into

from

 Closed


Explicit Message Padding for OnionRealm0HopData
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 5 additions & 7 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use std::error::Error;
use std::{cmp, fmt};
use std::io::Read;
use std::result::Result;
use std::marker::PhantomData;

use util::events;
use util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -610,7 +611,7 @@ pub(crate) struct OnionRealm0HopData {
	pub(crate) short_channel_id: u64,
	pub(crate) amt_to_forward: u64,
	pub(crate) outgoing_cltv_value: u32,
// 12 bytes of 0-padding
pub(crate) padding: PhantomData<[u8; 12]>,
@jkczyzjkczyzJan 31, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's too bad RFC 2000 (rust-lang/rust#44580) isn't in the stable Rust release yet. Then we could type alias this as:
pub(crate)typeBytePadding<constN:usize> = ::std::marker::PhantomData<[u8;N]>;
So this should be fine for now.
@TheBlueMattTheBlueMattFeb 3, 2020

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 probably do something like this anyway without generic constants. PhantomData has a somewhat specific meaning in Rust (that we have a template type that we're not going to instantiate). We probably just want a new type in ser.rs like (but with better names):

pub(crate) struct PaddingData<T: Default + std::convert::AsRef<[u8]>> {
t: std::marker::PhantomData<T>,
}
impl<T: Default + std::convert::AsRef<[u8]>> Writeable for PaddingData<T> {
#[inline]
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
let nt: T = Default::default();
w.write_all(nt.as_ref())
}
}

}

mod fuzzy_internal_msgs {
Expand DownExpand Up@@ -964,7 +965,7 @@ impl Writeable for OnionRealm0HopData {
 self.short_channel_id.write(w)?;
 self.amt_to_forward.write(w)?;
 self.outgoing_cltv_value.write(w)?;
w.write_all(&[0;12])?;
self.padding.write(w)?;
 Ok(())
	}
}
Expand All@@ -974,11 +975,8 @@ impl<R: Read> Readable<R> for OnionRealm0HopData {
 Ok(OnionRealm0HopData {
 short_channel_id: Readable::read(r)?,
 amt_to_forward: Readable::read(r)?,
 outgoing_cltv_value: {
 let v: u32 = Readable::read(r)?;
 r.read_exact(&mut [0; 12])?;
 v
 }
 outgoing_cltv_value: Readable::read(r)?,
 padding: Readable::read(r)?,
 })
	}
}
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use secp256k1::key::{SecretKey,PublicKey};
use secp256k1::Secp256k1;
use secp256k1::ecdh::SharedSecret;
use secp256k1;
use std::marker::PhantomData;

use std::io::Cursor;
use std::sync::Arc;
Expand DownExpand Up@@ -126,6 +127,7 @@ pub(super) fn build_onion_payloads(route: &Route, starting_htlc_offset: u32) ->
 short_channel_id: last_short_channel_id,
 amt_to_forward: value_msat,
 outgoing_cltv_value: cltv,
 padding: PhantomData,
 },
 hmac: [0; 32],
 });
Expand DownExpand Up@@ -429,6 +431,8 @@ mod tests {
	use ln::router::{Route, RouteHop};
	use ln::msgs;
	use util::ser::Writeable;

	use std::marker::PhantomData;

	use hex;

Expand DownExpand Up@@ -521,6 +525,7 @@ mod tests {
 short_channel_id: 0,
 amt_to_forward: 0,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -530,6 +535,7 @@ mod tests {
 short_channel_id: 0x0101010101010101,
 amt_to_forward: 0x0100000001,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -539,6 +545,7 @@ mod tests {
 short_channel_id: 0x0202020202020202,
 amt_to_forward: 0x0200000002,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -548,6 +555,7 @@ mod tests {
 short_channel_id: 0x0303030303030303,
 amt_to_forward: 0x0300000003,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -557,6 +565,7 @@ mod tests {
 short_channel_id: 0x0404040404040404,
 amt_to_forward: 0x0400000004,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand Down

16 changes: 16 additions & 0 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use std::io::{Read, Write};
use std::collections::HashMap;
use std::hash::Hash;
use std::sync::Mutex;
use std::marker::PhantomData;

use secp256k1::Signature;
use secp256k1::key::{PublicKey, SecretKey};
Expand DownExpand Up@@ -208,6 +209,7 @@ macro_rules! impl_array {
impl_array!(3); // for rgb
impl_array!(4); // for IPv4
impl_array!(10); // for OnionV2
impl_array!(12); // for OnionRealm0HopData
impl_array!(16); // for IPv6
impl_array!(32); // for channel id & hmac
impl_array!(33); // for PublicKey
Expand DownExpand Up@@ -392,6 +394,20 @@ impl Writeable for PaymentHash {
	}
}

impl<R: Read> Readable<R> for PhantomData<[u8; 12]> {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let _buf: [u8; 12] = Readable::read(r)?; 
 Ok(PhantomData)
	}
}

impl Writeable for PhantomData<[u8; 12]> {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
 w.write_all(&[0; 12])?;
 Ok(())
	}
}

impl<R: Read> Readable<R> for PaymentHash {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let buf: [u8; 32] = Readable::read(r)?;
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
Explicit Message Padding for OnionRealm0HopData#469

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

varunsrin
wants to merge
1
commit into

from

 Closed


Explicit Message Padding for OnionRealm0HopData
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 5 additions & 7 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use std::error::Error;
use std::{cmp, fmt};
use std::io::Read;
use std::result::Result;
use std::marker::PhantomData;

use util::events;
use util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -610,7 +611,7 @@ pub(crate) struct OnionRealm0HopData {
	pub(crate) short_channel_id: u64,
	pub(crate) amt_to_forward: u64,
	pub(crate) outgoing_cltv_value: u32,
// 12 bytes of 0-padding
pub(crate) padding: PhantomData<[u8; 12]>,
@jkczyzjkczyzJan 31, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's too bad RFC 2000 (rust-lang/rust#44580) isn't in the stable Rust release yet. Then we could type alias this as:
pub(crate)typeBytePadding<constN:usize> = ::std::marker::PhantomData<[u8;N]>;
So this should be fine for now.
@TheBlueMattTheBlueMattFeb 3, 2020

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 probably do something like this anyway without generic constants. PhantomData has a somewhat specific meaning in Rust (that we have a template type that we're not going to instantiate). We probably just want a new type in ser.rs like (but with better names):

pub(crate) struct PaddingData<T: Default + std::convert::AsRef<[u8]>> {
t: std::marker::PhantomData<T>,
}
impl<T: Default + std::convert::AsRef<[u8]>> Writeable for PaddingData<T> {
#[inline]
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
let nt: T = Default::default();
w.write_all(nt.as_ref())
}
}

}

mod fuzzy_internal_msgs {
Expand DownExpand Up@@ -964,7 +965,7 @@ impl Writeable for OnionRealm0HopData {
 self.short_channel_id.write(w)?;
 self.amt_to_forward.write(w)?;
 self.outgoing_cltv_value.write(w)?;
w.write_all(&[0;12])?;
self.padding.write(w)?;
 Ok(())
	}
}
Expand All@@ -974,11 +975,8 @@ impl<R: Read> Readable<R> for OnionRealm0HopData {
 Ok(OnionRealm0HopData {
 short_channel_id: Readable::read(r)?,
 amt_to_forward: Readable::read(r)?,
 outgoing_cltv_value: {
 let v: u32 = Readable::read(r)?;
 r.read_exact(&mut [0; 12])?;
 v
 }
 outgoing_cltv_value: Readable::read(r)?,
 padding: Readable::read(r)?,
 })
	}
}
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use secp256k1::key::{SecretKey,PublicKey};
use secp256k1::Secp256k1;
use secp256k1::ecdh::SharedSecret;
use secp256k1;
use std::marker::PhantomData;

use std::io::Cursor;
use std::sync::Arc;
Expand DownExpand Up@@ -126,6 +127,7 @@ pub(super) fn build_onion_payloads(route: &Route, starting_htlc_offset: u32) ->
 short_channel_id: last_short_channel_id,
 amt_to_forward: value_msat,
 outgoing_cltv_value: cltv,
 padding: PhantomData,
 },
 hmac: [0; 32],
 });
Expand DownExpand Up@@ -429,6 +431,8 @@ mod tests {
	use ln::router::{Route, RouteHop};
	use ln::msgs;
	use util::ser::Writeable;

	use std::marker::PhantomData;

	use hex;

Expand DownExpand Up@@ -521,6 +525,7 @@ mod tests {
 short_channel_id: 0,
 amt_to_forward: 0,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -530,6 +535,7 @@ mod tests {
 short_channel_id: 0x0101010101010101,
 amt_to_forward: 0x0100000001,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -539,6 +545,7 @@ mod tests {
 short_channel_id: 0x0202020202020202,
 amt_to_forward: 0x0200000002,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -548,6 +555,7 @@ mod tests {
 short_channel_id: 0x0303030303030303,
 amt_to_forward: 0x0300000003,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -557,6 +565,7 @@ mod tests {
 short_channel_id: 0x0404040404040404,
 amt_to_forward: 0x0400000004,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand Down

16 changes: 16 additions & 0 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use std::io::{Read, Write};
use std::collections::HashMap;
use std::hash::Hash;
use std::sync::Mutex;
use std::marker::PhantomData;

use secp256k1::Signature;
use secp256k1::key::{PublicKey, SecretKey};
Expand DownExpand Up@@ -208,6 +209,7 @@ macro_rules! impl_array {
impl_array!(3); // for rgb
impl_array!(4); // for IPv4
impl_array!(10); // for OnionV2
impl_array!(12); // for OnionRealm0HopData
impl_array!(16); // for IPv6
impl_array!(32); // for channel id & hmac
impl_array!(33); // for PublicKey
Expand DownExpand Up@@ -392,6 +394,20 @@ impl Writeable for PaymentHash {
	}
}

impl<R: Read> Readable<R> for PhantomData<[u8; 12]> {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let _buf: [u8; 12] = Readable::read(r)?; 
 Ok(PhantomData)
	}
}

impl Writeable for PhantomData<[u8; 12]> {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
 w.write_all(&[0; 12])?;
 Ok(())
	}
}

impl<R: Read> Readable<R> for PaymentHash {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let buf: [u8; 32] = Readable::read(r)?;
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
Explicit Message Padding for OnionRealm0HopData#469

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

varunsrin
wants to merge
1
commit into

from

 Closed


Explicit Message Padding for OnionRealm0HopData
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 5 additions & 7 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use std::error::Error;
use std::{cmp, fmt};
use std::io::Read;
use std::result::Result;
use std::marker::PhantomData;

use util::events;
use util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -610,7 +611,7 @@ pub(crate) struct OnionRealm0HopData {
	pub(crate) short_channel_id: u64,
	pub(crate) amt_to_forward: u64,
	pub(crate) outgoing_cltv_value: u32,
// 12 bytes of 0-padding
pub(crate) padding: PhantomData<[u8; 12]>,
@jkczyzjkczyzJan 31, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's too bad RFC 2000 (rust-lang/rust#44580) isn't in the stable Rust release yet. Then we could type alias this as:
pub(crate)typeBytePadding<constN:usize> = ::std::marker::PhantomData<[u8;N]>;
So this should be fine for now.
@TheBlueMattTheBlueMattFeb 3, 2020

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 probably do something like this anyway without generic constants. PhantomData has a somewhat specific meaning in Rust (that we have a template type that we're not going to instantiate). We probably just want a new type in ser.rs like (but with better names):

pub(crate) struct PaddingData<T: Default + std::convert::AsRef<[u8]>> {
t: std::marker::PhantomData<T>,
}
impl<T: Default + std::convert::AsRef<[u8]>> Writeable for PaddingData<T> {
#[inline]
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
let nt: T = Default::default();
w.write_all(nt.as_ref())
}
}

}

mod fuzzy_internal_msgs {
Expand DownExpand Up@@ -964,7 +965,7 @@ impl Writeable for OnionRealm0HopData {
 self.short_channel_id.write(w)?;
 self.amt_to_forward.write(w)?;
 self.outgoing_cltv_value.write(w)?;
w.write_all(&[0;12])?;
self.padding.write(w)?;
 Ok(())
	}
}
Expand All@@ -974,11 +975,8 @@ impl<R: Read> Readable<R> for OnionRealm0HopData {
 Ok(OnionRealm0HopData {
 short_channel_id: Readable::read(r)?,
 amt_to_forward: Readable::read(r)?,
 outgoing_cltv_value: {
 let v: u32 = Readable::read(r)?;
 r.read_exact(&mut [0; 12])?;
 v
 }
 outgoing_cltv_value: Readable::read(r)?,
 padding: Readable::read(r)?,
 })
	}
}
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use secp256k1::key::{SecretKey,PublicKey};
use secp256k1::Secp256k1;
use secp256k1::ecdh::SharedSecret;
use secp256k1;
use std::marker::PhantomData;

use std::io::Cursor;
use std::sync::Arc;
Expand DownExpand Up@@ -126,6 +127,7 @@ pub(super) fn build_onion_payloads(route: &Route, starting_htlc_offset: u32) ->
 short_channel_id: last_short_channel_id,
 amt_to_forward: value_msat,
 outgoing_cltv_value: cltv,
 padding: PhantomData,
 },
 hmac: [0; 32],
 });
Expand DownExpand Up@@ -429,6 +431,8 @@ mod tests {
	use ln::router::{Route, RouteHop};
	use ln::msgs;
	use util::ser::Writeable;

	use std::marker::PhantomData;

	use hex;

Expand DownExpand Up@@ -521,6 +525,7 @@ mod tests {
 short_channel_id: 0,
 amt_to_forward: 0,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -530,6 +535,7 @@ mod tests {
 short_channel_id: 0x0101010101010101,
 amt_to_forward: 0x0100000001,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -539,6 +545,7 @@ mod tests {
 short_channel_id: 0x0202020202020202,
 amt_to_forward: 0x0200000002,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -548,6 +555,7 @@ mod tests {
 short_channel_id: 0x0303030303030303,
 amt_to_forward: 0x0300000003,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -557,6 +565,7 @@ mod tests {
 short_channel_id: 0x0404040404040404,
 amt_to_forward: 0x0400000004,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand Down

16 changes: 16 additions & 0 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use std::io::{Read, Write};
use std::collections::HashMap;
use std::hash::Hash;
use std::sync::Mutex;
use std::marker::PhantomData;

use secp256k1::Signature;
use secp256k1::key::{PublicKey, SecretKey};
Expand DownExpand Up@@ -208,6 +209,7 @@ macro_rules! impl_array {
impl_array!(3); // for rgb
impl_array!(4); // for IPv4
impl_array!(10); // for OnionV2
impl_array!(12); // for OnionRealm0HopData
impl_array!(16); // for IPv6
impl_array!(32); // for channel id & hmac
impl_array!(33); // for PublicKey
Expand DownExpand Up@@ -392,6 +394,20 @@ impl Writeable for PaymentHash {
	}
}

impl<R: Read> Readable<R> for PhantomData<[u8; 12]> {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let _buf: [u8; 12] = Readable::read(r)?; 
 Ok(PhantomData)
	}
}

impl Writeable for PhantomData<[u8; 12]> {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
 w.write_all(&[0; 12])?;
 Ok(())
	}
}

impl<R: Read> Readable<R> for PaymentHash {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let buf: [u8; 32] = Readable::read(r)?;
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
Explicit Message Padding for OnionRealm0HopData#469

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

varunsrin
wants to merge
1
commit into

from

 Closed


Explicit Message Padding for OnionRealm0HopData
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 5 additions & 7 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use std::error::Error;
use std::{cmp, fmt};
use std::io::Read;
use std::result::Result;
use std::marker::PhantomData;

use util::events;
use util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -610,7 +611,7 @@ pub(crate) struct OnionRealm0HopData {
	pub(crate) short_channel_id: u64,
	pub(crate) amt_to_forward: u64,
	pub(crate) outgoing_cltv_value: u32,
// 12 bytes of 0-padding
pub(crate) padding: PhantomData<[u8; 12]>,
@jkczyzjkczyzJan 31, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's too bad RFC 2000 (rust-lang/rust#44580) isn't in the stable Rust release yet. Then we could type alias this as:
pub(crate)typeBytePadding<constN:usize> = ::std::marker::PhantomData<[u8;N]>;
So this should be fine for now.
@TheBlueMattTheBlueMattFeb 3, 2020

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 probably do something like this anyway without generic constants. PhantomData has a somewhat specific meaning in Rust (that we have a template type that we're not going to instantiate). We probably just want a new type in ser.rs like (but with better names):

pub(crate) struct PaddingData<T: Default + std::convert::AsRef<[u8]>> {
t: std::marker::PhantomData<T>,
}
impl<T: Default + std::convert::AsRef<[u8]>> Writeable for PaddingData<T> {
#[inline]
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
let nt: T = Default::default();
w.write_all(nt.as_ref())
}
}

}

mod fuzzy_internal_msgs {
Expand DownExpand Up@@ -964,7 +965,7 @@ impl Writeable for OnionRealm0HopData {
 self.short_channel_id.write(w)?;
 self.amt_to_forward.write(w)?;
 self.outgoing_cltv_value.write(w)?;
w.write_all(&[0;12])?;
self.padding.write(w)?;
 Ok(())
	}
}
Expand All@@ -974,11 +975,8 @@ impl<R: Read> Readable<R> for OnionRealm0HopData {
 Ok(OnionRealm0HopData {
 short_channel_id: Readable::read(r)?,
 amt_to_forward: Readable::read(r)?,
 outgoing_cltv_value: {
 let v: u32 = Readable::read(r)?;
 r.read_exact(&mut [0; 12])?;
 v
 }
 outgoing_cltv_value: Readable::read(r)?,
 padding: Readable::read(r)?,
 })
	}
}
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use secp256k1::key::{SecretKey,PublicKey};
use secp256k1::Secp256k1;
use secp256k1::ecdh::SharedSecret;
use secp256k1;
use std::marker::PhantomData;

use std::io::Cursor;
use std::sync::Arc;
Expand DownExpand Up@@ -126,6 +127,7 @@ pub(super) fn build_onion_payloads(route: &Route, starting_htlc_offset: u32) ->
 short_channel_id: last_short_channel_id,
 amt_to_forward: value_msat,
 outgoing_cltv_value: cltv,
 padding: PhantomData,
 },
 hmac: [0; 32],
 });
Expand DownExpand Up@@ -429,6 +431,8 @@ mod tests {
	use ln::router::{Route, RouteHop};
	use ln::msgs;
	use util::ser::Writeable;

	use std::marker::PhantomData;

	use hex;

Expand DownExpand Up@@ -521,6 +525,7 @@ mod tests {
 short_channel_id: 0,
 amt_to_forward: 0,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -530,6 +535,7 @@ mod tests {
 short_channel_id: 0x0101010101010101,
 amt_to_forward: 0x0100000001,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -539,6 +545,7 @@ mod tests {
 short_channel_id: 0x0202020202020202,
 amt_to_forward: 0x0200000002,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -548,6 +555,7 @@ mod tests {
 short_channel_id: 0x0303030303030303,
 amt_to_forward: 0x0300000003,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -557,6 +565,7 @@ mod tests {
 short_channel_id: 0x0404040404040404,
 amt_to_forward: 0x0400000004,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand Down

16 changes: 16 additions & 0 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use std::io::{Read, Write};
use std::collections::HashMap;
use std::hash::Hash;
use std::sync::Mutex;
use std::marker::PhantomData;

use secp256k1::Signature;
use secp256k1::key::{PublicKey, SecretKey};
Expand DownExpand Up@@ -208,6 +209,7 @@ macro_rules! impl_array {
impl_array!(3); // for rgb
impl_array!(4); // for IPv4
impl_array!(10); // for OnionV2
impl_array!(12); // for OnionRealm0HopData
impl_array!(16); // for IPv6
impl_array!(32); // for channel id & hmac
impl_array!(33); // for PublicKey
Expand DownExpand Up@@ -392,6 +394,20 @@ impl Writeable for PaymentHash {
	}
}

impl<R: Read> Readable<R> for PhantomData<[u8; 12]> {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let _buf: [u8; 12] = Readable::read(r)?; 
 Ok(PhantomData)
	}
}

impl Writeable for PhantomData<[u8; 12]> {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
 w.write_all(&[0; 12])?;
 Ok(())
	}
}

impl<R: Read> Readable<R> for PaymentHash {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let buf: [u8; 32] = Readable::read(r)?;
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
Explicit Message Padding for OnionRealm0HopData#469

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

varunsrin
wants to merge
1
commit into

from

 Closed


Explicit Message Padding for OnionRealm0HopData
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 5 additions & 7 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use std::error::Error;
use std::{cmp, fmt};
use std::io::Read;
use std::result::Result;
use std::marker::PhantomData;

use util::events;
use util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -610,7 +611,7 @@ pub(crate) struct OnionRealm0HopData {
	pub(crate) short_channel_id: u64,
	pub(crate) amt_to_forward: u64,
	pub(crate) outgoing_cltv_value: u32,
// 12 bytes of 0-padding
pub(crate) padding: PhantomData<[u8; 12]>,
@jkczyzjkczyzJan 31, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's too bad RFC 2000 (rust-lang/rust#44580) isn't in the stable Rust release yet. Then we could type alias this as:
pub(crate)typeBytePadding<constN:usize> = ::std::marker::PhantomData<[u8;N]>;
So this should be fine for now.
@TheBlueMattTheBlueMattFeb 3, 2020

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 probably do something like this anyway without generic constants. PhantomData has a somewhat specific meaning in Rust (that we have a template type that we're not going to instantiate). We probably just want a new type in ser.rs like (but with better names):

pub(crate) struct PaddingData<T: Default + std::convert::AsRef<[u8]>> {
t: std::marker::PhantomData<T>,
}
impl<T: Default + std::convert::AsRef<[u8]>> Writeable for PaddingData<T> {
#[inline]
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
let nt: T = Default::default();
w.write_all(nt.as_ref())
}
}

}

mod fuzzy_internal_msgs {
Expand DownExpand Up@@ -964,7 +965,7 @@ impl Writeable for OnionRealm0HopData {
 self.short_channel_id.write(w)?;
 self.amt_to_forward.write(w)?;
 self.outgoing_cltv_value.write(w)?;
w.write_all(&[0;12])?;
self.padding.write(w)?;
 Ok(())
	}
}
Expand All@@ -974,11 +975,8 @@ impl<R: Read> Readable<R> for OnionRealm0HopData {
 Ok(OnionRealm0HopData {
 short_channel_id: Readable::read(r)?,
 amt_to_forward: Readable::read(r)?,
 outgoing_cltv_value: {
 let v: u32 = Readable::read(r)?;
 r.read_exact(&mut [0; 12])?;
 v
 }
 outgoing_cltv_value: Readable::read(r)?,
 padding: Readable::read(r)?,
 })
	}
}
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use secp256k1::key::{SecretKey,PublicKey};
use secp256k1::Secp256k1;
use secp256k1::ecdh::SharedSecret;
use secp256k1;
use std::marker::PhantomData;

use std::io::Cursor;
use std::sync::Arc;
Expand DownExpand Up@@ -126,6 +127,7 @@ pub(super) fn build_onion_payloads(route: &Route, starting_htlc_offset: u32) ->
 short_channel_id: last_short_channel_id,
 amt_to_forward: value_msat,
 outgoing_cltv_value: cltv,
 padding: PhantomData,
 },
 hmac: [0; 32],
 });
Expand DownExpand Up@@ -429,6 +431,8 @@ mod tests {
	use ln::router::{Route, RouteHop};
	use ln::msgs;
	use util::ser::Writeable;

	use std::marker::PhantomData;

	use hex;

Expand DownExpand Up@@ -521,6 +525,7 @@ mod tests {
 short_channel_id: 0,
 amt_to_forward: 0,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -530,6 +535,7 @@ mod tests {
 short_channel_id: 0x0101010101010101,
 amt_to_forward: 0x0100000001,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -539,6 +545,7 @@ mod tests {
 short_channel_id: 0x0202020202020202,
 amt_to_forward: 0x0200000002,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -548,6 +555,7 @@ mod tests {
 short_channel_id: 0x0303030303030303,
 amt_to_forward: 0x0300000003,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -557,6 +565,7 @@ mod tests {
 short_channel_id: 0x0404040404040404,
 amt_to_forward: 0x0400000004,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand Down

16 changes: 16 additions & 0 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use std::io::{Read, Write};
use std::collections::HashMap;
use std::hash::Hash;
use std::sync::Mutex;
use std::marker::PhantomData;

use secp256k1::Signature;
use secp256k1::key::{PublicKey, SecretKey};
Expand DownExpand Up@@ -208,6 +209,7 @@ macro_rules! impl_array {
impl_array!(3); // for rgb
impl_array!(4); // for IPv4
impl_array!(10); // for OnionV2
impl_array!(12); // for OnionRealm0HopData
impl_array!(16); // for IPv6
impl_array!(32); // for channel id & hmac
impl_array!(33); // for PublicKey
Expand DownExpand Up@@ -392,6 +394,20 @@ impl Writeable for PaymentHash {
	}
}

impl<R: Read> Readable<R> for PhantomData<[u8; 12]> {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let _buf: [u8; 12] = Readable::read(r)?; 
 Ok(PhantomData)
	}
}

impl Writeable for PhantomData<[u8; 12]> {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
 w.write_all(&[0; 12])?;
 Ok(())
	}
}

impl<R: Read> Readable<R> for PaymentHash {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let buf: [u8; 32] = Readable::read(r)?;
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
Explicit Message Padding for OnionRealm0HopData#469

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

varunsrin
wants to merge
1
commit into

from

 Closed


Explicit Message Padding for OnionRealm0HopData
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 5 additions & 7 deletions
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ use std::error::Error;
use std::{cmp, fmt};
use std::io::Read;
use std::result::Result;
use std::marker::PhantomData;

use util::events;
use util::ser::{Readable, Writeable, Writer};
Expand DownExpand Up@@ -610,7 +611,7 @@ pub(crate) struct OnionRealm0HopData {
	pub(crate) short_channel_id: u64,
	pub(crate) amt_to_forward: u64,
	pub(crate) outgoing_cltv_value: u32,
// 12 bytes of 0-padding
pub(crate) padding: PhantomData<[u8; 12]>,
@jkczyzjkczyzJan 31, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's too bad RFC 2000 (rust-lang/rust#44580) isn't in the stable Rust release yet. Then we could type alias this as:
pub(crate)typeBytePadding<constN:usize> = ::std::marker::PhantomData<[u8;N]>;
So this should be fine for now.
@TheBlueMattTheBlueMattFeb 3, 2020

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 probably do something like this anyway without generic constants. PhantomData has a somewhat specific meaning in Rust (that we have a template type that we're not going to instantiate). We probably just want a new type in ser.rs like (but with better names):

pub(crate) struct PaddingData<T: Default + std::convert::AsRef<[u8]>> {
t: std::marker::PhantomData<T>,
}
impl<T: Default + std::convert::AsRef<[u8]>> Writeable for PaddingData<T> {
#[inline]
fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
let nt: T = Default::default();
w.write_all(nt.as_ref())
}
}

}

mod fuzzy_internal_msgs {
Expand DownExpand Up@@ -964,7 +965,7 @@ impl Writeable for OnionRealm0HopData {
 self.short_channel_id.write(w)?;
 self.amt_to_forward.write(w)?;
 self.outgoing_cltv_value.write(w)?;
w.write_all(&[0;12])?;
self.padding.write(w)?;
 Ok(())
	}
}
Expand All@@ -974,11 +975,8 @@ impl<R: Read> Readable<R> for OnionRealm0HopData {
 Ok(OnionRealm0HopData {
 short_channel_id: Readable::read(r)?,
 amt_to_forward: Readable::read(r)?,
 outgoing_cltv_value: {
 let v: u32 = Readable::read(r)?;
 r.read_exact(&mut [0; 12])?;
 v
 }
 outgoing_cltv_value: Readable::read(r)?,
 padding: Readable::read(r)?,
 })
	}
}
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/onion_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ use secp256k1::key::{SecretKey,PublicKey};
use secp256k1::Secp256k1;
use secp256k1::ecdh::SharedSecret;
use secp256k1;
use std::marker::PhantomData;

use std::io::Cursor;
use std::sync::Arc;
Expand DownExpand Up@@ -126,6 +127,7 @@ pub(super) fn build_onion_payloads(route: &Route, starting_htlc_offset: u32) ->
 short_channel_id: last_short_channel_id,
 amt_to_forward: value_msat,
 outgoing_cltv_value: cltv,
 padding: PhantomData,
 },
 hmac: [0; 32],
 });
Expand DownExpand Up@@ -429,6 +431,8 @@ mod tests {
	use ln::router::{Route, RouteHop};
	use ln::msgs;
	use util::ser::Writeable;

	use std::marker::PhantomData;

	use hex;

Expand DownExpand Up@@ -521,6 +525,7 @@ mod tests {
 short_channel_id: 0,
 amt_to_forward: 0,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -530,6 +535,7 @@ mod tests {
 short_channel_id: 0x0101010101010101,
 amt_to_forward: 0x0100000001,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -539,6 +545,7 @@ mod tests {
 short_channel_id: 0x0202020202020202,
 amt_to_forward: 0x0200000002,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -548,6 +555,7 @@ mod tests {
 short_channel_id: 0x0303030303030303,
 amt_to_forward: 0x0300000003,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand All@@ -557,6 +565,7 @@ mod tests {
 short_channel_id: 0x0404040404040404,
 amt_to_forward: 0x0400000004,
 outgoing_cltv_value: 0,
 padding: PhantomData,
 },
 hmac: [0; 32],
 },
Expand Down

16 changes: 16 additions & 0 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ use std::io::{Read, Write};
use std::collections::HashMap;
use std::hash::Hash;
use std::sync::Mutex;
use std::marker::PhantomData;

use secp256k1::Signature;
use secp256k1::key::{PublicKey, SecretKey};
Expand DownExpand Up@@ -208,6 +209,7 @@ macro_rules! impl_array {
impl_array!(3); // for rgb
impl_array!(4); // for IPv4
impl_array!(10); // for OnionV2
impl_array!(12); // for OnionRealm0HopData
impl_array!(16); // for IPv6
impl_array!(32); // for channel id & hmac
impl_array!(33); // for PublicKey
Expand DownExpand Up@@ -392,6 +394,20 @@ impl Writeable for PaymentHash {
	}
}

impl<R: Read> Readable<R> for PhantomData<[u8; 12]> {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let _buf: [u8; 12] = Readable::read(r)?; 
 Ok(PhantomData)
	}
}

impl Writeable for PhantomData<[u8; 12]> {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
 w.write_all(&[0; 12])?;
 Ok(())
	}
}

impl<R: Read> Readable<R> for PaymentHash {
	fn read(r: &mut R) -> Result<Self, DecodeError> {
 let buf: [u8; 32] = Readable::read(r)?;
Expand Down