Add ability to drop overly large packets

[onak.git] / gpgwww.c

diff --git a/gpgwww.c b/gpgwww.c
index 7d90a00332f585fc4be843af4ea73bfcb83f02ea..ae634e9c0f7f8ca6dfd0e202e8e7fe161152de39 100644 (file)
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -1,9 +1,19 @@
 /*
  * gpgwww.c - www interface to path finder.
- * 
- * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2001-2002 Project Purple.
+ * Copyright 2001-2004 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <inttypes.h>
@@ -14,7 +24,6 @@
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleanup.h"
-#include "config.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
@@ -23,6 +32,7 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "stats.h"
+#include "version.h"
 
 #define OP_UNKNOWN 0
 #define OP_GET     1
@@ -51,24 +61,24 @@ int parsecgistuff(char **cgiparams, uint64_t *from, uint64_t *to)
        return op;
 }
 
-int getkeyspath(uint64_t have, uint64_t want, int count)
+int getkeyspath(struct onak_dbctx *dbctx,
+               uint64_t have, uint64_t want, int count)
 {
        struct openpgp_publickey *publickey = NULL;
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;
        struct stats_key *keyinfoa, *keyinfob, *curkey;
        uint64_t fullhave, fullwant;
-       int rec;
        int pathlen = 0;
 
-       fullhave = config.dbbackend->getfullkeyid(have);
-       fullwant = config.dbbackend->getfullkeyid(want);
+       fullhave = dbctx->getfullkeyid(dbctx, have);
+       fullwant = dbctx->getfullkeyid(dbctx, want);
 
        /*
         * Make sure the keys we have and want are in the cache.
         */
-       config.dbbackend->cached_getkeysigs(fullhave);
-       config.dbbackend->cached_getkeysigs(fullwant);
+       dbctx->cached_getkeysigs(dbctx, fullhave);
+       dbctx->cached_getkeysigs(dbctx, fullwant);
 
        if ((keyinfoa = findinhash(fullhave)) == NULL) {
                return 1;
@@ -82,7 +92,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
                 * Fill the tree info up.
                 */
                initcolour(true);
-               rec = findpath(keyinfoa, keyinfob);
+               findpath(dbctx, keyinfoa, keyinfob);
                keyinfob->parent = 0;
                if (keyinfoa->colour == 0) {
                        pathlen = count;
@@ -94,7 +104,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
                        curkey = findinhash(keyinfoa->parent);
                        while (curkey != NULL && curkey->keyid != 0) {
                                if (curkey->keyid != fullwant &&
-                                               config.dbbackend->fetch_key(
+                                               dbctx->fetch_key_id(dbctx,
                                                curkey->keyid,
                                                &publickey, false)) {
                                        flatten_publickey(publickey,
@@ -115,7 +125,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
        /*
         * Add the destination key to the list of returned keys.
         */
-       if (config.dbbackend->fetch_key(fullwant, &publickey, false)) {
+       if (dbctx->fetch_key_id(dbctx, fullwant, &publickey, false)) {
                flatten_publickey(publickey,
                                &packets,
                                &list_end);
@@ -135,6 +145,7 @@ int main(int argc, char *argv[])
        char     **cgiparams = NULL;    /* Our CGI parameter block */
        uint64_t   from = 0, to = 0;
        int        op = OP_UNKNOWN;
+       struct onak_dbctx *dbctx;
 
        cgiparams = getcgivars(argc, argv);
 
@@ -171,7 +182,7 @@ int main(int argc, char *argv[])
        readconfig(NULL);
        initlogthing("gpgwww", config.logfile);
        catchsignals();
-       config.dbbackend->initdb(true);
+       dbctx = config.dbinit(config.backend, true);
        inithash();
        logthing(LOGTHING_NOTICE, "Looking for path from 0x%016" PRIX64
                        " to 0x%016"
@@ -179,20 +190,18 @@ int main(int argc, char *argv[])
                        from,
                        to);
        if (op == OP_GET) {
-               getkeyspath(from, to, 3);
+               getkeyspath(dbctx, from, to, 3);
        } else {
-               dofindpath(from, to, true, 3);
+               dofindpath(dbctx, from, to, true, 3);
        }
        destroyhash();
-       config.dbbackend->cleanupdb();
+       dbctx->cleanupdb(dbctx);
        cleanuplogthing();
        cleanupconfig();
 
        if (op != OP_GET) {
                puts("<HR>");
-               puts("Produced by gpgwww " PACKAGE_VERSION ", part of onak. "
-                       "<A HREF=\"mailto:noodles-onak@earth.li\">"
-                       "Jonathan McDowell</A>");
+               puts("Produced by gpgwww " ONAK_VERSION ", part of onak. ");
                end_html();
        }