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.103 by root, Thu Jul 18 17:35:10 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, auth_mac &mac)
76{ 184{
77 EVP_MD_CTX ctx; 185 HMAC_CTX ctx;
78 186
79 EVP_MD_CTX_init (&ctx); 187 HMAC_CTX_init (&ctx);
80 require (EVP_DigestInit (&ctx, RSA_HASH)); 188 require (HMAC_Init_ex (&ctx, auth.rsa.auth_key, sizeof (auth.rsa.auth_key), AUTH_DIGEST (), 0));
81 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg)); 189 require (HMAC_Update (&ctx, (const unsigned char *)&auth, sizeof auth));
82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 190 require (HMAC_Final (&ctx, (unsigned char *)&mac, 0));
84 EVP_MD_CTX_cleanup (&ctx); 191 HMAC_CTX_cleanup (&ctx);
85} 192}
86 193
87struct rsa_entry 194void
195connection::generate_auth_data ()
88{ 196{
89 tstamp expire; 197 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 { 198 {
102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ()) 199 // request data
103 { 200 rand_fill (snd_auth.rsa);
104 memcpy (&chg, &i->chg, sizeof chg); 201 curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
202 auth_hash (snd_auth, snd_auth_mac);
105 203
106 erase (i); 204 // eventual response data
107 return true; 205 curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
108 }
109 } 206 }
110 207
111 if (!cleaner.is_active ()) 208 // 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; 209 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} 210}
155 211
156////////////////////////////////////////////////////////////////////////////// 212//////////////////////////////////////////////////////////////////////////////
157 213
158pkt_queue::pkt_queue (double max_ttl, int max_queue) 214pkt_queue::pkt_queue (double max_ttl, int max_queue)
172 delete p; 228 delete p;
173 229
174 delete [] queue; 230 delete [] queue;
175} 231}
176 232
233void
177void pkt_queue::expire_cb (ev::timer &w, int revents) 234pkt_queue::expire_cb (ev::timer &w, int revents)
178{ 235{
179 ev_tstamp expire = ev_now () - max_ttl; 236 ev_tstamp expire = ev_now () - max_ttl;
180 237
181 for (;;) 238 for (;;)
182 { 239 {
193 250
194 delete get (); 251 delete get ();
195 } 252 }
196} 253}
197 254
255void
198void pkt_queue::put (net_packet *p) 256pkt_queue::put (net_packet *p)
199{ 257{
200 ev_tstamp now = ev_now (); 258 ev_tstamp now = ev_now ();
201 259
202 // start expiry timer 260 // start expiry timer
203 if (empty ()) 261 if (empty ())
212 queue[i].tstamp = now; 270 queue[i].tstamp = now;
213 271
214 i = ni; 272 i = ni;
215} 273}
216 274
217net_packet *pkt_queue::get () 275net_packet *
276pkt_queue::get ()
218{ 277{
219 if (empty ()) 278 if (empty ())
220 return 0; 279 return 0;
221 280
222 net_packet *p = queue[j].pkt; 281 net_packet *p = queue[j].pkt;
246 305
247 bool can (const sockinfo &si) { return can((u32)si.host); } 306 bool can (const sockinfo &si) { return can((u32)si.host); }
248 bool can (u32 host); 307 bool can (u32 host);
249}; 308};
250 309
251net_rate_limiter auth_rate_limiter, reset_rate_limiter; 310static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
252 311
312bool
253bool net_rate_limiter::can (u32 host) 313net_rate_limiter::can (u32 host)
254{ 314{
255 iterator i; 315 iterator i;
256 316
257 for (i = begin (); i != end (); ) 317 for (i = begin (); i != end (); )
258 if (i->host == host) 318 if (i->host == host)
305 365
306///////////////////////////////////////////////////////////////////////////// 366/////////////////////////////////////////////////////////////////////////////
307 367
308unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 368unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
309 369
370void
310void hmac_packet::hmac_gen (crypto_ctx *ctx) 371hmac_packet::hmac_gen (crypto_ctx *ctx)
311{ 372{
312 unsigned int xlen; 373 unsigned int xlen;
313 374
314 HMAC_CTX *hctx = &ctx->hctx; 375 HMAC_CTX *hctx = &ctx->hctx;
315 376
316 HMAC_Init_ex (hctx, 0, 0, 0, 0); 377 require (HMAC_Init_ex (hctx, 0, 0, 0, 0));
317 HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), 378 require (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet),
318 len - sizeof (hmac_packet)); 379 len - sizeof (hmac_packet)));
319 HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen); 380 require (HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen));
320} 381}
321 382
322void 383void
323hmac_packet::hmac_set (crypto_ctx *ctx) 384hmac_packet::hmac_set (crypto_ctx *ctx)
324{ 385{
333 hmac_gen (ctx); 394 hmac_gen (ctx);
334 395
335 return !memcmp (hmac, hmac_digest, HMACLENGTH); 396 return !memcmp (hmac, hmac_digest, HMACLENGTH);
336} 397}
337 398
399void
338void vpn_packet::set_hdr (ptype type_, unsigned int dst) 400vpn_packet::set_hdr (ptype type_, unsigned int dst)
339{ 401{
340 type = type_; 402 type = type_;
341 403
342 int src = THISNODE->id; 404 int src = THISNODE->id;
343 405
348 410
349#define MAXVPNDATA (MAX_MTU - 6 - 6) 411#define MAXVPNDATA (MAX_MTU - 6 - 6)
350#define DATAHDR (sizeof (u32) + RAND_SIZE) 412#define DATAHDR (sizeof (u32) + RAND_SIZE)
351 413
352struct vpndata_packet : vpn_packet 414struct vpndata_packet : vpn_packet
415{
416 u8 data[MAXVPNDATA + DATAHDR]; // seqno
417
418 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
419 tap_packet *unpack (connection *conn, u32 &seqno);
420
421private:
422 const u32 data_hdr_size () const
353 { 423 {
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; 424 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
363 }
364 }; 425 }
426};
365 427
366void 428void
367vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 429vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
368{ 430{
369 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 431 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
371 ptype type = PT_DATA_UNCOMPRESSED; 433 ptype type = PT_DATA_UNCOMPRESSED;
372 434
373#if ENABLE_COMPRESSION 435#if ENABLE_COMPRESSION
374 u8 cdata[MAX_MTU]; 436 u8 cdata[MAX_MTU];
375 437
376 if (conn->features & ENABLE_COMPRESSION) 438 if (conn->features & FEATURE_COMPRESSION)
377 { 439 {
378 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 440 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
379 441
380 if (cl) 442 if (cl)
381 { 443 {
387 d[1] = cl; 449 d[1] = cl;
388 } 450 }
389 } 451 }
390#endif 452#endif
391 453
392 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 454 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 1));
393 455
394 struct { 456 struct {
395#if RAND_SIZE 457#if RAND_SIZE
396 u8 rnd[RAND_SIZE]; 458 u8 rnd[RAND_SIZE];
397#endif 459#endif
398 u32 seqno; 460 u32 seqno;
399 } datahdr; 461 } datahdr;
400 462
401 datahdr.seqno = ntohl (seqno); 463 datahdr.seqno = ntohl (seqno);
402#if RAND_SIZE 464#if RAND_SIZE
403 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 465 // NB: a constant (per session) random prefix
466 // is likely enough, but we don't take any chances.
467 conn->oiv.get (datahdr.rnd, RAND_SIZE);
404#endif 468#endif
405 469
406 require (EVP_EncryptUpdate (cctx, 470 require (EVP_EncryptUpdate (cctx,
407 (unsigned char *) data + outl, &outl2, 471 (unsigned char *) data + outl, &outl2,
408 (unsigned char *) &datahdr, DATAHDR)); 472 (unsigned char *) &datahdr, DATAHDR));
430 int outl = 0, outl2; 494 int outl = 0, outl2;
431 tap_packet *p = new tap_packet; 495 tap_packet *p = new tap_packet;
432 u8 *d; 496 u8 *d;
433 u32 l = len - data_hdr_size (); 497 u32 l = len - data_hdr_size ();
434 498
435 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0)); 499 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 0));
436 500
437#if ENABLE_COMPRESSION 501#if ENABLE_COMPRESSION
438 u8 cdata[MAX_MTU]; 502 u8 cdata[MAX_MTU];
439 503
440 if (type == PT_DATA_COMPRESSED) 504 if (type == PT_DATA_COMPRESSED)
441 d = cdata; 505 d = cdata;
442 else 506 else
443#endif 507#endif
444 d = &(*p)[6 + 6 - DATAHDR]; 508 d = &(*p)[6 + 6] - DATAHDR;
445 509
446 /* this overwrites part of the src mac, but we fix that later */ 510 // we play do evil games with the struct layout atm.
511 // pending better solutions, we at least do some verification.
512 // this is fine, as we left ISO territory long ago.
513 require (DATAHDR <= 16);
514 require ((u8 *)(&p->len + 1) == &(*p)[0]);
515
516 // this can overwrite the len/dst/src fields
447 require (EVP_DecryptUpdate (cctx, 517 require (EVP_DecryptUpdate (cctx,
448 d, &outl2, 518 d, &outl2,
449 (unsigned char *)&data, len - data_hdr_size ())); 519 (unsigned char *)&data, len - data_hdr_size ()));
450 outl += outl2; 520 outl += outl2;
451 521
482 } 552 }
483}; 553};
484 554
485struct config_packet : vpn_packet 555struct config_packet : vpn_packet
486{ 556{
487 // actually, hmaclen cannot be checked because the hmac 557 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; 558 u8 prot_major, prot_minor, randsize;
491 u8 flags, challengelen, features, pad3; 559 u8 flags, features, pad6, pad7, pad8;
492 u32 cipher_nid, digest_nid, hmac_nid; 560 u32 cipher_nid, mac_nid, auth_nid;
493 561
494 void setup (ptype type, int dst); 562 void setup (ptype type, int dst);
495 bool chk_config () const; 563 bool chk_config (const conf_node *conf, const sockinfo &rsi) const;
496 564
497 static u8 get_features () 565 static u8 get_features ()
498 { 566 {
499 u8 f = 0; 567 u8 f = 0;
500#if ENABLE_COMPRESSION 568#if ENABLE_COMPRESSION
508#endif 576#endif
509 return f; 577 return f;
510 } 578 }
511}; 579};
512 580
581void
513void config_packet::setup (ptype type, int dst) 582config_packet::setup (ptype type, int dst)
514{ 583{
515 prot_major = PROTOCOL_MAJOR; 584 prot_major = PROTOCOL_MAJOR;
516 prot_minor = PROTOCOL_MINOR; 585 prot_minor = PROTOCOL_MINOR;
517 randsize = RAND_SIZE; 586 randsize = RAND_SIZE;
518 hmaclen = HMACLENGTH;
519 flags = 0; 587 flags = 0;
520 challengelen = sizeof (rsachallenge);
521 features = get_features (); 588 features = get_features ();
522 589
590 strncpy ((char *)serial, conf.serial, sizeof (serial));
591
523 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 592 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
524 digest_nid = htonl (EVP_MD_type (RSA_HASH));
525 hmac_nid = htonl (EVP_MD_type (DIGEST)); 593 mac_nid = htonl (EVP_MD_type (MAC_DIGEST ()));
594 auth_nid = htonl (EVP_MD_type (AUTH_DIGEST ()));
526 595
527 len = sizeof (*this) - sizeof (net_packet); 596 len = sizeof (*this) - sizeof (net_packet);
528 set_hdr (type, dst); 597 set_hdr (type, dst);
529} 598}
530 599
531bool config_packet::chk_config () const 600bool
601config_packet::chk_config (const conf_node *conf, const sockinfo &rsi) const
532{ 602{
533 if (prot_major != PROTOCOL_MAJOR) 603 if (prot_major != PROTOCOL_MAJOR)
534 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 604 slog (L_WARN, _("%s(%s): major version mismatch (remote %d <=> local %d)"),
605 conf->nodename, (const char *)rsi, prot_major, PROTOCOL_MAJOR);
535 else if (randsize != RAND_SIZE) 606 else if (randsize != RAND_SIZE)
536 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 607 slog (L_WARN, _("%s(%s): rand size mismatch (remote %d <=> local %d)"),
537 else if (hmaclen != HMACLENGTH) 608 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))) 609 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)); 610 slog (L_WARN, _("%s(%s): cipher algo mismatch (remote %x <=> local %x)"),
543 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 611 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))) 612 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)); 613 slog (L_WARN, _("%s(%s): mac algo mismatch (remote %x <=> local %x)"),
614 conf->nodename, (const char *)rsi, ntohl (mac_nid), EVP_MD_type (MAC_DIGEST ()));
615 else if (auth_nid != htonl (EVP_MD_type (AUTH_DIGEST ())))
616 slog (L_WARN, _("%s(%s): auth algo mismatch (remote %x <=> local %x)"),
617 conf->nodename, (const char *)rsi, ntohl (auth_nid), EVP_MD_type (AUTH_DIGEST ()));
547 else 618 else
619 {
620 int cmp = memcmp (serial, ::conf.serial, sizeof (serial));
621
622 if (cmp > 0)
623 slog (L_WARN, _("%s(%s): remote serial newer than local serial - outdated config?"),
624 conf->nodename, (const char *)rsi);
625 else if (cmp == 0)
548 return true; 626 return true;
627 }
549 628
550 return false; 629 return false;
551} 630}
552 631
553struct auth_req_packet : config_packet 632struct auth_req_packet : config_packet // UNPROTECTED
554{ 633{
555 char magic[8]; 634 char magic[8];
556 u8 initiate; // false if this is just an automatic reply 635 u8 initiate; // false if this is just an automatic reply
557 u8 protocols; // supported protocols (will be patched on forward) 636 u8 protocols; // supported protocols (will be patched on forward)
558 u8 pad2, pad3; 637 u8 pad2, pad3;
559 rsaid id; 638 auth_encr encr;
560 rsaencrdata encr;
561 639
562 auth_req_packet (int dst, bool initiate_, u8 protocols_) 640 auth_req_packet (int dst, bool initiate_, u8 protocols_)
563 { 641 {
564 config_packet::setup (PT_AUTH_REQ, dst); 642 config_packet::setup (PT_AUTH_REQ, dst);
565 strncpy (magic, MAGIC, 8); 643 memcpy (magic, MAGIC, 8);
566 initiate = !!initiate_; 644 initiate = !!initiate_;
567 protocols = protocols_; 645 protocols = protocols_;
568 646
569 len = sizeof (*this) - sizeof (net_packet); 647 len = sizeof (*this) - sizeof (net_packet);
570 } 648 }
571}; 649};
572 650
573struct auth_res_packet : config_packet 651struct auth_res_packet : vpn_packet // UNPROTECTED
574{ 652{
575 rsaid id;
576 u8 pad1, pad2, pad3;
577 u8 response_len; // encrypted length
578 rsaresponse response; 653 auth_response response;
579 654
580 auth_res_packet (int dst) 655 auth_res_packet (int dst)
581 { 656 {
582 config_packet::setup (PT_AUTH_RES, dst); 657 set_hdr (PT_AUTH_RES, dst);
583 658
584 len = sizeof (*this) - sizeof (net_packet); 659 len = sizeof (*this) - sizeof (net_packet);
585 } 660 }
586}; 661};
587 662
617}; 692};
618 693
619///////////////////////////////////////////////////////////////////////////// 694/////////////////////////////////////////////////////////////////////////////
620 695
621void 696void
622connection::connection_established () 697connection::connection_established (const sockinfo &rsi)
623{ 698{
624 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 699 if (!have_snd_auth || !have_rcv_auth)
700 return;
625 701
702 si = rsi;
703 protocol = rsi.prot;
704
705 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
706 conf->nodename, (const char *)rsi,
707 is_direct ? "direct" : "forwarded",
708 PROTOCOL_MAJOR, prot_minor);
709
710 if (::conf.script_node_up)
711 {
712 run_script_cb *cb = new run_script_cb;
713 cb->set<connection, &connection::script_node_up> (this);
714 run_script_queued (cb, _("node-up command execution failed, continuing."));
715 }
716
717 delete ictx; ictx = new crypto_ctx (rcv_auth, snd_auth, rcv_ecdh_a, rcv_auth.ecdh, 0);
718 iseqno.reset (ntohl (rcv_auth.rsa.seqno) & 0x7fffffff);
719
720 delete octx; octx = new crypto_ctx (snd_auth, rcv_auth, snd_ecdh_a, snd_ecdh_b , 1);
721 oseqno = ntohl (snd_auth.rsa.seqno) & 0x7fffffff;
722
723 oiv.reset ();
724
725 // make sure rekeying timeouts are slightly asymmetric
726 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
727 rekey.start (rekey_interval, rekey_interval);
728
729 keepalive.start (::conf.keepalive);
730
731 // send queued packets
626 if (ictx && octx) 732 if (ictx && octx)
627 { 733 {
628 // make sure rekeying timeouts are slightly asymmetric 734 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 { 735 {
636 while (tap_packet *p = (tap_packet *)data_queue.get ())
637 {
638 if (p->len) send_data_packet (p); 736 if (p->len) send_data_packet (p);
639 delete p; 737 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 } 738 }
739
740 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
741 {
742 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
743 delete p;
744 }
648 } 745 }
746
747 vpn->connection_established (this);
748}
749
750void
751connection::reset_si ()
752{
753 if (vpn->can_direct (THISNODE, conf))
754 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
649 else 755 else
650 { 756 {
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); 757 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
673 protocol = 0; 758 protocol = 0;
674 } 759 }
675 760
676 si.set (conf, protocol); 761 si.set (conf, protocol);
762
763 is_direct = si.valid ();
677} 764}
678 765
679// ensure sockinfo is valid, forward if necessary 766// ensure sockinfo is valid, forward if necessary
680const sockinfo & 767const sockinfo &
681connection::forward_si (const sockinfo &si) const 768connection::forward_si (const sockinfo &si) const
682{ 769{
683 if (!si.valid ()) 770 if (!si.valid ())
684 { 771 {
685 connection *r = vpn->find_router (); 772 connection *r = vpn->find_router_for (this);
686 773
687 if (r) 774 if (r)
688 { 775 {
689 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 776 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
690 conf->nodename, r->conf->nodename, (const char *)r->si); 777 conf->nodename, r->conf->nodename);
691 return r->si; 778 return r->si;
692 } 779 }
693 else 780 else
694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 781 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
695 conf->nodename); 782 conf->nodename);
696 } 783 }
697 784
698 return si; 785 return si;
699} 786}
709connection::send_ping (const sockinfo &si, u8 pong) 796connection::send_ping (const sockinfo &si, u8 pong)
710{ 797{
711 ping_packet *pkt = new ping_packet; 798 ping_packet *pkt = new ping_packet;
712 799
713 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 800 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
801
802 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
714 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 803 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
715 804
716 delete pkt; 805 delete pkt;
717} 806}
718 807
733void 822void
734connection::send_auth_request (const sockinfo &si, bool initiate) 823connection::send_auth_request (const sockinfo &si, bool initiate)
735{ 824{
736 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 825 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
737 826
738 rsachallenge chg; 827 generate_auth_data ();
739 rsa_cache.gen (pkt->id, chg);
740 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 828 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
741 829
742 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 830 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 831 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
745 832
746 delete pkt; 833 delete pkt;
747} 834}
748 835
749void 836void
750connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 837connection::send_auth_response (const sockinfo &si)
751{ 838{
752 auth_res_packet *pkt = new auth_res_packet (conf->id); 839 auth_res_packet *pkt = new auth_res_packet (conf->id);
753 840
754 pkt->id = id; 841 auth_hash (rcv_auth, pkt->response.mac);
842 memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof (rcv_ecdh_b));
755 843
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); 844 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 845 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
763 846
764 delete pkt; 847 delete pkt;
765} 848}
766 849
767void 850void
768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 851connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
769{ 852{
770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 853 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
771 conf->id, rid, (const char *)rsi); 854 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
855 conf->protocols);
772 856
773 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 857 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
774 858
775 r->hmac_set (octx); 859 r->hmac_set (octx);
776 send_vpn_packet (r, si); 860 send_vpn_packet (r, si);
779} 863}
780 864
781inline void 865inline void
782connection::establish_connection_cb (ev::timer &w, int revents) 866connection::establish_connection_cb (ev::timer &w, int revents)
783{ 867{
784 if (!ictx 868 if (!(ictx && octx)
785 && conf != THISNODE 869 && conf != THISNODE
786 && connectmode != conf_node::C_NEVER 870 && connectmode != conf_node::C_NEVER
787 && connectmode != conf_node::C_DISABLED 871 && connectmode != conf_node::C_DISABLED
788 && !w.is_active ()) 872 && !w.is_active ())
789 { 873 {
793 { 877 {
794 reset_connection (); 878 reset_connection ();
795 return; 879 return;
796 } 880 }
797 881
882 last_establish_attempt = ev_now ();
883
798 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 884 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
799 ? (retry_cnt & 3) + 1 885 ? (retry_cnt & 3) + 1
800 : 1 << (retry_cnt >> 2)); 886 : 1 << (retry_cnt >> 2));
801 887
802 reset_si (); 888 reset_si ();
803 889
804 bool slow = si.prot & PROT_SLOW; 890 bool slow = si.prot & PROT_SLOW;
805 891
806 if (si.prot && !si.host) 892 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
807 { 893 {
808 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
809 /*TODO*/ /* start the timer so we don't recurse endlessly */ 894 /*TODO*/ /* start the timer so we don't recurse endlessly */
810 w.start (1); 895 w.start (1);
811 vpn->send_connect_request (conf->id); 896 vpn->send_connect_request (this);
812 } 897 }
813 else 898 else
814 { 899 {
815 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx); 900 if (si.valid ())
901 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
902 conf->nodename, (const char *)si);
816 903
817 const sockinfo &dsi = forward_si (si); 904 const sockinfo &dsi = forward_si (si);
818 905
819 slow = slow || (dsi.prot & PROT_SLOW); 906 slow = slow || (dsi.prot & PROT_SLOW);
820 907
825 else 912 else
826 send_ping (dsi, 0); 913 send_ping (dsi, 0);
827 } 914 }
828 } 915 }
829 916
830 retry_int *= slow ? 8. : 0.7; 917 retry_int *= slow ? 8. : 0.9;
831 918
832 if (retry_int < conf->max_retry) 919 if (retry_int < conf->max_retry)
833 retry_cnt++; 920 retry_cnt++;
834 else 921 else
835 retry_int = conf->max_retry; 922 retry_int = conf->max_retry;
846 slog (L_INFO, _("%s(%s): connection lost"), 933 slog (L_INFO, _("%s(%s): connection lost"),
847 conf->nodename, (const char *)si); 934 conf->nodename, (const char *)si);
848 935
849 if (::conf.script_node_down) 936 if (::conf.script_node_down)
850 { 937 {
851 run_script_cb cb; 938 run_script_cb *cb = new run_script_cb;
852 cb.set<connection, &connection::script_node_down> (this); 939 cb->set<connection, &connection::script_node_down> (this);
853 if (!run_script (cb, false))
854 slog (L_WARN, _("node-down command execution failed, continuing.")); 940 run_script_queued (cb, _("node-down command execution failed, continuing."));
855 } 941 }
856 } 942 }
857 943
858 delete ictx; ictx = 0; 944 delete ictx; ictx = 0;
859 delete octx; octx = 0; 945 delete octx; octx = 0;
860#if ENABLE_DNS
861 dnsv4_reset_connection ();
862#endif
863 946
864 si.host = 0; 947 si.host = 0;
865 948
949 have_snd_auth = false;
950 have_rcv_auth = false;
951 auth_expire = 0.;
952
866 last_activity = 0; 953 last_activity = 0.;
954 //last_si_change = 0.;
867 retry_cnt = 0; 955 retry_cnt = 0;
868 956
869 rekey.stop (); 957 rekey.stop ();
870 keepalive.stop (); 958 keepalive.stop ();
871 establish_connection.stop (); 959 establish_connection.stop ();
878 send_reset (si); 966 send_reset (si);
879 967
880 reset_connection (); 968 reset_connection ();
881} 969}
882 970
971// poor-man's rekeying
883inline void 972inline void
884connection::rekey_cb (ev::timer &w, int revents) 973connection::rekey_cb (ev::timer &w, int revents)
885{ 974{
886 reset_connection (); 975 reset_connection ();
887 establish_connection (); 976 establish_connection ();
905 if (oseqno > MAX_SEQNO) 994 if (oseqno > MAX_SEQNO)
906 rekey (); 995 rekey ();
907} 996}
908 997
909void 998void
999connection::post_inject_queue ()
1000{
1001 // force a connection every now and when when packets are sent (max 1/s)
1002 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
1003 establish_connection.stop ();
1004
1005 establish_connection ();
1006}
1007
1008void
910connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 1009connection::inject_data_packet (tap_packet *pkt)
911{ 1010{
912 if (ictx && octx) 1011 if (ictx && octx)
913 send_data_packet (pkt); 1012 send_data_packet (pkt);
914 else 1013 else
915 { 1014 {
916 if (!broadcast)
917 data_queue.put (new tap_packet (*pkt)); 1015 data_queue.put (new tap_packet (*pkt));
918 1016 post_inject_queue ();
919 establish_connection ();
920 } 1017 }
921} 1018}
922 1019
1020void
923void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1021connection::inject_vpn_packet (vpn_packet *pkt, int tos)
924{ 1022{
925 if (ictx && octx) 1023 if (ictx && octx)
926 send_vpn_packet (pkt, si, tos); 1024 send_vpn_packet (pkt, si, tos);
927 else 1025 else
928 { 1026 {
929 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1027 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
930 1028 post_inject_queue ();
931 establish_connection ();
932 } 1029 }
933} 1030}
934 1031
935void 1032void
936connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1033connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
937{ 1034{
938 last_activity = ev_now (); 1035 last_activity = ev_now ();
939 1036
940 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1037 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
941 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1038 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
942 1039
943 if (connectmode == conf_node::C_DISABLED) 1040 if (connectmode == conf_node::C_DISABLED)
944 return; 1041 return;
945 1042
946 switch (pkt->typ ()) 1043 switch (pkt->typ ())
947 { 1044 {
948 case vpn_packet::PT_PING: 1045 case vpn_packet::PT_PING:
1046 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1047
949 // we send pings instead of auth packets after some retries, 1048 // we send pings instead of auth packets after some retries,
950 // so reset the retry counter and establish a connection 1049 // so reset the retry counter and establish a connection
951 // when we receive a ping. 1050 // when we receive a ping.
952 if (!ictx) 1051 if (!ictx)
953 { 1052 {
954 if (auth_rate_limiter.can (rsi)) 1053 if (auth_rate_limiter.can (rsi))
955 send_auth_request (rsi, true); 1054 send_auth_request (rsi, true);
956 } 1055 }
957 else 1056 else
1057 // we would love to change the socket address here, but ping's aren't
1058 // authenticated, so we best ignore it.
958 send_ping (rsi, 1); // pong 1059 send_ping (rsi, 1); // pong
959 1060
960 break; 1061 break;
961 1062
962 case vpn_packet::PT_PONG: 1063 case vpn_packet::PT_PONG:
1064 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1065
1066 // a PONG might mean that the other side doesn't really know
1067 // about our desire for communication.
1068 establish_connection ();
963 break; 1069 break;
964 1070
965 case vpn_packet::PT_RESET: 1071 case vpn_packet::PT_RESET:
966 { 1072 {
967 reset_connection (); 1073 reset_connection ();
968 1074
969 config_packet *p = (config_packet *) pkt; 1075 config_packet *p = (config_packet *) pkt;
970 1076
971 if (!p->chk_config ()) 1077 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 (); 1078 establish_connection ();
979 } 1079 }
980 break; 1080 break;
981 1081
982 case vpn_packet::PT_AUTH_REQ: 1082 case vpn_packet::PT_AUTH_REQ:
983 if (auth_rate_limiter.can (rsi)) 1083 if (auth_rate_limiter.can (rsi))
984 { 1084 {
985 auth_req_packet *p = (auth_req_packet *) pkt; 1085 auth_req_packet *p = (auth_req_packet *)pkt;
986 1086
987 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1087 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1088 conf->nodename, p->initiate ? "initiate" : "reply",
1089 p->protocols, p->features);
988 1090
989 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1091 if (memcmp (p->magic, MAGIC, 8))
1092 {
1093 slog (L_WARN, _("%s(%s): protocol magic mismatch - stray packet?"),
1094 conf->nodename, (const char *)rsi);
1095 }
1096 else if (p->chk_config (conf, rsi))
990 { 1097 {
991 if (p->prot_minor != PROTOCOL_MINOR) 1098 if (p->prot_minor != PROTOCOL_MINOR)
992 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1099 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
993 conf->nodename, (const char *)rsi, 1100 conf->nodename, (const char *)rsi,
994 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1101 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
995 1102
996 if (p->initiate) 1103 if (p->initiate)
997 send_auth_request (rsi, false); 1104 send_auth_request (rsi, false);
998 1105
999 rsachallenge k; 1106 auth_data auth;
1000 1107
1001 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1108 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
1002 { 1109 {
1003 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1110 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)); 1111 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1005 break;
1006 } 1112 }
1007 else 1113 else
1008 { 1114 {
1009 delete octx; 1115 bool chg = !have_rcv_auth || memcmp (&rcv_auth, &auth, sizeof auth);
1010 1116
1011 octx = new crypto_ctx (k, 1); 1117 rcv_auth = auth;
1012 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1118 have_rcv_auth = true;
1013 1119
1120 send_auth_response (rsi);
1121
1122 if (chg)
1123 {
1014 conf->protocols = p->protocols; 1124 conf->protocols = p->protocols;
1015 features = p->features & config_packet::get_features (); 1125 features = p->features & config_packet::get_features ();
1016 1126
1017 send_auth_response (rsi, p->id, k);
1018
1019 connection_established (); 1127 connection_established (rsi);
1020
1021 break; 1128 }
1022 } 1129 }
1130
1131 break;
1023 } 1132 }
1024 else
1025 slog (L_WARN, _("%s(%s): protocol mismatch"),
1026 conf->nodename, (const char *)rsi);
1027 1133
1028 send_reset (rsi); 1134 send_reset (rsi);
1029 } 1135 }
1030 1136
1031 break; 1137 break;
1032 1138
1033 case vpn_packet::PT_AUTH_RES: 1139 case vpn_packet::PT_AUTH_RES:
1034 { 1140 {
1035 auth_res_packet *p = (auth_res_packet *) pkt; 1141 auth_res_packet *p = (auth_res_packet *)pkt;
1036 1142
1037 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1143 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1038 1144
1039 if (p->chk_config ()) 1145 if (memcmp (&p->response.mac, snd_auth_mac, sizeof (snd_auth_mac)))
1040 { 1146 {
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"), 1147 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1051 conf->nodename, (const char *)rsi); 1148 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 } 1149 }
1150 else if (!have_snd_auth)
1151 {
1152 memcpy (snd_ecdh_b, p->response.ecdh, sizeof (snd_ecdh_b));
1153
1154 have_snd_auth = true;
1155 connection_established (rsi);
1156 }
1157
1158 break;
1106 } 1159 }
1107 1160
1108 send_reset (rsi); 1161 send_reset (rsi);
1109 break; 1162 break;
1110 1163
1120 { 1173 {
1121 vpndata_packet *p = (vpndata_packet *)pkt; 1174 vpndata_packet *p = (vpndata_packet *)pkt;
1122 1175
1123 if (!p->hmac_chk (ictx)) 1176 if (!p->hmac_chk (ictx))
1124 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1177 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1125 "could be an attack, or just corruption or a synchronization error"), 1178 "could be an attack, or just corruption or a synchronization error."),
1126 conf->nodename, (const char *)rsi); 1179 conf->nodename, (const char *)rsi);
1127 else 1180 else
1128 { 1181 {
1129 u32 seqno; 1182 u32 seqno;
1130 tap_packet *d = p->unpack (this, seqno); 1183 tap_packet *d = p->unpack (this, seqno);
1184 int seqclass = iseqno.seqno_classify (seqno);
1131 1185
1132 if (iseqno.recv_ok (seqno)) 1186 if (seqclass == 0) // ok
1133 { 1187 {
1134 vpn->tap->send (d); 1188 vpn->tap->send (d);
1135 1189
1136 if (si != rsi) 1190 if (si != rsi)
1137 { 1191 {
1138 // fast re-sync on source address changes, useful especially for tcp/ip 1192 // fast re-sync on source address changes, useful especially for tcp/ip
1193 //if (last_si_change < ev_now () + 5.)
1139 si = rsi; 1194 // {
1140
1141 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1195 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1142 conf->nodename, (const char *)si, (const char *)rsi); 1196 conf->nodename, (const char *)si, (const char *)rsi);
1197
1198 si = rsi;
1199
1200 if (::conf.script_node_change)
1201 {
1202 run_script_cb *cb = new run_script_cb;
1203 cb->set<connection, &connection::script_node_change> (this);
1204 run_script_queued (cb, _("node-change command execution failed, continuing."));
1205 }
1206
1207 // }
1208 //else
1209 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1210 // conf->nodename, (const char *)si, (const char *)rsi);
1143 } 1211 }
1212 }
1213 else if (seqclass == 1) // far history
1214 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1215 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1216 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1217 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1218 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1219 else if (seqclass == 3) // reset
1220 {
1221 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1222 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1223 send_reset (rsi);
1144 } 1224 }
1145 1225
1146 delete d; 1226 delete d;
1147 break; 1227 break;
1148 } 1228 }
1152 break; 1232 break;
1153 1233
1154 case vpn_packet::PT_CONNECT_REQ: 1234 case vpn_packet::PT_CONNECT_REQ:
1155 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1235 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1156 { 1236 {
1157 connect_req_packet *p = (connect_req_packet *) pkt; 1237 connect_req_packet *p = (connect_req_packet *)pkt;
1158 1238
1159 if (p->id > 0 && p->id <= vpn->conns.size ()) 1239 if (p->id > 0 && p->id <= vpn->conns.size ())
1160 { 1240 {
1161 connection *c = vpn->conns[p->id - 1]; 1241 connection *c = vpn->conns[p->id - 1];
1162 conf->protocols = p->protocols; 1242 conf->protocols = p->protocols;
1163 1243
1164 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1244 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1245 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1246 p->protocols,
1165 conf->id, p->id, c->ictx && c->octx); 1247 c->ictx && c->octx);
1166 1248
1167 if (c->ictx && c->octx) 1249 if (c->ictx && c->octx)
1168 { 1250 {
1169 // send connect_info packets to both sides, in case one is 1251 // send connect_info packets to both sides, in case one is
1170 // behind a nat firewall (or both ;) 1252 // behind a nat firewall (or both ;)
1193 1275
1194 c->conf->protocols = p->protocols; 1276 c->conf->protocols = p->protocols;
1195 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1277 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1196 p->si.upgrade_protocol (protocol, c->conf); 1278 p->si.upgrade_protocol (protocol, c->conf);
1197 1279
1198 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1280 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); 1281 conf->nodename,
1282 vpn->conns[p->id - 1]->conf->nodename,
1283 (const char *)p->si,
1284 p->protocols,
1285 protocol,
1286 p->si.supported_protocols (c->conf),
1287 !c->ictx && !c->octx);
1200 1288
1201 const sockinfo &dsi = forward_si (p->si); 1289 const sockinfo &dsi = forward_si (p->si);
1202 1290
1203 if (dsi.valid ()) 1291 if (dsi.valid ())
1204 c->send_auth_request (dsi, true); 1292 c->send_auth_request (dsi, true);
1293 else
1294 slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
1295 vpn->conns[p->id - 1]->conf->nodename,
1296 (const char *)p->si);
1205 } 1297 }
1206 else 1298 else
1207 slog (L_WARN, 1299 slog (L_WARN,
1208 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1300 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1209 p->id); 1301 p->id);
1218} 1310}
1219 1311
1220inline void 1312inline void
1221connection::keepalive_cb (ev::timer &w, int revents) 1313connection::keepalive_cb (ev::timer &w, int revents)
1222{ 1314{
1223 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1315 ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
1316
1317 if (when >= 0)
1318 w.start (when);
1319 else if (when < -15)
1224 { 1320 {
1225 reset_connection (); 1321 reset_connection ();
1226 establish_connection (); 1322 establish_connection ();
1227 } 1323 }
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 1324 else if (conf->connectmode != conf_node::C_ONDEMAND
1231 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1325 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1232 { 1326 {
1327 w.start (3);
1233 send_ping (si); 1328 send_ping (si);
1234 w.start (5);
1235 } 1329 }
1236 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1330 else if (when >= -10)
1237 // hold ondemand connections implicitly a few seconds longer 1331 // hold ondemand connections implicitly a few seconds longer
1238 // should delete octx, though, or something like that ;) 1332 // should delete octx, though, or something like that ;)
1239 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1333 w.start (when + 10);
1240 else 1334 else
1241 reset_connection (); 1335 reset_connection ();
1242} 1336}
1243 1337
1338void
1244void connection::send_connect_request (int id) 1339connection::send_connect_request (int id)
1245{ 1340{
1246 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1341 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1247 1342
1248 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1343 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1344 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1345 THISNODE->protocols);
1249 p->hmac_set (octx); 1346 p->hmac_set (octx);
1250 send_vpn_packet (p, si); 1347 send_vpn_packet (p, si);
1251 1348
1252 delete p; 1349 delete p;
1253} 1350}
1254 1351
1352void
1255void connection::script_init_env (const char *ext) 1353connection::script_init_env (const char *ext)
1256{ 1354{
1257 char *env; 1355 char *env;
1258 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1356 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1259 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1357 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1260 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1358 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1261 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1359 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1262 conf->id & 0xff); putenv (env); 1360 conf->id & 0xff); putenv (env);
1263} 1361}
1264 1362
1363void
1265void connection::script_init_connect_env () 1364connection::script_init_connect_env ()
1266{ 1365{
1267 vpn->script_init_env (); 1366 vpn->script_init_env ();
1268 1367
1269 char *env; 1368 char *env;
1270 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1369 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1370 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1271 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1371 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1272 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1372 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1273 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1373 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1274} 1374}
1275 1375
1276inline const char * 1376inline const char *
1277connection::script_node_up () 1377connection::script_node_up ()
1278{ 1378{
1288 1388
1289 return filename; 1389 return filename;
1290} 1390}
1291 1391
1292inline const char * 1392inline const char *
1393connection::script_node_change ()
1394{
1395 script_init_connect_env ();
1396
1397 putenv ((char *)"STATE=change");
1398
1399 char *filename;
1400 asprintf (&filename,
1401 "%s/%s",
1402 confbase,
1403 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1404
1405 return filename;
1406}
1407
1408inline const char *
1293connection::script_node_down () 1409connection::script_node_down ()
1294{ 1410{
1295 script_init_connect_env (); 1411 script_init_connect_env ();
1296 1412
1297 putenv ((char *)"STATE=down"); 1413 putenv ((char *)"STATE=down");
1308connection::connection (struct vpn *vpn, conf_node *conf) 1424connection::connection (struct vpn *vpn, conf_node *conf)
1309: vpn(vpn), conf(conf), 1425: vpn(vpn), conf(conf),
1310#if ENABLE_DNS 1426#if ENABLE_DNS
1311 dns (0), 1427 dns (0),
1312#endif 1428#endif
1313 data_queue(conf->max_ttl, conf->max_queue), 1429 data_queue(conf->max_ttl, conf->max_queue + 1),
1314 vpn_queue(conf->max_ttl, conf->max_queue) 1430 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1315{ 1431{
1316 rekey .set<connection, &connection::rekey_cb > (this); 1432 rekey .set<connection, &connection::rekey_cb > (this);
1317 keepalive .set<connection, &connection::keepalive_cb > (this); 1433 keepalive .set<connection, &connection::keepalive_cb > (this);
1318 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1434 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1319 1435
1436 last_establish_attempt = 0.;
1320 octx = ictx = 0; 1437 octx = ictx = 0;
1321 retry_cnt = 0;
1322
1323 if (!conf->protocols) // make sure some protocol is enabled
1324 conf->protocols = PROT_UDPv4;
1325 1438
1326 connectmode = conf->connectmode; 1439 connectmode = conf->connectmode;
1327 1440
1328 // queue a dummy packet to force an initial connection attempt 1441 // queue a dummy packet to force an initial connection attempt
1329 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1442 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1330 { 1443 vpn_queue.put (new net_packet);
1331 net_packet *p = new net_packet;
1332 p->len = 0;
1333 vpn_queue.put (p);
1334 }
1335 1444
1336 reset_connection (); 1445 reset_connection ();
1337} 1446}
1338 1447
1339connection::~connection () 1448connection::~connection ()
1340{ 1449{
1341 shutdown (); 1450 shutdown ();
1342} 1451}
1343 1452
1453void
1344void connection_init () 1454connection_init ()
1345{ 1455{
1346 auth_rate_limiter.clear (); 1456 auth_rate_limiter.clear ();
1347 reset_rate_limiter.clear (); 1457 reset_rate_limiter.clear ();
1348} 1458}
1349 1459

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines