ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

Comparing gvpe/src/connection.C (file contents):
Revision 1.87 by pcg, Fri Nov 12 18:39:33 2010 UTC vs.
Revision 1.112 by root, Fri Sep 12 10:40:43 2014 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2010,2011,2013 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify it 7 GVPE is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
… …
33 33
34#include <list> 34#include <list>
35#include <queue> 35#include <queue>
36#include <utility> 36#include <utility>
37 37
38#include <openssl/opensslv.h>
38#include <openssl/rand.h> 39#include <openssl/rand.h>
39#include <openssl/evp.h> 40#include <openssl/evp.h>
40#include <openssl/rsa.h> 41#include <openssl/rsa.h>
41#include <openssl/err.h> 42#include <openssl/err.h>
43
44// openssl 0.9.8 compatibility
45#if OPENSSL_VERSION_NUMBER < 0x10100000
46 #define require101(exp) exp
47#else
48 #define require101(exp) require (exp)
49#endif
42 50
43#include "conf.h" 51#include "conf.h"
44#include "slog.h" 52#include "slog.h"
45#include "device.h" 53#include "device.h"
46#include "vpn.h" 54#include "vpn.h"
47#include "connection.h" 55#include "connection.h"
56#include "hkdf.h"
48 57
49#include "netcompat.h" 58#include "netcompat.h"
50 59
51#if !HAVE_RAND_PSEUDO_BYTES
52# define RAND_pseudo_bytes RAND_bytes
53#endif
54
55#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
56#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated) 60#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic
57 61
58#define ULTRA_FAST 1 62#define ULTRA_FAST 1
59#define HLOG 15 63#define HLOG 15
60#include "lzf/lzf.h" 64#include "lzf/lzf.h"
61#include "lzf/lzf_c.c" 65#include "lzf/lzf_c.c"
… …
64////////////////////////////////////////////////////////////////////////////// 68//////////////////////////////////////////////////////////////////////////////
65 69
66static std::queue< std::pair<run_script_cb *, const char *> > rs_queue; 70static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
67static ev::child rs_child_ev; 71static ev::child rs_child_ev;
68 72
73namespace
74{
69void // c++ requires external linkage here, apparently :( 75 void // c++ requires external linkage here, apparently :(
70rs_child_cb (ev::child &w, int revents) 76 rs_child_cb (ev::child &w, int revents)
71{ 77 {
72 w.stop (); 78 w.stop ();
73 79
74 if (rs_queue.empty ()) 80 if (rs_queue.empty ())
75 return; 81 return;
76 82
77 pid_t pid = run_script (*rs_queue.front ().first, false); 83 pid_t pid = run_script (*rs_queue.front ().first, false);
78 if (pid) 84 if (pid)
79 { 85 {
80 w.set (pid); 86 w.set (pid);
81 w.start (); 87 w.start ();
82 } 88 }
83 else 89 else
84 slog (L_WARN, rs_queue.front ().second); 90 slog (L_WARN, rs_queue.front ().second);
85 91
86 delete rs_queue.front ().first; 92 delete rs_queue.front ().first;
87 rs_queue.pop (); 93 rs_queue.pop ();
88} 94 }
95};
89 96
90// despite the fancy name, this is quite a hack 97// despite the fancy name, this is quite a hack
91static void 98static void
92run_script_queued (run_script_cb *cb, const char *warnmsg) 99run_script_queued (run_script_cb *cb, const char *warnmsg)
93{ 100{
… …
105struct crypto_ctx 112struct crypto_ctx
106{ 113{
107 EVP_CIPHER_CTX cctx; 114 EVP_CIPHER_CTX cctx;
108 HMAC_CTX hctx; 115 HMAC_CTX hctx;
109 116
110 crypto_ctx (const rsachallenge &challenge, int enc); 117 crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc);
111 ~crypto_ctx (); 118 ~crypto_ctx ();
112}; 119};
113 120
114crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 121crypto_ctx::crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc)
115{ 122{
123 ecdh_key s;
124
125 curve25519_combine (a, b, s);
126
127 {
128 u8 mac_key[MAC_KEYSIZE];
129 static const unsigned char mac_info[] = "gvpe mac key";
130
131 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
132 kdf.extract (auth1.rsa.mac_key, sizeof (auth1.rsa.mac_key));
133 kdf.extract (s, sizeof (s));
134 kdf.extract_done (HKDF_PRF_HASH ());
135 kdf.expand (mac_key, sizeof (mac_key), mac_info, sizeof (mac_info));
136
137 HMAC_CTX_init (&hctx);
138 require101 (HMAC_Init_ex (&hctx, mac_key, MAC_KEYSIZE, MAC_DIGEST (), 0));
139 }
140
141 {
142 u8 cipher_key[CIPHER_KEYSIZE];
143 static const unsigned char cipher_info[] = "gvpe cipher key";
144
145 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
146 kdf.extract (auth1.rsa.cipher_key, sizeof (auth1.rsa.cipher_key));
147 kdf.extract (s, sizeof (s));
148 kdf.extract_done (HKDF_PRF_HASH ());
149 kdf.expand (cipher_key, sizeof (cipher_key), cipher_info, sizeof (cipher_info));
150
116 EVP_CIPHER_CTX_init (&cctx); 151 EVP_CIPHER_CTX_init (&cctx);
117 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc)); 152 require (EVP_CipherInit_ex (&cctx, CIPHER (), 0, cipher_key, 0, enc));
118 HMAC_CTX_init (&hctx); 153 }
119 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
120} 154}
121 155
122crypto_ctx::~crypto_ctx () 156crypto_ctx::~crypto_ctx ()
123{ 157{
124 require (EVP_CIPHER_CTX_cleanup (&cctx)); 158 require (EVP_CIPHER_CTX_cleanup (&cctx));
125 HMAC_CTX_cleanup (&hctx); 159 HMAC_CTX_cleanup (&hctx);
126} 160}
127 161
162static inline void
163auth_encrypt (RSA *key, const auth_data &auth, auth_encr &encr)
164{
165 if (RSA_public_encrypt (sizeof (auth.rsa),
166 (unsigned char *)&auth.rsa, (unsigned char *)&encr.rsa,
167 key, RSA_PKCS1_OAEP_PADDING) < 0)
168 fatal ("RSA_public_encrypt error");
169
170 memcpy (&encr.ecdh, &auth.ecdh, sizeof (encr.ecdh));
171}
172
173static inline bool
174auth_decrypt (RSA *key, const auth_encr &encr, auth_data &auth)
175{
176 u8 rsa_decrypt[RSA_KEYLEN];
177
178 if (RSA_private_decrypt (sizeof (encr.rsa),
179 (const unsigned char *)&encr.rsa, (unsigned char *)rsa_decrypt,
180 key, RSA_PKCS1_OAEP_PADDING) != sizeof (auth.rsa))
181 return 0;
182
183 memcpy (&auth.rsa, rsa_decrypt, sizeof (auth.rsa));
184 memcpy (&auth.ecdh, &encr.ecdh, sizeof (auth.ecdh));
185
186 return 1;
187}
188
128static void 189static void
129rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 190auth_hash (const auth_data &auth, const ecdh_key &b, auth_mac &mac)
130{ 191{
131 EVP_MD_CTX ctx; 192 hkdf kdf (b, sizeof b, AUTH_DIGEST ()); // use response ecdh b as salt
132 193 kdf.extract (&auth.rsa, sizeof (auth.rsa));
133 EVP_MD_CTX_init (&ctx); 194 kdf.extract_done ();
134 require (EVP_DigestInit (&ctx, RSA_HASH)); 195 kdf.expand (mac, sizeof mac, auth.ecdh, sizeof (auth.ecdh)); // use challenge ecdh b as info
135 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
136 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
137 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
138 EVP_MD_CTX_cleanup (&ctx);
139} 196}
140 197
141struct rsa_entry 198void
199connection::generate_auth_data ()
142{ 200{
143 tstamp expire; 201 if (auth_expire < ev_now ())
144 rsaid id;
145 rsachallenge chg;
146};
147
148struct rsa_cache : list<rsa_entry>
149{
150 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
151
152 bool find (const rsaid &id, rsachallenge &chg)
153 {
154 for (iterator i = begin (); i != end (); ++i)
155 { 202 {
156 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ()) 203 // request data
157 { 204 rand_fill (snd_auth.rsa);
158 memcpy (&chg, &i->chg, sizeof chg); 205 curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
159 206
160 erase (i); 207 // eventual response data
161 return true; 208 curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
162 }
163 } 209 }
164 210
165 if (!cleaner.is_active ()) 211 // every use prolongs the expiry
166 cleaner.again ();
167
168 return false;
169 }
170
171 void gen (rsaid &id, rsachallenge &chg)
172 {
173 rsa_entry e;
174
175 RAND_bytes ((unsigned char *)&id, sizeof id);
176 RAND_bytes ((unsigned char *)&chg, sizeof chg);
177
178 e.expire = ev_now () + RSA_TTL; 212 auth_expire = ev_now () + AUTH_TTL;
179 e.id = id;
180 memcpy (&e.chg, &chg, sizeof chg);
181
182 push_back (e);
183
184 if (!cleaner.is_active ())
185 cleaner.again ();
186 }
187
188 rsa_cache ()
189 {
190 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
191 cleaner.set (RSA_TTL, RSA_TTL);
192 }
193
194} rsa_cache;
195
196void rsa_cache::cleaner_cb (ev::timer &w, int revents)
197{
198 if (empty ())
199 w.stop ();
200 else
201 {
202 for (iterator i = begin (); i != end (); )
203 if (i->expire <= ev_now ())
204 i = erase (i);
205 else
206 ++i;
207 }
208} 213}
209 214
210////////////////////////////////////////////////////////////////////////////// 215//////////////////////////////////////////////////////////////////////////////
211 216
212pkt_queue::pkt_queue (double max_ttl, int max_queue) 217pkt_queue::pkt_queue (double max_ttl, int max_queue)
… …
226 delete p; 231 delete p;
227 232
228 delete [] queue; 233 delete [] queue;
229} 234}
230 235
236void
231void pkt_queue::expire_cb (ev::timer &w, int revents) 237pkt_queue::expire_cb (ev::timer &w, int revents)
232{ 238{
233 ev_tstamp expire = ev_now () - max_ttl; 239 ev_tstamp expire = ev_now () - max_ttl;
234 240
235 for (;;) 241 for (;;)
236 { 242 {
… …
247 253
248 delete get (); 254 delete get ();
249 } 255 }
250} 256}
251 257
258void
252void pkt_queue::put (net_packet *p) 259pkt_queue::put (net_packet *p)
253{ 260{
254 ev_tstamp now = ev_now (); 261 ev_tstamp now = ev_now ();
255 262
256 // start expiry timer 263 // start expiry timer
257 if (empty ()) 264 if (empty ())
… …
266 queue[i].tstamp = now; 273 queue[i].tstamp = now;
267 274
268 i = ni; 275 i = ni;
269} 276}
270 277
271net_packet *pkt_queue::get () 278net_packet *
279pkt_queue::get ()
272{ 280{
273 if (empty ()) 281 if (empty ())
274 return 0; 282 return 0;
275 283
276 net_packet *p = queue[j].pkt; 284 net_packet *p = queue[j].pkt;
… …
300 308
301 bool can (const sockinfo &si) { return can((u32)si.host); } 309 bool can (const sockinfo &si) { return can((u32)si.host); }
302 bool can (u32 host); 310 bool can (u32 host);
303}; 311};
304 312
305net_rate_limiter auth_rate_limiter, reset_rate_limiter; 313static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
306 314
315bool
307bool net_rate_limiter::can (u32 host) 316net_rate_limiter::can (u32 host)
308{ 317{
309 iterator i; 318 iterator i;
310 319
311 for (i = begin (); i != end (); ) 320 for (i = begin (); i != end (); )
312 if (i->host == host) 321 if (i->host == host)
… …
357 } 366 }
358} 367}
359 368
360///////////////////////////////////////////////////////////////////////////// 369/////////////////////////////////////////////////////////////////////////////
361 370
362unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 371void
363
364void hmac_packet::hmac_gen (crypto_ctx *ctx) 372hmac_packet::hmac_gen (crypto_ctx *ctx, u8 *hmac_digest)
365{ 373{
366 unsigned int xlen;
367
368 HMAC_CTX *hctx = &ctx->hctx; 374 HMAC_CTX *hctx = &ctx->hctx;
369 375
370 HMAC_Init_ex (hctx, 0, 0, 0, 0); 376 require101 (HMAC_Init_ex (hctx, 0, 0, 0, 0));
371 HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), 377 require101 (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), len - sizeof (hmac_packet)));
372 len - sizeof (hmac_packet)); 378 require101 (HMAC_Final (hctx, hmac_digest, 0));
373 HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);
374} 379}
375 380
376void 381void
377hmac_packet::hmac_set (crypto_ctx *ctx) 382hmac_packet::hmac_set (crypto_ctx *ctx)
378{ 383{
379 hmac_gen (ctx); 384 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
380 385 hmac_gen (ctx, hmac_digest);
381 memcpy (hmac, hmac_digest, HMACLENGTH); 386 memcpy (hmac, hmac_digest, HMACLENGTH);
382} 387}
383 388
384bool 389bool
385hmac_packet::hmac_chk (crypto_ctx *ctx) 390hmac_packet::hmac_chk (crypto_ctx *ctx)
386{ 391{
387 hmac_gen (ctx); 392 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
388 393 hmac_gen (ctx, hmac_digest);
389 return !memcmp (hmac, hmac_digest, HMACLENGTH); 394 return slow_memeq (hmac, hmac_digest, HMACLENGTH);
390} 395}
391 396
397void
392void vpn_packet::set_hdr (ptype type_, unsigned int dst) 398vpn_packet::set_hdr (ptype type_, unsigned int dst)
393{ 399{
394 type = type_; 400 type = type_;
395 401
396 int src = THISNODE->id; 402 int src = THISNODE->id;
397 403
… …
402 408
403#define MAXVPNDATA (MAX_MTU - 6 - 6) 409#define MAXVPNDATA (MAX_MTU - 6 - 6)
404#define DATAHDR (sizeof (u32) + RAND_SIZE) 410#define DATAHDR (sizeof (u32) + RAND_SIZE)
405 411
406struct vpndata_packet : vpn_packet 412struct vpndata_packet : vpn_packet
413{
414 u8 data[MAXVPNDATA + DATAHDR]; // seqno
415
416 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
417 tap_packet *unpack (connection *conn, u32 &seqno);
418
419private:
420 const u32 data_hdr_size () const
407 { 421 {
408 u8 data[MAXVPNDATA + DATAHDR]; // seqno
409
410 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
411 tap_packet *unpack (connection *conn, u32 &seqno);
412private:
413
414 const u32 data_hdr_size () const
415 {
416 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 422 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
417 }
418 }; 423 }
424};
419 425
420void 426void
421vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 427vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
422{ 428{
423 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 429 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
… …
441 d[1] = cl; 447 d[1] = cl;
442 } 448 }
443 } 449 }
444#endif 450#endif
445 451
446 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 452 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 1));
447 453
448 struct { 454 struct {
449#if RAND_SIZE 455#if RAND_SIZE
450 u8 rnd[RAND_SIZE]; 456 u8 rnd[RAND_SIZE];
451#endif 457#endif
452 u32 seqno; 458 u32 seqno;
453 } datahdr; 459 } datahdr;
454 460
455 datahdr.seqno = ntohl (seqno); 461 datahdr.seqno = ntohl (seqno);
456#if RAND_SIZE 462#if RAND_SIZE
457 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 463 // NB: a constant (per session) random prefix
464 // is likely enough, but we don't take any chances.
465 conn->oiv.get (datahdr.rnd, RAND_SIZE);
458#endif 466#endif
459 467
460 require (EVP_EncryptUpdate (cctx, 468 require (EVP_EncryptUpdate (cctx,
461 (unsigned char *) data + outl, &outl2, 469 (unsigned char *) data + outl, &outl2,
462 (unsigned char *) &datahdr, DATAHDR)); 470 (unsigned char *) &datahdr, DATAHDR));
… …
484 int outl = 0, outl2; 492 int outl = 0, outl2;
485 tap_packet *p = new tap_packet; 493 tap_packet *p = new tap_packet;
486 u8 *d; 494 u8 *d;
487 u32 l = len - data_hdr_size (); 495 u32 l = len - data_hdr_size ();
488 496
489 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0)); 497 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 0));
490 498
491#if ENABLE_COMPRESSION 499#if ENABLE_COMPRESSION
492 u8 cdata[MAX_MTU]; 500 u8 cdata[MAX_MTU];
493 501
494 if (type == PT_DATA_COMPRESSED) 502 if (type == PT_DATA_COMPRESSED)
495 d = cdata; 503 d = cdata;
496 else 504 else
497#endif 505#endif
498 d = &(*p)[6 + 6 - DATAHDR]; 506 d = &(*p)[6 + 6] - DATAHDR;
499 507
500 /* this overwrites part of the src mac, but we fix that later */ 508 // we play do evil games with the struct layout atm.
509 // pending better solutions, we at least do some verification.
510 // this is fine, as we left ISO territory long ago.
511 require (DATAHDR <= 16);
512 require ((u8 *)(&p->len + 1) == &(*p)[0]);
513
514 // this can overwrite the len/dst/src fields
501 require (EVP_DecryptUpdate (cctx, 515 require (EVP_DecryptUpdate (cctx,
502 d, &outl2, 516 d, &outl2,
503 (unsigned char *)&data, len - data_hdr_size ())); 517 (unsigned char *)&data, len - data_hdr_size ()));
504 outl += outl2; 518 outl += outl2;
505 519
… …
536 } 550 }
537}; 551};
538 552
539struct config_packet : vpn_packet 553struct config_packet : vpn_packet
540{ 554{
541 // actually, hmaclen cannot be checked because the hmac 555 u8 serial[SERIAL_SIZE];
542 // field comes before this data, so peers with other
543 // hmacs simply will not work.
544 u8 prot_major, prot_minor, randsize, hmaclen; 556 u8 prot_major, prot_minor, randsize;
545 u8 flags, challengelen, features, pad3; 557 u8 flags, features, pad6, pad7, pad8;
546 u32 cipher_nid, digest_nid, hmac_nid; 558 u32 cipher_nid, mac_nid, auth_nid;
547 559
548 void setup (ptype type, int dst); 560 void setup (ptype type, int dst);
549 bool chk_config () const; 561 bool chk_config (const conf_node *conf, const sockinfo &rsi) const;
550 562
551 static u8 get_features () 563 static u8 get_features ()
552 { 564 {
553 u8 f = 0; 565 u8 f = 0;
554#if ENABLE_COMPRESSION 566#if ENABLE_COMPRESSION
… …
562#endif 574#endif
563 return f; 575 return f;
564 } 576 }
565}; 577};
566 578
579void
567void config_packet::setup (ptype type, int dst) 580config_packet::setup (ptype type, int dst)
568{ 581{
569 prot_major = PROTOCOL_MAJOR; 582 prot_major = PROTOCOL_MAJOR;
570 prot_minor = PROTOCOL_MINOR; 583 prot_minor = PROTOCOL_MINOR;
571 randsize = RAND_SIZE; 584 randsize = RAND_SIZE;
572 hmaclen = HMACLENGTH;
573 flags = 0; 585 flags = 0;
574 challengelen = sizeof (rsachallenge);
575 features = get_features (); 586 features = get_features ();
576 587
588 strncpy ((char *)serial, conf.serial, sizeof (serial));
589
577 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 590 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
578 digest_nid = htonl (EVP_MD_type (RSA_HASH));
579 hmac_nid = htonl (EVP_MD_type (DIGEST)); 591 mac_nid = htonl (EVP_MD_type (MAC_DIGEST ()));
592 auth_nid = htonl (EVP_MD_type (AUTH_DIGEST ()));
580 593
581 len = sizeof (*this) - sizeof (net_packet); 594 len = sizeof (*this) - sizeof (net_packet);
582 set_hdr (type, dst); 595 set_hdr (type, dst);
583} 596}
584 597
585bool config_packet::chk_config () const 598bool
599config_packet::chk_config (const conf_node *conf, const sockinfo &rsi) const
586{ 600{
587 if (prot_major != PROTOCOL_MAJOR) 601 if (prot_major != PROTOCOL_MAJOR)
588 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 602 slog (L_WARN, _("%s(%s): major version mismatch (remote %d <=> local %d)"),
603 conf->nodename, (const char *)rsi, prot_major, PROTOCOL_MAJOR);
589 else if (randsize != RAND_SIZE) 604 else if (randsize != RAND_SIZE)
590 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 605 slog (L_WARN, _("%s(%s): rand size mismatch (remote %d <=> local %d)"),
591 else if (hmaclen != HMACLENGTH) 606 conf->nodename, (const char *)rsi, randsize, RAND_SIZE);
592 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
593 else if (challengelen != sizeof (rsachallenge))
594 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
595 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 607 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
596 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 608 slog (L_WARN, _("%s(%s): cipher algo mismatch (remote %x <=> local %x)"),
597 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 609 conf->nodename, (const char *)rsi, ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
598 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
599 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 610 else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
600 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 611 slog (L_WARN, _("%s(%s): mac algo mismatch (remote %x <=> local %x)"),
612 conf->nodename, (const char *)rsi, ntohl (mac_nid), EVP_MD_type (MAC_DIGEST ()));
613 else if (auth_nid != htonl (EVP_MD_type (AUTH_DIGEST ())))
614 slog (L_WARN, _("%s(%s): auth algo mismatch (remote %x <=> local %x)"),
615 conf->nodename, (const char *)rsi, ntohl (auth_nid), EVP_MD_type (AUTH_DIGEST ()));
601 else 616 else
617 {
618 int cmp = memcmp (serial, ::conf.serial, sizeof (serial));
619
620 if (cmp > 0)
621 slog (L_WARN, _("%s(%s): remote serial newer than local serial - outdated config?"),
622 conf->nodename, (const char *)rsi);
623 else if (cmp == 0)
602 return true; 624 return true;
625 }
603 626
604 return false; 627 return false;
605} 628}
606 629
607struct auth_req_packet : config_packet 630struct auth_req_packet : config_packet // UNPROTECTED
608{ 631{
609 char magic[8]; 632 char magic[8];
610 u8 initiate; // false if this is just an automatic reply 633 u8 initiate; // false if this is just an automatic reply
611 u8 protocols; // supported protocols (will be patched on forward) 634 u8 protocols; // supported protocols (will be patched on forward)
612 u8 pad2, pad3; 635 u8 pad2, pad3;
613 rsaid id; 636 auth_encr encr;
614 rsaencrdata encr;
615 637
616 auth_req_packet (int dst, bool initiate_, u8 protocols_) 638 auth_req_packet (int dst, bool initiate_, u8 protocols_)
617 { 639 {
618 config_packet::setup (PT_AUTH_REQ, dst); 640 config_packet::setup (PT_AUTH_REQ, dst);
619 strncpy (magic, MAGIC_OLD, 8); 641 memcpy (magic, MAGIC, 8);
620 initiate = !!initiate_; 642 initiate = !!initiate_;
621 protocols = protocols_; 643 protocols = protocols_;
622 644
623 len = sizeof (*this) - sizeof (net_packet); 645 len = sizeof (*this) - sizeof (net_packet);
624 } 646 }
625}; 647};
626 648
627struct auth_res_packet : config_packet 649struct auth_res_packet : vpn_packet // UNPROTECTED
628{ 650{
629 rsaid id;
630 u8 pad1, pad2, pad3;
631 u8 response_len; // encrypted length
632 rsaresponse response; 651 auth_response response;
633 652
634 auth_res_packet (int dst) 653 auth_res_packet (int dst)
635 { 654 {
636 config_packet::setup (PT_AUTH_RES, dst); 655 set_hdr (PT_AUTH_RES, dst);
637 656
638 len = sizeof (*this) - sizeof (net_packet); 657 len = sizeof (*this) - sizeof (net_packet);
639 } 658 }
640}; 659};
641 660
… …
671}; 690};
672 691
673///////////////////////////////////////////////////////////////////////////// 692/////////////////////////////////////////////////////////////////////////////
674 693
675void 694void
676connection::connection_established () 695connection::connection_established (const sockinfo &rsi)
677{ 696{
678 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 697 if (!have_snd_auth || !have_rcv_auth)
698 return;
679 699
680 if (ictx && octx) 700 si = rsi;
701 protocol = rsi.prot;
702
703 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
704 conf->nodename, (const char *)rsi,
705 vpn->can_direct (THISNODE, conf) ? "direct" : "forwarded",
706 PROTOCOL_MAJOR, prot_minor);
707
708 if (::conf.script_node_up)
709 {
710 run_script_cb *cb = new run_script_cb;
711 cb->set<connection, &connection::script_node_up> (this);
712 run_script_queued (cb, _("node-up command execution failed, continuing."));
681 { 713 }
714
715 delete ictx; ictx = new crypto_ctx (rcv_auth, snd_auth, rcv_ecdh_a, rcv_auth.ecdh, 0);
716 iseqno.reset (ntohl (rcv_auth.rsa.seqno) & 0x7fffffff);
717
718 delete octx; octx = new crypto_ctx (snd_auth, rcv_auth, snd_ecdh_a, snd_ecdh_b , 1);
719 oseqno = ntohl (snd_auth.rsa.seqno) & 0x7fffffff;
720
721 oiv.reset ();
722
682 // make sure rekeying timeouts are slightly asymmetric 723 // make sure rekeying timeouts are slightly asymmetric
683 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 724 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
684 rekey.start (rekey_interval, rekey_interval); 725 rekey.start (rekey_interval, rekey_interval);
726
727 hmac_error = 0.;
728
685 keepalive.start (::conf.keepalive); 729 keepalive.start (::conf.keepalive);
686 730
687 // send queued packets 731 // send queued packets
688 if (ictx && octx)
689 {
690 while (tap_packet *p = (tap_packet *)data_queue.get ()) 732 while (tap_packet *p = (tap_packet *)data_queue.get ())
691 { 733 {
692 if (p->len) send_data_packet (p); 734 if (p->len) send_data_packet (p);
693 delete p; 735 delete p;
694 } 736 }
695 737
696 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 738 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
697 { 739 {
698 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY); 740 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
699 delete p; 741 delete p;
700 } 742 }
701 }
702 743
703 vpn->connection_established (this); 744 vpn->connection_established (this);
704 }
705 else
706 {
707 retry_cnt = 0;
708 establish_connection.start (5);
709 keepalive.stop ();
710 rekey.stop ();
711 }
712} 745}
713 746
714void 747void
715connection::reset_si () 748connection::reset_si ()
716{ 749{
… …
721 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename); 754 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
722 protocol = 0; 755 protocol = 0;
723 } 756 }
724 757
725 si.set (conf, protocol); 758 si.set (conf, protocol);
726
727 is_direct = si.valid ();
728} 759}
729 760
730// ensure sockinfo is valid, forward if necessary 761// ensure sockinfo is valid, forward if necessary
731const sockinfo & 762const sockinfo &
732connection::forward_si (const sockinfo &si) const 763connection::forward_si (const sockinfo &si) const
… …
751 782
752void 783void
753connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 784connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
754{ 785{
755 if (!vpn->send_vpn_packet (pkt, si, tos)) 786 if (!vpn->send_vpn_packet (pkt, si, tos))
756 reset_connection (); 787 reset_connection ("packet send error");
757} 788}
758 789
759void 790void
760connection::send_ping (const sockinfo &si, u8 pong) 791connection::send_ping (const sockinfo &si, u8 pong)
761{ 792{
762 ping_packet *pkt = new ping_packet; 793 ping_packet *pkt = new ping_packet;
763 794
764 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 795 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
765 796
766 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si); 797 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
767
768 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 798 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
769 799
770 delete pkt; 800 delete pkt;
771} 801}
772 802
… …
787void 817void
788connection::send_auth_request (const sockinfo &si, bool initiate) 818connection::send_auth_request (const sockinfo &si, bool initiate)
789{ 819{
790 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 820 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
791 821
792 rsachallenge chg; 822 generate_auth_data ();
793 rsa_cache.gen (pkt->id, chg);
794 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 823 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
795 824
796 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si); 825 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
797
798 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 826 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
799 827
800 delete pkt; 828 delete pkt;
801} 829}
802 830
803void 831void
804connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 832connection::send_auth_response (const sockinfo &si)
805{ 833{
806 auth_res_packet *pkt = new auth_res_packet (conf->id); 834 auth_res_packet *pkt = new auth_res_packet (conf->id);
807 835
808 pkt->id = id; 836 memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof rcv_ecdh_b);
809 837 auth_hash (rcv_auth, rcv_ecdh_b, pkt->response.mac);
810 rsa_hash (id, chg, pkt->response);
811
812 pkt->hmac_set (octx);
813 838
814 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si); 839 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
815
816 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 840 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
817 841
818 delete pkt; 842 delete pkt;
819} 843}
820 844
821void 845void
822connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 846connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
823{ 847{
824 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename, 848 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
825 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi); 849 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
850 conf->protocols);
826 851
827 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 852 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
828 853
829 r->hmac_set (octx); 854 r->hmac_set (octx);
830 send_vpn_packet (r, si); 855 send_vpn_packet (r, si);
… …
833} 858}
834 859
835inline void 860inline void
836connection::establish_connection_cb (ev::timer &w, int revents) 861connection::establish_connection_cb (ev::timer &w, int revents)
837{ 862{
838 if (!ictx 863 if (!(ictx && octx)
839 && conf != THISNODE 864 && conf != THISNODE
840 && connectmode != conf_node::C_NEVER 865 && connectmode != conf_node::C_NEVER
841 && connectmode != conf_node::C_DISABLED 866 && connectmode != conf_node::C_DISABLED
842 && !w.is_active ()) 867 && !w.is_active ())
843 { 868 {
844 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection 869 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
845 // and stop trying. should probably be handled by a per-connection expire handler. 870 // and stop trying. should probably be handled by a per-connection expire handler.
846 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ()) 871 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
847 { 872 {
848 reset_connection (); 873 reset_connection ("no demand");
849 return; 874 return;
850 } 875 }
851 876
852 last_establish_attempt = ev_now (); 877 last_establish_attempt = ev_now ();
853 878
… …
855 ? (retry_cnt & 3) + 1 880 ? (retry_cnt & 3) + 1
856 : 1 << (retry_cnt >> 2)); 881 : 1 << (retry_cnt >> 2));
857 882
858 reset_si (); 883 reset_si ();
859 884
860 bool slow = si.prot & PROT_SLOW; 885 bool slow = (si.prot & PROT_SLOW) || (conf->low_power || THISNODE->low_power);
861 886
862 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf)) 887 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
863 { 888 {
864 /*TODO*/ /* start the timer so we don't recurse endlessly */ 889 /*TODO*/ /* start the timer so we don't recurse endlessly */
865 w.start (1); 890 w.start (1);
… …
875 900
876 slow = slow || (dsi.prot & PROT_SLOW); 901 slow = slow || (dsi.prot & PROT_SLOW);
877 902
878 if (dsi.valid () && auth_rate_limiter.can (dsi)) 903 if (dsi.valid () && auth_rate_limiter.can (dsi))
879 { 904 {
880 if (retry_cnt < 4) 905 // use ping after the first few retries
906 // TODO: on rekeys, the other node might not interpret ping correctly,
907 // TODO: as it will still have a valid connection
908 if (retry_cnt < 4 && (!conf->low_power || THISNODE->low_power))
881 send_auth_request (dsi, true); 909 send_auth_request (dsi, true);
882 else 910 else
883 send_ping (dsi, 0); 911 send_ping (dsi, 0);
884 } 912 }
885 } 913 }
886 914
887 retry_int *= slow ? 8. : 0.9; 915 retry_int *= slow ? 4. : 0.9;
888 916
889 if (retry_int < conf->max_retry) 917 if (retry_int < conf->max_retry)
890 retry_cnt++; 918 retry_cnt++;
891 else 919 else
892 retry_int = conf->max_retry; 920 retry_int = conf->max_retry;
… …
894 w.start (retry_int); 922 w.start (retry_int);
895 } 923 }
896} 924}
897 925
898void 926void
899connection::reset_connection () 927connection::reset_connection (const char *reason)
900{ 928{
901 if (ictx && octx) 929 if (ictx && octx)
902 { 930 {
903 slog (L_INFO, _("%s(%s): connection lost"), 931 slog (L_INFO, _("%s(%s): connection lost (%s)"),
904 conf->nodename, (const char *)si); 932 conf->nodename, (const char *)si, reason);
905 933
906 if (::conf.script_node_down) 934 if (::conf.script_node_down)
907 { 935 {
908 run_script_cb *cb = new run_script_cb; 936 run_script_cb *cb = new run_script_cb;
909 cb->set<connection, &connection::script_node_down> (this); 937 cb->set<connection, &connection::script_node_down> (this);
… …
911 } 939 }
912 } 940 }
913 941
914 delete ictx; ictx = 0; 942 delete ictx; ictx = 0;
915 delete octx; octx = 0; 943 delete octx; octx = 0;
916#if ENABLE_DNS
917 dnsv4_reset_connection ();
918#endif
919 944
920 si.host = 0; 945 si.host = 0;
946
947 have_snd_auth = false;
948 have_rcv_auth = false;
949 auth_expire = 0.;
921 950
922 last_activity = 0.; 951 last_activity = 0.;
923 //last_si_change = 0.; 952 //last_si_change = 0.;
924 retry_cnt = 0; 953 retry_cnt = 0;
925 954
… …
932connection::shutdown () 961connection::shutdown ()
933{ 962{
934 if (ictx && octx) 963 if (ictx && octx)
935 send_reset (si); 964 send_reset (si);
936 965
937 reset_connection (); 966 reset_connection ("shutdown");
938} 967}
939 968
940// poor-man's rekeying 969// poor-man's rekeying
941inline void 970inline void
942connection::rekey_cb (ev::timer &w, int revents) 971connection::rekey_cb (ev::timer &w, int revents)
943{ 972{
944 reset_connection (); 973 reset_connection ("rekeying");
945 establish_connection (); 974 establish_connection ();
946} 975}
947 976
948void 977void
949connection::send_data_packet (tap_packet *pkt) 978connection::send_data_packet (tap_packet *pkt)
… …
966 995
967void 996void
968connection::post_inject_queue () 997connection::post_inject_queue ()
969{ 998{
970 // force a connection every now and when when packets are sent (max 1/s) 999 // force a connection every now and when when packets are sent (max 1/s)
971 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary 1000 if (ev_now () - last_establish_attempt >= (conf->low_power || THISNODE->low_power ? 2.95 : 0.95)) // arbitrary
972 establish_connection.stop (); 1001 establish_connection.stop ();
973 1002
974 establish_connection (); 1003 establish_connection ();
975} 1004}
976 1005
… …
984 data_queue.put (new tap_packet (*pkt)); 1013 data_queue.put (new tap_packet (*pkt));
985 post_inject_queue (); 1014 post_inject_queue ();
986 } 1015 }
987} 1016}
988 1017
1018void
989void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1019connection::inject_vpn_packet (vpn_packet *pkt, int tos)
990{ 1020{
991 if (ictx && octx) 1021 if (ictx && octx)
992 send_vpn_packet (pkt, si, tos); 1022 send_vpn_packet (pkt, si, tos);
993 else 1023 else
994 { 1024 {
… …
1000void 1030void
1001connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1031connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
1002{ 1032{
1003 last_activity = ev_now (); 1033 last_activity = ev_now ();
1004 1034
1005 slog (L_NOISE, "%s >> received packet type %d from %d to %d.", 1035 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
1006 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ()); 1036 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1007 1037
1008 if (connectmode == conf_node::C_DISABLED) 1038 if (connectmode == conf_node::C_DISABLED)
1009 return; 1039 return;
1010 1040
… …
1014 slog (L_TRACE, "%s >> PT_PING", conf->nodename); 1044 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1015 1045
1016 // we send pings instead of auth packets after some retries, 1046 // we send pings instead of auth packets after some retries,
1017 // so reset the retry counter and establish a connection 1047 // so reset the retry counter and establish a connection
1018 // when we receive a ping. 1048 // when we receive a ping.
1019 if (!(ictx && octx)) 1049 if (!ictx)
1020 { 1050 {
1021 if (auth_rate_limiter.can (rsi)) 1051 if (auth_rate_limiter.can (rsi))
1022 send_auth_request (rsi, true); 1052 send_auth_request (rsi, true);
1023 } 1053 }
1024 else 1054 else
1025 // we would love to change thre socket address here, but ping's aren't 1055 // we would love to change the socket address here, but ping's aren't
1026 // authenticated, so we best ignore it. 1056 // authenticated, so we best ignore it.
1027 send_ping (rsi, 1); // pong 1057 send_ping (rsi, 1); // pong
1028 1058
1029 break; 1059 break;
1030 1060
1031 case vpn_packet::PT_PONG: 1061 case vpn_packet::PT_PONG:
1032 slog (L_TRACE, "%s >> PT_PONG", conf->nodename); 1062 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1063
1064 // a PONG might mean that the other side doesn't really know
1065 // about our desire for communication.
1066 establish_connection ();
1033 break; 1067 break;
1034 1068
1035 case vpn_packet::PT_RESET: 1069 case vpn_packet::PT_RESET:
1070 slog (L_TRACE, "%s >> PT_RESET", conf->nodename);
1071
1072 if (ictx && octx)
1036 { 1073 {
1037 reset_connection (); 1074 reset_connection ("remote reset");
1038 1075
1039 config_packet *p = (config_packet *) pkt; 1076 config_packet *p = (config_packet *) pkt;
1040 1077
1041 if (!p->chk_config ()) 1078 if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
1042 {
1043 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
1044 conf->nodename, (const char *)rsi);
1045 connectmode = conf_node::C_DISABLED;
1046 }
1047 else if (connectmode == conf_node::C_ALWAYS)
1048 establish_connection (); 1079 establish_connection ();
1049 } 1080 }
1081
1050 break; 1082 break;
1051 1083
1052 case vpn_packet::PT_AUTH_REQ: 1084 case vpn_packet::PT_AUTH_REQ:
1053 if (auth_rate_limiter.can (rsi)) 1085 if (auth_rate_limiter.can (rsi))
1054 { 1086 {
1055 auth_req_packet *p = (auth_req_packet *) pkt; 1087 auth_req_packet *p = (auth_req_packet *)pkt;
1056 1088
1057 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply"); 1089 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1090 conf->nodename, p->initiate ? "initiate" : "reply",
1091 p->protocols, p->features);
1058 1092
1093 if (memcmp (p->magic, MAGIC, 8))
1094 {
1095 slog (L_WARN, _("%s(%s): protocol magic mismatch - stray packet?"),
1096 conf->nodename, (const char *)rsi);
1097 }
1059 if (p->chk_config () 1098 else if (p->chk_config (conf, rsi))
1060 && (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
1061 { 1099 {
1062 if (p->prot_minor != PROTOCOL_MINOR) 1100 if (p->prot_minor != PROTOCOL_MINOR)
1063 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1101 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1064 conf->nodename, (const char *)rsi, 1102 conf->nodename, (const char *)rsi,
1065 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1103 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1066 1104
1067 if (p->initiate) 1105 if (p->initiate)
1106 {
1068 send_auth_request (rsi, false); 1107 send_auth_request (rsi, false);
1069 1108
1070 rsachallenge k; 1109 if (ictx && octx)
1110 reset_connection ("reconnect");
1111 }
1071 1112
1113 auth_data auth;
1114
1072 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1115 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
1073 { 1116 {
1074 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1117 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
1075 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 1118 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1076 break;
1077 } 1119 }
1078 else 1120 else
1079 { 1121 {
1080 delete octx; 1122 bool chg = !have_rcv_auth || !slow_memeq (&rcv_auth, &auth, sizeof auth);
1081 1123
1082 octx = new crypto_ctx (k, 1); 1124 rcv_auth = auth;
1083 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1125 have_rcv_auth = true;
1084 1126
1127 send_auth_response (rsi);
1128
1129 if (chg)
1130 {
1085 conf->protocols = p->protocols; 1131 conf->protocols = p->protocols;
1086 features = p->features & config_packet::get_features (); 1132 features = p->features & config_packet::get_features ();
1087 1133
1088 send_auth_response (rsi, p->id, k);
1089
1090 connection_established (); 1134 connection_established (rsi);
1091
1092 break; 1135 }
1093 } 1136 }
1137
1138 break;
1094 } 1139 }
1095 else
1096 slog (L_WARN, _("%s(%s): protocol mismatch."),
1097 conf->nodename, (const char *)rsi);
1098 1140
1099 send_reset (rsi); 1141 send_reset (rsi);
1100 } 1142 }
1101 1143
1102 break; 1144 break;
… …
1105 { 1147 {
1106 auth_res_packet *p = (auth_res_packet *)pkt; 1148 auth_res_packet *p = (auth_res_packet *)pkt;
1107 1149
1108 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename); 1150 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1109 1151
1110 if (p->chk_config ()) 1152 auth_mac local_mac;
1153 auth_hash (snd_auth, p->response.ecdh, local_mac);
1154
1155 if (!slow_memeq (&p->response.mac, local_mac, sizeof local_mac))
1111 { 1156 {
1112 if (p->prot_minor != PROTOCOL_MINOR)
1113 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1114 conf->nodename, (const char *)rsi,
1115 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1116
1117 rsachallenge chg;
1118
1119 if (!rsa_cache.find (p->id, chg))
1120 {
1121 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."), 1157 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1122 conf->nodename, (const char *)rsi); 1158 conf->nodename, (const char *)rsi);
1123 break;
1124 } 1159 }
1125 else 1160 else if (!have_snd_auth)
1126 { 1161 {
1127 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1162 memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
1128 1163
1129 if (!p->hmac_chk (cctx)) 1164 have_snd_auth = true;
1130 {
1131 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1132 "could be an attack, or just corruption or a synchronization error."),
1133 conf->nodename, (const char *)rsi);
1134 break;
1135 }
1136 else
1137 {
1138 rsaresponse h;
1139
1140 rsa_hash (p->id, chg, h);
1141
1142 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
1143 {
1144 prot_minor = p->prot_minor;
1145
1146 delete ictx; ictx = cctx;
1147
1148 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1149
1150 si = rsi;
1151 protocol = rsi.prot;
1152
1153 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1154 conf->nodename, (const char *)rsi,
1155 is_direct ? "direct" : "forwarded",
1156 p->prot_major, p->prot_minor);
1157
1158 connection_established (); 1165 connection_established (rsi);
1159
1160 if (::conf.script_node_up)
1161 {
1162 run_script_cb *cb = new run_script_cb;
1163 cb->set<connection, &connection::script_node_up> (this);
1164 run_script_queued (cb, _("node-up command execution failed, continuing."));
1165 }
1166
1167 break;
1168 }
1169 else
1170 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1171 conf->nodename, (const char *)rsi);
1172 }
1173
1174 delete cctx;
1175 }
1176 } 1166 }
1177 } 1167 }
1178
1179 send_reset (rsi);
1180 break; 1168 break;
1181 1169
1182 case vpn_packet::PT_DATA_COMPRESSED: 1170 case vpn_packet::PT_DATA_COMPRESSED:
1183#if !ENABLE_COMPRESSION 1171#if !ENABLE_COMPRESSION
1184 send_reset (rsi); 1172 send_reset (rsi);
… …
1190 if (ictx && octx) 1178 if (ictx && octx)
1191 { 1179 {
1192 vpndata_packet *p = (vpndata_packet *)pkt; 1180 vpndata_packet *p = (vpndata_packet *)pkt;
1193 1181
1194 if (!p->hmac_chk (ictx)) 1182 if (!p->hmac_chk (ictx))
1183 {
1184 // rekeying often creates temporary hmac auth floods
1185 // we assume they don't take longer than a few seconds normally,
1186 // and suppress messages and resets during that time.
1187 //TODO: should be done per source address
1188 if (!hmac_error)
1189 {
1190 hmac_error = ev_now () + 3;
1191 break;
1192 }
1193 else if (hmac_error >= ev_now ())
1194 break; // silently suppress
1195 else
1196 {
1195 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1197 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1196 "could be an attack, or just corruption or a synchronization error."), 1198 "could be an attack, or just corruption or a synchronization error."),
1197 conf->nodename, (const char *)rsi); 1199 conf->nodename, (const char *)rsi);
1200 // reset
1201 }
1202 }
1198 else 1203 else
1199 { 1204 {
1200 u32 seqno; 1205 u32 seqno;
1201 tap_packet *d = p->unpack (this, seqno); 1206 tap_packet *d = p->unpack (this, seqno);
1202 int seqclass = iseqno.seqno_classify (seqno); 1207 int seqclass = iseqno.seqno_classify (seqno);
1208
1209 hmac_error = 0;
1203 1210
1204 if (seqclass == 0) // ok 1211 if (seqclass == 0) // ok
1205 { 1212 {
1206 vpn->tap->send (d); 1213 vpn->tap->send (d);
1207 1214
… …
1257 if (p->id > 0 && p->id <= vpn->conns.size ()) 1264 if (p->id > 0 && p->id <= vpn->conns.size ())
1258 { 1265 {
1259 connection *c = vpn->conns[p->id - 1]; 1266 connection *c = vpn->conns[p->id - 1];
1260 conf->protocols = p->protocols; 1267 conf->protocols = p->protocols;
1261 1268
1262 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]", 1269 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1263 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx); 1270 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1271 p->protocols,
1272 c->ictx && c->octx);
1264 1273
1265 if (c->ictx && c->octx) 1274 if (c->ictx && c->octx)
1266 { 1275 {
1267 // send connect_info packets to both sides, in case one is 1276 // send connect_info packets to both sides, in case one is
1268 // behind a nat firewall (or both ;) 1277 // behind a nat firewall (or both ;)
… …
1291 1300
1292 c->conf->protocols = p->protocols; 1301 c->conf->protocols = p->protocols;
1293 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1302 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1294 p->si.upgrade_protocol (protocol, c->conf); 1303 p->si.upgrade_protocol (protocol, c->conf);
1295 1304
1296 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]", 1305 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
1306 conf->nodename,
1297 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, 1307 vpn->conns[p->id - 1]->conf->nodename,
1308 (const char *)p->si,
1309 p->protocols,
1310 protocol,
1311 p->si.supported_protocols (c->conf),
1298 (const char *)p->si, !c->ictx && !c->octx); 1312 !c->ictx && !c->octx);
1299 1313
1300 const sockinfo &dsi = forward_si (p->si); 1314 const sockinfo &dsi = forward_si (p->si);
1301 1315
1302 if (dsi.valid ()) 1316 if (dsi.valid ())
1303 c->send_auth_request (dsi, true); 1317 c->send_auth_request (dsi, true);
1318 else
1319 slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
1320 vpn->conns[p->id - 1]->conf->nodename,
1321 (const char *)p->si);
1304 } 1322 }
1305 else 1323 else
1306 slog (L_WARN, 1324 slog (L_WARN,
1307 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1325 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1308 p->id); 1326 p->id);
… …
1317} 1335}
1318 1336
1319inline void 1337inline void
1320connection::keepalive_cb (ev::timer &w, int revents) 1338connection::keepalive_cb (ev::timer &w, int revents)
1321{ 1339{
1322 if (ev_now () >= last_activity + ::conf.keepalive + 15) 1340 ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
1341
1342 if (when >= 0)
1343 w.start (when);
1344 else if (when < -15)
1323 { 1345 {
1324 reset_connection (); 1346 reset_connection ("keepalive overdue");
1325 establish_connection (); 1347 establish_connection ();
1326 } 1348 }
1327 else if (ev_now () < last_activity + ::conf.keepalive)
1328 w.start (last_activity + ::conf.keepalive - ev::now ());
1329 else if (conf->connectmode != conf_node::C_ONDEMAND 1349 else if (conf->connectmode != conf_node::C_ONDEMAND
1330 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1350 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1331 { 1351 {
1352 w.start (3);
1332 send_ping (si); 1353 send_ping (si);
1333 w.start (3);
1334 } 1354 }
1335 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1355 else if (when >= -10)
1336 // hold ondemand connections implicitly a few seconds longer 1356 // hold ondemand connections implicitly a few seconds longer
1337 // should delete octx, though, or something like that ;) 1357 // should delete octx, though, or something like that ;)
1338 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1358 w.start (when + 10);
1339 else 1359 else
1340 reset_connection (); 1360 reset_connection ("keepalive timeout");
1341} 1361}
1342 1362
1363void
1343void connection::send_connect_request (int id) 1364connection::send_connect_request (int id)
1344{ 1365{
1345 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1366 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1346 1367
1347 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)", 1368 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1348 conf->nodename, vpn->conns[id - 1]->conf->nodename); 1369 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1370 THISNODE->protocols);
1349 p->hmac_set (octx); 1371 p->hmac_set (octx);
1350 send_vpn_packet (p, si); 1372 send_vpn_packet (p, si);
1351 1373
1352 delete p; 1374 delete p;
1353} 1375}
1354 1376
1377void
1355void connection::script_init_env (const char *ext) 1378connection::script_init_env (const char *ext)
1356{ 1379{
1357 char *env; 1380 char *env;
1358 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1381 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1359 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1382 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1360 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1383 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1361 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1384 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1362 conf->id & 0xff); putenv (env); 1385 conf->id & 0xff); putenv (env);
1363} 1386}
1364 1387
1388void
1365void connection::script_init_connect_env () 1389connection::script_init_connect_env ()
1366{ 1390{
1367 vpn->script_init_env (); 1391 vpn->script_init_env ();
1368 1392
1369 char *env; 1393 char *env;
1370 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1394 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
… …
1435 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1459 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1436 1460
1437 last_establish_attempt = 0.; 1461 last_establish_attempt = 0.;
1438 octx = ictx = 0; 1462 octx = ictx = 0;
1439 1463
1440 if (!conf->protocols) // make sure some protocol is enabled
1441 conf->protocols = PROT_UDPv4;
1442
1443 connectmode = conf->connectmode; 1464 connectmode = conf->connectmode;
1444 1465
1445 // queue a dummy packet to force an initial connection attempt 1466 // queue a dummy packet to force an initial connection attempt
1446 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1467 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1447 vpn_queue.put (new net_packet); 1468 vpn_queue.put (new net_packet);
1448 1469
1449 reset_connection (); 1470 reset_connection ("startup");
1450} 1471}
1451 1472
1452connection::~connection () 1473connection::~connection ()
1453{ 1474{
1454 shutdown (); 1475 shutdown ();
1455} 1476}
1456 1477
1478void
1457void connection_init () 1479connection_init ()
1458{ 1480{
1459 auth_rate_limiter.clear (); 1481 auth_rate_limiter.clear ();
1460 reset_rate_limiter.clear (); 1482 reset_rate_limiter.clear ();
1461} 1483}
1462 1484

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines