diff options
author | Andreu Botella <andreu@andreubotella.com> | 2023-01-17 16:18:24 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-18 01:18:24 +0100 |
commit | 69ec45eac76c63ea973c68479ea4f0bbf58b29e9 (patch) | |
tree | 6e58f2eecc903f91981c695430dc64dca98fe7b6 /cli/tools/installer.rs | |
parent | 1a792f8805d835257302baf538505451b149d84c (diff) |
refactor(cli): Integrate standalone mode cert handling into `Flags` (#17419)
The way the standalone mode handles the `--cert` flag is different to
all other modes. This is because `--cert` takes a path to the
certificate file, which is directly added to the root cert store; except
for compile mode, where its byte contents are stored in the standalone
metadata, and they are added to the root cert store after the
`ProcState` is created.
This change instead changes `Flags::ca_file` (an `Option<String>`) into
`Flags::ca_data`, which can represent a `String` file path or a
`Vec<u8>` with the certificate contents. That way, standalone mode can
create a `ProcState` whose root cert store alreay contains the
certificate.
This change also adds a tests for certificates in standalone mode, since
there weren't any before.
This refactor will help with implementing web workers in standalone mode
in the future.
Diffstat (limited to 'cli/tools/installer.rs')
-rw-r--r-- | cli/tools/installer.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs index 344758590..2d2584f54 100644 --- a/cli/tools/installer.rs +++ b/cli/tools/installer.rs @@ -1,6 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. use crate::args::resolve_no_prompt; +use crate::args::CaData; use crate::args::ConfigFlag; use crate::args::Flags; use crate::args::InstallFlags; @@ -325,7 +326,7 @@ fn resolve_shim_data( executable_args.push("--location".to_string()); executable_args.push(url.to_string()); } - if let Some(ca_file) = &flags.ca_file { + if let Some(CaData::File(ca_file)) = &flags.ca_data { executable_args.push("--cert".to_string()); executable_args.push(ca_file.to_owned()) } |