Allow using key & configuration parser from tincd in tinc.

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index f78e272..fc39b64 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -46,6 +46,7 @@
 #include "xalloc.h"
 
 #include "ed25519/sha512.h"
+#include "keys.h"
 
 int invitation_lifetime;
 ecdsa_t *invitation_key = NULL;
@@ -160,7 +161,7 @@ bool send_id(connection_t *c) {
        int minor = 0;
 
        if(experimental) {
-               if(c->outgoing && !read_ecdsa_public_key(c)) {
+               if(c->outgoing && !read_ecdsa_public_key(&c->ecdsa, &c->config_tree, c->name)) {
                        minor = 1;
                } else {
                        minor = myself->connection->protocol_minor;
@@ -214,6 +215,9 @@ static bool finalize_invitation(connection_t *c, const char *data, uint16_t len)
        environment_add(&env, "REMOTEADDRESS=%s", address);
        environment_add(&env, "NAME=%s", myself->name);
 
+       free(address);
+       free(port);
+
        execute_script("invitation-accepted", &env);
 
        environment_exit(&env);
@@ -284,13 +288,16 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
        }
 
        // Read the new node's Name from the file
-       char buf[1024];
+       char buf[1024] = "";
        fgets(buf, sizeof(buf), f);
+       size_t buflen = strlen(buf);
 
-       if(*buf) {
-               buf[strlen(buf) - 1] = 0;
+       // Strip whitespace at the end
+       while(buflen && strchr(" \t\r\n", buf[buflen - 1])) {
+               buf[--buflen] = 0;
        }
 
+       // Split the first line into variable and value
        len = strcspn(buf, " \t=");
        char *name = buf + len;
        name += strspn(name, " \t");
@@ -302,6 +309,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 
        buf[len] = 0;
 
+       // Check that it is a valid Name
        if(!*buf || !*name || strcasecmp(buf, "Name") || !check_id(name) || !strcmp(name, myself->name)) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Invalid invitation file %s\n", cookie);
                fclose(f);
@@ -446,7 +454,7 @@ bool id_h(connection_t *c, const char *request) {
                }
 
                if(experimental) {
-                       read_ecdsa_public_key(c);
+                       read_ecdsa_public_key(&c->ecdsa, &c->config_tree, c->name);
                }
 
                /* Ignore failures if no key known yet */
@@ -493,7 +501,7 @@ bool send_metakey(connection_t *c) {
                return false;
        }
 
-       if(!read_rsa_public_key(c)) {
+       if(!read_rsa_public_key(&c->rsa, c->config_tree, c->name)) {
                return false;
        }
 
@@ -910,7 +918,7 @@ static bool upgrade_h(connection_t *c, const char *request) {
                return false;
        }
 
-       if(ecdsa_active(c->ecdsa) || read_ecdsa_public_key(c)) {
+       if(ecdsa_active(c->ecdsa) || read_ecdsa_public_key(&c->ecdsa, &c->config_tree, c->name)) {
                char *knownkey = ecdsa_get_base64_public_key(c->ecdsa);
                bool different = strcmp(knownkey, pubkey);
                free(knownkey);