Update credman.c

This commit is contained in:
Token2
2025-08-27 11:44:48 +02:00
committed by GitHub
parent fe26347134
commit 5e475bab18

View File

@@ -3,6 +3,8 @@
* Use of this source code is governed by a BSD-style * Use of this source code is governed by a BSD-style
* license that can be found in the LICENSE file. * license that can be found in the LICENSE file.
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* Updated by Token2 Sarl - Accommodating command line PIN and skipping fingerprint verification
*/ */
#include <fido.h> #include <fido.h>
@@ -21,315 +23,362 @@
int int
credman_get_metadata(fido_dev_t *dev, const char *path) credman_get_metadata(fido_dev_t *dev, const char *path)
{ {
fido_credman_metadata_t *metadata = NULL; fido_credman_metadata_t *metadata = NULL;
char *pin = NULL; char *pin = NULL;
int r, ok = 1; int r = FIDO_ERR_INTERNAL, ok = 1;
if ((metadata = fido_credman_metadata_new()) == NULL) { if ((metadata = fido_credman_metadata_new()) == NULL) {
warnx("fido_credman_metadata_new"); warnx("fido_credman_metadata_new");
goto out; goto out;
} }
if ((r = fido_credman_get_dev_metadata(dev, metadata,
NULL)) != FIDO_OK && should_retry_with_pin(dev, r)) {
if ((pin = get_pin(path)) == NULL)
goto out;
r = fido_credman_get_dev_metadata(dev, metadata, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
if (r != FIDO_OK) {
warnx("fido_credman_get_dev_metadata: %s", fido_strerr(r));
goto out;
}
printf("existing rk(s): %u\n", if (global_pin == NULL) {
(unsigned)fido_credman_rk_existing(metadata)); r = fido_credman_get_dev_metadata(dev, metadata, NULL);
printf("remaining rk(s): %u\n", if (r != FIDO_OK && should_retry_with_pin(dev, r)) {
(unsigned)fido_credman_rk_remaining(metadata)); pin = get_pin(path);
if (pin == NULL)
goto out;
r = fido_credman_get_dev_metadata(dev, metadata, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
} else {
r = fido_credman_get_dev_metadata(dev, metadata, global_pin);
}
ok = 0; if (r != FIDO_OK) {
warnx("fido_credman_get_dev_metadata: %s", fido_strerr(r));
goto out;
}
printf("existing rk(s): %u\n",
(unsigned)fido_credman_rk_existing(metadata));
printf("remaining rk(s): %u\n",
(unsigned)fido_credman_rk_remaining(metadata));
ok = 0;
out: out:
fido_credman_metadata_free(&metadata); fido_credman_metadata_free(&metadata);
fido_dev_close(dev); fido_dev_close(dev);
fido_dev_free(&dev); fido_dev_free(&dev);
exit(ok); exit(ok);
} }
static int static int
print_rp(fido_credman_rp_t *rp, size_t idx) print_rp(fido_credman_rp_t *rp, size_t idx)
{ {
char *rp_id_hash = NULL; char *rp_id_hash = NULL;
if (base64_encode(fido_credman_rp_id_hash_ptr(rp, idx), if (base64_encode(fido_credman_rp_id_hash_ptr(rp, idx),
fido_credman_rp_id_hash_len(rp, idx), &rp_id_hash) < 0) { fido_credman_rp_id_hash_len(rp, idx), &rp_id_hash) < 0) {
warnx("output error"); warnx("output error");
return -1; return -1;
} }
printf("%02u: %s %s\n", (unsigned)idx, rp_id_hash, printf("%02u: %s %s\n", (unsigned)idx, rp_id_hash,
fido_credman_rp_id(rp, idx)); fido_credman_rp_id(rp, idx));
free(rp_id_hash); free(rp_id_hash);
return 0; return 0;
} }
int int
credman_list_rp(const char *path) credman_list_rp(const char *path)
{ {
fido_credman_rp_t *rp = NULL; fido_credman_rp_t *rp = NULL;
fido_dev_t *dev = NULL; fido_dev_t *dev = NULL;
char *pin = NULL; char *pin = NULL;
int r, ok = 1; int r = FIDO_ERR_INTERNAL, ok = 1;
dev = open_dev(path); dev = open_dev(path);
if ((rp = fido_credman_rp_new()) == NULL) { if ((rp = fido_credman_rp_new()) == NULL) {
warnx("fido_credman_rp_new"); warnx("fido_credman_rp_new");
goto out; goto out;
} }
if ((r = fido_credman_get_dev_rp(dev, rp, NULL)) != FIDO_OK &&
should_retry_with_pin(dev, r)) {
if ((pin = get_pin(path)) == NULL)
goto out;
r = fido_credman_get_dev_rp(dev, rp, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
if (r != FIDO_OK) {
warnx("fido_credman_get_dev_rp: %s", fido_strerr(r));
goto out;
}
for (size_t i = 0; i < fido_credman_rp_count(rp); i++)
if (print_rp(rp, i) < 0)
goto out;
ok = 0; if (global_pin == NULL) {
r = fido_credman_get_dev_rp(dev, rp, NULL);
if (r != FIDO_OK && should_retry_with_pin(dev, r)) {
pin = get_pin(path);
if (pin == NULL)
goto out;
r = fido_credman_get_dev_rp(dev, rp, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
} else {
r = fido_credman_get_dev_rp(dev, rp, global_pin);
}
if (r != FIDO_OK) {
warnx("fido_credman_get_dev_rp: %s", fido_strerr(r));
goto out;
}
for (size_t i = 0; i < fido_credman_rp_count(rp); i++)
if (print_rp(rp, i) < 0)
goto out;
ok = 0;
out: out:
fido_credman_rp_free(&rp); fido_credman_rp_free(&rp);
fido_dev_close(dev); fido_dev_close(dev);
fido_dev_free(&dev); fido_dev_free(&dev);
exit(ok); exit(ok);
} }
static int static int
print_rk(const fido_credman_rk_t *rk, size_t idx) print_rk(const fido_credman_rk_t *rk, size_t idx)
{ {
const fido_cred_t *cred; const fido_cred_t *cred;
char *id = NULL; char *id = NULL;
char *user_id = NULL; char *user_id = NULL;
const char *type; const char *type;
const char *prot; const char *prot;
if ((cred = fido_credman_rk(rk, idx)) == NULL) { if ((cred = fido_credman_rk(rk, idx)) == NULL) {
warnx("fido_credman_rk"); warnx("fido_credman_rk");
return -1; return -1;
} }
if (base64_encode(fido_cred_id_ptr(cred), fido_cred_id_len(cred),
&id) < 0 || base64_encode(fido_cred_user_id_ptr(cred),
fido_cred_user_id_len(cred), &user_id) < 0) {
warnx("output error");
return -1;
}
type = cose_string(fido_cred_type(cred)); if (base64_encode(fido_cred_id_ptr(cred), fido_cred_id_len(cred),
prot = prot_string(fido_cred_prot(cred)); &id) < 0 || base64_encode(fido_cred_user_id_ptr(cred),
fido_cred_user_id_len(cred), &user_id) < 0) {
warnx("output error");
return -1;
}
/* commenting out the original code, was not giving the user login name, only display name */ type = cose_string(fido_cred_type(cred));
/*printf("%02u: %s %s %s %s %s %s\n", (unsigned)idx, id, fido_cred_display_name(cred), user_id, type, port); */ prot = prot_string(fido_cred_prot(cred));
printf("%02u: %s %s %s %s %s %s \n", (unsigned)idx, id, fido_cred_display_name(cred), fido_cred_user_name(cred), user_id, type, prot);
free(user_id); printf("%02u: %s %s %s %s %s %s\n",
free(id); (unsigned)idx, id, fido_cred_display_name(cred),
fido_cred_user_name(cred), user_id, type, prot);
return 0; free(user_id);
free(id);
return 0;
} }
int int
credman_list_rk(const char *path, const char *rp_id) credman_list_rk(const char *path, const char *rp_id)
{ {
fido_dev_t *dev = NULL; fido_dev_t *dev = NULL;
fido_credman_rk_t *rk = NULL; fido_credman_rk_t *rk = NULL;
char *pin = NULL; char *pin = NULL;
int r, ok = 1; int r = FIDO_ERR_INTERNAL, ok = 1;
dev = open_dev(path); dev = open_dev(path);
if ((rk = fido_credman_rk_new()) == NULL) { if ((rk = fido_credman_rk_new()) == NULL) {
warnx("fido_credman_rk_new"); warnx("fido_credman_rk_new");
goto out; goto out;
} }
if ((r = fido_credman_get_dev_rk(dev, rp_id, rk, NULL)) != FIDO_OK &&
should_retry_with_pin(dev, r)) {
if ((pin = get_pin(path)) == NULL)
goto out;
r = fido_credman_get_dev_rk(dev, rp_id, rk, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
if (r != FIDO_OK) {
warnx("fido_credman_get_dev_rk: %s", fido_strerr(r));
goto out;
}
for (size_t i = 0; i < fido_credman_rk_count(rk); i++)
if (print_rk(rk, i) < 0)
goto out;
ok = 0; if (global_pin == NULL) {
r = fido_credman_get_dev_rk(dev, rp_id, rk, NULL);
if (r != FIDO_OK && should_retry_with_pin(dev, r)) {
pin = get_pin(path);
if (pin == NULL)
goto out;
r = fido_credman_get_dev_rk(dev, rp_id, rk, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
} else {
r = fido_credman_get_dev_rk(dev, rp_id, rk, global_pin);
}
if (r != FIDO_OK) {
warnx("fido_credman_get_dev_rk: %s", fido_strerr(r));
goto out;
}
for (size_t i = 0; i < fido_credman_rk_count(rk); i++)
if (print_rk(rk, i) < 0)
goto out;
ok = 0;
out: out:
fido_credman_rk_free(&rk); fido_credman_rk_free(&rk);
fido_dev_close(dev); fido_dev_close(dev);
fido_dev_free(&dev); fido_dev_free(&dev);
exit(ok); exit(ok);
} }
int int
credman_print_rk(fido_dev_t *dev, const char *path, const char *rp_id, credman_print_rk(fido_dev_t *dev, const char *path, const char *rp_id,
const char *cred_id) const char *cred_id)
{ {
fido_credman_rk_t *rk = NULL; fido_credman_rk_t *rk = NULL;
const fido_cred_t *cred = NULL; const fido_cred_t *cred = NULL;
char *pin = NULL; char *pin = NULL;
void *cred_id_ptr = NULL; void *cred_id_ptr = NULL;
size_t cred_id_len = 0; size_t cred_id_len = 0;
int r, ok = 1; int r = FIDO_ERR_INTERNAL, ok = 1;
if ((rk = fido_credman_rk_new()) == NULL) { if ((rk = fido_credman_rk_new()) == NULL) {
warnx("fido_credman_rk_new"); warnx("fido_credman_rk_new");
goto out; goto out;
} }
if (base64_decode(cred_id, &cred_id_ptr, &cred_id_len) < 0) {
warnx("base64_decode");
goto out;
}
if ((r = fido_credman_get_dev_rk(dev, rp_id, rk, NULL)) != FIDO_OK &&
should_retry_with_pin(dev, r)) {
if ((pin = get_pin(path)) == NULL)
goto out;
r = fido_credman_get_dev_rk(dev, rp_id, rk, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
if (r != FIDO_OK) {
warnx("fido_credman_get_dev_rk: %s", fido_strerr(r));
goto out;
}
for (size_t i = 0; i < fido_credman_rk_count(rk); i++) { if (base64_decode(cred_id, &cred_id_ptr, &cred_id_len) < 0) {
if ((cred = fido_credman_rk(rk, i)) == NULL || warnx("base64_decode");
fido_cred_id_ptr(cred) == NULL) { goto out;
warnx("output error"); }
goto out;
}
if (cred_id_len != fido_cred_id_len(cred) ||
memcmp(cred_id_ptr, fido_cred_id_ptr(cred), cred_id_len))
continue;
print_cred(stdout, fido_cred_type(cred), cred);
ok = 0;
goto out;
}
warnx("credential not found"); if (global_pin == NULL) {
r = fido_credman_get_dev_rk(dev, rp_id, rk, NULL);
if (r != FIDO_OK && should_retry_with_pin(dev, r)) {
pin = get_pin(path);
if (pin == NULL)
goto out;
r = fido_credman_get_dev_rk(dev, rp_id, rk, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
} else {
r = fido_credman_get_dev_rk(dev, rp_id, rk, global_pin);
}
if (r != FIDO_OK) {
warnx("fido_credman_get_dev_rk: %s", fido_strerr(r));
goto out;
}
for (size_t i = 0; i < fido_credman_rk_count(rk); i++) {
if ((cred = fido_credman_rk(rk, i)) == NULL ||
fido_cred_id_ptr(cred) == NULL) {
warnx("output error");
goto out;
}
if (cred_id_len != fido_cred_id_len(cred) ||
memcmp(cred_id_ptr, fido_cred_id_ptr(cred), cred_id_len))
continue;
print_cred(stdout, fido_cred_type(cred), cred);
ok = 0;
goto out;
}
warnx("credential not found");
out: out:
free(cred_id_ptr); free(cred_id_ptr);
fido_credman_rk_free(&rk); fido_credman_rk_free(&rk);
fido_dev_close(dev); fido_dev_close(dev);
fido_dev_free(&dev); fido_dev_free(&dev);
exit(ok); exit(ok);
} }
int int
credman_delete_rk(const char *path, const char *id) credman_delete_rk(const char *path, const char *id)
{ {
fido_dev_t *dev = NULL; fido_dev_t *dev = NULL;
char *pin = NULL; char *pin = NULL;
void *id_ptr = NULL; void *id_ptr = NULL;
size_t id_len = 0; size_t id_len = 0;
int r, ok = 1; int r = FIDO_ERR_INTERNAL, ok = 1;
dev = open_dev(path); dev = open_dev(path);
if (base64_decode(id, &id_ptr, &id_len) < 0) { if (base64_decode(id, &id_ptr, &id_len) < 0) {
warnx("base64_decode"); warnx("base64_decode");
goto out; goto out;
} }
if ((r = fido_credman_del_dev_rk(dev, id_ptr, id_len,
NULL)) != FIDO_OK && should_retry_with_pin(dev, r)) {
if ((pin = get_pin(path)) == NULL)
goto out;
r = fido_credman_del_dev_rk(dev, id_ptr, id_len, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
if (r != FIDO_OK) {
warnx("fido_credman_del_dev_rk: %s", fido_strerr(r));
goto out;
}
ok = 0; if (global_pin == NULL) {
r = fido_credman_del_dev_rk(dev, id_ptr, id_len, NULL);
if (r != FIDO_OK && should_retry_with_pin(dev, r)) {
pin = get_pin(path);
if (pin == NULL)
goto out;
r = fido_credman_del_dev_rk(dev, id_ptr, id_len, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
} else {
r = fido_credman_del_dev_rk(dev, id_ptr, id_len, global_pin);
}
if (r != FIDO_OK) {
warnx("fido_credman_del_dev_rk: %s", fido_strerr(r));
goto out;
}
ok = 0;
out: out:
free(id_ptr); free(id_ptr);
fido_dev_close(dev); fido_dev_close(dev);
fido_dev_free(&dev); fido_dev_free(&dev);
exit(ok); exit(ok);
} }
int int
credman_update_rk(const char *path, const char *user_id, const char *cred_id, credman_update_rk(const char *path, const char *user_id, const char *cred_id,
const char *name, const char *display_name) const char *name, const char *display_name)
{ {
fido_dev_t *dev = NULL; fido_dev_t *dev = NULL;
fido_cred_t *cred = NULL; fido_cred_t *cred = NULL;
char *pin = NULL; char *pin = NULL;
void *user_id_ptr = NULL; void *user_id_ptr = NULL;
void *cred_id_ptr = NULL; void *cred_id_ptr = NULL;
size_t user_id_len = 0; size_t user_id_len = 0;
size_t cred_id_len = 0; size_t cred_id_len = 0;
int r, ok = 1; int r = FIDO_ERR_INTERNAL, ok = 1;
dev = open_dev(path); dev = open_dev(path);
if (base64_decode(user_id, &user_id_ptr, &user_id_len) < 0 || if (base64_decode(user_id, &user_id_ptr, &user_id_len) < 0 ||
base64_decode(cred_id, &cred_id_ptr, &cred_id_len) < 0) { base64_decode(cred_id, &cred_id_ptr, &cred_id_len) < 0) {
warnx("base64_decode"); warnx("base64_decode");
goto out; goto out;
} }
if ((cred = fido_cred_new()) == NULL) {
warnx("fido_cred_new");
goto out;
}
if ((r = fido_cred_set_id(cred, cred_id_ptr, cred_id_len)) != FIDO_OK) {
warnx("fido_cred_set_id: %s", fido_strerr(r));
goto out;
}
if ((r = fido_cred_set_user(cred, user_id_ptr, user_id_len, name,
display_name, NULL)) != FIDO_OK) {
warnx("fido_cred_set_user: %s", fido_strerr(r));
goto out;
}
if ((r = fido_credman_set_dev_rk(dev, cred, NULL)) != FIDO_OK &&
should_retry_with_pin(dev, r)) {
if ((pin = get_pin(path)) == NULL)
goto out;
r = fido_credman_set_dev_rk(dev, cred, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
if (r != FIDO_OK) {
warnx("fido_credman_set_dev_rk: %s", fido_strerr(r));
goto out;
}
ok = 0; if ((cred = fido_cred_new()) == NULL) {
warnx("fido_cred_new");
goto out;
}
r = fido_cred_set_id(cred, cred_id_ptr, cred_id_len);
if (r != FIDO_OK) {
warnx("fido_cred_set_id: %s", fido_strerr(r));
goto out;
}
r = fido_cred_set_user(cred, user_id_ptr, user_id_len, name,
display_name, NULL);
if (r != FIDO_OK) {
warnx("fido_cred_set_user: %s", fido_strerr(r));
goto out;
}
if (global_pin == NULL) {
r = fido_credman_set_dev_rk(dev, cred, NULL);
if (r != FIDO_OK && should_retry_with_pin(dev, r)) {
pin = get_pin(path);
if (pin == NULL)
goto out;
r = fido_credman_set_dev_rk(dev, cred, pin);
freezero(pin, PINBUF_LEN);
pin = NULL;
}
} else {
r = fido_credman_set_dev_rk(dev, cred, global_pin);
}
if (r != FIDO_OK) {
warnx("fido_credman_set_dev_rk: %s", fido_strerr(r));
goto out;
}
ok = 0;
out: out:
free(user_id_ptr); free(user_id_ptr);
free(cred_id_ptr); free(cred_id_ptr);
fido_dev_close(dev); fido_dev_close(dev);
fido_dev_free(&dev); fido_dev_free(&dev);
fido_cred_free(&cred); fido_cred_free(&cred);
exit(ok); exit(ok);
} }