Skip to content

[nexus] base64 decode SSH private key before use #3612

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+28 −4
Open

[nexus] base64 decode SSH private key before use #3612

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3956c96
[nexus] base64 decode SSH private key before use
heavycrystal Oct 16, 2025
6587321
copilot found an issue but low confidence
heavycrystal Oct 16, 2025
24f07d7
review feedback
heavycrystal Oct 16, 2025
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
1 change: 1 addition & 0 deletions nexus/Cargo.lock
View file
Open in desktop

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

12 changes: 9 additions & 3 deletions nexus/catalog/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,15 @@ impl Catalog {
.pg
.prepare_typed(
"INSERT INTO flows (name, source_peer, destination_peer, description,
query_string, flow_metadata) VALUES ($1, $2, $3, $4, $5, $6, $7)",
&[types::Type::TEXT, types::Type::INT4, types::Type::INT4, types::Type::TEXT,
types::Type::TEXT, types::Type::JSONB],
query_string, flow_metadata) VALUES ($1, $2, $3, $4, $5, $6)",
&[
types::Type::TEXT,
types::Type::INT4,
types::Type::INT4,
types::Type::TEXT,
types::Type::TEXT,
types::Type::JSONB,
],
)
.await?;

Expand Down
1 change: 1 addition & 0 deletions nexus/postgres-connection/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ tokio-util = { version = "0.7", features = ["compat"] }
tokio-stream = "0.1"
tracing.workspace = true
urlencoding = "2"
base64 = "0.22"
17 changes: 16 additions & 1 deletion nexus/postgres-connection/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use base64::Engine;
use pt::peerdb_peers::{PostgresConfig, SshConfig};
use rustls::pki_types::{CertificateDer, ServerName, UnixTime};
use rustls::{ClientConfig, DigitallySignedStruct, RootCertStore, SignatureScheme};
Expand Down Expand Up @@ -94,7 +95,21 @@ pub async fn create_tunnel(
session.userauth_password(&ssh_config.user, &ssh_config.password)?;
}
if !ssh_config.private_key.is_empty() {
session.userauth_pubkey_memory(&ssh_config.user, None, &ssh_config.private_key, None)?;
let private_key_bytes = base64::engine::general_purpose::STANDARD
.decode(&ssh_config.private_key)
.map_err(|e| {
io::Error::new(
io::ErrorKind::InvalidData,
format!("Failed to decode private key: {e}"),
)
})?;
let private_key = String::from_utf8(private_key_bytes).map_err(|e| {
io::Error::new(
io::ErrorKind::InvalidData,
format!("Invalid UTF-8 in private key: {e}"),
)
})?;
session.userauth_pubkey_memory(&ssh_config.user, None, &private_key, None)?;
}
if !ssh_config.host_key.is_empty() {
let mut known_hosts = session.known_hosts()?;
Expand Down
Loading