Commit Graph

5533 Commits

Author SHA1 Message Date
63b36e8569 . 2022-01-20 15:36:29 -08:00
726d359335 part 2 2022-01-20 15:35:18 -08:00
fc0858a4a3 fix the fix cargo build on mac
--debug isn't a cargo option at all
2022-01-20 15:32:58 -08:00
f80103778a Merge branch 'dev' into central-controller 2022-01-20 15:15:59 -08:00
c09010c25a handle nonce rotation in controller better
Won't generate new nonces until there are no active ones.
2022-01-20 15:14:29 -08:00
9cd1466e6b Merge branch 'dev' into central-controller 2022-01-20 11:12:21 -08:00
801be64ed3 Merge branch 'zeroidc' into dev 2022-01-20 09:46:22 -08:00
d719137565 temp workaround for oidc auth dropping issue
Add a method to "kick" the refresh thread and re-post the tokens in the case where the thread is somehow still running & controller pushes out an AUTH_REQUIRED.  This situation happens in a corner case still under investigation where the controller pushes out many copies of the network config repeatedly
2022-01-20 09:44:56 -08:00
58aba96494 Mac Rust build fix. 2022-01-20 11:16:26 -05:00
f8d7796099 Merge branch 'zeroidc' into dev 2022-01-20 10:43:37 -05:00
241c41267b Merge branch 'master' into dev 2022-01-20 08:23:12 -05:00
2ac1ff9be2 Merge pull request #1451 from channelbeta/update-pgp-url
Update PGP keyserver URL
2022-01-20 08:22:52 -05:00
cb31b3987f Merge pull request #1539 from khng300/getdefaultgateway-rtm-fix
ext/libnatpmp: Set sa_len properly in getdefaultgateway()
2022-01-20 08:21:24 -05:00
c256398095 Merge pull request #1541 from khng300/fbsd-osdep-PortMapper
Build osdep/PortMapper on FreeBSD
2022-01-20 08:21:08 -05:00
7bb8703bf9 Build osdep/PortMapper on FreeBSD
This enables NAT-PMP and UPnP supports on FreeBSD.
2022-01-12 13:52:46 -05:00
0da00bf546 Merge pull request #1535 from zerotier/linux-route-metric
Set a high metric on linux routes that have a via.
2022-01-12 18:41:54 +01:00
4866490cdf Merge pull request #1533 from zerotier/tl-linux-route-if
Prevent adding routes to non-zerotier interfaces in rare cases.
2022-01-12 18:41:45 +01:00
1547b1a581 Merge branch 'zeroidc' into central-controller
# Conflicts:
#	node/NetworkConfig.cpp
#	node/NetworkConfig.hpp
2022-01-11 12:09:57 -08:00
511c77aa99 ext/libnatpmp: Set sa_len properly in getdefaultgateway()
In USE_SOCKET_ROUTE's implementation, sa_len of the sockaddrs need to be
set as well.

Sponsored by:	The FreeBSD Foundation
2022-01-10 20:42:34 -05:00
692a0e7ac2 Set a high metric on linux routes that have a via.
See issue #750.

zerotier doesn't currently set a metric on routes. Linux
takes this to mean "0", the highest priority.

Every comment in the issue is about routing between zerotier
and lan and how they conflict.

This quick change could fix this problem for most people.

The subnet route for the zerotier network, the one with no
via, is still 0 in this patch. Just the "via" routes get
higher metrics.
If for some reason, you needed your via routes to have
higher priority, you could use a prefix work-around:

192.168.1.0/25 via 10.147.17.1
192.168.1.128/25 via 10.147.17.1
2022-01-07 13:10:36 -08:00
fa25b45198 Keep interface name on via routes on linux
See issue #1498
2022-01-07 11:58:42 -08:00
cdd25c389e Merge branch 'dev' into zeroidc 2022-01-06 14:55:40 -08:00
133a6ff7b3 fix env var 2022-01-06 14:55:20 -08:00
96add0ba65 Merge branch 'dev' into zeroidc 2022-01-06 14:54:09 -08:00
f5096a1f26 add wait for docker in controller startup script 2022-01-06 14:51:56 -08:00
3d4d087f07 make some impl functions pub 2022-01-05 15:43:45 -08:00
953e62f103 Clean up some extraneous output in release mode 2022-01-05 11:55:47 -08:00
084727c54a link zeroidc to selftest 2022-01-05 11:55:25 -08:00
8ea192fcab update dependency specs 2022-01-05 08:44:01 -08:00
dceba1f2f1 Merge branch 'dev' into zeroidc 2022-01-05 08:35:15 -08:00
73878fbdc4 Merge pull request #1531 from StephenCWills/mingw32-disable-salsasse
Disable Salsa20 SSE on MinGW 32-bit compiler
2022-01-04 17:42:40 -08:00
87d17088cc Disable Salsa20 SSE on MinGW 32-bit compiler 2022-01-04 20:39:08 -05:00
cc6c48fca8 Merge pull request #1525 from StephenCWills/lowercase-windows-headers
Use lowercase when including Windows headers
2022-01-04 17:11:51 -08:00
e556a2ee23 Merge pull request #1528 from StephenCWills/android-miniupnpc
[Android] Fix include for miniupnpc
2022-01-04 16:56:05 -08:00
50b866c5cf clean up & pass along errors from ZeroIDC::new() method 2022-01-03 17:25:30 -08:00
f83eed9ef9 [Android] Fix include for miniupnpc 2022-01-03 12:15:21 -05:00
cb9313a454 Merge branch 'dev' into zeroidc 2022-01-03 08:37:10 -08:00
cf411efd1d a little cleanup 2022-01-03 08:36:16 -08:00
1c956494a4 Use lowercase when including Windows headers 2021-12-29 16:29:08 -05:00
dbe3aa1efc Merge branch 'master' into dev 2021-12-17 17:41:03 -05:00
4128d80974 1.8.5 version bump. 2021-12-17 17:40:00 -05:00
057356a725 Just some comments 2021-12-16 22:07:17 -08:00
a69e91c541 Fix hash verification on refresh 2021-12-16 19:49:15 -08:00
8fccf3136c Enable validation of token hashes as part of the oidc process 2021-12-16 18:44:36 -08:00
2435ab70ab remove some extra verbose logging
... and baby you got a full flow goin on
2021-12-16 12:37:22 -08:00
f489862500 update final page text a smidge 2021-12-16 12:20:31 -08:00
2642fa1ee2 Return HTML instead of blank page when auth is successful! 2021-12-16 12:06:16 -08:00
2293b0703f Can get Central JSON bundle back to zerotier-one window 2021-12-16 11:37:58 -08:00
1375e3e2f5 allow debug & release builds of Rust 2021-12-15 15:53:48 -08:00
0ab5cce878 TIL: Its not as hard as I thought to make Rust deadlock 2021-12-15 14:37:06 -08:00