Change to using void * for character function content parameter
We were passing unsigned char * as the parameter to all of the
character fetching/putting functions. Use void * instead so that
we can pass other types of data without needlessly having to cast.
Output details of key search after retrieval for pks/lookup
Rather than logging what we're searching for beforehand, and then
indicating failure after (but not success), just output the results
and search details after retrieval.
Hopefully this will enabled compilation on GNU/Hurd. PATH_MAX is not
entirely removed, but now only used for array definitions and
conditionally defined if not already defined. Moving the static defs
to dynamic allocations is future work, but this provides a start.
Use generic db dependencies rather than 4.8 versioned ones
Rather than depending on libdb4.8-dev and db4.8-util depend on
libdb-dev and db-util, allowing easy binary only rebuilds in the
event of new db4 releases.
The regular keydb functions for talking to keyd work fine for key
related operations, but there are extra things we want to do with
keyd (such as checking its status or asking it to cleanly exit) that
there's no way to do at present. Add keydctl to provide a way to
access these additional features.
catchsignals() normally catches SIGPIPE and sets the cleanup flag,
as per the other signals it catches. This is fine for the HKP CGI,
but not appropriate for keyd (as it's probably because the client
has exited without doing appropriate cleanup). Ignore it; we'll
deal with the error when we try to read/write to the socket.
Output KEYD_REPLY_OK response for close/quite commands as well
as data size for version/longkeyid commands. Means that commands
can always expect to get an OK response if they've been understood
and a size if they're going to result in some more data.
While cross machine compatibility is not currently an aim for keyd
we should specify the word size for commands to help down the line
if we decide to do this.
Configure db4 locks according to maxkeys and actually check maxkeys
The number of db4 objects iin use is related to the maximum number of
keys we return at once. Configure the locking subsystem accordingly
and limit the number of returned keys to maxkeys.
Significantly improves the reliability of the db4 backend on a large
busy server.
Add use_keyd config file option to select keyd as the backend
We want to be able to use a common config file across the various
tools, so add a config variable to indicate that we're using keyd.
This allows keyd to override the option and then get the configured
backend, while everything else knows to use keyd.
Only seed database for Debian install if we're using default config
If the user changes the config away from DB4 or the default DB
directory and deletes the old directory we'll think they don't
have an initialised key database and try to seed it with my key.
Check the config file and if it doesn't match what we expect
assume the user has configured appropriately and don't seed the DB.
Actually close the socket in keyd/the keyd backend
We were calling shutdown() on the socket, but this isn't sufficient -
we need to call close() as well. Otherwise we end up leaking sockets
and eventually keyd can no longer service requests.
We were defining a custom compile rule for the keydb .c -> .o stage,
which left out the CFLAGS. We don't need this; the custom bit is at
link time so we pick up the right libs.
libdb4.7 isn't in stable (lenny) and libdb4.8 is in testing (squeeze)
and sid, so given that we can do the auto upgrade no reason not to
bump to use the latest. Tested with 20000+ invocations of "onak index"
to try to confirm no repeat of the read-only-open problem hit with 4.6.
We didn't specify the version in the README, though it was correct in
debian/copyright. Add the version to the README and point to the
versioned file in debian/copyright rather than the symlink to the
current version.
Change PostgreSQL backend to use PQescapeStringConn
While the PostgreSQL backend is not known to be in use anywhere we were
using an older escaping function (PQescapeString) which does not have
knowledge of the connection character encoding and so has potential
problems. Switch to using PQescapeStringConn, which does have this
knowledge.
Don't add a key to the stats hash if it doesn't have any sigs
We always added a key to the stats hash if we tried to find its sigs,
even if it didn't exist. So if it doesn't have any sigs (either because
it doesn't exist or it's just a non linked in key), don't add it.
Closes Debian bug #542187.
Correct formatting of some places we output a keyid
Format keyids in various places to be 16 digits long, zero padded
if necessary. Closes Debian bug #540196 (which has a patch from
Philippe Teuwen, but that uses 8 digits instead of 16).
db4.6 (on Debian at least) seems to throw a fit after a number of
read-only opens. db4.7 (and 4.5) don't seem to suffer from this.
Closes Debian bug #520117
Ensure DB4 backend dbconns memory is initialised to zero
Change to using calloc to allocate the memory for the dbconns array,
as this will ensure that all the pointers in it are NULL which
prevents us segfaulting on abnormal cleanup. Fixes the segfault from
Debian bug #520117 but not the underlying issue.
We were using the void * ctx argument as the file descriptor. Find for
32 bit, but on 64 bit we're truncating. No reason not to just pass the
pointer to the fd, so do so.
Add initial support for upgrading db4 DBs built with older DB4 versions
DB4 data base files are tied to the version of DB4 that created them.
It'd be nice to be able to compile with a more recent version of db4
than db4.2, which is currently used for the Debian packages. However
we don't want to have dump and reload the database, so this adds a
first cut at trying to use the DB4 provided upgrade functions.
We sometimes see critical subpackets for signature UIDs and and Policy
URIs. While we should probably display such things in indexes in the
future this isn't critical enough for us to log the packets as an error.
We would always show the first photo ID on a key when displaying it
in /pks/lookup. Fix this so we show them all correctly. Patch from
Philippe Teuwen as reporting in Debian bug #467020
We don't want to add keys when there are no keys in the previous list,
we want to only add new keys on the first pass. Otherwise if we end up
with an empty list we'll start again as if none of the previous words
where specified.
Apparently PGP Desktop doesn't like our "Storing %d keys." success
message when storing keys received via HKP. Change our output to match
what the pgp.com and SKS keyservers return. Patch from Timothy Legge.
Fix up dynamic loading; we export a structure of functions now from
each of the backends, which means we can maintain unique namespaces.
This should allow further cleanups/cunningness, but hopefully this is
enough to get us operating correctly across all platforms to start with.
Fix config structure references for dynamic backends
This patch fixes the config structure when dynamic backends are
used - the basic issue is that when the backend was loaded, it wouldn't
(neccessarily) share the config structure with the program that called
it (and had therefore read the config). Thanks to Brett Parker.
Fixup config file for Debian package upgrades
We now need to configure a suitable DB backend and are also using the
mail_dir setting, so we need to add/fix these in onak.conf for package
upgrades.
projects / onak.git / log