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.78 by pcg, Mon Aug 11 16:44:47 2008 UTC vs.
Revision 1.108 by root, Fri Oct 11 04:07:24 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
679 if (ictx && octx) 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 vpn->can_direct (THISNODE, conf) ? "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."));
680 { 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
681 // make sure rekeying timeouts are slightly asymmetric 724 // make sure rekeying timeouts are slightly asymmetric
682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 725 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
683 rekey.start (rekey_interval, rekey_interval); 726 rekey.start (rekey_interval, rekey_interval);
727
728 hmac_error = 0.;
729
684 keepalive.start (::conf.keepalive); 730 keepalive.start (::conf.keepalive);
685 731
686 // send queued packets 732 // send queued packets
687 if (ictx && octx)
688 {
689 while (tap_packet *p = (tap_packet *)data_queue.get ()) 733 while (tap_packet *p = (tap_packet *)data_queue.get ())
690 { 734 {
691 if (p->len) send_data_packet (p); 735 if (p->len) send_data_packet (p);
692 delete p; 736 delete p;
693 } 737 }
694 738
695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 739 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
696 { 740 {
697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY); 741 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
698 delete p; 742 delete p;
699 } 743 }
700 }
701 744
702 vpn->connection_established (this); 745 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} 746}
712 747
713void 748void
714connection::reset_si () 749connection::reset_si ()
715{ 750{
… …
720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename); 755 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
721 protocol = 0; 756 protocol = 0;
722 } 757 }
723 758
724 si.set (conf, protocol); 759 si.set (conf, protocol);
725
726 is_direct = si.valid ();
727} 760}
728 761
729// ensure sockinfo is valid, forward if necessary 762// ensure sockinfo is valid, forward if necessary
730const sockinfo & 763const sockinfo &
731connection::forward_si (const sockinfo &si) const 764connection::forward_si (const sockinfo &si) const
… …
750 783
751void 784void
752connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 785connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
753{ 786{
754 if (!vpn->send_vpn_packet (pkt, si, tos)) 787 if (!vpn->send_vpn_packet (pkt, si, tos))
755 reset_connection (); 788 reset_connection ("packet send error");
756} 789}
757 790
758void 791void
759connection::send_ping (const sockinfo &si, u8 pong) 792connection::send_ping (const sockinfo &si, u8 pong)
760{ 793{
761 ping_packet *pkt = new ping_packet; 794 ping_packet *pkt = new ping_packet;
762 795
763 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 796 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
764 797
765 slog (L_TRACE, ">>%d %s [%s]", conf->id, pong ? "PT_PONG" : "PT_PING", (const char *)si); 798 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); 799 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
768 800
769 delete pkt; 801 delete pkt;
770} 802}
771 803
… …
786void 818void
787connection::send_auth_request (const sockinfo &si, bool initiate) 819connection::send_auth_request (const sockinfo &si, bool initiate)
788{ 820{
789 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 821 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
790 822
791 rsachallenge chg; 823 generate_auth_data ();
792 rsa_cache.gen (pkt->id, chg);
793 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 824 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
794 825
795 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 826 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 827 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
798 828
799 delete pkt; 829 delete pkt;
800} 830}
801 831
802void 832void
803connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 833connection::send_auth_response (const sockinfo &si)
804{ 834{
805 auth_res_packet *pkt = new auth_res_packet (conf->id); 835 auth_res_packet *pkt = new auth_res_packet (conf->id);
806 836
807 pkt->id = id; 837 memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof rcv_ecdh_b);
838 auth_hash (rcv_auth, rcv_ecdh_b, pkt->response.mac);
808 839
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); 840 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 841 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
816 842
817 delete pkt; 843 delete pkt;
818} 844}
819 845
820void 846void
821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 847connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
822{ 848{
823 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 849 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
824 conf->id, rid, (const char *)rsi); 850 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
851 conf->protocols);
825 852
826 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 853 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
827 854
828 r->hmac_set (octx); 855 r->hmac_set (octx);
829 send_vpn_packet (r, si); 856 send_vpn_packet (r, si);
… …
832} 859}
833 860
834inline void 861inline void
835connection::establish_connection_cb (ev::timer &w, int revents) 862connection::establish_connection_cb (ev::timer &w, int revents)
836{ 863{
837 if (!ictx 864 if (!(ictx && octx)
838 && conf != THISNODE 865 && conf != THISNODE
839 && connectmode != conf_node::C_NEVER 866 && connectmode != conf_node::C_NEVER
840 && connectmode != conf_node::C_DISABLED 867 && connectmode != conf_node::C_DISABLED
841 && !w.is_active ()) 868 && !w.is_active ())
842 { 869 {
843 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection 870 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
844 // and stop trying. should probably be handled by a per-connection expire handler. 871 // and stop trying. should probably be handled by a per-connection expire handler.
845 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ()) 872 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
846 { 873 {
847 reset_connection (); 874 reset_connection ("no demand");
848 return; 875 return;
849 } 876 }
850 877
851 last_establish_attempt = ev_now (); 878 last_establish_attempt = ev_now ();
852 879
… …
893 w.start (retry_int); 920 w.start (retry_int);
894 } 921 }
895} 922}
896 923
897void 924void
898connection::reset_connection () 925connection::reset_connection (const char *reason)
899{ 926{
900 if (ictx && octx) 927 if (ictx && octx)
901 { 928 {
902 slog (L_INFO, _("%s(%s): connection lost"), 929 slog (L_INFO, _("%s(%s): connection lost (%s)"),
903 conf->nodename, (const char *)si); 930 conf->nodename, (const char *)si, reason);
904 931
905 if (::conf.script_node_down) 932 if (::conf.script_node_down)
906 { 933 {
907 run_script_cb *cb = new run_script_cb; 934 run_script_cb *cb = new run_script_cb;
908 cb->set<connection, &connection::script_node_down> (this); 935 cb->set<connection, &connection::script_node_down> (this);
… …
910 } 937 }
911 } 938 }
912 939
913 delete ictx; ictx = 0; 940 delete ictx; ictx = 0;
914 delete octx; octx = 0; 941 delete octx; octx = 0;
915#if ENABLE_DNS
916 dnsv4_reset_connection ();
917#endif
918 942
919 si.host = 0; 943 si.host = 0;
944
945 have_snd_auth = false;
946 have_rcv_auth = false;
947 auth_expire = 0.;
920 948
921 last_activity = 0.; 949 last_activity = 0.;
922 //last_si_change = 0.; 950 //last_si_change = 0.;
923 retry_cnt = 0; 951 retry_cnt = 0;
924 952
… …
931connection::shutdown () 959connection::shutdown ()
932{ 960{
933 if (ictx && octx) 961 if (ictx && octx)
934 send_reset (si); 962 send_reset (si);
935 963
936 reset_connection (); 964 reset_connection ("shutdown");
937} 965}
938 966
939// poor-man's rekeying 967// poor-man's rekeying
940inline void 968inline void
941connection::rekey_cb (ev::timer &w, int revents) 969connection::rekey_cb (ev::timer &w, int revents)
942{ 970{
943 reset_connection (); 971 reset_connection ("rekeying");
944 establish_connection (); 972 establish_connection ();
945} 973}
946 974
947void 975void
948connection::send_data_packet (tap_packet *pkt) 976connection::send_data_packet (tap_packet *pkt)
… …
983 data_queue.put (new tap_packet (*pkt)); 1011 data_queue.put (new tap_packet (*pkt));
984 post_inject_queue (); 1012 post_inject_queue ();
985 } 1013 }
986} 1014}
987 1015
1016void
988void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1017connection::inject_vpn_packet (vpn_packet *pkt, int tos)
989{ 1018{
990 if (ictx && octx) 1019 if (ictx && octx)
991 send_vpn_packet (pkt, si, tos); 1020 send_vpn_packet (pkt, si, tos);
992 else 1021 else
993 { 1022 {
… …
999void 1028void
1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1029connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
1001{ 1030{
1002 last_activity = ev_now (); 1031 last_activity = ev_now ();
1003 1032
1004 slog (L_NOISE, "<<%d received packet type %d from %d to %d.", 1033 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
1005 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1034 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1006 1035
1007 if (connectmode == conf_node::C_DISABLED) 1036 if (connectmode == conf_node::C_DISABLED)
1008 return; 1037 return;
1009 1038
1010 switch (pkt->typ ()) 1039 switch (pkt->typ ())
1011 { 1040 {
1012 case vpn_packet::PT_PING: 1041 case vpn_packet::PT_PING:
1042 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1043
1013 // we send pings instead of auth packets after some retries, 1044 // we send pings instead of auth packets after some retries,
1014 // so reset the retry counter and establish a connection 1045 // so reset the retry counter and establish a connection
1015 // when we receive a ping. 1046 // when we receive a ping.
1016 if (!ictx) 1047 if (!ictx)
1017 { 1048 {
1018 if (auth_rate_limiter.can (rsi)) 1049 if (auth_rate_limiter.can (rsi))
1019 send_auth_request (rsi, true); 1050 send_auth_request (rsi, true);
1020 } 1051 }
1021 else 1052 else
1022 // we would love to change thre socket address here, but ping's aren't 1053 // we would love to change the socket address here, but ping's aren't
1023 // authenticated, so we best ignore it. 1054 // authenticated, so we best ignore it.
1024 send_ping (rsi, 1); // pong 1055 send_ping (rsi, 1); // pong
1025 1056
1026 break; 1057 break;
1027 1058
1028 case vpn_packet::PT_PONG: 1059 case vpn_packet::PT_PONG:
1060 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1061
1062 // a PONG might mean that the other side doesn't really know
1063 // about our desire for communication.
1064 establish_connection ();
1029 break; 1065 break;
1030 1066
1031 case vpn_packet::PT_RESET: 1067 case vpn_packet::PT_RESET:
1068 slog (L_TRACE, "%s >> PT_RESET", conf->nodename);
1069
1070 if (ictx && octx)
1032 { 1071 {
1033 reset_connection (); 1072 reset_connection ("remote reset");
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 }
1079
1046 break; 1080 break;
1047 1081
1048 case vpn_packet::PT_AUTH_REQ: 1082 case vpn_packet::PT_AUTH_REQ:
1049 if (auth_rate_limiter.can (rsi)) 1083 if (auth_rate_limiter.can (rsi))
1050 { 1084 {
1051 auth_req_packet *p = (auth_req_packet *) pkt; 1085 auth_req_packet *p = (auth_req_packet *)pkt;
1052 1086
1053 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);
1054 1090
1055 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))
1056 { 1097 {
1057 if (p->prot_minor != PROTOCOL_MINOR) 1098 if (p->prot_minor != PROTOCOL_MINOR)
1058 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."),
1059 conf->nodename, (const char *)rsi, 1100 conf->nodename, (const char *)rsi,
1060 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1101 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1061 1102
1062 if (p->initiate) 1103 if (p->initiate)
1104 {
1063 send_auth_request (rsi, false); 1105 send_auth_request (rsi, false);
1064 1106
1065 rsachallenge k; 1107 if (ictx && octx)
1108 reset_connection ("reconnect");
1109 }
1066 1110
1111 auth_data auth;
1112
1067 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1113 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
1068 { 1114 {
1069 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1115 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)); 1116 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1071 break;
1072 } 1117 }
1073 else 1118 else
1074 { 1119 {
1075 delete octx; 1120 bool chg = !have_rcv_auth || memcmp (&rcv_auth, &auth, sizeof auth);
1076 1121
1077 octx = new crypto_ctx (k, 1); 1122 rcv_auth = auth;
1078 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1123 have_rcv_auth = true;
1079 1124
1125 send_auth_response (rsi);
1126
1127 if (chg)
1128 {
1080 conf->protocols = p->protocols; 1129 conf->protocols = p->protocols;
1081 features = p->features & config_packet::get_features (); 1130 features = p->features & config_packet::get_features ();
1082 1131
1083 send_auth_response (rsi, p->id, k);
1084
1085 connection_established (); 1132 connection_established (rsi);
1086
1087 break; 1133 }
1088 } 1134 }
1135
1136 break;
1089 } 1137 }
1090 else
1091 slog (L_WARN, _("%s(%s): protocol mismatch."),
1092 conf->nodename, (const char *)rsi);
1093 1138
1094 send_reset (rsi); 1139 send_reset (rsi);
1095 } 1140 }
1096 1141
1097 break; 1142 break;
1098 1143
1099 case vpn_packet::PT_AUTH_RES: 1144 case vpn_packet::PT_AUTH_RES:
1100 { 1145 {
1101 auth_res_packet *p = (auth_res_packet *) pkt; 1146 auth_res_packet *p = (auth_res_packet *)pkt;
1102 1147
1103 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1148 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1104 1149
1105 if (p->chk_config ()) 1150 auth_mac local_mac;
1151 auth_hash (snd_auth, p->response.ecdh, local_mac);
1152
1153 if (memcmp (&p->response.mac, local_mac, sizeof local_mac))
1106 { 1154 {
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."), 1155 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1117 conf->nodename, (const char *)rsi); 1156 conf->nodename, (const char *)rsi);
1118 break;
1119 } 1157 }
1120 else 1158 else if (!have_snd_auth)
1121 { 1159 {
1122 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1160 memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
1123 1161
1124 if (!p->hmac_chk (cctx)) 1162 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 (%s), protocol version %d.%d."),
1149 conf->nodename, (const char *)rsi,
1150 is_direct ? "direct" : "routed",
1151 p->prot_major, p->prot_minor);
1152
1153 connection_established (); 1163 connection_established (rsi);
1154
1155 if (::conf.script_node_up)
1156 {
1157 run_script_cb *cb = new run_script_cb;
1158 cb->set<connection, &connection::script_node_up> (this);
1159 run_script_queued (cb, _("node-up command execution failed, continuing."));
1160 }
1161
1162 break;
1163 }
1164 else
1165 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1166 conf->nodename, (const char *)rsi);
1167 }
1168
1169 delete cctx;
1170 }
1171 } 1164 }
1172 } 1165 }
1173
1174 send_reset (rsi);
1175 break; 1166 break;
1176 1167
1177 case vpn_packet::PT_DATA_COMPRESSED: 1168 case vpn_packet::PT_DATA_COMPRESSED:
1178#if !ENABLE_COMPRESSION 1169#if !ENABLE_COMPRESSION
1179 send_reset (rsi); 1170 send_reset (rsi);
… …
1185 if (ictx && octx) 1176 if (ictx && octx)
1186 { 1177 {
1187 vpndata_packet *p = (vpndata_packet *)pkt; 1178 vpndata_packet *p = (vpndata_packet *)pkt;
1188 1179
1189 if (!p->hmac_chk (ictx)) 1180 if (!p->hmac_chk (ictx))
1181 {
1182 // rekeying often creates temporary hmac auth floods
1183 // we assume they don't take longer than a few seconds normally,
1184 // and suppress messages and resets during that time.
1185 //TODO: should be done per source address
1186 if (!hmac_error)
1187 {
1188 hmac_error = ev_now () + 3;
1189 break;
1190 }
1191 else if (hmac_error >= ev_now ())
1192 break; // silently suppress
1193 else
1194 {
1190 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1195 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1191 "could be an attack, or just corruption or a synchronization error."), 1196 "could be an attack, or just corruption or a synchronization error."),
1192 conf->nodename, (const char *)rsi); 1197 conf->nodename, (const char *)rsi);
1198 // reset
1199 }
1200 }
1193 else 1201 else
1194 { 1202 {
1195 u32 seqno; 1203 u32 seqno;
1196 tap_packet *d = p->unpack (this, seqno); 1204 tap_packet *d = p->unpack (this, seqno);
1197 int seqclass = iseqno.seqno_classify (seqno); 1205 int seqclass = iseqno.seqno_classify (seqno);
1206
1207 hmac_error = 0;
1198 1208
1199 if (seqclass == 0) // ok 1209 if (seqclass == 0) // ok
1200 { 1210 {
1201 vpn->tap->send (d); 1211 vpn->tap->send (d);
1202 1212
… …
1207 // { 1217 // {
1208 slog (L_INFO, _("%s(%s): changing socket address to %s."), 1218 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1209 conf->nodename, (const char *)si, (const char *)rsi); 1219 conf->nodename, (const char *)si, (const char *)rsi);
1210 1220
1211 si = rsi; 1221 si = rsi;
1222
1223 if (::conf.script_node_change)
1224 {
1225 run_script_cb *cb = new run_script_cb;
1226 cb->set<connection, &connection::script_node_change> (this);
1227 run_script_queued (cb, _("node-change command execution failed, continuing."));
1228 }
1229
1212 // } 1230 // }
1213 //else 1231 //else
1214 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."), 1232 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1215 // conf->nodename, (const char *)si, (const char *)rsi); 1233 // conf->nodename, (const char *)si, (const char *)rsi);
1216 } 1234 }
… …
1237 break; 1255 break;
1238 1256
1239 case vpn_packet::PT_CONNECT_REQ: 1257 case vpn_packet::PT_CONNECT_REQ:
1240 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1258 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1241 { 1259 {
1242 connect_req_packet *p = (connect_req_packet *) pkt; 1260 connect_req_packet *p = (connect_req_packet *)pkt;
1243 1261
1244 if (p->id > 0 && p->id <= vpn->conns.size ()) 1262 if (p->id > 0 && p->id <= vpn->conns.size ())
1245 { 1263 {
1246 connection *c = vpn->conns[p->id - 1]; 1264 connection *c = vpn->conns[p->id - 1];
1247 conf->protocols = p->protocols; 1265 conf->protocols = p->protocols;
1248 1266
1249 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1267 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1268 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1269 p->protocols,
1250 conf->id, p->id, c->ictx && c->octx); 1270 c->ictx && c->octx);
1251 1271
1252 if (c->ictx && c->octx) 1272 if (c->ictx && c->octx)
1253 { 1273 {
1254 // send connect_info packets to both sides, in case one is 1274 // send connect_info packets to both sides, in case one is
1255 // behind a nat firewall (or both ;) 1275 // behind a nat firewall (or both ;)
… …
1278 1298
1279 c->conf->protocols = p->protocols; 1299 c->conf->protocols = p->protocols;
1280 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1300 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1281 p->si.upgrade_protocol (protocol, c->conf); 1301 p->si.upgrade_protocol (protocol, c->conf);
1282 1302
1283 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1303 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
1284 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1304 conf->nodename,
1305 vpn->conns[p->id - 1]->conf->nodename,
1306 (const char *)p->si,
1307 p->protocols,
1308 protocol,
1309 p->si.supported_protocols (c->conf),
1310 !c->ictx && !c->octx);
1285 1311
1286 const sockinfo &dsi = forward_si (p->si); 1312 const sockinfo &dsi = forward_si (p->si);
1287 1313
1288 if (dsi.valid ()) 1314 if (dsi.valid ())
1289 c->send_auth_request (dsi, true); 1315 c->send_auth_request (dsi, true);
1316 else
1317 slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
1318 vpn->conns[p->id - 1]->conf->nodename,
1319 (const char *)p->si);
1290 } 1320 }
1291 else 1321 else
1292 slog (L_WARN, 1322 slog (L_WARN,
1293 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1323 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1294 p->id); 1324 p->id);
… …
1303} 1333}
1304 1334
1305inline void 1335inline void
1306connection::keepalive_cb (ev::timer &w, int revents) 1336connection::keepalive_cb (ev::timer &w, int revents)
1307{ 1337{
1308 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1338 ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
1339
1340 if (when >= 0)
1341 w.start (when);
1342 else if (when < -15)
1309 { 1343 {
1310 reset_connection (); 1344 reset_connection ("keepalive overdue");
1311 establish_connection (); 1345 establish_connection ();
1312 } 1346 }
1313 else if (ev_now () < last_activity + ::conf.keepalive)
1314 w.start (last_activity + ::conf.keepalive - ev::now ());
1315 else if (conf->connectmode != conf_node::C_ONDEMAND 1347 else if (conf->connectmode != conf_node::C_ONDEMAND
1316 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1348 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1317 { 1349 {
1350 w.start (3);
1318 send_ping (si); 1351 send_ping (si);
1319 w.start (5);
1320 } 1352 }
1321 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1353 else if (when >= -10)
1322 // hold ondemand connections implicitly a few seconds longer 1354 // hold ondemand connections implicitly a few seconds longer
1323 // should delete octx, though, or something like that ;) 1355 // should delete octx, though, or something like that ;)
1324 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1356 w.start (when + 10);
1325 else 1357 else
1326 reset_connection (); 1358 reset_connection ("keepalive timeout");
1327} 1359}
1328 1360
1361void
1329void connection::send_connect_request (int id) 1362connection::send_connect_request (int id)
1330{ 1363{
1331 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1364 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1332 1365
1333 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1366 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1367 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1368 THISNODE->protocols);
1334 p->hmac_set (octx); 1369 p->hmac_set (octx);
1335 send_vpn_packet (p, si); 1370 send_vpn_packet (p, si);
1336 1371
1337 delete p; 1372 delete p;
1338} 1373}
1339 1374
1375void
1340void connection::script_init_env (const char *ext) 1376connection::script_init_env (const char *ext)
1341{ 1377{
1342 char *env; 1378 char *env;
1343 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1379 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1344 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1380 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1345 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1381 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1346 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1382 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1347 conf->id & 0xff); putenv (env); 1383 conf->id & 0xff); putenv (env);
1348} 1384}
1349 1385
1386void
1350void connection::script_init_connect_env () 1387connection::script_init_connect_env ()
1351{ 1388{
1352 vpn->script_init_env (); 1389 vpn->script_init_env ();
1353 1390
1354 char *env; 1391 char *env;
1355 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1392 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1393 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1356 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1394 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1357 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1395 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1358 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1396 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1359} 1397}
1360 1398
1361inline const char * 1399inline const char *
1362connection::script_node_up () 1400connection::script_node_up ()
1363{ 1401{
… …
1368 char *filename; 1406 char *filename;
1369 asprintf (&filename, 1407 asprintf (&filename,
1370 "%s/%s", 1408 "%s/%s",
1371 confbase, 1409 confbase,
1372 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1410 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1411
1412 return filename;
1413}
1414
1415inline const char *
1416connection::script_node_change ()
1417{
1418 script_init_connect_env ();
1419
1420 putenv ((char *)"STATE=change");
1421
1422 char *filename;
1423 asprintf (&filename,
1424 "%s/%s",
1425 confbase,
1426 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1373 1427
1374 return filename; 1428 return filename;
1375} 1429}
1376 1430
1377inline const char * 1431inline const char *
… …
1403 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1457 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1404 1458
1405 last_establish_attempt = 0.; 1459 last_establish_attempt = 0.;
1406 octx = ictx = 0; 1460 octx = ictx = 0;
1407 1461
1408 if (!conf->protocols) // make sure some protocol is enabled
1409 conf->protocols = PROT_UDPv4;
1410
1411 connectmode = conf->connectmode; 1462 connectmode = conf->connectmode;
1412 1463
1413 // queue a dummy packet to force an initial connection attempt 1464 // queue a dummy packet to force an initial connection attempt
1414 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1465 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1415 vpn_queue.put (new net_packet); 1466 vpn_queue.put (new net_packet);
1416 1467
1417 reset_connection (); 1468 reset_connection ("startup");
1418} 1469}
1419 1470
1420connection::~connection () 1471connection::~connection ()
1421{ 1472{
1422 shutdown (); 1473 shutdown ();
1423} 1474}
1424 1475
1476void
1425void connection_init () 1477connection_init ()
1426{ 1478{
1427 auth_rate_limiter.clear (); 1479 auth_rate_limiter.clear ();
1428 reset_rate_limiter.clear (); 1480 reset_rate_limiter.clear ();
1429} 1481}
1430 1482

Diff Legend

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