irmd: Add flow authentication

This adds initial implementation of peer authentication as part of
flow allocation. If credentials are not provided, this will be
accepted and logged as info that the flow is not authenticated.

Certificates and keys are passed as .pem files. The key file should
not be encrypted, else the IRMd will open a prompt for the password.
The default location for these .pem files is in
/etc/ouroboros/security. It is strongly recommended to make this
directory only accessible to root.

├── security
│   ├── cacert
│   │   └── ca.root.o7s.crt.pem
│   ├── client
│   │   ├── <name>
│   │   |   ├── crt.pem
│   │   |   └── key.pem
│   │   └── <name>
|   |       ├──...
|   |
│   ├── server
│   │   ├── <name>
│   │   |   ├── crt.pem
│   │   |   └── key.pem
│   │   └── <name>
|   |       ├── ...
|   |
│   └── untrusted
│       └── sign.root.o7s.crt.pem

Trusted root CA certificates go in the /cacert directory, untrusted
certificates for signature verification go in the /untrusted
directory. The IRMd will load these certificates at boot.  The IRMd
will look for certificates in the /client and /server directories. For
each name a subdirectory can be added and the credentials in that
directory are used to sign the OAP header for flows at flow_alloc() on
the client side and flow_accept() on the server side.

These defaults can be changed at build time using the following
variables (in alphabetical order):
 OUROBOROS_CA_CRT_DIR             /etc/ouroboros/security/cacert
 OUROBOROS_CLI_CRT_DIR            /etc/ouroboros/security/client
 OUROBOROS_SECURITY_DIR           /etc/ouroboros/security
 OUROBOROS_SRV_CRT_DIR            /etc/ouroboros/security/server
 OUROBOROS_UNTRUSTED_DIR          /etc/ouroboros/security/untrusted

The directories for the names can also be configured at IRMd boot
using the configuraton file and at runtime when a name is created
using the "irm name create" CLI tool. The user needs to have
permissions to access the keyfile and certificate when specifying the
paths with the "irm name create" CLI tool.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>

7 files changed, 166 insertions, 101 deletions

diff --git a/src/irmd/reg/flow.h b/src/irmd/reg/flow.h
index b0f0c51c..aba0d7a4 100644
--- a/src/irmd/reg/flow.h
+++ b/src/irmd/reg/flow.h
@@ -25,6 +25,7 @@
 
 #include <ouroboros/list.h>
 #include <ouroboros/flow.h>
+#include <ouroboros/name.h>
 #include <ouroboros/pthread.h>
 #include <ouroboros/qos.h>
 #include <ouroboros/shm_rbuff.h>
@@ -41,6 +42,8 @@ struct reg_flow {
         buffer_t           data;
         struct timespec    t0;
 
+        char               name[NAME_SIZE + 1];
+
         struct shm_rbuff * n_rb;
         struct shm_rbuff * n_1_rb;
 };
diff --git a/src/irmd/reg/name.c b/src/irmd/reg/name.c
index 1ac939a5..4e609711 100644
--- a/src/irmd/reg/name.c
+++ b/src/irmd/reg/name.c
@@ -66,15 +66,14 @@ struct reg_name * reg_name_create(const struct name_info * info)
                 goto fail_malloc;
         }
 
+        memset(name, 0, sizeof(*name));
+
         list_head_init(&name->next);
-        list_head_init(&name->progs);
-        list_head_init(&name->procs);
-        list_head_init(&name->active);
+        list_head_init(&name->progs.list);
+        list_head_init(&name->procs.list);
+        list_head_init(&name->active.list);
 
-        name->info     = *info;
-        name->n_progs  = 0;
-        name->n_procs  = 0;
-        name->n_active = 0;
+        name->info = *info;
 
         return name;
 
@@ -88,13 +87,13 @@ void reg_name_destroy(struct reg_name * name)
 
         assert(list_is_empty(&name->next));
 
-        assert(name->n_progs == 0);
-        assert(name->n_procs == 0);
-        assert(name->n_active == 0);
+        assert(name->progs.len == 0);
+        assert(name->procs.len == 0);
+        assert(name->active.len == 0);
 
-        assert(list_is_empty(&name->progs));
-        assert(list_is_empty(&name->procs));
-        assert(list_is_empty(&name->active));
+        assert(list_is_empty(&name->progs.list));
+        assert(list_is_empty(&name->procs.list));
+        assert(list_is_empty(&name->active.list));
 
         free(name);
 }
@@ -107,7 +106,7 @@ static struct proc_entry * __reg_name_get_active(const struct reg_name * name,
         assert(name != NULL);
         assert(pid > 0);
 
-        list_for_each(p, &name->active) {
+        list_for_each(p, &name->active.list) {
                 struct proc_entry * entry;
                 entry = list_entry(p, struct proc_entry, next);
                 if (entry->pid == pid)
@@ -123,13 +122,13 @@ static void __reg_name_del_all_active(struct reg_name * name,
         struct list_head * p;
         struct list_head * h;
 
-        list_for_each_safe(p, h, &name->active) {
+        list_for_each_safe(p, h, &name->active.list) {
                 struct proc_entry * entry;
                 entry = list_entry(p, struct proc_entry, next);
                 if (entry->pid == pid) {
                         list_del(&entry->next);
                         free(entry);
-                        name->n_active--;
+                        --name->active.len;
                 }
         }
 }
@@ -142,7 +141,7 @@ static struct proc_entry * __reg_name_get_proc(const struct reg_name * name,
         assert(name != NULL);
         assert(pid > 0);
 
-        list_for_each(p, &name->procs) {
+        list_for_each(p, &name->procs.list) {
                 struct proc_entry * entry;
                 entry = list_entry(p, struct proc_entry, next);
                 if (entry->pid == pid)
@@ -160,7 +159,7 @@ static struct prog_entry * __reg_name_get_prog(const struct reg_name * name,
         assert(name != NULL);
         assert(prog != NULL);
 
-        list_for_each(p, &name->progs) {
+        list_for_each(p, &name->progs.list) {
                 struct prog_entry * entry;
                 entry = list_entry(p, struct prog_entry, next);
                 if (strcmp(entry->exec[0], prog) == 0)
@@ -195,16 +194,16 @@ int reg_name_add_active(struct reg_name * name,
 
         switch (name->info.pol_lb) {
         case LB_RR:    /* Round robin policy. */
-                list_add_tail(&entry->next, &name->active);
+                list_add_tail(&entry->next, &name->active.list);
                 break;
         case LB_SPILL: /* Keep accepting flows on the current process */
-                list_add(&entry->next, &name->active);
+                list_add(&entry->next, &name->active.list);
                 break;
         default:
                 goto fail_unreachable;
         }
 
-        name->n_active++;
+        ++name->active.len;
 
         return 0;
 
@@ -226,19 +225,23 @@ void reg_name_del_active(struct reg_name * name,
 
         list_del(&entry->next);
 
-        name->n_active--;
+        --name->active.len;
 
         free(entry);
 }
 
 pid_t reg_name_get_active(struct reg_name * name)
 {
+        struct proc_entry * e;
+
         assert(name != NULL);
 
-        if (list_is_empty(&name->active))
+        if (list_is_empty(&name->active.list))
                 return -1;
 
-        return list_first_entry(&name->active, struct proc_entry, next)->pid;
+        e = list_first_entry(&name->active.list, struct proc_entry, next);
+
+        return e->pid;
 }
 
 int reg_name_add_proc(struct reg_name * name,
@@ -259,9 +262,9 @@ int reg_name_add_proc(struct reg_name * name,
 
         entry->pid = pid;
 
-        list_add(&entry->next, &name->procs);
+        list_add(&entry->next, &name->procs.list);
 
-        name->n_procs++;
+        ++name->procs.len;
 
         return 0;
 
@@ -287,7 +290,7 @@ void reg_name_del_proc(struct reg_name * name,
 
         free(entry);
 
-        name->n_procs--;
+        --name->procs.len;
 
         assert(__reg_name_get_proc(name, pid) == NULL);
 }
@@ -296,8 +299,7 @@ bool reg_name_has_proc(const struct reg_name * name,
                        pid_t                   pid)
 {
         return __reg_name_get_proc(name, pid) != NULL;
-}                char ** exec;
-
+}
 
 int reg_name_add_prog(struct reg_name * name,
                       char **           exec)
@@ -322,11 +324,11 @@ int reg_name_add_prog(struct reg_name * name,
                 goto fail_exec;
         }
 
-        list_add(&entry->next, &name->progs);
+        list_add(&entry->next, &name->progs.list);
 
         log_dbg("Add prog %s to name %s.", exec[0], name->info.name);
 
-        name->n_progs++;
+        ++name->progs.len;
 
         return 0;
 
@@ -352,7 +354,7 @@ void reg_name_del_prog(struct reg_name * name,
 
         __free_prog_entry(entry);
 
-        name->n_progs--;
+        --name->progs.len;
 
         assert(__reg_name_get_prog(name, prog) == NULL);
 }
@@ -368,8 +370,12 @@ bool reg_name_has_prog(const struct reg_name * name,
 
 char ** reg_name_get_exec(const struct reg_name * name)
 {
-        if (list_is_empty(&name->progs))
+        struct prog_entry * e;
+
+        if (list_is_empty(&name->progs.list))
                 return NULL;
 
-        return list_first_entry(&name->progs, struct prog_entry, next)->exec;
+        e = list_first_entry(&name->progs.list, struct prog_entry, next);
+
+        return e->exec;
 }
diff --git a/src/irmd/reg/name.h b/src/irmd/reg/name.h
index 97ca7f04..30a64e1c 100644
--- a/src/irmd/reg/name.h
+++ b/src/irmd/reg/name.h
@@ -33,14 +33,25 @@ struct reg_name {
 
         struct name_info info;
 
-        struct list_head progs;    /* autostart programs for this name  */
-        size_t           n_progs;  /* number of programs                */
-
-        struct list_head procs;    /* processes bound to this name      */
-        size_t           n_procs;  /* number of processes               */
-
-        struct list_head active;   /* processes actively calling accept */
-        size_t           n_active; /* number of processes accepting     */
+        struct {
+                void * key;
+                void * crt;
+        } cache;
+
+        struct {
+                struct list_head list;
+                size_t           len;
+        } progs;  /* autostart programs for this name  */
+
+        struct {
+                struct list_head list;
+                size_t           len;
+        } procs;  /* processes bound to this name      */
+
+        struct {
+                struct list_head list;
+                size_t           len;
+        } active; /* processes actively calling accept */
 };
 
 struct reg_name * reg_name_create(const struct name_info * info);
@@ -74,5 +85,4 @@ pid_t             reg_name_get_active(struct reg_name * name);
 
 void              reg_name_del_active(struct reg_name * name,
                                       pid_t             proc);
-
 #endif /* OUROBOROS_IRMD_REG_NAME_H */
diff --git a/src/irmd/reg/reg.c b/src/irmd/reg/reg.c
index 8d1fa8cf..0d4c6f24 100644
--- a/src/irmd/reg/reg.c
+++ b/src/irmd/reg/reg.c
@@ -28,6 +28,7 @@ The IPC Resource Manager - Registry
 #include <ouroboros/errno.h>
 #include <ouroboros/list.h>
 #include <ouroboros/logs.h>
+#include <ouroboros/protobuf.h>
 #include <ouroboros/pthread.h>
 
 #include "reg.h"
@@ -46,6 +47,7 @@ The IPC Resource Manager - Registry
 
 struct {
         struct bmp *         flow_ids;  /* flow_ids for flows         */
+
         struct list_head     flows;     /* flow information           */
         size_t               n_flows;   /* number of flows            */
 
@@ -196,6 +198,10 @@ static int __reg_get_pending_flow_id(const char * name)
         struct reg_flow * flow;
         pid_t             pid;
 
+        assert(name != NULL);
+        assert(strlen(name) > 0);
+        assert(strlen(name) < NAME_SIZE + 1);
+
         entry =__reg_get_name(name);
         if (entry == NULL)
                 return -ENAME;
@@ -205,7 +211,10 @@ static int __reg_get_pending_flow_id(const char * name)
                 return -EAGAIN;
 
         flow = __reg_get_accept_flow(pid);
-        assert(flow != NULL);
+        if (flow == NULL) /* compiler barks, this can't be NULL */
+                return -EAGAIN;
+
+        strcpy(flow->name, name);
 
         return flow->info.id;
 }
@@ -580,6 +589,14 @@ void reg_clear(void)
                 reg.n_procs--;
         }
 
+        list_for_each_safe(p, h, &reg.flows) {
+                struct reg_flow * entry;
+                entry = list_entry(p, struct reg_flow, next);
+                list_del(&entry->next);
+                reg_flow_destroy(entry);
+                reg.n_flows--;
+        }
+
         list_for_each_safe(p, h, &reg.names) {
                 struct reg_name * entry;
                 entry = list_entry(p, struct reg_name, next);
@@ -596,14 +613,6 @@ void reg_clear(void)
                 reg.n_ipcps--;
         }
 
-        list_for_each_safe(p, h, &reg.flows) {
-                struct reg_flow * entry;
-                entry = list_entry(p, struct reg_flow, next);
-                list_del(&entry->next);
-                reg_flow_destroy(entry);
-                reg.n_flows--;
-        }
-
         pthread_mutex_unlock(&reg.mtx);
 }
 
@@ -950,6 +959,34 @@ bool reg_has_name(const char * name)
         return ret;
 }
 
+int reg_get_name_info(const char *       name,
+                      struct name_info * info)
+{
+        struct reg_name * n;
+
+        assert(name != NULL);
+        assert(info != NULL);
+
+        pthread_mutex_lock(&reg.mtx);
+
+        n = __reg_get_name(name);
+        if (n == NULL) {
+                log_err("Name %s does not exist.", name);
+                goto no_name;
+        }
+
+        *info = n->info;
+
+        pthread_mutex_unlock(&reg.mtx);
+
+        return 0;
+
+ no_name:
+        pthread_mutex_unlock(&reg.mtx);
+        return -ENOENT;
+
+}
+
 int reg_get_name_for_hash(char *          buf,
                           enum hash_algo  algo,
                           const uint8_t * hash)
@@ -986,29 +1023,20 @@ int reg_get_name_for_hash(char *          buf,
         return name == NULL ? -ENOENT : 0;
 }
 
-
-static int __get_name_info(name_info_msg_t ** msg,
-                           struct reg_name *  n)
+int reg_get_name_for_flow_id(char * buf,
+                             int    flow_id)
 {
-        *msg = malloc(sizeof(**msg));
-        if (*msg == NULL)
-                goto fail;
-
-        name_info_msg__init(*msg);
+        struct reg_flow * f;
 
-        (*msg)->name = strdup(n->info.name);
-        if ((*msg)->name == NULL)
-                goto fail_msg;
+        pthread_mutex_lock(&reg.mtx);
 
-        (*msg)->pol_lb = n->info.pol_lb;
+        f = __reg_get_flow(flow_id);
+        if (f != NULL)
+                strcpy(buf, f->name);
 
-        return 0;
+        pthread_mutex_unlock(&reg.mtx);
 
- fail_msg:
-        name_info_msg__free_unpacked(*msg, NULL);
-        *msg = NULL;
- fail:
-        return -1;
+        return f == NULL ? -ENOENT : 0;
 }
 
 int reg_list_names(name_info_msg_t *** names)
@@ -1030,10 +1058,20 @@ int reg_list_names(name_info_msg_t *** names)
         list_for_each(p, &reg.names) {
                 struct reg_name * entry;
                 entry = list_entry(p, struct reg_name, next);
-                if (__get_name_info(&(*names)[i], entry) < 0) {
+                (*names)[i] = name_info_s_to_msg(&entry->info);
+                if ((*names)[i] == NULL) {
                         log_err("Failed to create name list info.");
                         goto fail;
                 }
+                /* wipe security info to avoid huge messages */
+                free((*names)[i]->scrt);
+                (*names)[i]->scrt = NULL;
+                free((*names)[i]->skey);
+                (*names)[i]->skey = NULL;
+                free((*names)[i]->ccrt);
+                (*names)[i]->ccrt = NULL;
+                free((*names)[i]->ckey);
+                (*names)[i]->ckey = NULL;
 
                 i++;
         }
@@ -1947,12 +1985,14 @@ void reg_dealloc_flow(struct flow_info * info)
         assert(flow != NULL);
         assert(flow->data.data == NULL);
         assert(flow->data.len == 0);
-
         assert(flow->info.state == FLOW_ALLOCATED);
+
         flow->info.state = FLOW_DEALLOC_PENDING;
         info->state = FLOW_DEALLOC_PENDING;
         info->n_1_pid = flow->info.n_1_pid;
 
+        memset(flow->name, 0, sizeof(flow->name));
+
         reg_flow_update(flow, info);
 
         pthread_mutex_unlock(&reg.mtx);
diff --git a/src/irmd/reg/reg.h b/src/irmd/reg/reg.h
index 00db8f0b..57257dd5 100644
--- a/src/irmd/reg/reg.h
+++ b/src/irmd/reg/reg.h
@@ -90,10 +90,16 @@ int   reg_destroy_name(const char * name);
 
 bool  reg_has_name(const char * name);
 
+int   reg_get_name_info(const char *       name,
+                        struct name_info * info);
+
 int   reg_get_name_for_hash(char *          buf,
                             enum hash_algo  algo,
                             const uint8_t * hash);
 
+int   reg_get_name_for_flow_id(char * buf,
+                               int    flow_id);
+
 /* TODO don't rely on protobuf here */
 int   reg_list_names(name_info_msg_t *** names);
 
diff --git a/src/irmd/reg/tests/name_test.c b/src/irmd/reg/tests/name_test.c
index 64635eec..9071364b 100644
--- a/src/irmd/reg/tests/name_test.c
+++ b/src/irmd/reg/tests/name_test.c
@@ -76,8 +76,8 @@ static int test_reg_name_add_proc(void)
                 goto fail;
         }
 
-        if (n->n_procs != 1) {
-                printf("n_procs not updated.\n");
+        if (n->procs.len != 1) {
+                printf("Proc not added to list.\n");
                 goto fail;
         }
 
@@ -88,8 +88,8 @@ static int test_reg_name_add_proc(void)
 
         reg_name_del_proc(n, TEST_PID);
 
-        if (n->n_procs != 0) {
-                printf("n_procs not updated.\n");
+        if (n->procs.len != 0) {
+                printf("Proc not removed from list.\n");
                 goto fail;
         }
 
@@ -126,8 +126,8 @@ static int test_reg_name_add_prog(void)
                 goto fail;
         }
 
-        if (n->n_progs != 1) {
-                printf("n_progs not updated.\n");
+        if (n->progs.len != 1) {
+                printf("Prog not added to list.\n");
                 goto fail;
         }
 
@@ -138,8 +138,8 @@ static int test_reg_name_add_prog(void)
 
         reg_name_del_prog(n, TEST_PROG);
 
-        if (n->n_progs != 0) {
-                printf("n_progs not updated.\n");
+        if (n->progs.len != 0) {
+                printf("Prog not removed from list.\n");
                 goto fail;
         }
 
@@ -195,8 +195,8 @@ static int test_reg_name_add_active(enum pol_balance lb)
                 goto fail;
         }
 
-        if (n->n_active != 1) {
-                printf("n_active not updated.\n");
+        if (n->active.len != 1) {
+                printf("Active list not updated.\n");
                 goto fail;
         }
 
@@ -226,13 +226,13 @@ static int test_reg_name_add_active(enum pol_balance lb)
                 goto fail;
         }
 
-        if (n->n_procs != 3) {
-                printf("n_procs not updated.\n");
+        if (n->procs.len != 3) {
+                printf("Procs list not updated.\n");
                 goto fail;
         }
 
-        if (n->n_active != 4) {
-                printf("n_active not updated.\n");
+        if (n->active.len != 4) {
+                printf("Active list not updated.\n");
                 goto fail;
         }
 
@@ -263,13 +263,13 @@ static int test_reg_name_add_active(enum pol_balance lb)
 
         reg_name_del_proc(n, TEST_PID);
 
-        if (n->n_procs != 0) {
-                printf("n_procs not updated.\n");
+        if (n->procs.len != 0) {
+                printf("Procs list not cleared.\n");
                 goto fail;
         }
 
-        if (n->n_active != 0) {
-                printf("n_active not updated.\n");
+        if (n->active.len != 0) {
+                printf("Active list not cleared.\n");
                 goto fail;
         }
 
@@ -283,20 +283,19 @@ static int test_reg_name_add_active(enum pol_balance lb)
         return TEST_RC_FAIL;
 }
 
-
 int name_test(int     argc,
               char ** argv)
 {
-        int res = 0;
+        int rc = 0;
 
         (void) argc;
         (void) argv;
 
-        res |= test_reg_name_create();
-        res |= test_reg_name_add_proc();
-        res |= test_reg_name_add_prog();
-        res |= test_reg_name_add_active(LB_RR);
-        res |= test_reg_name_add_active(LB_SPILL);
+        rc |= test_reg_name_create();
+        rc |= test_reg_name_add_proc();
+        rc |= test_reg_name_add_prog();
+        rc |= test_reg_name_add_active(LB_RR);
+        rc |= test_reg_name_add_active(LB_SPILL);
 
-        return res;
+        return rc;
 }
diff --git a/src/irmd/reg/tests/reg_test.c b/src/irmd/reg/tests/reg_test.c
index fb99e6d3..280ea9a8 100644
--- a/src/irmd/reg/tests/reg_test.c
+++ b/src/irmd/reg/tests/reg_test.c
@@ -36,7 +36,7 @@
 #define TEST_DATA2    "testpbufdata2"
 #define TEST_LAYER    "testlayer"
 #define REG_TEST_FAIL() \
-        do { TEST_FAIL(); memset(&reg, 0, sizeof(reg)); } while(0)
+        do { TEST_FAIL(); memset(&reg, 0, sizeof(reg)); abort();} while(0)
 
 static int test_reg_init(void)
 {
@@ -254,7 +254,7 @@ static int test_reg_accept_flow_success(void)
 
         pthread_create(&thr, NULL, test_flow_respond_accept, &n_1_info);
 
-        if (reg_wait_flow_accepted(&info, &rbuf, &abstime) < 0 ) {
+        if (reg_wait_flow_accepted(&info, &rbuf, &abstime) < 0) {
                 printf("Flow allocation failed.\n");
                 goto fail;
         }
@@ -1344,13 +1344,14 @@ static int test_wait_accepting_success(void)
 {
         struct timespec  abstime;
         struct timespec  timeo = TIMESPEC_INIT_S(1);
-        int              flow_id;
         pthread_t        thr;
+        int              flow_id;
         struct name_info ninfo = {
                 .name   = TEST_NAME,
                 .pol_lb = LB_RR
         };
 
+
         TEST_START();
 
         if (reg_init()) {