summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-03-08 22:07:02 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-03-08 22:07:02 +0100
commit103133c2fc7110085bbb730a71c762f6759e84e9 (patch)
treec98267c41ebe08c1157de6fbb8f637aec78df0d2 /src
parent56255a15a35650098c2358107e2dc4f21df43241 (diff)
downloadfastd-103133c2fc7110085bbb730a71c762f6759e84e9.tar
fastd-103133c2fc7110085bbb730a71c762f6759e84e9.zip
Handle duplicate keys
When two peers are configured with the same key, disable both. When a temporary peer's key is configured, delete the temporary key.
Diffstat (limited to 'src')
-rw-r--r--src/fastd.c24
-rw-r--r--src/fastd.h2
-rw-r--r--src/protocol_ec25519_fhmqvc.c70
3 files changed, 73 insertions, 23 deletions
diff --git a/src/fastd.c b/src/fastd.c
index 59a99ab..3c3d130 100644
--- a/src/fastd.c
+++ b/src/fastd.c
@@ -615,23 +615,31 @@ static void delete_peer_groups(fastd_context_t *ctx) {
static void init_peers(fastd_context_t *ctx) {
fastd_peer_config_t *peer_conf;
- for (peer_conf = ctx->conf->peers; peer_conf; peer_conf = peer_conf->next) {
- bool was_enabled = peer_conf->enabled;
-
- peer_conf->enabled = true;
+ for (peer_conf = ctx->conf->peers; peer_conf; peer_conf = peer_conf->next)
ctx->conf->protocol->peer_configure(ctx, peer_conf);
- if (peer_conf->enabled && !was_enabled)
+ for (peer_conf = ctx->conf->peers; peer_conf; peer_conf = peer_conf->next) {
+ bool enable = ctx->conf->protocol->peer_check(ctx, peer_conf);
+
+ if (enable && !peer_conf->enabled)
fastd_peer_add(ctx, peer_conf);
+
+ peer_conf->enabled = enable;
}
fastd_peer_t *peer, *next;
for (peer = ctx->peers; peer; peer = next) {
next = peer->next;
- if (!peer->config->enabled) {
- pr_info(ctx, "previously enabled peer %P disabled, deleting.", peer);
- fastd_peer_delete(ctx, peer);
+ if (peer->config) {
+ if (!peer->config->enabled) {
+ pr_info(ctx, "previously enabled peer %P disabled, deleting.", peer);
+ fastd_peer_delete(ctx, peer);
+ }
+ }
+ else {
+ if (!ctx->conf->protocol->peer_check_temporary(ctx, peer))
+ fastd_peer_delete(ctx, peer);
}
}
}
diff --git a/src/fastd.h b/src/fastd.h
index f8d51dd..11f6dfb 100644
--- a/src/fastd.h
+++ b/src/fastd.h
@@ -68,6 +68,8 @@ struct fastd_protocol {
fastd_protocol_config_t* (*init)(fastd_context_t *ctx);
void (*peer_configure)(fastd_context_t *ctx, fastd_peer_config_t *peer_conf);
+ bool (*peer_check)(fastd_context_t *ctx, fastd_peer_config_t *peer_conf);
+ bool (*peer_check_temporary)(fastd_context_t *ctx, fastd_peer_t *peer);
void (*handshake_init)(fastd_context_t *ctx, const fastd_socket_t *sock, const fastd_peer_address_t *address, fastd_peer_t *peer);
void (*handshake_handle)(fastd_context_t *ctx, fastd_socket_t *sock, const fastd_peer_address_t *address, fastd_peer_t *peer, const fastd_handshake_t *handshake, const fastd_method_t *method);
diff --git a/src/protocol_ec25519_fhmqvc.c b/src/protocol_ec25519_fhmqvc.c
index d804eac..9b18ad5 100644
--- a/src/protocol_ec25519_fhmqvc.c
+++ b/src/protocol_ec25519_fhmqvc.c
@@ -159,19 +159,38 @@ static fastd_protocol_config_t* protocol_init(fastd_context_t *ctx) {
return protocol_config;
}
+static inline void hexdump(char out[65], unsigned char d[32]) {
+ int i;
+ for (i = 0; i < 32; i++)
+ snprintf(out+2*i, 3, "%02x", d[i]);
+}
+
+static size_t key_count(fastd_context_t *ctx, const ecc_int256_t *key) {
+ size_t ret = 0;
+
+ fastd_peer_config_t *p;
+ for (p = ctx->conf->peers; p; p = p->next) {
+ if (!p->protocol_config)
+ continue;
+
+ if (memcmp(p->protocol_config->public_key.p, key->p, 32) == 0)
+ ret++;
+ }
+
+ return ret;
+}
+
static void protocol_peer_configure(fastd_context_t *ctx, fastd_peer_config_t *peer_conf) {
if (!peer_conf->protocol_config) {
if (!peer_conf->key) {
pr_warn(ctx, "no key configured for `%s', disabling peer", peer_conf->name);
- peer_conf->enabled = false;
- return;
+ goto disable;
}
ecc_int256_t key;
if (!read_key(key.p, peer_conf->key)) {
pr_warn(ctx, "invalid key configured for `%s', disabling peer", peer_conf->name);
- peer_conf->enabled = false;
- return;
+ goto disable;
}
peer_conf->protocol_config = malloc(sizeof(fastd_protocol_peer_config_t));
@@ -179,14 +198,39 @@ static void protocol_peer_configure(fastd_context_t *ctx, fastd_peer_config_t *p
if (memcmp(peer_conf->protocol_config->public_key.p, ctx->conf->protocol_config->public_key.p, 32) == 0) {
pr_debug(ctx, "found own key as `%s', ignoring peer", peer_conf->name);
- peer_conf->enabled = false;
- return;
+ goto disable;
}
}
- else if (memcmp(peer_conf->protocol_config->public_key.p, ctx->conf->protocol_config->public_key.p, 32) == 0) {
- peer_conf->enabled = false;
- return;
+
+ return;
+
+ disable:
+ peer_conf->enabled = false;
+}
+
+static bool protocol_peer_check(fastd_context_t *ctx, fastd_peer_config_t *peer_conf) {
+ if (memcmp(peer_conf->protocol_config->public_key.p, ctx->conf->protocol_config->public_key.p, 32) == 0) {
+ return false;
}
+ if (key_count(ctx, &peer_conf->protocol_config->public_key) > 1) {
+ char buf[65];
+ hexdump(buf, peer_conf->protocol_config->public_key.p);
+ pr_warn(ctx, "more than one peer is configured with key %s, disabling %s", buf, peer_conf->name);
+ return false;
+ }
+
+ return true;
+}
+
+static bool protocol_peer_check_temporary(fastd_context_t *ctx, fastd_peer_t *peer) {
+ if (key_count(ctx, &peer->protocol_config->public_key)) {
+ char buf[65];
+ hexdump(buf, peer->protocol_config->public_key.p);
+ pr_info(ctx, "key %s is configured now, deleting temporary peer.", buf);
+ return false;
+ }
+
+ return true;
}
static void init_protocol_state(fastd_context_t *ctx) {
@@ -859,12 +903,6 @@ static void protocol_free_peer_state(fastd_context_t *ctx, fastd_peer_t *peer) {
}
}
-static inline void hexdump(char out[65], unsigned char d[32]) {
- int i;
- for (i = 0; i < 32; i++)
- snprintf(out+2*i, 3, "%02x", d[i]);
-}
-
static inline void print_hexdump(const char *desc, unsigned char d[32]) {
char buf[65];
hexdump(buf, d);
@@ -935,6 +973,8 @@ const fastd_protocol_t fastd_protocol_ec25519_fhmqvc = {
.init = protocol_init,
.peer_configure = protocol_peer_configure,
+ .peer_check = protocol_peer_check,
+ .peer_check_temporary = protocol_peer_check_temporary,
.handshake_init = protocol_handshake_init,
.handshake_handle = protocol_handshake_handle,