Wednesday

Today went poorly; unforeseen RRDP quirks. Had to revert most of it.

diff --git a/src/abbreviations.txt b/src/abbreviations.txt
index effa6d8cec1de7090e3a3c0202253033684819d0..235fc1ed16e57a9dd528ee06be9832dd12899778 100644 (file)
--- a/src/abbreviations.txt
+++ b/src/abbreviations.txt
@@ -7,6 +7,7 @@ addr6: IPv6 address
 be: Big Endian
 cert: certificate
 certstack: certificate stack
+ck: check (test assertion, inherited from the unit test framework)
 db: database
 dl: download
 eof: end of file

diff --git a/src/cache/cachent.h b/src/cache/cachent.h
index 26c514e5bb042ad6b892bcd869d3baebfddf1a01..abf8da6aac3821a275efd44535b76f3f0f7ef059 100644 (file)
--- a/src/cache/cachent.h
+++ b/src/cache/cachent.h
@@ -65,8 +65,8 @@ struct cache_node {
         */
        char *tmppath;          /* path/to/cache/tmp/1234 */
 
-//     /* Only if flags & CNF_NOTIFICATION */
-//     struct cachefile_notification notif;
+       /* Only if flags & CNF_NOTIFICATION */
+       struct cachefile_notification notif;
 
        struct cache_node *parent;      /* Tree parent */
        struct cache_node *children;    /* Tree children */

diff --git a/src/cache/local_cache.c b/src/cache/local_cache.c
index 716d705caa44b612ea0fa7c0c8e3ca26fbe3825c..099a15a1368d77a3926992907d7baeabb336cfb5 100644 (file)
--- a/src/cache/local_cache.c
+++ b/src/cache/local_cache.c
@@ -685,7 +685,7 @@ cache_download_uri(struct strlist *uris, maps_dl_cb cb, void *arg)
  * that's already cached, and callbacks it.
  */
 int
-cache_download_alt(struct sia_uris *uris, maps_dl_cb cb, void *arg)
+cache_download_alt(struct sia_uris *sias, maps_dl_cb cb, void *arg)
 {
        int error;
 
@@ -695,18 +695,18 @@ cache_download_alt(struct sia_uris *uris, maps_dl_cb cb, void *arg)
        /* Online attempts */
        // XXX review result signs
        // XXX normalize rpkiNotify & caRepository?
-       error = try_uri(uris->rpkiNotify, cache.https, dl_rrdp, cb, arg);
+       error = try_uri(sias->rpkiNotify, cache.https, dl_rrdp, cb, arg);
        if (error <= 0)
                return error;
-       error = try_uri(uris->caRepository, cache.rsync, dl_rsync, cb, arg);
+       error = try_uri(sias->caRepository, cache.rsync, dl_rsync, cb, arg);
        if (error <= 0)
                return error;
 
        /* Offline attempts */
-       error = try_uri(uris->rpkiNotify, cache.https, NULL, cb, arg);
+       error = try_uri(sias->rpkiNotify, cache.https, NULL, cb, arg);
        if (error <= 0)
                return error;
-       return try_uri(uris->caRepository, cache.rsync, NULL, cb, arg);
+       return try_uri(sias->caRepository, cache.rsync, NULL, cb, arg);
 }
 
 void

diff --git a/src/rrdp.c b/src/rrdp.c
index 3983176c0771e23e4a2fda973adc924e2a814167..32c7179780df5ba9dee3016f7f098d868f188310 100644 (file)
--- a/src/rrdp.c
+++ b/src/rrdp.c
@@ -557,6 +557,9 @@ handle_publish(xmlTextReaderPtr reader, struct cache_node *rpp)
        if (error)
                return error;
 
+       // XXX 1st argument is a bit hairy.
+       // Also, not going to pass URL validation.
+       // Also, children need to inherit temporal directory.
        node = cachent_provide(rpp, tag->meta.uri);
        if (!node) {
                error = pr_val_err("Malicious RRDP: <publish> is attempting to create file '%s' outside of its publication point '%s'.",
@@ -573,7 +576,7 @@ handle_publish(xmlTextReaderPtr reader, struct cache_node *rpp)
                        goto end;
                }
 
-               error = validate_hash(&tag->meta, cachent_path(node));
+               error = validate_hash(&tag->meta, node->path);
                if (error)
                        goto end;
 
@@ -584,7 +587,7 @@ handle_publish(xmlTextReaderPtr reader, struct cache_node *rpp)
                goto end;
        }
 
-       error = write_file(node->tmpdir, tag.content, tag.content_len);
+       error = write_file(node->tmppath, tag.content, tag.content_len);
 
 end:   metadata_cleanup(&tag.meta);
        free(tag.content);
@@ -782,9 +785,9 @@ parse_notification(struct cache_node *notif, struct update_notification *result)
 }
 
 static int
-xml_read_snapshot(xmlTextReaderPtr reader, void *_args)
+xml_read_snapshot(xmlTextReaderPtr reader, void *arg)
 {
-       struct parser_args *args = _args;
+       struct parser_args *args = arg;
        xmlReaderTypes type;
        xmlChar const *name;
        int error;
@@ -885,8 +888,9 @@ end1:       fnstack_pop();
 }
 
 static int
-xml_read_delta(xmlTextReaderPtr reader, void *session)
+xml_read_delta(xmlTextReaderPtr reader, void *arg)
 {
+       struct parser_args *args = arg;
        xmlReaderTypes type;
        xmlChar const *name;
        int error;
@@ -896,11 +900,11 @@ xml_read_delta(xmlTextReaderPtr reader, void *session)
        switch (type) {
        case XML_READER_TYPE_ELEMENT:
                if (xmlStrEqual(name, BAD_CAST RRDP_ELEM_PUBLISH))
-                       error = handle_publish(reader);
+                       error = handle_publish(reader, args->rpp);
                else if (xmlStrEqual(name, BAD_CAST RRDP_ELEM_WITHDRAW))
-                       error = handle_withdraw(reader);
+                       error = handle_withdraw(reader, args->rpp);
                else if (xmlStrEqual(name, BAD_CAST RRDP_ELEM_DELTA))
-                       error = validate_session(reader, session);
+                       error = validate_session(reader, args->session);
                else
                        return pr_val_err("Unexpected '%s' element", name);
                if (error)
@@ -915,8 +919,9 @@ xml_read_delta(xmlTextReaderPtr reader, void *session)
 
 static int
 parse_delta(struct update_notification *notif, struct notification_delta *delta,
-    char const *path)
+    char const *path, struct cache_node *node)
 {
+       struct parser_args args;
        struct rrdp_session session;
        int error;
 
@@ -926,12 +931,15 @@ parse_delta(struct update_notification *notif, struct notification_delta *delta,
 
        session.session_id = notif->session.session_id;
        session.serial = delta->serial;
+       args.session = &session;
+       args.rpp = node;
 
-       return relax_ng_parse(path, xml_read_delta, &session);
+       return relax_ng_parse(path, xml_read_delta, &args);
 }
 
 static int
-handle_delta(struct update_notification *notif, struct notification_delta *delta)
+handle_delta(struct update_notification *notif,
+    struct notification_delta *delta, struct cache_node *node)
 {
        char const *url = delta->meta.uri;
        char *path;
@@ -943,7 +951,7 @@ handle_delta(struct update_notification *notif, struct notification_delta *delta
        error = http_download_tmp(url, &path, NULL, NULL);
        if (error)
                goto end;
-       error = parse_delta(notif, delta, path);
+       error = parse_delta(notif, delta, path, node);
        delete_file(path);
 
        free(path);
@@ -952,8 +960,10 @@ end:       fnstack_pop();
 }
 
 static int
-handle_deltas(struct update_notification *notif, struct rrdp_serial *serial)
+handle_deltas(struct update_notification *notif, struct cache_node *node)
 {
+       struct rrdp_serial *old;
+       struct rrdp_serial *new;
        BIGNUM *diff_bn;
        BN_ULONG diff;
        array_index d;
@@ -964,28 +974,30 @@ handle_deltas(struct update_notification *notif, struct rrdp_serial *serial)
                return -ENOENT;
        }
 
-       pr_val_debug("Handling RRDP delta serials %s-%s.", serial->str,
-           notif->session.serial.str);
+       old = &node->notif->session.serial;
+       new = &notif->session.serial;
+
+       pr_val_debug("Handling RRDP delta serials %s-%s.", old->str, new->str);
 
        diff_bn = BN_create();
-       if (!BN_sub(diff_bn, notif->session.serial.num, serial->num)) {
+       if (!BN_sub(diff_bn, new->num, old->num)) {
                BN_free(diff_bn);
                return pr_val_err("Could not subtract %s - %s; unknown cause.",
-                   notif->session.serial.str, serial->str);
+                   new->str, old->str);
        }
        if (BN_is_negative(diff_bn)) {
                BN_free(diff_bn);
                return pr_val_err("Cached delta's serial [%s] is larger than Notification's current serial [%s].",
-                   serial->str, notif->session.serial.str);
+                  old->str, new->str);
        }
        diff = BN_get_word(diff_bn);
        BN_free(diff_bn);
        if (diff > config_get_rrdp_delta_threshold() || diff > notif->deltas.len)
                return pr_val_err("Cached RPP is too old. (Cached serial: %s; current serial: %s)",
-                   serial->str, notif->session.serial.str);
+                   old->str, new->str);
 
        for (d = notif->deltas.len - diff; d < notif->deltas.len; d++) {
-               error = handle_delta(notif, &notif->deltas.array[d]);
+               error = handle_delta(notif, &notif->deltas.array[d], node);
                if (error)
                        return error;
        }
@@ -1177,7 +1189,7 @@ rrdp_update(struct cache_node *notif)
                error = validate_session_desync(old, &new);
                if (error)
                        goto snapshot_fallback;
-               error = handle_deltas(&new, &old->session.serial);
+               error = handle_deltas(&new, notif);
                if (error)
                        goto snapshot_fallback;
                error = update_notif(old, &new);