add Secret<T> to pub fns in ops::registry and corresponding commands

Author: kylematsuda

src/bin/cargo/commands/login.rs

@@ -1,6 +1,7 @@
 use crate::command_prelude::*;
 
 use cargo::ops;
+use cargo::util::auth::Secret;
 
 pub fn cli() -> Command {
     subcommand("login")
@@ -36,7 +37,7 @@ pub fn cli() -> Command {
 pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
     ops::registry_login(
         config,
-        args.get_one("token").map(String::as_str),
+        args.get_one("token").map(String::as_str).map(Secret::from),
         args.get_one("registry").map(String::as_str),
         args.flag("generate-keypair"),
         args.flag("secret-key"),

src/bin/cargo/commands/owner.rs

@@ -1,6 +1,7 @@
 use crate::command_prelude::*;
 
 use cargo::ops::{self, OwnersOptions};
+use cargo::util::auth::Secret;
 
 pub fn cli() -> Command {
     subcommand("owner")
@@ -34,7 +35,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
     let registry = args.registry(config)?;
     let opts = OwnersOptions {
         krate: args.get_one::<String>("crate").cloned(),
-        token: args.get_one::<String>("token").cloned(),
+        token: args.get_one::<String>("token").cloned().map(Secret::from),
         index: args.get_one::<String>("index").cloned(),
         to_add: args
             .get_many::<String>("add")

src/bin/cargo/commands/publish.rs

@@ -1,6 +1,7 @@
 use crate::command_prelude::*;
 
 use cargo::ops::{self, PublishOpts};
+use cargo::util::auth::Secret;
 
 pub fn cli() -> Command {
     subcommand("publish")
@@ -36,7 +37,9 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
         &ws,
         &PublishOpts {
             config,
-            token: args.get_one::<String>("token").map(|s| s.to_string()),
+            token: args
+                .get_one::<String>("token")
+                .map(|s| Secret::from(s.to_string())),
             index,
             verify: !args.flag("no-verify"),
             allow_dirty: args.flag("allow-dirty"),

src/bin/cargo/commands/yank.rs

@@ -1,6 +1,7 @@
 use crate::command_prelude::*;
 
 use cargo::ops;
+use cargo::util::auth::Secret;
 
 pub fn cli() -> Command {
     subcommand("yank")
@@ -37,7 +38,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
         config,
         krate.map(|s| s.to_string()),
         version.map(|s| s.to_string()),
-        args.get_one::<String>("token").cloned(),
+        args.get_one::<String>("token").cloned().map(Secret::from),
         args.get_one::<String>("index").cloned(),
         args.flag("undo"),
         registry,

src/cargo/ops/registry.rs

@@ -96,7 +96,7 @@ impl RegistryCredentialConfig {
 
 pub struct PublishOpts<'cfg> {
     pub config: &'cfg Config,
-    pub token: Option<String>,
+    pub token: Option<Secret<String>>,
     pub index: Option<String>,
     pub verify: bool,
     pub allow_dirty: bool,
@@ -174,7 +174,7 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
 
     let (mut registry, reg_ids) = registry(
         opts.config,
-        opts.token.as_deref().map(Secret::from),
+        opts.token.as_ref().map(Secret::as_deref),
         opts.index.as_deref(),
         publish_registry.as_deref(),
         true,
@@ -786,7 +786,7 @@ fn http_proxy_exists(config: &Config) -> CargoResult<bool> {
 
 pub fn registry_login(
     config: &Config,
-    token: Option<&str>,
+    token: Option<Secret<&str>>,
     reg: Option<&str>,
     generate_keypair: bool,
     secret_key_required: bool,
@@ -939,7 +939,7 @@ pub fn registry_logout(config: &Config, reg: Option<&str>) -> CargoResult<()> {
 
 pub struct OwnersOptions {
     pub krate: Option<String>,
-    pub token: Option<String>,
+    pub token: Option<Secret<String>>,
     pub index: Option<String>,
     pub to_add: Option<Vec<String>>,
     pub to_remove: Option<Vec<String>>,
@@ -961,7 +961,7 @@ pub fn modify_owners(config: &Config, opts: &OwnersOptions) -> CargoResult<()> {
 
     let (mut registry, _) = registry(
         config,
-        opts.token.as_deref().map(Secret::from),
+        opts.token.as_ref().map(Secret::as_deref),
         opts.index.as_deref(),
         opts.registry.as_deref(),
         true,
@@ -1020,7 +1020,7 @@ pub fn yank(
     config: &Config,
     krate: Option<String>,
     version: Option<String>,
-    token: Option<String>,
+    token: Option<Secret<String>>,
     index: Option<String>,
     undo: bool,
     reg: Option<String>,
@@ -1052,7 +1052,7 @@ pub fn yank(
 
     let (mut registry, _) = registry(
         config,
-        token.as_deref().map(Secret::from),
+        token.as_ref().map(Secret::as_deref),
         index.as_deref(),
         reg.as_deref(),
         true,

src/cargo/util/auth.rs

@@ -140,9 +140,9 @@ pub fn registry_credential_config(
         return registry_credential_config_inner(
             true,
             None,
-            token,
+            token.map(Secret::from),
             credential_process,
-            secret_key,
+            secret_key.map(Secret::from),
             secret_key_subject,
             config,
         );
@@ -231,9 +231,9 @@ pub fn registry_credential_config(
     registry_credential_config_inner(
         false,
         name.as_deref(),
-        token,
+        token.map(Secret::from),
         credential_process,
-        secret_key,
+        secret_key.map(Secret::from),
         secret_key_subject,
         config,
     )
@@ -242,9 +242,9 @@ pub fn registry_credential_config(
 fn registry_credential_config_inner(
     is_crates_io: bool,
     name: Option<&str>,
-    token: Option<String>,
+    token: Option<Secret<String>>,
     credential_process: Option<config::PathAndArgs>,
-    secret_key: Option<String>,
+    secret_key: Option<Secret<String>>,
     secret_key_subject: Option<String>,
     config: &Config,
 ) -> CargoResult<RegistryCredentialConfig> {
@@ -281,13 +281,13 @@ fn registry_credential_config_inner(
                     registry
                 ));
             }
-            (Some(token), _, _, _) => RegistryCredentialConfig::Token(Secret::from(token)),
+            (Some(token), _, _, _) => RegistryCredentialConfig::Token(token),
             (_, Some(process), _, _) => RegistryCredentialConfig::Process((
                 process.path.resolve_program(config),
                 process.args,
             )),
             (None, None, Some(key), subject) => {
-                RegistryCredentialConfig::AsymmetricKey((Secret::from(key), subject))
+                RegistryCredentialConfig::AsymmetricKey((key, subject))
             }
             (None, None, None, _) => {
                 if !is_crates_io {