Fix bugs (base64 sanitize function, TAL URIs validations) and memleak.

+The base64 sanitize function was setting a nul char at a wrong location.
+Validate the TAL URIs syntax when they are loaded, not until they are utilized.
+Possible memleak at 'x509stack_push' when the function error'd.

diff --git a/src/cert_stack.c b/src/cert_stack.c
index deea8acf92ffc608e784cead2bc1e87556f8c008..5cedf0ad2b806afda1e77d25164a351c85b0d3d9 100644 (file)
--- a/src/cert_stack.c
+++ b/src/cert_stack.c
@@ -324,6 +324,7 @@ x509stack_push(struct cert_stack *stack, struct rpki_uri *uri, X509 *x509,
 end5:  resources_destroy(meta->resources);
 end4:  subjects_cleanup(&meta->subjects, subject_cleanup);
        serial_numbers_cleanup(&meta->serials, serial_cleanup);
+       uri_refput(meta->uri);
        free(meta);
        return error;
 }

diff --git a/src/object/tal.c b/src/object/tal.c
index 592b8cef05a927f433ea331b62ec8092b19848a2..fe834cf167b90f6de0b90ee553defd985804d92d 100644 (file)
--- a/src/object/tal.c
+++ b/src/object/tal.c
@@ -31,7 +31,7 @@
 #define TAL_FILE_EXTENSION     ".tal"
 
 struct uris {
-       char **array; /* This is an array of string pointers. */
+       struct rpki_uri **array; /* This is an array of rpki URIs. */
        unsigned int count;
        unsigned int size;
 };
@@ -64,7 +64,7 @@ uris_init(struct uris *uris)
 {
        uris->count = 0;
        uris->size = 4; /* Most TALs only define one. */
-       uris->array = malloc(uris->size * sizeof(char *));
+       uris->array = malloc(uris->size * sizeof(struct rpki_uri *));
        return (uris->array != NULL) ? 0 : -ENOMEM;
 }
 
@@ -73,24 +73,36 @@ uris_destroy(struct uris *uris)
 {
        unsigned int i;
        for (i = 0; i < uris->count; i++)
-               free(uris->array[i]);
+               uri_refput(uris->array[i]);
        free(uris->array);
 }
 
 static int
 uris_add(struct uris *uris, char *uri)
 {
-       char **tmp;
+       struct rpki_uri **tmp;
+       struct rpki_uri *new;
+       int error;
+
+       error = uri_create_mixed_str(&new, uri, strlen(uri));
+       if (error == ENOTSUPPORTED)
+               return pr_err("TAL has non-RSYNC/HTTPS URI.");
+
+       if (error)
+               return error;
 
        if (uris->count + 1 >= uris->size) {
                uris->size *= 2;
-               tmp = realloc(uris->array, uris->size * sizeof(char *));
-               if (tmp == NULL)
+               tmp = realloc(uris->array,
+                   uris->size * sizeof(struct rpki_uri *));
+               if (tmp == NULL) {
+                       uri_refput(new);
                        return pr_enomem();
+               }
                uris->array = tmp;
        }
 
-       uris->array[uris->count++] = uri;
+       uris->array[uris->count++] = new;
        return 0;
 }
 
@@ -128,11 +140,12 @@ read_uris(struct line_file *lfile, struct uris *uris)
                } while (true);
        }
 
-       error = uris_add(uris, uri);
-       if (error)
-               return error;
-
        do {
+               error = uris_add(uris, uri);
+               free(uri); /* Won't be needed anymore */
+               if (error)
+                       return error;
+
                error = lfile_read(lfile, &uri);
                if (error)
                        return error;
@@ -143,10 +156,6 @@ read_uris(struct line_file *lfile, struct uris *uris)
                        free(uri);
                        return 0; /* Happy path */
                }
-
-               error = uris_add(uris, uri);
-               if (error)
-                       return error;
        } while (true);
 }
 
@@ -255,7 +264,7 @@ base64_sanitize(struct line_file *lfile, char **out)
                }
        }
        /* Reallocate to exact size and add nul char */
-       if (offset != new_size + 1) {
+       if (offset != new_size) {
                eol = realloc(result, offset + 1);
                if (eol == NULL) {
                        error = pr_enomem();
@@ -375,22 +384,11 @@ void tal_destroy(struct tal *tal)
 int
 foreach_uri(struct tal *tal, foreach_uri_cb cb, void *arg)
 {
-       struct rpki_uri *uri;
        unsigned int i;
        int error;
 
        for (i = 0; i < tal->uris.count; i++) {
-               error = uri_create_mixed_str(&uri, tal->uris.array[i],
-                   strlen(tal->uris.array[i]));
-               if (error == ENOTSUPPORTED) {
-                       pr_info("TAL has non-RSYNC/HTTPS URI; ignoring.");
-                       continue;
-               }
-               if (error)
-                       return error;
-
-               error = cb(tal, uri, arg);
-               uri_refput(uri);
+               error = cb(tal, tal->uris.array[i], arg);
                if (error)
                        return error;
        }
@@ -401,9 +399,9 @@ foreach_uri(struct tal *tal, foreach_uri_cb cb, void *arg)
 void
 tal_shuffle_uris(struct tal *tal)
 {
-       char **array = tal->uris.array;
+       struct rpki_uri **array = tal->uris.array;
+       struct rpki_uri *tmp;
        unsigned int count = tal->uris.count;
-       char *tmp;
        long random_index;
        unsigned int i;
 

diff --git a/test/tal/lacnic.tal b/test/tal/lacnic.tal
index 62bda32d70a8cad4150a470d948d76df3f065800..86e72d45b355060f7b3b30450ee2232ecb20868a 100644 (file)
--- a/test/tal/lacnic.tal
+++ b/test/tal/lacnic.tal
@@ -1,5 +1,5 @@
 rsync://repository.lacnic.net/rpki/lacnic/rta-lacnic-rpki.cer
-http://potato
+https://potato
 rsync://potato
 
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqZEzhYK0+PtDOPfub/KR

diff --git a/test/tal_test.c b/test/tal_test.c
index b7d60d9ab798f68591417cefd231ecca9cc85025..9917f254e30a622a292706c39af14fd2d46cf33b 100644 (file)
--- a/test/tal_test.c
+++ b/test/tal_test.c
@@ -138,7 +138,7 @@ START_TEST(tal_load_normal)
        ck_assert_uint_eq(tal->uris.count, 3);
        ck_assert_str_eq(tal->uris.array[0],
            "rsync://repository.lacnic.net/rpki/lacnic/rta-lacnic-rpki.cer");
-       ck_assert_str_eq(tal->uris.array[1], "http://potato");
+       ck_assert_str_eq(tal->uris.array[1], "https://potato");
        ck_assert_str_eq(tal->uris.array[2], "rsync://potato");
 
        ck_assert_uint_eq(ARRAY_LEN(decoded), tal->spki_len);