Add support for displaying EC/ECDSA key types

[onak.git] / keydb_hkp.c

diff --git a/keydb_hkp.c b/keydb_hkp.c
index f1dfe4477786b83b087359533d5e95457b6b5532..ac1edace24617127c6cd6375c7241f493044e025 100644 (file)
--- a/keydb_hkp.c
+++ b/keydb_hkp.c
@@ -31,18 +31,63 @@
 #include "mem.h"
 #include "onak-conf.h"
 #include "parsekey.h"
+#include "version.h"
 
 static CURL *curl = NULL;
 
-/**
- *     initdb - Initialize the key database.
- *
- *     We initialize CURL here.
- */
-static void hkp_initdb(bool readonly)
+static char hkpbase[1024];
+
+static int hkp_parse_url(const char *url)
 {
-       curl_global_init(CURL_GLOBAL_DEFAULT);
-       curl = curl_easy_init();
+       char proto[6], host[256];
+       unsigned int port;
+       int matched;
+       int ret = 1;
+
+       proto[0] = host[0] = 0;
+       port = 0;
+
+       matched = sscanf(url, "%5[a-z]://%256[a-zA-Z0-9.]:%u", proto, host,
+                       &port);
+       if (matched < 2) {
+               proto[0] = 0;
+               matched = sscanf(url, "%256[a-zA-Z0-9.]:%u", host, &port);
+       }
+
+       if (host[0] == 0) {
+               logthing(LOGTHING_CRITICAL, "Couldn't parse HKP host: %s",
+                       url);
+               ret = 0;
+               goto out;
+       }
+
+       if (proto[0] == 0 || !strcmp(proto, "hkp")) {
+               if (port == 0) {
+                       port = 11371;
+               }
+               snprintf(hkpbase, sizeof(hkpbase),
+                       "http://%s:%u/pks", host, port);
+       } else if (!strcmp(proto, "hkps")) {
+               if (port == 0) {
+                       port = 11372;
+               }
+               snprintf(hkpbase, sizeof(hkpbase),
+                       "https://%s:%u/pks", host, port);
+       } else if (strcmp(proto, "http") && strcmp(proto, "https")) {
+               logthing(LOGTHING_CRITICAL, "Unknown HKP protocol: %s",
+                       proto);
+               ret = 0;
+               goto out;
+       } else if (port == 0) {
+               snprintf(hkpbase, sizeof(hkpbase),
+                       "%s://%s/pks", proto, host);
+       } else {
+               snprintf(hkpbase, sizeof(hkpbase),
+                       "%s://%s:%u/pks", proto, host, port);
+       }
+
+out:
+       return ret;
 }
 
 /**
@@ -59,6 +104,38 @@ static void hkp_cleanupdb(void)
        curl_global_cleanup();
 }
 
+/**
+ *     initdb - Initialize the key database.
+ *
+ *     We initialize CURL here.
+ */
+static void hkp_initdb(bool readonly)
+{
+       curl_version_info_data *curl_info;
+
+       if (!hkp_parse_url(config.db_dir)) {
+               exit(EXIT_FAILURE);
+       }
+       curl_global_init(CURL_GLOBAL_DEFAULT);
+       curl = curl_easy_init();
+       if (curl == NULL) {
+               logthing(LOGTHING_CRITICAL, "Could not initialize CURL.");
+               exit(EXIT_FAILURE);
+       }
+       curl_easy_setopt(curl, CURLOPT_USERAGENT, "onak/" ONAK_VERSION);
+
+       if (strncmp(hkpbase, "https://", 8) == 0) {
+               curl_info = curl_version_info(CURLVERSION_NOW);
+               if (! (curl_info->features & CURL_VERSION_SSL)) {
+                       logthing(LOGTHING_CRITICAL,
+                               "CURL lacks SSL support; cannot use HKP url: %s",
+                               hkpbase);
+                       hkp_cleanupdb();
+                       exit(EXIT_FAILURE);
+               }
+       }
+}
+
 /**
  *     Receive data from a CURL request and process it into a buffer context.
  */
@@ -95,8 +172,8 @@ static int hkp_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        buf.buffer = malloc(8192);
 
        snprintf(keyurl, sizeof(keyurl),
-                       "http://%s:11371/pks/lookup?op=get&search=0x%08" PRIX64,
-                       config.db_dir, keyid);
+                       "%s/lookup?op=get&search=0x%08" PRIX64,
+                       hkpbase, keyid);
 
        curl_easy_setopt(curl, CURLOPT_URL, keyurl);
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
@@ -146,8 +223,8 @@ static int hkp_fetch_key_text(const char *search,
        buf.buffer = malloc(8192);
 
        snprintf(keyurl, sizeof(keyurl),
-                       "http://%s:11371/pks/lookup?op=get&search=%s",
-                       config.db_dir, search);
+                       "%s/lookup?op=get&search=%s",
+                       hkpbase, search);
 
        curl_easy_setopt(curl, CURLOPT_URL, keyurl);
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
@@ -200,9 +277,7 @@ static int hkp_store_key(struct openpgp_publickey *publickey, bool intrans,
        addform = curl_easy_escape(curl, buf.buffer, buf.offset);
        addform[7] = '=';
 
-       snprintf(keyurl, sizeof(keyurl),
-                       "http://%s:11371/pks/add",
-                       config.db_dir);
+       snprintf(keyurl, sizeof(keyurl), "%s/add", hkpbase);
 
        curl_easy_setopt(curl, CURLOPT_URL, keyurl);
        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, addform);