Skip to content

Commit

Permalink
X-Forwarded-Host to contain full linkup domain (#50)
Browse files Browse the repository at this point in the history
Use the full linkup domain as X-Forwarded-Host. This is "truer" to the
standard, should still work with the rest of the linkup session
detection functions, and makes some next features work for us.
  • Loading branch information
ostenbom authored Nov 23, 2023
1 parent 750ed33 commit 202213a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion linkup-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "linkup-cli"
version = "0.2.0"
version = "0.2.1"
edition = "2021"

[[bin]]
Expand Down
10 changes: 5 additions & 5 deletions linkup/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub fn get_additional_headers(
if !headers.contains_key(HeaderName::ForwardedHost) {
additional_headers.insert(
HeaderName::ForwardedHost,
get_target_domain(url, session_name),
format!("{}.{}", session_name, get_target_domain(url, session_name)),
);
}

Expand Down Expand Up @@ -405,7 +405,7 @@ mod tests {
);
assert_eq!(
add_headers.get(HeaderName::ForwardedHost).unwrap(),
"example.com"
"tiny-cow.example.com"
);
assert_eq!(
add_headers.get(HeaderName::LinkupDestination).unwrap(),
Expand All @@ -415,7 +415,7 @@ mod tests {
let mut already_headers = HeaderMap::new();
already_headers.insert(HeaderName::TraceParent, "anything");
already_headers.insert(HeaderName::TraceState, "linkup-session=tiny-cow");
already_headers.insert(HeaderName::ForwardedHost, "example.com");
already_headers.insert(HeaderName::ForwardedHost, "tiny-cow.example.com");
already_headers.insert(HeaderName::LinkupDestination, "frontend");
let add_headers = get_additional_headers(
"https://abc.some-tunnel.com/abc-xyz",
Expand All @@ -432,7 +432,7 @@ mod tests {
let mut already_headers_two = HeaderMap::new();
already_headers_two.insert(HeaderName::TraceParent, "anything");
already_headers_two.insert(HeaderName::TraceState, "other-service=32");
already_headers_two.insert(HeaderName::ForwardedHost, "example.com");
already_headers_two.insert(HeaderName::ForwardedHost, "tiny-cow.example.com");
let add_headers = get_additional_headers(
"https://abc.some-tunnel.com/abc-xyz",
&already_headers_two,
Expand All @@ -448,7 +448,7 @@ mod tests {
);

let mut already_headers_three = HeaderMap::new();
already_headers_three.insert(HeaderName::ForwardedHost, "example.com");
already_headers_three.insert(HeaderName::ForwardedHost, "tiny-cow.example.com");
let add_headers = get_additional_headers(
"https://abc.some-tunnel.com/abc-xyz",
&already_headers_three,
Expand Down

0 comments on commit 202213a

Please sign in to comment.