Skip to content
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

feat: Deno.ConnectTlsOptions.{cert,key} #22274

Merged
merged 9 commits into from
Feb 18, 2024
Merged

feat: Deno.ConnectTlsOptions.{cert,key} #22274

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3fc8cd6
feat: `ConnectTlsOptions.{cert,key}`
iuioiua Feb 5, 2024
66cc22b
tweak
iuioiua Feb 5, 2024
13df2a7
tweaks
iuioiua Feb 6, 2024
44bba4d
Merge branch 'main' into connect-tls-options-key-cert
iuioiua Feb 6, 2024
b43747d
use `warnOnDeprecatedApi()`
iuioiua Feb 13, 2024
383d75d
update
iuioiua Feb 13, 2024
ac47c91
Merge branch 'main' into pr/iuioiua/22274
iuioiua Feb 13, 2024
dcc5ad9
tweaks
iuioiua Feb 13, 2024
87462e0
tweaks and fixes
iuioiua Feb 13, 2024
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
Prev Previous commit
Next Next commit
tweaks
  • Loading branch information
@iuioiua
iuioiua committed Feb 13, 2024
commit dcc5ad98c2d6a1e2714af854d260b4ce24c31be0
6 changes: 3 additions & 3 deletions ext/net/02_tls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ async function connectTls({
"Cannot specify both `privateKey` and `key`",
);
}
certChain ??= cert;
privateKey ??= key;
cert ??= certChain;
key ??= privateKey;
const { 0: rid, 1: localAddr, 2: remoteAddr } = await op_net_connect_tls(
{ hostname, port },
{ certFile, caCerts, certChain, privateKey, alpnProtocols },
{ certFile, caCerts, cert, key, alpnProtocols },
);
localAddr.transport = "tcp";
remoteAddr.transport = "tcp";
Expand Down
29 changes: 14 additions & 15 deletions ext/net/ops_tls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ impl Resource for TlsStreamResource {
pub struct ConnectTlsArgs {
cert_file: Option<String>,
ca_certs: Vec<String>,
cert_chain: Option<String>,
private_key: Option<String>,
cert: Option<String>,
key: Option<String>,
alpn_protocols: Option<Vec<String>>,
}

Expand Down Expand Up @@ -297,24 +297,23 @@ where
let local_addr = tcp_stream.local_addr()?;
let remote_addr = tcp_stream.peer_addr()?;

let cert_chain_and_key =
if args.cert_chain.is_some() || args.private_key.is_some() {
let cert_chain = args
.cert_chain
.ok_or_else(|| type_error("No certificate chain provided"))?;
let private_key = args
.private_key
.ok_or_else(|| type_error("No private key provided"))?;
Some((cert_chain, private_key))
} else {
None
};
let cert_and_key = if args.cert.is_some() || args.key.is_some() {
let cert = args
.cert
.ok_or_else(|| type_error("No certificate chain provided"))?;
let key = args
.key
.ok_or_else(|| type_error("No private key provided"))?;
Some((cert, key))
} else {
None
};

let mut tls_config = create_client_config(
root_cert_store,
ca_certs,
unsafely_ignore_certificate_errors,
cert_chain_and_key,
cert_and_key,
SocketUse::GeneralSsl,
)?;

Expand Down