dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,665 Commits 106 Branches 71 Tags
Commit Graph

3025 Commits

Author SHA1 Message Date
ViacheslavKlimov
0ce243f2e7 Merge with develop/3.5 2023-04-25 12:26:25 +03:00
ViacheslavKlimov
6013e19e54 Fix entity action notification 2023-04-24 18:15:18 +03:00
ViacheslavKlimov
b71257ba23 User title template param, improve notification preview, improve default notifications 2023-04-24 15:47:00 +03:00
Andrew Shvayka
76f24827aa
Merge pull request #8398 from dashevchenko/newMessageTypes 
Added new message types to rule engine
 2023-04-24 15:00:33 +03:00
dashevchenko
62e9605971 renamed ALARM_ASSIGN to ALARM_ASSIGNED 2023-04-24 13:01:06 +03:00
ViacheslavKlimov
af49a6a0be Fix failing tests 2023-04-24 12:08:17 +03:00
Andrew Shvayka
2c1a85e0af
Merge pull request #8405 from thingsboard/improvements/notification-system 
Notification system improvements
 2023-04-21 17:26:54 +03:00
ViacheslavKlimov
97cc1ab0da Improve entities count limit notification rule 2023-04-20 18:23:38 +03:00
Andrii Shvaika
a0c370079e Improve the device name 2023-04-20 18:00:34 +03:00
ViacheslavKlimov
fda74a72f0 Default notifications refactoring 2023-04-20 15:33:36 +03:00
Andrew Shvayka
08375e613b
Merge pull request #8384 from smatvienko-tb/feature/kafka_properties_refactor 
[3.5] Kafka other properties inline
 2023-04-18 18:30:14 +03:00
Andrii Shvaika
d118b761c8 Extra protection from null values 2023-04-18 14:12:15 +03:00
Sergey Matvienko
26ed90c534 kafka settings: kafka yaml parameters added for microservices same as thingsboard.yml . PropertyUtils added, duplicated code refactored to getProps. TB_QUEUE_KAFKA_REQUEST_TIMEOUT_MS and TB_QUEUE_KAFKA_SESSION_TIMEOUT_MS moved from other to main properties. Other yaml props is deprecated. other-inline added TB_QUEUE_KAFKA_OTHER_PROPERTIES. Tests added. 2023-04-18 10:54:10 +02:00
Sergey Matvienko
e621a21df3 kafka settings: test added, refactored to use configureSSL exact once 2023-04-18 10:54:10 +02:00
Sergey Matvienko
448fe341cf kafka settings: added default values for values for TbKafkaSettings class 2023-04-18 10:54:10 +02:00
YevhenBondarenko
08efbd1c85 revert tskv value noxss validation 2023-04-14 18:06:59 +02:00
Andrew Shvayka
d7707c99c3
Merge pull request #8356 from thingsboard/improvements/notification-system 
Notification system improvements
 2023-04-14 14:43:14 +03:00
Andrew Shvayka
f93e2d747c
Merge pull request #8353 from thingsboard/fix/noxss-kv 
Fixed xss vulnerabilities in attributes and telemetry
 2023-04-14 14:35:33 +03:00
Andrew Shvayka
d2fc5c7b77
Merge pull request #8358 from thingsboard/feature/x509-device-provisioning 
Feature/x509 device provisioning
 2023-04-14 14:30:24 +03:00
Andrew Shvayka
d7fc1ff83e
Merge pull request #8346 from volodymyr-babak/keep-alive-updates 
Improved Keep Alive Functionality between Edge and Cloud to Prevent Data Loss
 2023-04-14 14:29:39 +03:00
Andrii Landiak
1fc8d7a52b Add validation for X509 trusted chain 2023-04-14 13:26:28 +03:00
ViacheslavKlimov
7b6f3ed4df Notification requests per rule rate limits 2023-04-13 18:20:37 +03:00
Andrii Shvaika
7988a58c37 Protection from garbage in redis 2023-04-13 17:12:59 +03:00
Igor Kulikov
07504aad2b Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/home-page 2023-04-13 12:59:19 +03:00
ViacheslavKlimov
e926854911 NoXss and length validation for notification entities 2023-04-13 12:53:59 +03:00
Andrii Shvaika
3b5270a29f Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/x509-device-provisioning 2023-04-13 11:59:36 +03:00
Andrii Landiak
fbeb56cf70 Refactor after review and add tests for extracting by regex 2023-04-12 17:50:26 +03:00
Andrew Shvayka
90a0edd2d4
Merge pull request #8350 from dashevchenko/redundantNotNull 
Deleted redundant @NotNull annotations
 2023-04-12 17:34:31 +03:00
Andrew Shvayka
4b0709567c
Merge pull request #8349 from thingsboard/fix/vulnerabilities 
fix vulnerabilities
 2023-04-12 17:33:30 +03:00
Igor Kulikov
47909088f0 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/home-page 2023-04-12 16:43:54 +03:00
ViacheslavKlimov
5a57657479 Notification preview for first recipient; Slack notification preview; increase timeouts for testDelayedNotificationRequest 2023-04-12 15:14:38 +03:00
Andrii Shvaika
5d84945ccd Review and improvements 2023-04-12 14:06:38 +03:00
Andrii Shvaika
4cea4362dc Merge branch 'feature/x509-device-cert-impr' of github.com:AndriiLandiak/thingsboard into feature/x509-device-provisioning 2023-04-12 12:47:41 +03:00
YevhenBondarenko
ef86dc49b9 added noxss enable param for ts and attributes 2023-04-12 11:30:04 +02:00
Andrii Dovhopoliy
1a3ee8512d
Fixed xss vulnerabilities in attributes and telemetry (#8238) 
* added noxss validation on kventries

* added noxss validation on kventries

* added ConstraintValidator usages for validation

* added test

* upd

* removed star imports

* fixed licence

* removed NoXss Annotation from values

* fixed test

* added test

* removed redundant imports

* fixed test

* upd

* fixed telemetry test controller structure

* tskv noxss validation improvements

* upd test attributes

---------

Co-authored-by: YevhenBondarenko <ybondarenko@thingsboard.io>
 2023-04-11 23:31:37 +02:00
Andrew Shvayka
b952360055
Merge pull request #8026 from volodymyr-babak/filter-type-multiple-types 
Filter type alias - add possibility to specify multiple types, instead of single one
 2023-04-11 17:26:29 +03:00
dashevchenko
abfaeac087 deleted redundant @NonNull annotation 2023-04-11 16:09:54 +03:00
YevhenBondarenko
72ea018efc updated spring versions 2023-04-11 14:05:28 +02:00
Volodymyr Babak
c4d50181ff Always use multiple types if present. If not present - use singular type 2023-04-11 13:32:20 +03:00
Andrew Shvayka
bc5d6ea359
Merge pull request #8342 from volodymyr-babak/ssl-option-kafka 
[3.5] Add SSL option for Kafka queue connection
 2023-04-11 12:34:49 +03:00
Andrew Shvayka
c683b57cba
Merge pull request #8335 from thingsboard/feature/devices-activity 
Devices activity statistics
 2023-04-11 12:23:13 +03:00
Volodymyr Babak
d625af2cd5 Merge remote-tracking branch 'upstream/develop/3.5' into keep-alive-updates 2023-04-11 09:59:43 +03:00
Andrew Shvayka
d37283a292
Merge pull request #8340 from volodymyr-babak/max-inbound-message-size 
[3.5] Handle gRPC messages exceeding default max message size
 2023-04-10 18:22:28 +03:00
Igor Kulikov
1b952f2a71 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/home-page 2023-04-10 16:11:04 +03:00
Igor Kulikov
855c69e0d6 UI: Update sys admin home page. Add translations. 2023-04-10 16:10:44 +03:00
Volodymyr Babak
79393b2582 Refactoring - move common code into separate method 2023-04-10 15:49:46 +03:00
FawenYo
47542eb8c1 Add SSL option for Kafka queue connection 2023-04-10 15:29:14 +03:00
Volodymyr Babak
63b13e4353 Improved keep alive communication - handling properly nextwork failures 2023-04-10 13:57:31 +03:00
Volodymyr Babak
c95cff74f7 Fixed edge client tests by setting correctly max inbound message size 2023-04-10 13:12:11 +03:00
Volodymyr Babak
63703bcfdb Edge client - updated edge version 2023-04-10 11:03:49 +03:00