Merge branch 'dev' into winbuild

zerotier · Jun 18, 2024 · f5cc774 · f5cc774
2 parents 9de2b90 + 41a4690
commit f5cc774
Show file tree

Hide file tree

Showing 147 changed files with 696 additions and 610 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,13 +43,20 @@ jobs:
  # git config --global core.eol lf
  - name: checkout
  uses: actions/checkout@v3
- - name: Install Rust
+ - name: Install Rust aarch64
  uses: actions-rs/toolchain@v1
  with:
  toolchain: stable
  target: aarch64-apple-darwin
  override: true
  components: rustfmt, clippy
+ - name: Install Rust x86_64
+ uses: actions-rs/toolchain@v1
+ with:
+ toolchain: stable
+ target: x86_64-apple-darwin
+ override: true
+ components: rustfmt, clippy
  - name: Set up cargo cache
  uses: Swatinem/rust-cache@v2
  continue-on-error: false

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -47,7 +47,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided you
  services, social welfare, senior care, child care, and
  the care of persons with disabilities.
 
-Change Date: 2025-01-01
+Change Date: 2026-01-01
 
 Change License: Apache License version 2.0 as published by the Apache
  Software Foundation

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,6 +1,15 @@
 ZeroTier Release Notes
 ======
 
+# 2024-05-02 -- Version 1.14.0
+
+ * Linux I/O performance improvements under heavy load
+ * Improvements to multipath
+ * Fix for port rebinding "coma" bug after periods offline (some laptop users)
+ * Fixed a rules engine quirk/ambiguity (GitHub Issue #2200)
+ * Controller API enhancements: node names and other node meta-data
+ * Other bug fixes
+
 # 2023-09-12 -- Version 1.12.2
 
  * More improvements to macOS full tunnel mode.

diff --git a/SECURITY.md b/SECURITY.md
@@ -7,11 +7,11 @@ includes all source code repositories managed through our GitHub organization.
 
 The following versions of ZeroTier One receive security updates
 
-| Version | Supported |
-| ------- | ------------------ |
+| Version | Supported |
+| -------- | ------------------ |
+| 1.14.x | :white_check_mark: |
 | 1.12.x | :white_check_mark: |
-| 1.10.x | :white_check_mark: |
-| < 1.10.0 | :x: |
+| < 1.12.0 | :x: |
 
 ## Reporting a Vulnerability
 
@@ -23,7 +23,6 @@ please encrypt with our PGP key (see below).
 Please include the following information, or as much as you can provide to help us 
 understand the nature and scope of the issue:
 
-
  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
  * Full paths of source file(s) related to the manifestation of the issue
  * 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:
  * Proof-of-concept or exploit code (if possible)
  * Impact of the issue, including how an attacker might exploit the issue
 
-
 ## Preferred Languages
 
 We prefer all communications to be in English.

diff --git a/controller/ConnectionPool.hpp b/controller/ConnectionPool.hpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/controller/DB.cpp b/controller/DB.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.
@@ -382,6 +382,24 @@ void DB::_networkChanged(nlohmann::json &old,nlohmann::json &networkConfig,bool
  const std::string ids = old["id"];
  const uint64_t networkId = Utils::hexStrToU64(ids.c_str());
  if (networkId) {
+ try {
+ // deauth all members on the network
+ nlohmann::json network;
+ std::vector<nlohmann::json> members;
+ this->get(networkId, network, members);
+ for(auto i=members.begin();i!=members.end();++i) {
+ const std::string nodeID = (*i)["id"];
+ const uint64_t memberId = Utils::hexStrToU64(nodeID.c_str());
+ std::unique_lock<std::shared_mutex> ll(_changeListeners_l);
+ for(auto j=_changeListeners.begin();j!=_changeListeners.end();++j) {
+ (*j)->onNetworkMemberDeauthorize(this,networkId,memberId);
+ }
+ }
+ } catch (std::exception &e) {
+ std::cerr << "Error deauthorizing members on network delete: " << e.what() << std::endl;
+ }
+
+ // delete the network
  std::unique_lock<std::shared_mutex> l(_networks_l);
  _networks.erase(networkId);
  }

diff --git a/controller/DB.hpp b/controller/DB.hpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/controller/DBMirrorSet.cpp b/controller/DBMirrorSet.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/controller/DBMirrorSet.hpp b/controller/DBMirrorSet.hpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/controller/FileDB.cpp b/controller/FileDB.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/controller/FileDB.hpp b/controller/FileDB.hpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/controller/LFDB.cpp b/controller/LFDB.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/controller/LFDB.hpp b/controller/LFDB.hpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.
@@ -1180,7 +1180,7 @@ void PostgreSQL::_membersWatcher_Redis() {
  _memberChanged(oldConfig,newConfig,(this->_ready >= 2));
  }
  } catch (...) {
- fprintf(stderr, "json parse error in networkWatcher_Redis\n");
+ fprintf(stderr, "json parse error in _membersWatcher_Redis: %s\n", a.second.c_str());
  }
  }
  if (_rc->clusterMode) {
@@ -1269,8 +1269,8 @@ void PostgreSQL::_networksWatcher_Redis() {
  if (oldConfig.is_object()||newConfig.is_object()) {
  _networkChanged(oldConfig,newConfig,(this->_ready >= 2));
  }
- } catch (...) {
- fprintf(stderr, "json parse error in networkWatcher_Redis\n");
+ } catch (std::exception &e) {
+ fprintf(stderr, "json parse error in networkWatcher_Redis: what: %s json: %s\n", e.what(), a.second.c_str());
  }
  }
  if (_rc->clusterMode) {

diff --git a/controller/PostgreSQL.hpp b/controller/PostgreSQL.hpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+zerotier-one (1.14.0) unstable; urgency=medium
+
+ * See RELEASE-NOTES.md for release notes.
+
+ -- Adam Ierymenko <[email protected]> Tue, 19 Mar 2024 01:00:00 -0700
+
 zerotier-one (1.12.2) unstable; urgency=medium
 
  * See RELEASE-NOTES.md for release notes.

diff --git a/debian/copyright b/debian/copyright
@@ -12,7 +12,7 @@ License: ZeroTier BSL 1.1
  Use of this software is governed by the Business Source License included
  in the LICENSE.TXT file in the project's root directory.
 
- Change Date: 2025-01-01
+ Change Date: 2026-01-01
 
  On the date above, in accordance with the Business Source License, use
  of this software will be governed by version 2.0 of the Apache License.
diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj
@@ -701,7 +701,7 @@
  <key>USE_HFS+_COMPRESSION</key>
  <false/>
  <key>VERSION</key>
- <string>1.12.2</string>
+ <string>1.14.0</string>
  </dict>
  <key>TYPE</key>
  <integer>0</integer>

diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip
@@ -24,10 +24,10 @@
  <ROW Property="AiFeatIcoZeroTierOne" Value="ZeroTierIcon.exe" Type="8"/>
  <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
  <ROW Property="Manufacturer" Value="ZeroTier, Inc."/>
- <ROW Property="ProductCode" Value="1033:{56528063-D8C2-43F4-97DB-C787E6A2D9DB} " Type="16"/>
+ <ROW Property="ProductCode" Value="1033:{EC58088A-4E0F-4BD5-B0B2-FD81C803EEC4} " Type="16"/>
  <ROW Property="ProductLanguage" Value="1033"/>
  <ROW Property="ProductName" Value="ZeroTier One"/>
- <ROW Property="ProductVersion" Value="1.12.2" Options="32"/>
+ <ROW Property="ProductVersion" Value="1.14.0" Options="32"/>
  <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
  <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
  <ROW Property="UpgradeCode" Value="{B0E2A5F3-88B6-4E77-B922-CB4739B4C4C8}"/>
@@ -62,7 +62,7 @@
  <ROW Directory="regid.201001.com.zerotier_Dir" Directory_Parent="CommonAppDataFolder" DefaultDir="REGID2~1.ZER|regid.2010-01.com.zerotier" DirectoryOptions="12"/>
  </COMPONENT>
  <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
- <ROW Component="AI_CustomARPName" ComponentId="{A0629900-689C-4BD7-9315-85F05804DF03}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/>
+ <ROW Component="AI_CustomARPName" ComponentId="{8BC01817-02AC-4C44-A84C-0727BC5B6E22}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/>
  <ROW Component="AI_DisableModify" ComponentId="{46FFA8C5-A0CB-4E05-9AD3-911D543DE8CA}" Directory_="APPDIR" Attributes="4" KeyPath="NoModify" Options="1"/>
  <ROW Component="AI_ExePath" ComponentId="{8E02B36C-7A19-429B-A93E-77A9261AC918}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
  <ROW Component="APPDIR" ComponentId="{4DD7907D-D7FE-4CD6-B1A0-B5C1625F5133}" Directory_="APPDIR" Attributes="0"/>
@@ -124,7 +124,7 @@
  <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
  </COMPONENT>
  <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
- <ROW TimeStampUrl="http://timestamp.digicert.com" SignerDescription="ZeroTier One" DescriptionUrl="https://www.zerotier.com/" SignOptions="7" SignTool="5" UseSha256="1" KVTenantId="5300bf3b-0eff-4a5f-a63f-821e22ed1730" KVAppId="5f94d77e-b795-41fd-afe7-ec913b03c1d3" KVName="ZeroTier-CS" KVCertName="ZT-EV-CS" KVCertVersion="442c2d6f77874ff99eed4b36f5cb401c"/>
+ <ROW TimeStampUrl="http://timestamp.digicert.com" SignerDescription="ZeroTier One" DescriptionUrl="https://www.zerotier.com/" SignOptions="7" SignTool="5" UseSha256="1" KVTenantId="5300bf3b-0eff-4a5f-a63f-821e22ed1730" KVAppId="5f94d77e-b795-41fd-afe7-ec913b03c1d3" KVName="ZeroTier-CS" KVCertName="ZT-EV-CS-2024" KVCertVersion="64807be24d57468e895e2e577f430de2"/>
  </COMPONENT>
  <COMPONENT cid="caphyon.advinst.msicomp.FirewallExceptionComponent">
  <ROW FirewallException="ZeroTierOneUDP9993" Direction="1" Action="1" DisplayName="ZeroTier UDP/9993 In" GroupName="ZeroTierOne" Enabled="1" Scope="*" Condition="1" Profiles="7" Port="9993" Protocol="UDP"/>
@@ -498,10 +498,10 @@
  <ROW XmlAttribute="xsischemaLocation" XmlElement="swidsoftware_identification_tag" Name="xsi:schemaLocation" Flags="14" Order="3" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd software_identification_tag.xsd"/>
  </COMPONENT>
  <COMPONENT cid="caphyon.advinst.msicomp.XmlElementComponent">
- <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="2" UpdateIndexInParent="0"/>
+ <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="0" UpdateIndexInParent="0"/>
  <ROW XmlElement="swidentitlement_required_indicator" ParentElement="swidsoftware_identification_tag" Name="swid:entitlement_required_indicator" Condition="1" Order="0" Flags="14" Text="false" UpdateIndexInParent="0"/>
  <ROW XmlElement="swidmajor" ParentElement="swidnumeric" Name="swid:major" Condition="1" Order="0" Flags="14" Text="1" UpdateIndexInParent="0"/>
- <ROW XmlElement="swidminor" ParentElement="swidnumeric" Name="swid:minor" Condition="1" Order="1" Flags="14" Text="12" UpdateIndexInParent="0"/>
+ <ROW XmlElement="swidminor" ParentElement="swidnumeric" Name="swid:minor" Condition="1" Order="1" Flags="14" Text="14" UpdateIndexInParent="0"/>
  <ROW XmlElement="swidname" ParentElement="swidproduct_version" Name="swid:name" Condition="1" Order="0" Flags="14" Text="[ProductVersion]" UpdateIndexInParent="0"/>
  <ROW XmlElement="swidname_1" ParentElement="swidsoftware_creator" Name="swid:name" Condition="1" Order="0" Flags="14" Text="ZeroTier, Inc." UpdateIndexInParent="0"/>
  <ROW XmlElement="swidname_2" ParentElement="swidsoftware_licensor" Name="swid:name" Condition="1" Order="0" Flags="14" Text="ZeroTier, Inc." UpdateIndexInParent="0"/>

diff --git a/include/ZeroTierDebug.h b/include/ZeroTierDebug.h
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.

diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file in the project's root directory.
  *
- * Change Date: 2025-01-01
+ * Change Date: 2026-01-01
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2.0 of the Apache License.