Skip to content

Commit 2a2e20c

Browse files
ashvaykaashvayka
committed
Merge remote-tracking branch 'origin/staging/4.3' into release/4.3
2 parents f2611e6 + ac8a3f1 commit 2a2e20c

36 files changed

Lines changed: 482 additions & 48 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ CNAME
77
.idea/**
88
**/*.iml
99
_config.yml
10+
/.claude/

‎_config.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,19 @@ release:
8383
branch: release-4.3
8484
branch_major_next: master
8585
# In short form (e.g. 4.3)
86-
ver: 4.3.0.1
86+
ver: 4.3.1
8787
# In short form (e.g. 4.3)
88-
ce_ver: 4.3.0.1
88+
ce_ver: 4.3.1
8989
# In short form (e.g. v4.3)
90-
ce_tag: v4.3.0.1
90+
ce_tag: v4.3.1
9191
# In full form (e.g. 4.3.0, 4.3.0.1)
92-
ce_full_ver: 4.3.0.1
92+
ce_full_ver: 4.3.1
9393
# In short form (e.g. 4.3pe)
94-
pe_ver: 4.3.0.1pe
94+
pe_ver: 4.3.1pe
9595
# In full form (e.g. 4.3.0PE, 4.3.0.1PE)
96-
pe_full_ver: 4.3.0.1PE
96+
pe_full_ver: 4.3.1PE
9797
# In short form (e.g. v4.3)
98-
wd_examples_commit: v4.3.0.1
98+
wd_examples_commit: v4.3.1
9999
# >>> EDGE
100100
edge_ver: 4.3.0.1
101101
edge_tag: v4.3.0.1

‎_data/upgrade-instructions-data.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1+
4.3.1:
2+
upgradable-from: "4.2.1.x"
3+
release-date: Mar 10 2026
4+
lts: "true"
5+
patch: "true"
6+
x: "true"
7+
windows:
8+
zip: "true"
19
4.3.0.1:
10+
known-vulnerabilities: "true"
211
upgradable-from: "4.2.1.x"
312
release-date: Feb 3 2026
413
release-date-edge: Feb 4, 2026
@@ -12,7 +21,16 @@
1221
release-date-edge: Jan 21 2026
1322
lts: "true"
1423
x: "true"
24+
4.2.2:
25+
upgradable-from: "4.2.0"
26+
release-date: Mar 10 2026
27+
lts: "true"
28+
patch: "true"
29+
x: "true"
30+
windows:
31+
zip: "true"
1532
4.2.1.2:
33+
known-vulnerabilities: "true"
1634
upgradable-from: "4.2.0"
1735
release-date: Feb 3 2026
1836
release-date-edge: Feb 4, 2026

‎_includes/centos-upgrade-instructions.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
{%- assign prev_major = prev_parts[0] -%}
4242
{%- assign prev_minor = prev_parts[1] -%}
4343

44-
{% if patch_status == "true" %}
45-
### Upgrading {{ platform }} to latest {{ base_version }} ({{ current_version }})
44+
{% if include.is_latest_patch == "true" %}
45+
### Upgrading {{ platform }} to latest {{ curr_major }}.{{ curr_minor }}.x ({{ current_version }})
4646
{% else %}
4747
### Upgrading {{ platform }} to {{ current_version }}
4848
{% endif %}
@@ -71,7 +71,7 @@
7171
{% capture difference %}
7272
**NOTE:**
7373
{% if curr_major > "4" or (curr_major == "4" and curr_minor >= "2") %}
74-
These upgrade steps are applicable for ThingsBoard version {{ prev_version }}{% if patch_status == "true" %} or any {{ base_version }} patch{% endif %}.
74+
{% if include.is_latest_patch == "true" %}{% if prev_version contains ".x" %}{% assign prev_version_plus = prev_version | replace: ".x", "+" %}{% else %}{% assign prev_version_plus = prev_version | append: "+" %}{% endif %}These upgrade steps are applicable for ThingsBoard version {{ prev_version_plus }}.{% else %}These upgrade steps are applicable for ThingsBoard version {{ prev_version }}{% if patch_status == "true" %} or any {{ base_version }} patch{% endif %}.{% endif %}
7575
In order to upgrade to {{ current_version_with_platform | upcase }} you need to [**upgrade to {{ prev_version }} first**]({{ prev_version_href }}).
7676
{% else %}
7777
These upgrade steps are applicable for ThingsBoard version {{ prev_version_label }}{% if applicable_versions %}{% assign versions = applicable_versions | split: "," %}{% for v in versions %} and ThingsBoard version {{ v | strip }}{% endfor %}{% endif %}.
@@ -91,6 +91,8 @@ In order to upgrade to {{ current_version_with_platform | upcase }} you need to
9191
{% include templates/info-banner.md content=difference %}
9292
{% endif %}
9393

94+
{% include templates/install/upgrade-version-warning.md version=include.raw_version known_vulnerabilities=include.known_vulnerabilities %}
95+
9496
{%- if curr_major_n > 4 -%}
9597
{%- if docsPrefix == "pe/" -%}
9698
{% include templates/install/pe-tb-products-upgrade-compatibility.md %}
@@ -161,8 +163,9 @@ Package installer may ask you to merge your ThingsBoard configuration. It is pre
161163
{% capture update_note %}
162164
{% assign base_version_parts = base_version | split: "." %}
163165
{% assign patch_part = base_version_parts[2] %}
166+
{% assign prev_version_script = previous_version %}{% if previous_version contains ".x" %}{% assign prev_version_script = previous_version | replace: ".x", "+" %}{% endif %}
164167
{% if patch_status == "true" %}
165-
If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.
168+
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
166169
{% else %}
167170
If you are upgrading from version {{ previous_version }}, you must run the script below
168171
{% endif %}

‎_includes/docker-compose-upgrade-instructions.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
{%- assign prev_major = prev_parts[0] -%}
3939
{%- assign prev_minor = prev_parts[1] -%}
4040

41-
{% if patch_status == "true" %}
42-
### Upgrading {{ platform }} to latest {{ base_version }} ({{ current_version }})
41+
{% if include.is_latest_patch == "true" %}
42+
### Upgrading {{ platform }} to latest {{ curr_major }}.{{ curr_minor }}.x ({{ current_version }})
4343
{% else %}
4444
### Upgrading {{ platform }} to {{ current_version }}
4545
{% endif %}
@@ -68,7 +68,7 @@
6868
{% capture difference %}
6969
**NOTE:**
7070
{% if curr_major > "4" or (curr_major == "4" and curr_minor >= "2") %}
71-
These upgrade steps are applicable for ThingsBoard version {{ prev_version }}{% if patch_status == "true" %} or any {{ base_version }} patch{% endif %}.
71+
{% if include.is_latest_patch == "true" %}{% if prev_version contains ".x" %}{% assign prev_version_plus = prev_version | replace: ".x", "+" %}{% else %}{% assign prev_version_plus = prev_version | append: "+" %}{% endif %}These upgrade steps are applicable for ThingsBoard version {{ prev_version_plus }}.{% else %}These upgrade steps are applicable for ThingsBoard version {{ prev_version }}{% if patch_status == "true" %} or any {{ base_version }} patch{% endif %}.{% endif %}
7272
In order to upgrade to {{ current_version_with_platform | upcase }} you need to [**upgrade to {{ prev_version }} first**]({{ prev_version_href }}).
7373
{% else %}
7474
These upgrade steps are applicable for ThingsBoard version {{ prev_version_label }}{% if applicable_versions %}{% assign versions = applicable_versions | split: "," %}{% for v in versions %} and ThingsBoard version {{ v | strip }}{% endfor %}{% endif %}.
@@ -84,6 +84,8 @@ In order to upgrade to {{ current_version_with_platform | upcase }} you need to
8484
{% include templates/info-banner.md content=difference %}
8585
{% endif %}
8686

87+
{% include templates/install/upgrade-version-warning.md version=include.raw_version known_vulnerabilities=include.known_vulnerabilities %}
88+
8789
{% assign docker-compose-repo-link = "https://github.com/thingsboard/" %}
8890

8991
{% if docsPrefix == "pe/" %}

‎_includes/docker-upgrade-instructions.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
{%- assign prev_major = prev_parts[0] -%}
3939
{%- assign prev_minor = prev_parts[1] -%}
4040

41-
{% if patch_status == "true" %}
42-
### Upgrading {{ platform }} to latest {{ base_version }} ({{ current_version }})
41+
{% if include.is_latest_patch == "true" %}
42+
### Upgrading {{ platform }} to latest {{ curr_major }}.{{ curr_minor }}.x ({{ current_version }})
4343
{% else %}
4444
### Upgrading {{ platform }} to {{ current_version }}
4545
{% endif %}
@@ -68,7 +68,7 @@
6868
{% capture difference %}
6969
**NOTE:**
7070
{% if curr_major > "4" or (curr_major == "4" and curr_minor >= "2") %}
71-
These upgrade steps are applicable for ThingsBoard version {{ prev_version }}{% if patch_status == "true" %} or any {{ base_version }} patch{% endif %}.
71+
{% if include.is_latest_patch == "true" %}{% if prev_version contains ".x" %}{% assign prev_version_plus = prev_version | replace: ".x", "+" %}{% else %}{% assign prev_version_plus = prev_version | append: "+" %}{% endif %}These upgrade steps are applicable for ThingsBoard version {{ prev_version_plus }}.{% else %}These upgrade steps are applicable for ThingsBoard version {{ prev_version }}{% if patch_status == "true" %} or any {{ base_version }} patch{% endif %}.{% endif %}
7272
In order to upgrade to {{ current_version_with_platform | upcase }} you need to [**upgrade to {{ prev_version }} first**]({{ prev_version_href }}).
7373
{% else %}
7474
These upgrade steps are applicable for ThingsBoard version {{ prev_version_label }}{% if applicable_versions %}{% assign versions = applicable_versions | split: "," %}{% for v in versions %} and ThingsBoard version {{ v | strip }}{% endfor %}{% endif %}.
@@ -84,6 +84,8 @@ In order to upgrade to {{ current_version_with_platform | upcase }} you need to
8484
{% include templates/info-banner.md content=difference %}
8585
{% endif %}
8686

87+
{% include templates/install/upgrade-version-warning.md version=include.raw_version known_vulnerabilities=include.known_vulnerabilities %}
88+
8789
{%- if curr_major_n > 4 -%}
8890
{%- if docsPrefix == "pe/" -%}
8991
{% include templates/install/pe-tb-products-upgrade-compatibility.md %}

‎_includes/docs/pe/releases/releases-table/v4-2-2.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
### ThingsBoard PE v4.2.2 (Mar 10, 2026)
2+
3+
Everything from [CE v4.2.2](/docs/releases/releases-table/v4-2-x/#thingsboard-ce-v422-mar-10-2026){: target="_blank"} with the following fixes.
4+
5+
* Security
6+
* Fixed local files enumeration vulnerability
7+
8+
* Edge
9+
* Fixed construction of Edge in case add-on

‎_includes/docs/pe/releases/releases-table/v4-3-1.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
### ThingsBoard PE v4.3.1 (Mar 10, 2026)
2+
3+
Everything from [CE v4.3.1](/docs/releases/releases-table/v4-3-x/#thingsboard-ce-v431-mar-10-2026){: target="_blank"} with the following fixes.
4+
5+
* Security
6+
* Fixed local files enumeration vulnerability
7+
8+
* UI
9+
* Updated max length validator on secret storage value
10+
11+
* Edge
12+
* Fixed construction of Edge in case add-on

‎_includes/docs/pe/user-guide/install/new-docker-upgrade-steps.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{% assign current_version = include.version %}
22
{% assign previous_version = include.previous_version %}
3-
{%- assign family = include.family -%}
43

54
{% capture update_note %}
65
{% assign base_version_parts = base_version | split: "." %}
76
{% assign patch_part = base_version_parts[2] %}
7+
{% assign prev_version_script = previous_version %}{% if previous_version contains ".x" %}{% assign prev_version_script = previous_version | replace: ".x", "+" %}{% endif %}
88
{% if patch_status == "true" %}
9-
If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.
9+
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
1010
{% else %}
1111
If you are upgrading from version {{ previous_version }}, you must run the script below
1212
{% endif %}

‎_includes/docs/releases/releases-table/v4-2-2.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
### ThingsBoard CE v4.2.2 (Mar 10, 2026)
2+
3+
**What's Changed**
4+
5+
* Security
6+
* [#15076](https://github.com/thingsboard/thingsboard/pull/15076) Fixed CVE-2026-24734 and CVE-2025-66614 by @ViacheslavKlimov
7+
* [#15079](https://github.com/thingsboard/thingsboard/pull/15079) Fixed CVE-2025-7783, CVE-2026-26996 and CVE-2026-26960 by @vvlladd28
8+
* [#15109](https://github.com/thingsboard/thingsboard/pull/15109) Fixed CVE-2026-27903 and CVE-2026-27904 by @vvlladd28
9+
* [#15123](https://github.com/thingsboard/thingsboard/pull/15123) Added SSRF protection (must be enabled with SSRF_PROTECTION_ENABLED env) by @ViacheslavKlimov
10+
* [#15124](https://github.com/thingsboard/thingsboard/pull/15124) Fixed CWE-770 in Jackson Core (GHSA-72hv-8253-57qq) by @ViacheslavKlimov
11+
* [#15128](https://github.com/thingsboard/thingsboard/pull/15128) Fixed CVE-2026-27970 and CVE-2026-2391 by @vvlladd28
12+
* Fixed CVE-2026-2781 and CVE-2026-25646 for Docker images by @ViacheslavKlimov and @smatvienko-tb
13+
14+
* Major UI
15+
* [#14935](https://github.com/thingsboard/thingsboard/pull/14935) Angular 20 migration by @ikulikov
16+
17+
* Core & Rule Engine
18+
* [#15058](https://github.com/thingsboard/thingsboard/pull/15058) Added Cassandra result set byte-size limit by @ViacheslavKlimov
19+
* [#15078](https://github.com/thingsboard/thingsboard/pull/15078) Fixed TBEL script execution failures on repeated runs by @ViacheslavKlimov
20+
* [#15101](https://github.com/thingsboard/thingsboard/pull/15101) Fixed blocking JPA queries on access-validator single thread by @dskarzh
21+
* [#15100](https://github.com/thingsboard/thingsboard/pull/15100) Fixed preservation of rule node execution counter in delay and deduplication nodes by @dskarzh
22+
* [#15120](https://github.com/thingsboard/thingsboard/pull/15120) Improved Apple OAuth2 mapper and refactored OAuth2 client validation by @ViacheslavKlimov
23+
* [#15102](https://github.com/thingsboard/thingsboard/pull/15102) Fixed infinite loop when rule chain input node forwards to its own rule chain by @smatvienko-tb
24+
* [#15116](https://github.com/thingsboard/thingsboard/pull/15116) Made max WS message size configurable by @DmytroKhylko
25+
26+
* UI
27+
* [#15130](https://github.com/thingsboard/thingsboard/pull/15130) Extend modules map: moment-timezone, canvas-gauges and ngx-hm-carousel added by @ChantsovaEkaterina
28+
* [#14985](https://github.com/thingsboard/thingsboard/pull/14985) Fixed Redirect Url encoding by @mtsymbarov-del
29+
* [#14978](https://github.com/thingsboard/thingsboard/pull/14978) Fixed Popover placement for Marker, Polygon and Circle overlay config by @mtsymbarov-del
30+
* [#15018](https://github.com/thingsboard/thingsboard/pull/15018) Fixed adaptive in mail server configuration by @vvlladd28
31+
* [#15071](https://github.com/thingsboard/thingsboard/pull/15071) Fixed a race condition causing the toast component by @mtsymbarov-del
32+
* [#15097](https://github.com/thingsboard/thingsboard/pull/15097) Fixed a race condition when init image map by @mtsymbarov-del
33+
* [#15142](https://github.com/thingsboard/thingsboard/pull/15142) Removed pattern validation from name field on CF by @mtsymbarov-del
34+
35+
* Transport
36+
* [#14760](https://github.com/thingsboard/thingsboard/pull/14760) Fixed Sparkplug BIRTH message validation for metrics with empty string values by @nickAS21
37+
38+
* Edge
39+
* [#15050](https://github.com/thingsboard/thingsboard/pull/15050) Event-sourced propagation for admin settings by @volodymyr-babak
40+
41+
**Full Changelog**: [https://github.com/thingsboard/thingsboard/compare/v4.2.1.2...v4.2.2](https://github.com/thingsboard/thingsboard/compare/v4.2.1.2...v4.2.2)

0 commit comments

Comments
 (0)