Skip to content

Commit 91e7ce8

Browse files
adamierymenkoadamierymenko
authored
Merge pull request #2281 from zerotier/1.14.0
1.14.0
2 parents ac6d532 + e59790b commit 91e7ce8

File tree

171 files changed

+5009
-2449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+5009
-2449
lines changed

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
uses: Swatinem/rust-cache@v2
2323
continue-on-error: false
2424
with:
25-
key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
25+
key: ${{ runner.os }}-cargo-${{ hashFiles('rustybits//Cargo.lock') }}
2626
shared-key: ${{ runner.os }}-cargo-
2727
workspaces: |
28-
zeroidc/
28+
rustybits/
2929
3030
- name: make
3131
run: make
@@ -54,10 +54,10 @@ jobs:
5454
uses: Swatinem/rust-cache@v2
5555
continue-on-error: false
5656
with:
57-
key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
57+
key: ${{ runner.os }}-cargo-${{ hashFiles('rustybits//Cargo.lock') }}
5858
shared-key: ${{ runner.os }}-cargo-
5959
workspaces: |
60-
zeroidc/
60+
rustybits/
6161
6262
- name: make
6363
run: make
@@ -86,10 +86,10 @@ jobs:
8686
uses: Swatinem/rust-cache@v2
8787
continue-on-error: false
8888
with:
89-
key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
89+
key: ${{ runner.os }}-cargo-${{ hashFiles('rustybits//Cargo.lock') }}
9090
shared-key: ${{ runner.os }}-cargo-
9191
workspaces: |
92-
zeroidc/
92+
rustybits/
9393
9494
- name: setup msbuild
9595
uses: microsoft/[email protected]

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,4 @@ __pycache__
138138
*_source.tar.bz2
139139
snap/.snapcraft
140140
tcp-proxy/tcp-proxy
141+
rustybits/target

‎LICENSE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided you
2626
ZeroTier behind the scenes to operate a service not
2727
related to ZeroTier network administration.
2828

29-
* Create Non-Open-Source Commercial Derviative Works
29+
* Create Non-Open-Source Commercial Derivative Works
3030

3131
(2) Link or directly include the Licensed Work in a
3232
commercial or for-profit application or other product
@@ -47,7 +47,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided you
4747
services, social welfare, senior care, child care, and
4848
the care of persons with disabilities.
4949

50-
Change Date: 2025-01-01
50+
Change Date: 2026-01-01
5151

5252
Change License: Apache License version 2.0 as published by the Apache
5353
Software Foundation

‎README.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ The base path contains the ZeroTier One service main entry point (`one.cpp`), se
4444
- `windows/`: Visual Studio solution files, Windows service code, and the Windows task bar app UI.
4545
- `zeroidc/`: OIDC implementation used by ZeroTier service to log into SSO-enabled networks. (This part is written in Rust, and more Rust will be appearing in this repository in the future.)
4646

47+
### Contributing
48+
49+
Please do pull requests off of the `dev` branch.
50+
51+
Releases are done by merging `dev` into `main` and then tagging and doing builds.
52+
4753
### Build and Platform Notes
4854

4955
To build on Mac and Linux just type `make`. On FreeBSD and OpenBSD `gmake` (GNU make) is required and can be installed from packages or ports. For Windows there is a Visual Studio solution in `windows/`.
@@ -169,3 +175,23 @@ Metrics are also available on disk in ZeroTier's working directory:
169175
| zt_peer_packet_errors | node_id | Counter | number of incoming packet errors from a peer |
170176

171177
If there are other metrics you'd like to see tracked, ask us in an Issue or send us a Pull Request!
178+
179+
### HTTP / App server
180+
181+
There is a static http file server suitable for hosting Single Page Apps at http://localhost:9993/app/<app-path>
182+
183+
Use `zerotier-cli info -j` to find your zerotier-one service's homeDir
184+
185+
``` sh
186+
cd $ZT_HOME
187+
sudo mkdir -p app/app1
188+
sudo mkdir -p app/appB
189+
echo '<html><meta charset=utf-8><title>appA</title><body><h1>hello world A' | sudo tee app/appA/index.html
190+
echo '<html><meta charset=utf-8><title>app2</title><body><h1>hello world 2' | sudo tee app/app2/index.html
191+
curl -sL http://localhost:9993/app/appA http://localhost:9993/app/app2
192+
```
193+
194+
Then visit [http://localhost:9993/app/app1/](http://localhost:9993/app/app1/) and [http://localhost:9993/app/appB/](http://localhost:9993/app/appB/)
195+
196+
Requests to paths don't exist return the app root index.html, as is customary for SPAs.
197+
If you want, you can write some javascript that talks to the service or controller [api](https://docs.zerotier.com/service/v1).

‎RELEASE-NOTES.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
ZeroTier Release Notes
22
======
33

4+
# 2024-05-02 -- Version 1.14.0
5+
6+
* Linux I/O performance improvements under heavy load
7+
* Improvements to multipath
8+
* Fix for port rebinding "coma" bug after periods offline (some laptop users)
9+
* Fixed a rules engine quirk/ambiguity (GitHub Issue #2200)
10+
* Controller API enhancements: node names and other node meta-data
11+
* Other bug fixes
12+
413
# 2023-09-12 -- Version 1.12.2
514

615
* More improvements to macOS full tunnel mode.
@@ -89,7 +98,7 @@ Note that releases are coming few and far between because most of our dev effort
8998
# 2022-04-25 -- Version 1.8.9
9099

91100
* Fixed a long-standing and strange bug that was causing sporadic "phantom" packet authentication failures. Not a security problem but could be behind sporadic reports of link failures under some conditions.
92-
* Fized a memory leak in SSO/OIDC support.
101+
* Fixed a memory leak in SSO/OIDC support.
93102
* Fixed SSO/OIDC display error on CLI.
94103
* Fixed a bug causing nodes to sometimes fail to push certs to each other (primarily affects SSO/OIDC use cases).
95104
* Fixed a deadlock bug on leaving SSO/OIDC managed networks.
@@ -340,7 +349,7 @@ We're trying to fix all these issues before the 1.6.0 release. Stay tuned.
340349
# 2017-04-20 -- Version 1.2.4
341350

342351
* Managed routes are now only bifurcated for the default route. This is a change in behavior, though few people will probably notice. Bifurcating all managed routes was causing more trouble than it was worth for most users.
343-
* Up to 2X crypto speedup on x86-64 (except Windows, which will take some porting) and 32-bit ARM platforms due to integration of fast assembly language implementations of Salsa20/12 from the [supercop](http://bench.cr.yp.to/supercop.html) code base. These were written by Daniel J. Bernstein and are in the public domain. My Macbook Pro (Core i5 2.8ghz) now does almost 1.5GiB/sec Salsa20/12 per core and a Raspberry Pi got a 2X boost. 64-bit ARM support and Windows support will take some work but should not be too hard.
352+
* Up to 2X crypto speedup on x86-64 (except Windows, which will take some porting) and 32-bit ARM platforms due to integration of fast assembly language implementations of Salsa20/12 from the [supercop](http://bench.cr.yp.to/supercop.html) code base. These were written by Daniel J. Bernstein and are in the public domain. My MacBook Pro (Core i5 2.8ghz) now does almost 1.5GiB/sec Salsa20/12 per core and a Raspberry Pi got a 2X boost. 64-bit ARM support and Windows support will take some work but should not be too hard.
344353
* Refactored code that manages credentials to greatly reduce memory use in most cases. This may also result in a small performance improvement.
345354
* Reworked and simplified path selection and priority logic to fix path instability and dead path persistence edge cases. There have been some sporadic reports of persistent path instabilities and dead paths hanging around that take minutes to resolve. These have proven difficult to reproduce in house, but hopefully this will fix them. In any case it seems to speed up path establishment in our tests and it makes the code simpler and more readable.
346355
* Eliminated some unused cruft from the code around path management and in the peer class.

‎SECURITY.md‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ includes all source code repositories managed through our GitHub organization.
77

88
The following versions of ZeroTier One receive security updates
99

10-
| Version | Supported |
11-
| ------- | ------------------ |
12-
| 1.10.x | :white_check_mark: |
13-
| 1.8.x | :white_check_mark: |
14-
| < 1.8.0 | :x: |
10+
| Version | Supported |
11+
| -------- | ------------------ |
12+
| 1.14.x | :white_check_mark: |
13+
| 1.12.x | :white_check_mark: |
14+
| < 1.12.0 | :x: |
1515

1616
## Reporting a Vulnerability
1717

@@ -23,7 +23,6 @@ please encrypt with our PGP key (see below).
2323
Please include the following information, or as much as you can provide to help us
2424
understand the nature and scope of the issue:
2525

26-
2726
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
2827
* Full paths of source file(s) related to the manifestation of the issue
2928
* The location of the affected source code (tag/branch/commit or direct URL)
@@ -32,7 +31,6 @@ understand the nature and scope of the issue:
3231
* Proof-of-concept or exploit code (if possible)
3332
* Impact of the issue, including how an attacker might exploit the issue
3433

35-
3634
## Preferred Languages
3735

3836
We prefer all communications to be in English.

‎controller/ConnectionPool.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Use of this software is governed by the Business Source License included
55
* in the LICENSE.TXT file in the project's root directory.
66
*
7-
* Change Date: 2025-01-01
7+
* Change Date: 2026-01-01
88
*
99
* On the date above, in accordance with the Business Source License, use
1010
* of this software will be governed by version 2.0 of the Apache License.

‎controller/DB.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Use of this software is governed by the Business Source License included
55
* in the LICENSE.TXT file in the project's root directory.
66
*
7-
* Change Date: 2025-01-01
7+
* Change Date: 2026-01-01
88
*
99
* On the date above, in accordance with the Business Source License, use
1010
* of this software will be governed by version 2.0 of the Apache License.

‎controller/DB.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Use of this software is governed by the Business Source License included
55
* in the LICENSE.TXT file in the project's root directory.
66
*
7-
* Change Date: 2025-01-01
7+
* Change Date: 2026-01-01
88
*
99
* On the date above, in accordance with the Business Source License, use
1010
* of this software will be governed by version 2.0 of the Apache License.

‎controller/DBMirrorSet.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Use of this software is governed by the Business Source License included
55
* in the LICENSE.TXT file in the project's root directory.
66
*
7-
* Change Date: 2025-01-01
7+
* Change Date: 2026-01-01
88
*
99
* On the date above, in accordance with the Business Source License, use
1010
* of this software will be governed by version 2.0 of the Apache License.

0 commit comments

Comments
 (0)