5230 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Adam Ierymenko	5c7e51feaf	Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev	2021-07-23 18:49:05 -04:00
Adam Ierymenko	34de579c91	Handling of soon-to-expire members	2021-07-23 18:49:00 -04:00
Joseph Henry	0ed9db05d2	Restore original ECHO rate limiting (changed for multipath)	2021-07-20 19:06:47 -07:00
Grant Limberg	73ddea8864	use network ID, not controller ID for looking up network data	2021-07-06 14:15:01 -07:00
Grant Limberg	10215af96d	whoops	2021-07-06 13:18:08 -07:00
Grant Limberg	e67fee0264	debug logging	2021-07-06 13:08:21 -07:00
Grant Limberg	5ece4f734a	fix error message	2021-07-06 13:08:16 -07:00
Travis LaDuke	27409b615a	Merge branch 'thoradia-bind' into dev	2021-06-29 11:44:35 -07:00
Travis LaDuke	8866fbd618	Merge branch 'bind' of https://github.com/thoradia/ZeroTierOne into thoradia-bind	2021-06-29 11:22:46 -07:00
Adam Ierymenko	8885149cd3	Revert "Revert "Revert a change to LinuxEthernetTap threading to eliminate out of order packet issues on some systems."" ... This reverts commit 89ddf2991b.	2021-06-28 19:29:53 -04:00
Adam Ierymenko	89ddf2991b	Revert "Revert a change to LinuxEthernetTap threading to eliminate out of order packet issues on some systems." ... This reverts commit 0461b24db3.	2021-06-28 17:59:28 -04:00
Adam Ierymenko	547b0de8a5	Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev	2021-06-28 17:15:59 -04:00
Adam Ierymenko	0461b24db3	Revert a change to LinuxEthernetTap threading to eliminate out of order packet issues on some systems.	2021-06-28 17:15:34 -04:00
Sean OMeara	c698e9c122	Merge pull request #1420 from zerotier/someara/dev-json-hpp ... updating json.hpp to 3.9.1	2021-06-24 23:30:58 +02:00
Sean OMeara	8f84a968de	updating json.hpp to 3.9.1	2021-06-24 20:33:45 +02:00
Grant Limberg	f8ea7fdc2b	Fix for GitHub #859 ... Wrong DB::get() method being called to look up the network member for deletes	2021-06-24 10:32:21 -07:00
Travis LaDuke	7b0d11b187	Merge pull request #1408 from erikh/docker-release-fixes ... Small dockerfile release fixes	2021-06-08 08:44:53 -07:00
Grant Limberg	8dd3639576	set ssoEnabled = true on network config if we get ERROR_NETWORK_AUTHENTICATION_REQUIRED	2021-06-05 14:00:03 -07:00
Grant Limberg	364ad87e2b	add ssoEnabled flag to network config	2021-06-05 13:44:45 -07:00
Grant Limberg	9380ef708a	debug strings & query fixes	2021-06-05 13:44:07 -07:00
Grant Limberg	fd174b3459	fix auth time lookup	2021-06-04 20:55:22 -07:00
Grant Limberg	21d27c314c	HMACSHA384 the nonce bytes, not the hex encoded nonce bytes	2021-06-04 20:06:04 -07:00
Grant Limberg	0b89a49201	typo	2021-06-04 16:56:28 -07:00
Grant Limberg	de718d9743	handle ZT_SSO_REDIRECT_URL env file in docker	2021-06-04 16:32:02 -07:00
Grant Limberg	e6b4fb5af7	add "ssoRedirectURL" to local.conf ... plumbed it through to the central controller code	2021-06-04 16:29:03 -07:00
Grant Limberg	c227330d09	fix redirect_uri substitution	2021-06-04 15:58:38 -07:00
Adam Ierymenko	c769e282fb	Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev	2021-06-04 18:52:23 -04:00
Adam Ierymenko	98722ed7ea	Increase URL buffer sizes	2021-06-04 18:52:10 -04:00
Grant Limberg	b16f40c0de	.	2021-06-04 15:18:18 -07:00
Grant Limberg	fd85f87ade	handle null in result set	2021-06-04 15:15:42 -07:00
Grant Limberg	add33f1ab3	cast to bigint in query	2021-06-04 14:48:41 -07:00
Grant Limberg	3bfc438ae8	null handling	2021-06-04 14:40:14 -07:00
Adam Ierymenko	1dfe909bab	Increase authentication URL sizes.	2021-06-04 16:46:56 -04:00
Grant Limberg	75d17ea3c8	Helps to commit when trying to write a change to the db	2021-06-04 13:20:03 -07:00
Grant Limberg	96d15337bb	default 0	2021-06-04 13:19:39 -07:00
Grant Limberg	74a678c1e1	chicken or egg problem. ... member must exist in the database before we can generate a nonce & SSO URL	2021-06-04 12:49:26 -07:00
Grant Limberg	fed1846c6f	need tres commas	2021-06-04 12:19:52 -07:00
Grant Limberg	f27d193cf6	.	2021-06-04 11:56:12 -07:00
Grant Limberg	7941b63543	another typo	2021-06-04 11:43:42 -07:00
Grant Limberg	21965ac8e8	yet another query fix	2021-06-04 11:40:03 -07:00
Grant Limberg	7ca2ecb421	put expiry time back on nc object	2021-06-04 11:39:52 -07:00
Grant Limberg	1dcfc03cbc	another query fix	2021-06-04 11:22:30 -07:00
Grant Limberg	0702e581a1	remove some noisy log lines & fix a query error	2021-06-04 11:06:54 -07:00
Grant Limberg	c78792a705	moar temporary debug printfs	2021-06-04 11:00:51 -07:00
Grant Limberg	287c19e822	move this outside the auth block. If SSO is enabled, it should be checked whether authorized or not	2021-06-04 09:46:31 -07:00
Grant Limberg	bc901d613d	check for nulls	2021-06-04 09:20:39 -07:00
Grant Limberg	2192a8b0ec	do the ld.so dance in the docker container	2021-06-04 08:31:34 -07:00
Grant Limberg	6cb4c58d9a	linux docker build	2021-06-03 18:30:32 -07:00
Grant Limberg	4f521baafd	Big SSO update ... make things hopefully work	2021-06-03 14:38:26 -07:00
Grant Limberg	81fda3f5b8	set a default and goes boom 🤦‍♂️	2021-06-02 15:07:53 -07:00