bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename and rework signing helper methods

Browse source 
* Don't name static methods with a gpgme_ prefix to avoid confusion with
  methods provided by the library. These are static and local to our
  file so just give them sane non-prefixed names.
* Rework sigsum_test_bit() to not require assignment.
* Don't balk if there is more than one signature available (for now,
  only check the first).
* Fix error codes in publicly visible methods to return -1, not 0, if pkg
  or db are not provided.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-06-14 10:15:43 -05:00
parent 71fd34e596
commit 2f5f157274
1 changed files with 36 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
lib/libalpm/signing.c
View file

@ -42,7 +42,7 @@
if(err != GPG_ERR_NO_ERROR) { goto error; } \ if(err != GPG_ERR_NO_ERROR) { goto error; } \
} while(0) } while(0)
static const char *gpgme_string_validity(gpgme_validity_t validity) static const char *string_validity(gpgme_validity_t validity)
{ {
switch(validity) { switch(validity) {
case GPGME_VALIDITY_UNKNOWN: case GPGME_VALIDITY_UNKNOWN:
@ -61,43 +61,42 @@ static const char *gpgme_string_validity(gpgme_validity_t validity)
return "???"; return "???";
} }
static alpm_list_t *sigsum_test_bit(gpgme_sigsum_t sigsum, alpm_list_t *summary, static void sigsum_test_bit(gpgme_sigsum_t sigsum, alpm_list_t **summary,
gpgme_sigsum_t bit, const char *value) gpgme_sigsum_t bit, const char *value)
{ {
if(sigsum & bit) { if(sigsum & bit) {
summary = alpm_list_add(summary, (void *)value); *summary = alpm_list_add(*summary, (void *)value);
} }
return summary;
} }
static alpm_list_t *gpgme_list_sigsum(gpgme_sigsum_t sigsum) static alpm_list_t *list_sigsum(gpgme_sigsum_t sigsum)
{ {
alpm_list_t *summary = NULL; alpm_list_t *summary = NULL;
/* The docs say this can be a bitmask...not sure I believe it, but we'll code /* The docs say this can be a bitmask...not sure I believe it, but we'll code
* for it anyway and show all possible flags in the returned string. */ * for it anyway and show all possible flags in the returned string. */
/* The signature is fully valid. */ /* The signature is fully valid. */
summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_VALID, "valid"); sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_VALID, "valid");
/* The signature is good. */ /* The signature is good. */
summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_GREEN, "green"); sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_GREEN, "green");
/* The signature is bad. */ /* The signature is bad. */
summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_RED, "red"); sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_RED, "red");
/* One key has been revoked. */ /* One key has been revoked. */
summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_KEY_REVOKED, "key revoked"); sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_REVOKED, "key revoked");
/* One key has expired. */ /* One key has expired. */
summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_KEY_EXPIRED, "key expired"); sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_EXPIRED, "key expired");
/* The signature has expired. */ /* The signature has expired. */
summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_SIG_EXPIRED, "sig expired"); sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SIG_EXPIRED, "sig expired");
/* Can't verify: key missing. */ /* Can't verify: key missing. */
summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_KEY_MISSING, "key missing"); sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_MISSING, "key missing");
/* CRL not available. */ /* CRL not available. */
summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_CRL_MISSING, "crl missing"); sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_MISSING, "crl missing");
/* Available CRL is too old. */ /* Available CRL is too old. */
summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_CRL_TOO_OLD, "crl too old"); sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_TOO_OLD, "crl too old");
/* A policy was not met. */ /* A policy was not met. */
summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_BAD_POLICY, "bad policy"); sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_BAD_POLICY, "bad policy");
/* A system error occured. */ /* A system error occured. */
summary = sigsum_test_bit(sigsum, summary, GPGME_SIGSUM_SYS_ERROR, "sys error"); sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SYS_ERROR, "sys error");
/* Fallback case */ /* Fallback case */
if(!sigsum) { if(!sigsum) {
summary = alpm_list_add(summary, (void *)"(empty)"); summary = alpm_list_add(summary, (void *)"(empty)");
@ -105,10 +104,10 @@ static alpm_list_t *gpgme_list_sigsum(gpgme_sigsum_t sigsum)
return summary; return summary;
} }
static int gpgme_init(pmhandle_t *handle) static int init_gpgme(pmhandle_t *handle)
{ {
static int init = 0; static int init = 0;
const char *version; const char *version, *sigdir;
gpgme_error_t err; gpgme_error_t err;
gpgme_engine_info_t enginfo; gpgme_engine_info_t enginfo;
@ -117,7 +116,8 @@ static int gpgme_init(pmhandle_t *handle)
return 0; return 0;
} }
if(!alpm_option_get_signaturedir(handle)) { sigdir = alpm_option_get_signaturedir(handle);
if(!sigdir) {
RET_ERR(handle, PM_ERR_SIG_MISSINGDIR, 1); RET_ERR(handle, PM_ERR_SIG_MISSINGDIR, 1);
} }
@ -142,8 +142,7 @@ static int gpgme_init(pmhandle_t *handle)
CHECK_ERR(); CHECK_ERR();
/* set and check engine information */ /* set and check engine information */
err = gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, NULL, err = gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, NULL, sigdir);
alpm_option_get_signaturedir(handle));
CHECK_ERR(); CHECK_ERR();
err = gpgme_get_engine_info(&enginfo); err = gpgme_get_engine_info(&enginfo);
CHECK_ERR(); CHECK_ERR();
@ -194,12 +193,17 @@ error:
} }
/** /**
* Check the PGP signature for the given file. * Check the PGP signature for the given file path.
* If base64_sig is provided, it will be used as the signature data after
* decoding. If base64_sig is NULL, expect a signature file next to path
* (e.g. "%s.sig"). The return value will be 0 if all checked signatures are
* valid, 1 if there was some sort of problem (but not necessarily rejection),
* and -1 if an error occurred while checking signatures. If 1 is returned,
* pm_errno should be checked to see why the signatures did not pass muster.
* @param handle the context handle * @param handle the context handle
* @param path the full path to a file * @param path the full path to a file
* @param base64_sig PGP signature data in base64 encoding; if NULL, expect a * @param base64_sig optional PGP signature data in base64 encoding
* signature file next to 'path' * @return a int value : 0 (valid), 1 (invalid), -1 (an error occurred)
* @return a int value : 0 (valid), 1 (invalid), -1 (an error occured)
*/ */
int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path, int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path,
const char *base64_sig) const char *base64_sig)
@ -229,7 +233,7 @@ int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path,
} }
} }
if(gpgme_init(handle)) { if(init_gpgme(handle)) {
/* pm_errno was set in gpgme_init() */ /* pm_errno was set in gpgme_init() */
return -1; return -1;
} }
@ -282,14 +286,8 @@ int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path,
CHECK_ERR(); CHECK_ERR();
result = gpgme_op_verify_result(ctx); result = gpgme_op_verify_result(ctx);
gpgsig = result->signatures; gpgsig = result->signatures;
if(!gpgsig || gpgsig->next) { if(!gpgsig) {
int count = 0; _alpm_log(handle, PM_LOG_DEBUG, "no signatures returned\n");
while(gpgsig) {
count++;
gpgsig = gpgsig->next;
}
_alpm_log(handle, PM_LOG_ERROR, _("Unexpected number of signatures (%d)\n"),
count);
ret = -1; ret = -1;
goto error; goto error;
} }
@ -298,7 +296,7 @@ int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path,
alpm_list_t *summary_list, *summary; alpm_list_t *summary_list, *summary;
_alpm_log(handle, PM_LOG_DEBUG, "fingerprint: %s\n", gpgsig->fpr); _alpm_log(handle, PM_LOG_DEBUG, "fingerprint: %s\n", gpgsig->fpr);
summary_list = gpgme_list_sigsum(gpgsig->summary); summary_list = list_sigsum(gpgsig->summary);
for(summary = summary_list; summary; summary = summary->next) { for(summary = summary_list; summary; summary = summary->next) {
_alpm_log(handle, PM_LOG_DEBUG, "summary: %s\n", (const char *)summary->data); _alpm_log(handle, PM_LOG_DEBUG, "summary: %s\n", (const char *)summary->data);
} }
@ -307,7 +305,7 @@ int _alpm_gpgme_checksig(pmhandle_t *handle, const char *path,
_alpm_log(handle, PM_LOG_DEBUG, "timestamp: %lu\n", gpgsig->timestamp); _alpm_log(handle, PM_LOG_DEBUG, "timestamp: %lu\n", gpgsig->timestamp);
_alpm_log(handle, PM_LOG_DEBUG, "exp_timestamp: %lu\n", gpgsig->exp_timestamp); _alpm_log(handle, PM_LOG_DEBUG, "exp_timestamp: %lu\n", gpgsig->exp_timestamp);
_alpm_log(handle, PM_LOG_DEBUG, "validity: %s\n", _alpm_log(handle, PM_LOG_DEBUG, "validity: %s\n",
gpgme_string_validity(gpgsig->validity)); string_validity(gpgsig->validity));
_alpm_log(handle, PM_LOG_DEBUG, "validity_reason: %s\n", _alpm_log(handle, PM_LOG_DEBUG, "validity_reason: %s\n",
gpgme_strerror(gpgsig->validity_reason)); gpgme_strerror(gpgsig->validity_reason));
_alpm_log(handle, PM_LOG_DEBUG, "pubkey algo: %s\n", _alpm_log(handle, PM_LOG_DEBUG, "pubkey algo: %s\n",
@ -385,7 +383,7 @@ pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db)
*/ */
int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg) int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg)
{ {
ASSERT(pkg != NULL, return 0); ASSERT(pkg != NULL, return -1);
pkg->handle->pm_errno = 0; pkg->handle->pm_errno = 0;
return _alpm_gpgme_checksig(pkg->handle, alpm_pkg_get_filename(pkg), return _alpm_gpgme_checksig(pkg->handle, alpm_pkg_get_filename(pkg),
@ -399,7 +397,7 @@ int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg)
*/ */
int SYMEXPORT alpm_db_check_pgp_signature(pmdb_t *db) int SYMEXPORT alpm_db_check_pgp_signature(pmdb_t *db)
{ {
ASSERT(db != NULL, return 0); ASSERT(db != NULL, return -1);
db->handle->pm_errno = 0; db->handle->pm_errno = 0;
return _alpm_gpgme_checksig(db->handle, _alpm_db_path(db), NULL); return _alpm_gpgme_checksig(db->handle, _alpm_db_path(db), NULL);