security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

gpg: Only print out TOFU statistics for conflicts in interactive mode

Browse Source 
* g10/tofu.c (get_trust): Add arguments POLICYP and CONFLICT_SETP.  If
they are not NULL, return the policy and conflict set (if there is
one), respectively.  Update callers.  If MAY_ASK is FALSE, don't print
out the statistics.
(tofu_register_encryption): If there is a conflict and we haven't yet
printed the statistics about the conflicting bindings, do so now.
(tofu_get_validity): Likewise.

Signed-off-by: Neal H. Walfield <neal@g10code.com>
GnuPG-bug-id: 2914
This commit is contained in:
Neal H. Walfield 2017-02-02 13:24:57 +01:00
parent 74268180e5
commit 027b81b35f
1 changed files with 69 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
g10/tofu.c
View File

@ -2644,7 +2644,9 @@ get_policy (tofu_dbs_t dbs, PKT_public_key *pk,
static enum tofu_policy static enum tofu_policy
get_trust (ctrl_t ctrl, PKT_public_key *pk, get_trust (ctrl_t ctrl, PKT_public_key *pk,
const char *fingerprint, const char *email, const char *fingerprint, const char *email,
const char *user_id, int may_ask, time_t now) const char *user_id, int may_ask,
enum tofu_policy *policyp, strlist_t *conflict_setp,
time_t now)
{ {
tofu_dbs_t dbs = ctrl->tofu.dbs; tofu_dbs_t dbs = ctrl->tofu.dbs;
int in_transaction = 0; int in_transaction = 0;
@ -2683,6 +2685,7 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
if (tdb_keyid_is_utk (kid)) if (tdb_keyid_is_utk (kid))
{ {
trust_level = TRUST_ULTIMATE; trust_level = TRUST_ULTIMATE;
policy = TOFU_POLICY_GOOD;
goto out; goto out;
} }
} }
@ -2690,7 +2693,8 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
begin_transaction (ctrl, 0); begin_transaction (ctrl, 0);
in_transaction = 1; in_transaction = 1;
policy = get_policy (dbs, pk, fingerprint, user_id, email, &conflict_set, now); policy = get_policy (dbs, pk, fingerprint, user_id, email,
&conflict_set, now);
if (policy == TOFU_POLICY_AUTO) if (policy == TOFU_POLICY_AUTO)
{ {
policy = opt.tofu_default_policy; policy = opt.tofu_default_policy;
@ -2758,10 +2762,6 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
} }
else else
{ {
for (iter = conflict_set; iter; iter = iter->next)
show_statistics (dbs, iter->d, email,
TOFU_POLICY_ASK, NULL, 1, now);
trust_level = TRUST_UNDEFINED; trust_level = TRUST_UNDEFINED;
} }
@ -2807,6 +2807,12 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
if (in_transaction) if (in_transaction)
end_transaction (ctrl, 0); end_transaction (ctrl, 0);
if (policyp)
*policyp = policy;
if (conflict_setp)
*conflict_setp = conflict_set;
else
free_strlist (conflict_set); free_strlist (conflict_set);
return trust_level; return trust_level;
@ -3326,7 +3332,8 @@ tofu_register_signature (ctrl_t ctrl,
/* Make sure the binding exists and record any TOFU /* Make sure the binding exists and record any TOFU
conflicts. */ conflicts. */
if (get_trust (ctrl, pk, fingerprint, email, user_id->d, 0, now) if (get_trust (ctrl, pk, fingerprint, email, user_id->d,
0, NULL, NULL, now)
== _tofu_GET_TRUST_ERROR) == _tofu_GET_TRUST_ERROR)
{ {
rc = gpg_error (GPG_ERR_GENERAL); rc = gpg_error (GPG_ERR_GENERAL);
@ -3492,11 +3499,13 @@ tofu_register_encryption (ctrl_t ctrl,
for (user_id = user_id_list; user_id; user_id = user_id->next) for (user_id = user_id_list; user_id; user_id = user_id->next)
{ {
char *email = email_from_user_id (user_id->d); char *email = email_from_user_id (user_id->d);
strlist_t conflict_set = NULL;
enum tofu_policy policy;
/* Make sure the binding exists and that we recognize any /* Make sure the binding exists and that we recognize any
conflicts. */ conflicts. */
int tl = get_trust (ctrl, pk, fingerprint, email, user_id->d, int tl = get_trust (ctrl, pk, fingerprint, email, user_id->d,
may_ask, now); may_ask, &policy, &conflict_set, now);
if (tl == _tofu_GET_TRUST_ERROR) if (tl == _tofu_GET_TRUST_ERROR)
{ {
/* An error. */ /* An error. */
@ -3505,6 +3514,28 @@ tofu_register_encryption (ctrl_t ctrl,
goto die; goto die;
} }
/* If there is a conflict and MAY_ASK is true, we need to show
* the TOFU statistics for the current binding and the
* conflicting bindings. But, if we are not in batch mode, then
* they have already been printed (this is required to make sure
* the information is available to the caller before cpr_get is
* called). */
if (policy == TOFU_POLICY_ASK && may_ask && opt.batch)
{
strlist_t iter;
/* The conflict set should contain at least the current
* key. */
log_assert (conflict_set);
for (iter = conflict_set; iter; iter = iter->next)
show_statistics (dbs, iter->d, email,
TOFU_POLICY_ASK, NULL, 1, now);
}
free_strlist (conflict_set);
rc = gpgsql_stepx rc = gpgsql_stepx
(dbs->db, &dbs->s.register_encryption, NULL, NULL, &err, (dbs->db, &dbs->s.register_encryption, NULL, NULL, &err,
"insert into encryptions\n" "insert into encryptions\n"
@ -3681,11 +3712,13 @@ tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list,
for (user_id = user_id_list; user_id; user_id = user_id->next, bindings ++) for (user_id = user_id_list; user_id; user_id = user_id->next, bindings ++)
{ {
char *email = email_from_user_id (user_id->d); char *email = email_from_user_id (user_id->d);
strlist_t conflict_set = NULL;
enum tofu_policy policy;
/* Always call get_trust to make sure the binding is /* Always call get_trust to make sure the binding is
registered. */ registered. */
int tl = get_trust (ctrl, pk, fingerprint, email, user_id->d, int tl = get_trust (ctrl, pk, fingerprint, email, user_id->d,
may_ask, now); may_ask, &policy, &conflict_set, now);
if (tl == _tofu_GET_TRUST_ERROR) if (tl == _tofu_GET_TRUST_ERROR)
{ {
/* An error. */ /* An error. */
@ -3708,12 +3741,34 @@ tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list,
if (may_ask && tl != TRUST_ULTIMATE && tl != TRUST_EXPIRED) if (may_ask && tl != TRUST_ULTIMATE && tl != TRUST_EXPIRED)
{ {
enum tofu_policy policy = /* If policy is ask, then we already printed out the
get_policy (dbs, pk, fingerprint, user_id->d, email, NULL, now); * conflict information in ask_about_binding or will do so
* in a moment. */
if (policy != TOFU_POLICY_ASK)
need_warning |= need_warning |=
show_statistics (dbs, fingerprint, email, policy, NULL, 0, now); show_statistics (dbs, fingerprint, email, policy, NULL, 0, now);
/* If there is a conflict and MAY_ASK is true, we need to
* show the TOFU statistics for the current binding and the
* conflicting bindings. But, if we are not in batch mode,
* then they have already been printed (this is required to
* make sure the information is available to the caller
* before cpr_get is called). */
if (policy == TOFU_POLICY_ASK && opt.batch)
{
strlist_t iter;
/* The conflict set should contain at least the current
* key. */
log_assert (conflict_set);
for (iter = conflict_set; iter; iter = iter->next)
show_statistics (dbs, iter->d, email,
TOFU_POLICY_ASK, NULL, 1, now);
} }
}
free_strlist (conflict_set);
if (tl == TRUST_NEVER) if (tl == TRUST_NEVER)
trust_level = TRUST_NEVER; trust_level = TRUST_NEVER;