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.74 by pcg, Sun Aug 10 02:49:21 2008 UTC vs.
Revision 1.107 by root, Fri Sep 20 11:57:03 2013 UTC

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

Diff Legend

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