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.67 by pcg, Thu Aug 7 16:34:21 2008 UTC vs.
Revision 1.104 by root, Fri Jul 19 18:18:27 2013 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2005 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 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <list> 34#include <list>
35#include <queue>
36#include <utility>
25 37
26#include <openssl/rand.h> 38#include <openssl/rand.h>
27#include <openssl/evp.h> 39#include <openssl/evp.h>
28#include <openssl/rsa.h> 40#include <openssl/rsa.h>
29#include <openssl/err.h> 41#include <openssl/err.h>
31#include "conf.h" 43#include "conf.h"
32#include "slog.h" 44#include "slog.h"
33#include "device.h" 45#include "device.h"
34#include "vpn.h" 46#include "vpn.h"
35#include "connection.h" 47#include "connection.h"
48#include "hkdf.h"
36 49
37#include "netcompat.h" 50#include "netcompat.h"
38 51
39#if !HAVE_RAND_PSEUDO_BYTES
40# define RAND_pseudo_bytes RAND_bytes
41#endif
42
43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 52#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic
53#define MAGIC "HUHN\xbd\xc6\xdb\x82" // 8 bytes of magic//D
44 54
45#define ULTRA_FAST 1 55#define ULTRA_FAST 1
46#define HLOG 15 56#define HLOG 15
47#include "lzf/lzf.h" 57#include "lzf/lzf.h"
48#include "lzf/lzf_c.c" 58#include "lzf/lzf_c.c"
49#include "lzf/lzf_d.c" 59#include "lzf/lzf_d.c"
50 60
61//////////////////////////////////////////////////////////////////////////////
62
63static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
64static ev::child rs_child_ev;
65
66namespace
67{
68 void // c++ requires external linkage here, apparently :(
69 rs_child_cb (ev::child &w, int revents)
70 {
71 w.stop ();
72
73 if (rs_queue.empty ())
74 return;
75
76 pid_t pid = run_script (*rs_queue.front ().first, false);
77 if (pid)
78 {
79 w.set (pid);
80 w.start ();
81 }
82 else
83 slog (L_WARN, rs_queue.front ().second);
84
85 delete rs_queue.front ().first;
86 rs_queue.pop ();
87 }
88};
89
90// despite the fancy name, this is quite a hack
91static void
92run_script_queued (run_script_cb *cb, const char *warnmsg)
93{
94 rs_queue.push (std::make_pair (cb, warnmsg));
95
96 if (!rs_child_ev.is_active ())
97 {
98 rs_child_ev.set<rs_child_cb> ();
99 rs_child_ev ();
100 }
101}
102
103//////////////////////////////////////////////////////////////////////////////
104
51struct crypto_ctx 105struct crypto_ctx
52{ 106{
53 EVP_CIPHER_CTX cctx; 107 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 108 HMAC_CTX hctx;
55 109
56 crypto_ctx (const rsachallenge &challenge, int enc); 110 crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc);
57 ~crypto_ctx (); 111 ~crypto_ctx ();
58}; 112};
59 113
60crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 114crypto_ctx::crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc)
61{ 115{
116 ecdh_key s;
117
118 curve25519_combine (a, b, s);
119
120 {
121 u8 mac_key[MAC_KEYSIZE];
122 static const unsigned char mac_info[] = "gvpe mac key";
123
124 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
125 kdf.extract (auth1.rsa.mac_key, sizeof (auth1.rsa.mac_key));
126 kdf.extract (s, sizeof (s));
127 kdf.extract_done (HKDF_PRF_HASH ());
128 kdf.expand (mac_key, sizeof (mac_key), mac_info, sizeof (mac_info));
129
130 HMAC_CTX_init (&hctx);
131 require (HMAC_Init_ex (&hctx, mac_key, MAC_KEYSIZE, MAC_DIGEST (), 0));
132 }
133
134 {
135 u8 cipher_key[CIPHER_KEYSIZE];
136 static const unsigned char cipher_info[] = "gvpe cipher key";
137
138 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
139 kdf.extract (auth1.rsa.cipher_key, sizeof (auth1.rsa.cipher_key));
140 kdf.extract (s, sizeof (s));
141 kdf.extract_done (HKDF_PRF_HASH ());
142 kdf.expand (cipher_key, sizeof (cipher_key), cipher_info, sizeof (cipher_info));
143
62 EVP_CIPHER_CTX_init (&cctx); 144 EVP_CIPHER_CTX_init (&cctx);
63 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc)); 145 require (EVP_CipherInit_ex (&cctx, CIPHER (), 0, cipher_key, 0, enc));
64 HMAC_CTX_init (&hctx); 146 }
65 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
66} 147}
67 148
68crypto_ctx::~crypto_ctx () 149crypto_ctx::~crypto_ctx ()
69{ 150{
70 require (EVP_CIPHER_CTX_cleanup (&cctx)); 151 require (EVP_CIPHER_CTX_cleanup (&cctx));
71 HMAC_CTX_cleanup (&hctx); 152 HMAC_CTX_cleanup (&hctx);
72} 153}
73 154
155static inline void
156auth_encrypt (RSA *key, const auth_data &auth, auth_encr &encr)
157{
158 if (RSA_public_encrypt (sizeof (auth.rsa),
159 (unsigned char *)&auth.rsa, (unsigned char *)&encr.rsa,
160 key, RSA_PKCS1_OAEP_PADDING) < 0)
161 fatal ("RSA_public_encrypt error");
162
163 memcpy (&encr.ecdh, &auth.ecdh, sizeof (encr.ecdh));
164}
165
166static inline bool
167auth_decrypt (RSA *key, const auth_encr &encr, auth_data &auth)
168{
169 u8 rsa_decrypt[RSA_KEYLEN];
170
171 if (RSA_private_decrypt (sizeof (encr.rsa),
172 (const unsigned char *)&encr.rsa, (unsigned char *)rsa_decrypt,
173 key, RSA_PKCS1_OAEP_PADDING) != sizeof (auth.rsa))
174 return 0;
175
176 memcpy (&auth.rsa, rsa_decrypt, sizeof (auth.rsa));
177 memcpy (&auth.ecdh, &encr.ecdh, sizeof (auth.ecdh));
178
179 return 1;
180}
181
74static void 182static void
75rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 183auth_hash (const auth_data &auth, const ecdh_key &b, auth_mac &mac)
76{ 184{
77 EVP_MD_CTX ctx; 185 hkdf kdf (&auth.ecdh, sizeof (auth.ecdh), AUTH_DIGEST ()); // use remote ecdh b as salt
78 186 kdf.extract (&auth.rsa, sizeof (auth.rsa));
79 EVP_MD_CTX_init (&ctx); 187 kdf.extract_done ();
80 require (EVP_DigestInit (&ctx, RSA_HASH)); 188 kdf.expand (mac, sizeof mac, b, sizeof b); // use response ecdh b as info
81 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
84 EVP_MD_CTX_cleanup (&ctx);
85} 189}
86 190
87struct rsa_entry 191void
192connection::generate_auth_data ()
88{ 193{
89 tstamp expire; 194 if (auth_expire < ev_now ())
90 rsaid id;
91 rsachallenge chg;
92};
93
94struct rsa_cache : list<rsa_entry>
95{
96 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
97
98 bool find (const rsaid &id, rsachallenge &chg)
99 {
100 for (iterator i = begin (); i != end (); ++i)
101 { 195 {
102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ()) 196 // request data
103 { 197 rand_fill (snd_auth.rsa);
104 memcpy (&chg, &i->chg, sizeof chg); 198 curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
105 199
106 erase (i); 200 // eventual response data
107 return true; 201 curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
108 }
109 } 202 }
110 203
111 if (!cleaner.is_active ()) 204 // every use prolongs the expiry
112 cleaner.again ();
113
114 return false;
115 }
116
117 void gen (rsaid &id, rsachallenge &chg)
118 {
119 rsa_entry e;
120
121 RAND_bytes ((unsigned char *)&id, sizeof id);
122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
123
124 e.expire = ev_now () + RSA_TTL; 205 auth_expire = ev_now () + AUTH_TTL;
125 e.id = id;
126 memcpy (&e.chg, &chg, sizeof chg);
127
128 push_back (e);
129
130 if (!cleaner.is_active ())
131 cleaner.again ();
132 }
133
134 rsa_cache ()
135 {
136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
139
140} rsa_cache;
141
142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
143{
144 if (empty ())
145 w.stop ();
146 else
147 {
148 for (iterator i = begin (); i != end (); )
149 if (i->expire <= ev_now ())
150 i = erase (i);
151 else
152 ++i;
153 }
154} 206}
155 207
156////////////////////////////////////////////////////////////////////////////// 208//////////////////////////////////////////////////////////////////////////////
157 209
158pkt_queue::pkt_queue (double max_ttl, int max_queue) 210pkt_queue::pkt_queue (double max_ttl, int max_queue)
172 delete p; 224 delete p;
173 225
174 delete [] queue; 226 delete [] queue;
175} 227}
176 228
229void
177void pkt_queue::expire_cb (ev::timer &w, int revents) 230pkt_queue::expire_cb (ev::timer &w, int revents)
178{ 231{
179 ev_tstamp expire = ev_now () - max_ttl; 232 ev_tstamp expire = ev_now () - max_ttl;
180 233
181 for (;;) 234 for (;;)
182 { 235 {
193 246
194 delete get (); 247 delete get ();
195 } 248 }
196} 249}
197 250
251void
198void pkt_queue::put (net_packet *p) 252pkt_queue::put (net_packet *p)
199{ 253{
200 ev_tstamp now = ev_now (); 254 ev_tstamp now = ev_now ();
201 255
202 // start expiry timer 256 // start expiry timer
203 if (empty ()) 257 if (empty ())
212 queue[i].tstamp = now; 266 queue[i].tstamp = now;
213 267
214 i = ni; 268 i = ni;
215} 269}
216 270
217net_packet *pkt_queue::get () 271net_packet *
272pkt_queue::get ()
218{ 273{
219 if (empty ()) 274 if (empty ())
220 return 0; 275 return 0;
221 276
222 net_packet *p = queue[j].pkt; 277 net_packet *p = queue[j].pkt;
246 301
247 bool can (const sockinfo &si) { return can((u32)si.host); } 302 bool can (const sockinfo &si) { return can((u32)si.host); }
248 bool can (u32 host); 303 bool can (u32 host);
249}; 304};
250 305
251net_rate_limiter auth_rate_limiter, reset_rate_limiter; 306static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
252 307
308bool
253bool net_rate_limiter::can (u32 host) 309net_rate_limiter::can (u32 host)
254{ 310{
255 iterator i; 311 iterator i;
256 312
257 for (i = begin (); i != end (); ) 313 for (i = begin (); i != end (); )
258 if (i->host == host) 314 if (i->host == host)
303 } 359 }
304} 360}
305 361
306///////////////////////////////////////////////////////////////////////////// 362/////////////////////////////////////////////////////////////////////////////
307 363
308unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 364void
309
310void hmac_packet::hmac_gen (crypto_ctx *ctx) 365hmac_packet::hmac_gen (crypto_ctx *ctx, u8 *hmac_digest)
311{ 366{
312 unsigned int xlen;
313
314 HMAC_CTX *hctx = &ctx->hctx; 367 HMAC_CTX *hctx = &ctx->hctx;
315 368
316 HMAC_Init_ex (hctx, 0, 0, 0, 0); 369 require (HMAC_Init_ex (hctx, 0, 0, 0, 0));
317 HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), 370 require (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), len - sizeof (hmac_packet)));
318 len - sizeof (hmac_packet)); 371 require (HMAC_Final (hctx, hmac_digest, 0));
319 HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);
320} 372}
321 373
322void 374void
323hmac_packet::hmac_set (crypto_ctx *ctx) 375hmac_packet::hmac_set (crypto_ctx *ctx)
324{ 376{
325 hmac_gen (ctx); 377 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
326 378 hmac_gen (ctx, hmac_digest);
327 memcpy (hmac, hmac_digest, HMACLENGTH); 379 memcpy (hmac, hmac_digest, HMACLENGTH);
328} 380}
329 381
330bool 382bool
331hmac_packet::hmac_chk (crypto_ctx *ctx) 383hmac_packet::hmac_chk (crypto_ctx *ctx)
332{ 384{
333 hmac_gen (ctx); 385 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
334 386 hmac_gen (ctx, hmac_digest);
335 return !memcmp (hmac, hmac_digest, HMACLENGTH); 387 return !memcmp (hmac, hmac_digest, HMACLENGTH);
336} 388}
337 389
390void
338void vpn_packet::set_hdr (ptype type_, unsigned int dst) 391vpn_packet::set_hdr (ptype type_, unsigned int dst)
339{ 392{
340 type = type_; 393 type = type_;
341 394
342 int src = THISNODE->id; 395 int src = THISNODE->id;
343 396
348 401
349#define MAXVPNDATA (MAX_MTU - 6 - 6) 402#define MAXVPNDATA (MAX_MTU - 6 - 6)
350#define DATAHDR (sizeof (u32) + RAND_SIZE) 403#define DATAHDR (sizeof (u32) + RAND_SIZE)
351 404
352struct vpndata_packet : vpn_packet 405struct vpndata_packet : vpn_packet
406{
407 u8 data[MAXVPNDATA + DATAHDR]; // seqno
408
409 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
410 tap_packet *unpack (connection *conn, u32 &seqno);
411
412private:
413 const u32 data_hdr_size () const
353 { 414 {
354 u8 data[MAXVPNDATA + DATAHDR]; // seqno
355
356 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
357 tap_packet *unpack (connection *conn, u32 &seqno);
358private:
359
360 const u32 data_hdr_size () const
361 {
362 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 415 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
363 }
364 }; 416 }
417};
365 418
366void 419void
367vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 420vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
368{ 421{
369 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 422 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
371 ptype type = PT_DATA_UNCOMPRESSED; 424 ptype type = PT_DATA_UNCOMPRESSED;
372 425
373#if ENABLE_COMPRESSION 426#if ENABLE_COMPRESSION
374 u8 cdata[MAX_MTU]; 427 u8 cdata[MAX_MTU];
375 428
376 if (conn->features & ENABLE_COMPRESSION) 429 if (conn->features & FEATURE_COMPRESSION)
377 { 430 {
378 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 431 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
379 432
380 if (cl) 433 if (cl)
381 { 434 {
387 d[1] = cl; 440 d[1] = cl;
388 } 441 }
389 } 442 }
390#endif 443#endif
391 444
392 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 445 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 1));
393 446
394 struct { 447 struct {
395#if RAND_SIZE 448#if RAND_SIZE
396 u8 rnd[RAND_SIZE]; 449 u8 rnd[RAND_SIZE];
397#endif 450#endif
398 u32 seqno; 451 u32 seqno;
399 } datahdr; 452 } datahdr;
400 453
401 datahdr.seqno = ntohl (seqno); 454 datahdr.seqno = ntohl (seqno);
402#if RAND_SIZE 455#if RAND_SIZE
403 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 456 // NB: a constant (per session) random prefix
457 // is likely enough, but we don't take any chances.
458 conn->oiv.get (datahdr.rnd, RAND_SIZE);
404#endif 459#endif
405 460
406 require (EVP_EncryptUpdate (cctx, 461 require (EVP_EncryptUpdate (cctx,
407 (unsigned char *) data + outl, &outl2, 462 (unsigned char *) data + outl, &outl2,
408 (unsigned char *) &datahdr, DATAHDR)); 463 (unsigned char *) &datahdr, DATAHDR));
430 int outl = 0, outl2; 485 int outl = 0, outl2;
431 tap_packet *p = new tap_packet; 486 tap_packet *p = new tap_packet;
432 u8 *d; 487 u8 *d;
433 u32 l = len - data_hdr_size (); 488 u32 l = len - data_hdr_size ();
434 489
435 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0)); 490 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 0));
436 491
437#if ENABLE_COMPRESSION 492#if ENABLE_COMPRESSION
438 u8 cdata[MAX_MTU]; 493 u8 cdata[MAX_MTU];
439 494
440 if (type == PT_DATA_COMPRESSED) 495 if (type == PT_DATA_COMPRESSED)
441 d = cdata; 496 d = cdata;
442 else 497 else
443#endif 498#endif
444 d = &(*p)[6 + 6 - DATAHDR]; 499 d = &(*p)[6 + 6] - DATAHDR;
445 500
446 /* this overwrites part of the src mac, but we fix that later */ 501 // we play do evil games with the struct layout atm.
502 // pending better solutions, we at least do some verification.
503 // this is fine, as we left ISO territory long ago.
504 require (DATAHDR <= 16);
505 require ((u8 *)(&p->len + 1) == &(*p)[0]);
506
507 // this can overwrite the len/dst/src fields
447 require (EVP_DecryptUpdate (cctx, 508 require (EVP_DecryptUpdate (cctx,
448 d, &outl2, 509 d, &outl2,
449 (unsigned char *)&data, len - data_hdr_size ())); 510 (unsigned char *)&data, len - data_hdr_size ()));
450 outl += outl2; 511 outl += outl2;
451 512
482 } 543 }
483}; 544};
484 545
485struct config_packet : vpn_packet 546struct config_packet : vpn_packet
486{ 547{
487 // actually, hmaclen cannot be checked because the hmac 548 u8 serial[SERIAL_SIZE];
488 // field comes before this data, so peers with other
489 // hmacs simply will not work.
490 u8 prot_major, prot_minor, randsize, hmaclen; 549 u8 prot_major, prot_minor, randsize;
491 u8 flags, challengelen, features, pad3; 550 u8 flags, features, pad6, pad7, pad8;
492 u32 cipher_nid, digest_nid, hmac_nid; 551 u32 cipher_nid, mac_nid, auth_nid;
493 552
494 void setup (ptype type, int dst); 553 void setup (ptype type, int dst);
495 bool chk_config () const; 554 bool chk_config (const conf_node *conf, const sockinfo &rsi) const;
496 555
497 static u8 get_features () 556 static u8 get_features ()
498 { 557 {
499 u8 f = 0; 558 u8 f = 0;
500#if ENABLE_COMPRESSION 559#if ENABLE_COMPRESSION
508#endif 567#endif
509 return f; 568 return f;
510 } 569 }
511}; 570};
512 571
572void
513void config_packet::setup (ptype type, int dst) 573config_packet::setup (ptype type, int dst)
514{ 574{
515 prot_major = PROTOCOL_MAJOR; 575 prot_major = PROTOCOL_MAJOR;
516 prot_minor = PROTOCOL_MINOR; 576 prot_minor = PROTOCOL_MINOR;
517 randsize = RAND_SIZE; 577 randsize = RAND_SIZE;
518 hmaclen = HMACLENGTH;
519 flags = 0; 578 flags = 0;
520 challengelen = sizeof (rsachallenge);
521 features = get_features (); 579 features = get_features ();
522 580
581 strncpy ((char *)serial, conf.serial, sizeof (serial));
582
523 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 583 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
524 digest_nid = htonl (EVP_MD_type (RSA_HASH));
525 hmac_nid = htonl (EVP_MD_type (DIGEST)); 584 mac_nid = htonl (EVP_MD_type (MAC_DIGEST ()));
585 auth_nid = htonl (EVP_MD_type (AUTH_DIGEST ()));
526 586
527 len = sizeof (*this) - sizeof (net_packet); 587 len = sizeof (*this) - sizeof (net_packet);
528 set_hdr (type, dst); 588 set_hdr (type, dst);
529} 589}
530 590
531bool config_packet::chk_config () const 591bool
592config_packet::chk_config (const conf_node *conf, const sockinfo &rsi) const
532{ 593{
533 if (prot_major != PROTOCOL_MAJOR) 594 if (prot_major != PROTOCOL_MAJOR)
534 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 595 slog (L_WARN, _("%s(%s): major version mismatch (remote %d <=> local %d)"),
596 conf->nodename, (const char *)rsi, prot_major, PROTOCOL_MAJOR);
535 else if (randsize != RAND_SIZE) 597 else if (randsize != RAND_SIZE)
536 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 598 slog (L_WARN, _("%s(%s): rand size mismatch (remote %d <=> local %d)"),
537 else if (hmaclen != HMACLENGTH) 599 conf->nodename, (const char *)rsi, randsize, RAND_SIZE);
538 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
539 else if (challengelen != sizeof (rsachallenge))
540 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
541 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 600 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
542 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 601 slog (L_WARN, _("%s(%s): cipher algo mismatch (remote %x <=> local %x)"),
543 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 602 conf->nodename, (const char *)rsi, ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
544 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
545 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 603 else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
546 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 604 slog (L_WARN, _("%s(%s): mac algo mismatch (remote %x <=> local %x)"),
605 conf->nodename, (const char *)rsi, ntohl (mac_nid), EVP_MD_type (MAC_DIGEST ()));
606 else if (auth_nid != htonl (EVP_MD_type (AUTH_DIGEST ())))
607 slog (L_WARN, _("%s(%s): auth algo mismatch (remote %x <=> local %x)"),
608 conf->nodename, (const char *)rsi, ntohl (auth_nid), EVP_MD_type (AUTH_DIGEST ()));
547 else 609 else
610 {
611 int cmp = memcmp (serial, ::conf.serial, sizeof (serial));
612
613 if (cmp > 0)
614 slog (L_WARN, _("%s(%s): remote serial newer than local serial - outdated config?"),
615 conf->nodename, (const char *)rsi);
616 else if (cmp == 0)
548 return true; 617 return true;
618 }
549 619
550 return false; 620 return false;
551} 621}
552 622
553struct auth_req_packet : config_packet 623struct auth_req_packet : config_packet // UNPROTECTED
554{ 624{
555 char magic[8]; 625 char magic[8];
556 u8 initiate; // false if this is just an automatic reply 626 u8 initiate; // false if this is just an automatic reply
557 u8 protocols; // supported protocols (will be patched on forward) 627 u8 protocols; // supported protocols (will be patched on forward)
558 u8 pad2, pad3; 628 u8 pad2, pad3;
559 rsaid id; 629 auth_encr encr;
560 rsaencrdata encr;
561 630
562 auth_req_packet (int dst, bool initiate_, u8 protocols_) 631 auth_req_packet (int dst, bool initiate_, u8 protocols_)
563 { 632 {
564 config_packet::setup (PT_AUTH_REQ, dst); 633 config_packet::setup (PT_AUTH_REQ, dst);
565 strncpy (magic, MAGIC, 8); 634 memcpy (magic, MAGIC, 8);
566 initiate = !!initiate_; 635 initiate = !!initiate_;
567 protocols = protocols_; 636 protocols = protocols_;
568 637
569 len = sizeof (*this) - sizeof (net_packet); 638 len = sizeof (*this) - sizeof (net_packet);
570 } 639 }
571}; 640};
572 641
573struct auth_res_packet : config_packet 642struct auth_res_packet : vpn_packet // UNPROTECTED
574{ 643{
575 rsaid id;
576 u8 pad1, pad2, pad3;
577 u8 response_len; // encrypted length
578 rsaresponse response; 644 auth_response response;
579 645
580 auth_res_packet (int dst) 646 auth_res_packet (int dst)
581 { 647 {
582 config_packet::setup (PT_AUTH_RES, dst); 648 set_hdr (PT_AUTH_RES, dst);
583 649
584 len = sizeof (*this) - sizeof (net_packet); 650 len = sizeof (*this) - sizeof (net_packet);
585 } 651 }
586}; 652};
587 653
617}; 683};
618 684
619///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
620 686
621void 687void
622connection::connection_established () 688connection::connection_established (const sockinfo &rsi)
623{ 689{
624 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 690 if (!have_snd_auth || !have_rcv_auth)
691 return;
625 692
693 si = rsi;
694 protocol = rsi.prot;
695
696 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
697 conf->nodename, (const char *)rsi,
698 is_direct ? "direct" : "forwarded",
699 PROTOCOL_MAJOR, prot_minor);
700
701 if (::conf.script_node_up)
702 {
703 run_script_cb *cb = new run_script_cb;
704 cb->set<connection, &connection::script_node_up> (this);
705 run_script_queued (cb, _("node-up command execution failed, continuing."));
706 }
707
708 delete ictx; ictx = new crypto_ctx (rcv_auth, snd_auth, rcv_ecdh_a, rcv_auth.ecdh, 0);
709 iseqno.reset (ntohl (rcv_auth.rsa.seqno) & 0x7fffffff);
710
711 delete octx; octx = new crypto_ctx (snd_auth, rcv_auth, snd_ecdh_a, snd_ecdh_b , 1);
712 oseqno = ntohl (snd_auth.rsa.seqno) & 0x7fffffff;
713
714 oiv.reset ();
715
716 // make sure rekeying timeouts are slightly asymmetric
717 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
718 rekey.start (rekey_interval, rekey_interval);
719
720 keepalive.start (::conf.keepalive);
721
722 // send queued packets
626 if (ictx && octx) 723 if (ictx && octx)
627 { 724 {
628 // make sure rekeying timeouts are slightly asymmetric 725 while (tap_packet *p = (tap_packet *)data_queue.get ())
629 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
630 rekey.start (rekey_interval, rekey_interval);
631 keepalive.start (::conf.keepalive);
632
633 // send queued packets
634 if (ictx && octx)
635 { 726 {
636 while (tap_packet *p = (tap_packet *)data_queue.get ())
637 {
638 if (p->len) send_data_packet (p); 727 if (p->len) send_data_packet (p);
639 delete p; 728 delete p;
640 }
641
642 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
643 {
644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
645 delete p;
646 }
647 } 729 }
730
731 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
732 {
733 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
734 delete p;
735 }
648 } 736 }
737
738 vpn->connection_established (this);
739}
740
741void
742connection::reset_si ()
743{
744 if (vpn->can_direct (THISNODE, conf))
745 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
649 else 746 else
650 { 747 {
651 retry_cnt = 0;
652 establish_connection.start (5);
653 keepalive.stop ();
654 rekey.stop ();
655 }
656}
657
658void
659connection::reset_si ()
660{
661 protocol = best_protocol (THISNODE->protocols & conf->protocols);
662
663 // mask out protocols we cannot establish
664 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
665 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
666 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
667
668 if (protocol
669 && (!conf->can_direct (THISNODE)
670 || !THISNODE->can_direct (conf)))
671 {
672 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 748 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
673 protocol = 0; 749 protocol = 0;
674 } 750 }
675 751
676 si.set (conf, protocol); 752 si.set (conf, protocol);
753
754 is_direct = si.valid ();
677} 755}
678 756
679// ensure sockinfo is valid, forward if necessary 757// ensure sockinfo is valid, forward if necessary
680const sockinfo & 758const sockinfo &
681connection::forward_si (const sockinfo &si) const 759connection::forward_si (const sockinfo &si) const
682{ 760{
683 if (!si.valid ()) 761 if (!si.valid ())
684 { 762 {
685 connection *r = vpn->find_router (); 763 connection *r = vpn->find_router_for (this);
686 764
687 if (r) 765 if (r)
688 { 766 {
689 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 767 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
690 conf->nodename, r->conf->nodename, (const char *)r->si); 768 conf->nodename, r->conf->nodename);
691 return r->si; 769 return r->si;
692 } 770 }
693 else 771 else
694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 772 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
695 conf->nodename); 773 conf->nodename);
696 } 774 }
697 775
698 return si; 776 return si;
699} 777}
709connection::send_ping (const sockinfo &si, u8 pong) 787connection::send_ping (const sockinfo &si, u8 pong)
710{ 788{
711 ping_packet *pkt = new ping_packet; 789 ping_packet *pkt = new ping_packet;
712 790
713 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 791 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
792
793 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
714 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 794 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
715 795
716 delete pkt; 796 delete pkt;
717} 797}
718 798
733void 813void
734connection::send_auth_request (const sockinfo &si, bool initiate) 814connection::send_auth_request (const sockinfo &si, bool initiate)
735{ 815{
736 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 816 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
737 817
738 rsachallenge chg; 818 generate_auth_data ();
739 rsa_cache.gen (pkt->id, chg);
740 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 819 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
741 820
742 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 821 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
743
744 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 822 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
745 823
746 delete pkt; 824 delete pkt;
747} 825}
748 826
749void 827void
750connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 828connection::send_auth_response (const sockinfo &si)
751{ 829{
752 auth_res_packet *pkt = new auth_res_packet (conf->id); 830 auth_res_packet *pkt = new auth_res_packet (conf->id);
753 831
754 pkt->id = id; 832 memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof rcv_ecdh_b);
833 auth_hash (rcv_auth, rcv_ecdh_b, pkt->response.mac);
755 834
756 rsa_hash (id, chg, pkt->response);
757
758 pkt->hmac_set (octx);
759
760 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 835 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
761
762 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 836 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
763 837
764 delete pkt; 838 delete pkt;
765} 839}
766 840
767void 841void
768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 842connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
769{ 843{
770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 844 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
771 conf->id, rid, (const char *)rsi); 845 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
846 conf->protocols);
772 847
773 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 848 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
774 849
775 r->hmac_set (octx); 850 r->hmac_set (octx);
776 send_vpn_packet (r, si); 851 send_vpn_packet (r, si);
779} 854}
780 855
781inline void 856inline void
782connection::establish_connection_cb (ev::timer &w, int revents) 857connection::establish_connection_cb (ev::timer &w, int revents)
783{ 858{
784 if (!ictx 859 if (!(ictx && octx)
785 && conf != THISNODE 860 && conf != THISNODE
786 && connectmode != conf_node::C_NEVER 861 && connectmode != conf_node::C_NEVER
787 && connectmode != conf_node::C_DISABLED 862 && connectmode != conf_node::C_DISABLED
788 && !w.is_active ()) 863 && !w.is_active ())
789 { 864 {
793 { 868 {
794 reset_connection (); 869 reset_connection ();
795 return; 870 return;
796 } 871 }
797 872
873 last_establish_attempt = ev_now ();
874
798 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 875 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
799 ? (retry_cnt & 3) + 1 876 ? (retry_cnt & 3) + 1
800 : 1 << (retry_cnt >> 2)); 877 : 1 << (retry_cnt >> 2));
801 878
802 reset_si (); 879 reset_si ();
803 880
804 bool slow = si.prot & PROT_SLOW; 881 bool slow = si.prot & PROT_SLOW;
805 882
806 if (si.prot && !si.host) 883 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
807 { 884 {
808 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
809 /*TODO*/ /* start the timer so we don't recurse endlessly */ 885 /*TODO*/ /* start the timer so we don't recurse endlessly */
810 w.start (1); 886 w.start (1);
811 vpn->send_connect_request (conf->id); 887 vpn->send_connect_request (this);
812 } 888 }
813 else 889 else
814 { 890 {
815 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx); 891 if (si.valid ())
892 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
893 conf->nodename, (const char *)si);
816 894
817 const sockinfo &dsi = forward_si (si); 895 const sockinfo &dsi = forward_si (si);
818 896
819 slow = slow || (dsi.prot & PROT_SLOW); 897 slow = slow || (dsi.prot & PROT_SLOW);
820 898
825 else 903 else
826 send_ping (dsi, 0); 904 send_ping (dsi, 0);
827 } 905 }
828 } 906 }
829 907
830 retry_int *= slow ? 8. : 0.7; 908 retry_int *= slow ? 8. : 0.9;
831 909
832 if (retry_int < conf->max_retry) 910 if (retry_int < conf->max_retry)
833 retry_cnt++; 911 retry_cnt++;
834 else 912 else
835 retry_int = conf->max_retry; 913 retry_int = conf->max_retry;
846 slog (L_INFO, _("%s(%s): connection lost"), 924 slog (L_INFO, _("%s(%s): connection lost"),
847 conf->nodename, (const char *)si); 925 conf->nodename, (const char *)si);
848 926
849 if (::conf.script_node_down) 927 if (::conf.script_node_down)
850 { 928 {
851 run_script_cb cb; 929 run_script_cb *cb = new run_script_cb;
852 cb.set<connection, &connection::script_node_down> (this); 930 cb->set<connection, &connection::script_node_down> (this);
853 if (!run_script (cb, false))
854 slog (L_WARN, _("node-down command execution failed, continuing.")); 931 run_script_queued (cb, _("node-down command execution failed, continuing."));
855 } 932 }
856 } 933 }
857 934
858 delete ictx; ictx = 0; 935 delete ictx; ictx = 0;
859 delete octx; octx = 0; 936 delete octx; octx = 0;
860#if ENABLE_DNS
861 dnsv4_reset_connection ();
862#endif
863 937
864 si.host = 0; 938 si.host = 0;
865 939
940 have_snd_auth = false;
941 have_rcv_auth = false;
942 auth_expire = 0.;
943
866 last_activity = 0; 944 last_activity = 0.;
945 //last_si_change = 0.;
867 retry_cnt = 0; 946 retry_cnt = 0;
868 947
869 rekey.stop (); 948 rekey.stop ();
870 keepalive.stop (); 949 keepalive.stop ();
871 establish_connection.stop (); 950 establish_connection.stop ();
878 send_reset (si); 957 send_reset (si);
879 958
880 reset_connection (); 959 reset_connection ();
881} 960}
882 961
962// poor-man's rekeying
883inline void 963inline void
884connection::rekey_cb (ev::timer &w, int revents) 964connection::rekey_cb (ev::timer &w, int revents)
885{ 965{
886 reset_connection (); 966 reset_connection ();
887 establish_connection (); 967 establish_connection ();
905 if (oseqno > MAX_SEQNO) 985 if (oseqno > MAX_SEQNO)
906 rekey (); 986 rekey ();
907} 987}
908 988
909void 989void
990connection::post_inject_queue ()
991{
992 // force a connection every now and when when packets are sent (max 1/s)
993 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
994 establish_connection.stop ();
995
996 establish_connection ();
997}
998
999void
910connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 1000connection::inject_data_packet (tap_packet *pkt)
911{ 1001{
912 if (ictx && octx) 1002 if (ictx && octx)
913 send_data_packet (pkt); 1003 send_data_packet (pkt);
914 else 1004 else
915 { 1005 {
916 if (!broadcast)
917 data_queue.put (new tap_packet (*pkt)); 1006 data_queue.put (new tap_packet (*pkt));
918 1007 post_inject_queue ();
919 establish_connection ();
920 } 1008 }
921} 1009}
922 1010
1011void
923void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1012connection::inject_vpn_packet (vpn_packet *pkt, int tos)
924{ 1013{
925 if (ictx && octx) 1014 if (ictx && octx)
926 send_vpn_packet (pkt, si, tos); 1015 send_vpn_packet (pkt, si, tos);
927 else 1016 else
928 { 1017 {
929 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1018 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
930 1019 post_inject_queue ();
931 establish_connection ();
932 } 1020 }
933} 1021}
934 1022
935void 1023void
936connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1024connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
937{ 1025{
938 last_activity = ev_now (); 1026 last_activity = ev_now ();
939 1027
940 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1028 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
941 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1029 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
942 1030
943 if (connectmode == conf_node::C_DISABLED) 1031 if (connectmode == conf_node::C_DISABLED)
944 return; 1032 return;
945 1033
946 switch (pkt->typ ()) 1034 switch (pkt->typ ())
947 { 1035 {
948 case vpn_packet::PT_PING: 1036 case vpn_packet::PT_PING:
1037 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1038
949 // we send pings instead of auth packets after some retries, 1039 // we send pings instead of auth packets after some retries,
950 // so reset the retry counter and establish a connection 1040 // so reset the retry counter and establish a connection
951 // when we receive a ping. 1041 // when we receive a ping.
952 if (!ictx) 1042 if (!ictx)
953 { 1043 {
954 if (auth_rate_limiter.can (rsi)) 1044 if (auth_rate_limiter.can (rsi))
955 send_auth_request (rsi, true); 1045 send_auth_request (rsi, true);
956 } 1046 }
957 else 1047 else
1048 // we would love to change the socket address here, but ping's aren't
1049 // authenticated, so we best ignore it.
958 send_ping (rsi, 1); // pong 1050 send_ping (rsi, 1); // pong
959 1051
960 break; 1052 break;
961 1053
962 case vpn_packet::PT_PONG: 1054 case vpn_packet::PT_PONG:
1055 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1056
1057 // a PONG might mean that the other side doesn't really know
1058 // about our desire for communication.
1059 establish_connection ();
963 break; 1060 break;
964 1061
965 case vpn_packet::PT_RESET: 1062 case vpn_packet::PT_RESET:
966 { 1063 {
967 reset_connection (); 1064 reset_connection ();
968 1065
969 config_packet *p = (config_packet *) pkt; 1066 config_packet *p = (config_packet *) pkt;
970 1067
971 if (!p->chk_config ()) 1068 if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
972 {
973 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),
974 conf->nodename, (const char *)rsi);
975 connectmode = conf_node::C_DISABLED;
976 }
977 else if (connectmode == conf_node::C_ALWAYS)
978 establish_connection (); 1069 establish_connection ();
979 } 1070 }
980 break; 1071 break;
981 1072
982 case vpn_packet::PT_AUTH_REQ: 1073 case vpn_packet::PT_AUTH_REQ:
983 if (auth_rate_limiter.can (rsi)) 1074 if (auth_rate_limiter.can (rsi))
984 { 1075 {
985 auth_req_packet *p = (auth_req_packet *) pkt; 1076 auth_req_packet *p = (auth_req_packet *)pkt;
986 1077
987 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1078 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1079 conf->nodename, p->initiate ? "initiate" : "reply",
1080 p->protocols, p->features);
988 1081
989 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1082 if (memcmp (p->magic, MAGIC, 8))
1083 {
1084 slog (L_WARN, _("%s(%s): protocol magic mismatch - stray packet?"),
1085 conf->nodename, (const char *)rsi);
1086 }
1087 else if (p->chk_config (conf, rsi))
990 { 1088 {
991 if (p->prot_minor != PROTOCOL_MINOR) 1089 if (p->prot_minor != PROTOCOL_MINOR)
992 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1090 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
993 conf->nodename, (const char *)rsi, 1091 conf->nodename, (const char *)rsi,
994 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1092 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
995 1093
996 if (p->initiate) 1094 if (p->initiate)
997 send_auth_request (rsi, false); 1095 send_auth_request (rsi, false);
998 1096
999 rsachallenge k; 1097 auth_data auth;
1000 1098
1001 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1099 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
1002 { 1100 {
1003 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1101 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
1004 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 1102 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1005 break;
1006 } 1103 }
1007 else 1104 else
1008 { 1105 {
1009 delete octx; 1106 bool chg = !have_rcv_auth || memcmp (&rcv_auth, &auth, sizeof auth);
1010 1107
1011 octx = new crypto_ctx (k, 1); 1108 rcv_auth = auth;
1012 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1109 have_rcv_auth = true;
1013 1110
1111 send_auth_response (rsi);
1112
1113 if (chg)
1114 {
1014 conf->protocols = p->protocols; 1115 conf->protocols = p->protocols;
1015 features = p->features & config_packet::get_features (); 1116 features = p->features & config_packet::get_features ();
1016 1117
1017 send_auth_response (rsi, p->id, k);
1018
1019 connection_established (); 1118 connection_established (rsi);
1020
1021 break; 1119 }
1022 } 1120 }
1121
1122 break;
1023 } 1123 }
1024 else
1025 slog (L_WARN, _("%s(%s): protocol mismatch"),
1026 conf->nodename, (const char *)rsi);
1027 1124
1028 send_reset (rsi); 1125 send_reset (rsi);
1029 } 1126 }
1030 1127
1031 break; 1128 break;
1032 1129
1033 case vpn_packet::PT_AUTH_RES: 1130 case vpn_packet::PT_AUTH_RES:
1034 { 1131 {
1035 auth_res_packet *p = (auth_res_packet *) pkt; 1132 auth_res_packet *p = (auth_res_packet *)pkt;
1036 1133
1037 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1134 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1038 1135
1039 if (p->chk_config ()) 1136 auth_mac local_mac;
1137 auth_hash (snd_auth, p->response.ecdh, local_mac);
1138
1139 if (memcmp (&p->response.mac, local_mac, sizeof local_mac))
1040 { 1140 {
1041 if (p->prot_minor != PROTOCOL_MINOR)
1042 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1043 conf->nodename, (const char *)rsi,
1044 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1045
1046 rsachallenge chg;
1047
1048 if (!rsa_cache.find (p->id, chg))
1049 {
1050 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1141 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1051 conf->nodename, (const char *)rsi); 1142 conf->nodename, (const char *)rsi);
1052 break;
1053 }
1054 else
1055 {
1056 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1057
1058 if (!p->hmac_chk (cctx))
1059 {
1060 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1061 "could be an attack, or just corruption or a synchronization error"),
1062 conf->nodename, (const char *)rsi);
1063 break;
1064 }
1065 else
1066 {
1067 rsaresponse h;
1068
1069 rsa_hash (p->id, chg, h);
1070
1071 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
1072 {
1073 prot_minor = p->prot_minor;
1074
1075 delete ictx; ictx = cctx;
1076
1077 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1078
1079 si = rsi;
1080 protocol = rsi.prot;
1081
1082 connection_established ();
1083
1084 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1085 conf->nodename, (const char *)rsi,
1086 p->prot_major, p->prot_minor);
1087
1088 if (::conf.script_node_up)
1089 {
1090 run_script_cb cb;
1091 cb.set<connection, &connection::script_node_up> (this);
1092 if (!run_script (cb, false))
1093 slog (L_WARN, _("node-up command execution failed, continuing."));
1094 }
1095
1096 break;
1097 }
1098 else
1099 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
1100 conf->nodename, (const char *)rsi);
1101 }
1102
1103 delete cctx;
1104 }
1105 } 1143 }
1144 else if (!have_snd_auth)
1145 {
1146 memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
1147
1148 have_snd_auth = true;
1149 connection_established (rsi);
1150 }
1151
1152 break;
1106 } 1153 }
1107 1154
1108 send_reset (rsi); 1155 send_reset (rsi);
1109 break; 1156 break;
1110 1157
1120 { 1167 {
1121 vpndata_packet *p = (vpndata_packet *)pkt; 1168 vpndata_packet *p = (vpndata_packet *)pkt;
1122 1169
1123 if (!p->hmac_chk (ictx)) 1170 if (!p->hmac_chk (ictx))
1124 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1171 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1125 "could be an attack, or just corruption or a synchronization error"), 1172 "could be an attack, or just corruption or a synchronization error."),
1126 conf->nodename, (const char *)rsi); 1173 conf->nodename, (const char *)rsi);
1127 else 1174 else
1128 { 1175 {
1129 u32 seqno; 1176 u32 seqno;
1130 tap_packet *d = p->unpack (this, seqno); 1177 tap_packet *d = p->unpack (this, seqno);
1178 int seqclass = iseqno.seqno_classify (seqno);
1131 1179
1132 if (iseqno.recv_ok (seqno)) 1180 if (seqclass == 0) // ok
1133 { 1181 {
1134 vpn->tap->send (d); 1182 vpn->tap->send (d);
1135 1183
1136 if (si != rsi) 1184 if (si != rsi)
1137 { 1185 {
1138 // fast re-sync on source address changes, useful especially for tcp/ip 1186 // fast re-sync on source address changes, useful especially for tcp/ip
1187 //if (last_si_change < ev_now () + 5.)
1139 si = rsi; 1188 // {
1140
1141 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1189 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1142 conf->nodename, (const char *)si, (const char *)rsi); 1190 conf->nodename, (const char *)si, (const char *)rsi);
1191
1192 si = rsi;
1193
1194 if (::conf.script_node_change)
1195 {
1196 run_script_cb *cb = new run_script_cb;
1197 cb->set<connection, &connection::script_node_change> (this);
1198 run_script_queued (cb, _("node-change command execution failed, continuing."));
1199 }
1200
1201 // }
1202 //else
1203 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1204 // conf->nodename, (const char *)si, (const char *)rsi);
1143 } 1205 }
1206 }
1207 else if (seqclass == 1) // far history
1208 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1209 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1210 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1211 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1212 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1213 else if (seqclass == 3) // reset
1214 {
1215 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1216 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1217 send_reset (rsi);
1144 } 1218 }
1145 1219
1146 delete d; 1220 delete d;
1147 break; 1221 break;
1148 } 1222 }
1152 break; 1226 break;
1153 1227
1154 case vpn_packet::PT_CONNECT_REQ: 1228 case vpn_packet::PT_CONNECT_REQ:
1155 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1229 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1156 { 1230 {
1157 connect_req_packet *p = (connect_req_packet *) pkt; 1231 connect_req_packet *p = (connect_req_packet *)pkt;
1158 1232
1159 if (p->id > 0 && p->id <= vpn->conns.size ()) 1233 if (p->id > 0 && p->id <= vpn->conns.size ())
1160 { 1234 {
1161 connection *c = vpn->conns[p->id - 1]; 1235 connection *c = vpn->conns[p->id - 1];
1162 conf->protocols = p->protocols; 1236 conf->protocols = p->protocols;
1163 1237
1164 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1238 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1239 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1240 p->protocols,
1165 conf->id, p->id, c->ictx && c->octx); 1241 c->ictx && c->octx);
1166 1242
1167 if (c->ictx && c->octx) 1243 if (c->ictx && c->octx)
1168 { 1244 {
1169 // send connect_info packets to both sides, in case one is 1245 // send connect_info packets to both sides, in case one is
1170 // behind a nat firewall (or both ;) 1246 // behind a nat firewall (or both ;)
1193 1269
1194 c->conf->protocols = p->protocols; 1270 c->conf->protocols = p->protocols;
1195 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1271 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1196 p->si.upgrade_protocol (protocol, c->conf); 1272 p->si.upgrade_protocol (protocol, c->conf);
1197 1273
1198 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1274 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
1199 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1275 conf->nodename,
1276 vpn->conns[p->id - 1]->conf->nodename,
1277 (const char *)p->si,
1278 p->protocols,
1279 protocol,
1280 p->si.supported_protocols (c->conf),
1281 !c->ictx && !c->octx);
1200 1282
1201 const sockinfo &dsi = forward_si (p->si); 1283 const sockinfo &dsi = forward_si (p->si);
1202 1284
1203 if (dsi.valid ()) 1285 if (dsi.valid ())
1204 c->send_auth_request (dsi, true); 1286 c->send_auth_request (dsi, true);
1287 else
1288 slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
1289 vpn->conns[p->id - 1]->conf->nodename,
1290 (const char *)p->si);
1205 } 1291 }
1206 else 1292 else
1207 slog (L_WARN, 1293 slog (L_WARN,
1208 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1294 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1209 p->id); 1295 p->id);
1218} 1304}
1219 1305
1220inline void 1306inline void
1221connection::keepalive_cb (ev::timer &w, int revents) 1307connection::keepalive_cb (ev::timer &w, int revents)
1222{ 1308{
1223 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1309 ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
1310
1311 if (when >= 0)
1312 w.start (when);
1313 else if (when < -15)
1224 { 1314 {
1225 reset_connection (); 1315 reset_connection ();
1226 establish_connection (); 1316 establish_connection ();
1227 } 1317 }
1228 else if (ev_now () < last_activity + ::conf.keepalive)
1229 w.start (last_activity + ::conf.keepalive - ev::now ());
1230 else if (conf->connectmode != conf_node::C_ONDEMAND 1318 else if (conf->connectmode != conf_node::C_ONDEMAND
1231 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1319 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1232 { 1320 {
1321 w.start (3);
1233 send_ping (si); 1322 send_ping (si);
1234 w.start (5);
1235 } 1323 }
1236 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1324 else if (when >= -10)
1237 // hold ondemand connections implicitly a few seconds longer 1325 // hold ondemand connections implicitly a few seconds longer
1238 // should delete octx, though, or something like that ;) 1326 // should delete octx, though, or something like that ;)
1239 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1327 w.start (when + 10);
1240 else 1328 else
1241 reset_connection (); 1329 reset_connection ();
1242} 1330}
1243 1331
1332void
1244void connection::send_connect_request (int id) 1333connection::send_connect_request (int id)
1245{ 1334{
1246 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1335 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1247 1336
1248 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1337 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1338 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1339 THISNODE->protocols);
1249 p->hmac_set (octx); 1340 p->hmac_set (octx);
1250 send_vpn_packet (p, si); 1341 send_vpn_packet (p, si);
1251 1342
1252 delete p; 1343 delete p;
1253} 1344}
1254 1345
1346void
1255void connection::script_init_env (const char *ext) 1347connection::script_init_env (const char *ext)
1256{ 1348{
1257 char *env; 1349 char *env;
1258 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1350 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1259 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1351 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1260 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1352 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1261 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1353 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1262 conf->id & 0xff); putenv (env); 1354 conf->id & 0xff); putenv (env);
1263} 1355}
1264 1356
1357void
1265void connection::script_init_connect_env () 1358connection::script_init_connect_env ()
1266{ 1359{
1267 vpn->script_init_env (); 1360 vpn->script_init_env ();
1268 1361
1269 char *env; 1362 char *env;
1270 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1363 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1364 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1271 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1365 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1272 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1366 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1273 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1367 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1274} 1368}
1275 1369
1276inline const char * 1370inline const char *
1277connection::script_node_up () 1371connection::script_node_up ()
1278{ 1372{
1288 1382
1289 return filename; 1383 return filename;
1290} 1384}
1291 1385
1292inline const char * 1386inline const char *
1387connection::script_node_change ()
1388{
1389 script_init_connect_env ();
1390
1391 putenv ((char *)"STATE=change");
1392
1393 char *filename;
1394 asprintf (&filename,
1395 "%s/%s",
1396 confbase,
1397 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1398
1399 return filename;
1400}
1401
1402inline const char *
1293connection::script_node_down () 1403connection::script_node_down ()
1294{ 1404{
1295 script_init_connect_env (); 1405 script_init_connect_env ();
1296 1406
1297 putenv ((char *)"STATE=down"); 1407 putenv ((char *)"STATE=down");
1308connection::connection (struct vpn *vpn, conf_node *conf) 1418connection::connection (struct vpn *vpn, conf_node *conf)
1309: vpn(vpn), conf(conf), 1419: vpn(vpn), conf(conf),
1310#if ENABLE_DNS 1420#if ENABLE_DNS
1311 dns (0), 1421 dns (0),
1312#endif 1422#endif
1313 data_queue(conf->max_ttl, conf->max_queue), 1423 data_queue(conf->max_ttl, conf->max_queue + 1),
1314 vpn_queue(conf->max_ttl, conf->max_queue) 1424 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1315{ 1425{
1316 rekey .set<connection, &connection::rekey_cb > (this); 1426 rekey .set<connection, &connection::rekey_cb > (this);
1317 keepalive .set<connection, &connection::keepalive_cb > (this); 1427 keepalive .set<connection, &connection::keepalive_cb > (this);
1318 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1428 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1319 1429
1430 last_establish_attempt = 0.;
1320 octx = ictx = 0; 1431 octx = ictx = 0;
1321 retry_cnt = 0;
1322
1323 if (!conf->protocols) // make sure some protocol is enabled
1324 conf->protocols = PROT_UDPv4;
1325 1432
1326 connectmode = conf->connectmode; 1433 connectmode = conf->connectmode;
1327 1434
1328 // queue a dummy packet to force an initial connection attempt 1435 // queue a dummy packet to force an initial connection attempt
1329 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1436 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1330 { 1437 vpn_queue.put (new net_packet);
1331 net_packet *p = new net_packet;
1332 p->len = 0;
1333 vpn_queue.put (p);
1334 }
1335 1438
1336 reset_connection (); 1439 reset_connection ();
1337} 1440}
1338 1441
1339connection::~connection () 1442connection::~connection ()
1340{ 1443{
1341 shutdown (); 1444 shutdown ();
1342} 1445}
1343 1446
1447void
1344void connection_init () 1448connection_init ()
1345{ 1449{
1346 auth_rate_limiter.clear (); 1450 auth_rate_limiter.clear ();
1347 reset_rate_limiter.clear (); 1451 reset_rate_limiter.clear ();
1348} 1452}
1349 1453

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines