aboutsummaryrefslogtreecommitdiff
path: root/src/artifactory.c
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2024-06-14 19:47:34 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2024-06-14 19:47:34 -0400
commit91d7f4f70583e3aab13ae503bdeda97073cedb07 (patch)
tree8572a8fa782b9601f5ecf3b464fac6211c7dc394 /src/artifactory.c
parent77b3517c8d6d01526a1c5be9109981ca269dd21f (diff)
downloadstasis-91d7f4f70583e3aab13ae503bdeda97073cedb07.tar.gz
Fix redaction code to accept NULL pointers in array
* And let the caller specify the length of the array of strings to redact. * Redactions now occur directly on authentication strings rather than their command line arguments
Diffstat (limited to 'src/artifactory.c')
-rw-r--r--src/artifactory.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/artifactory.c b/src/artifactory.c
index 4772602..5678d64 100644
--- a/src/artifactory.c
+++ b/src/artifactory.c
@@ -229,16 +229,15 @@ int jfrog_cli(struct JFRT_Auth *auth, char *args) {
}
const char *redactable[] = {
- "--access-token=",
- "--ssh-key-path=",
- "--ssh-passphrase=",
- "--client-cert-key-path=",
- "--client-cert-path=",
- "--password=",
- NULL,
+ auth->access_token,
+ auth->ssh_key_path,
+ auth->ssh_passphrase,
+ auth->client_cert_key_path,
+ auth->client_cert_path,
+ auth->password,
};
snprintf(cmd, sizeof(cmd) - 1, "jf %s %s", args, auth_args);
- redact_sensitive(redactable, cmd, cmd_redacted, sizeof(cmd_redacted) - 1);
+ redact_sensitive(redactable, sizeof(redactable) / sizeof (*redactable), cmd, cmd_redacted, sizeof(cmd_redacted) - 1);
guard_free(auth_args);
guard_strlist_free(&arg_map);