repo
stringlengths
5
53
pr_number
int32
1
321k
task_type
stringclasses
2 values
issue_text
stringlengths
0
81.2k
pr_title
stringlengths
1
319
pr_body
stringlengths
0
105k
base_sha
stringlengths
40
40
head_sha
stringlengths
40
40
gold_diff
stringlengths
0
202M
changed_files
listlengths
0
100
review_threads
listlengths
0
100
test_patch
stringlengths
0
23.4M
merged
bool
1 class
thephpleague/flysystem
1,883
issue_to_patch
add error_clear_last() to rename and copy
All other methods which are using the error_get_last() function are already using error_clear_last(). This two methods are showing old errors when a unknown error happens: ``` Unable to move file from xxx/x/x.xml to xxx/x/x.xml.20251110082848.done, because file_get_contents(/var/www/html/.env): Failed to open stre...
200c084f1fa4134ce9a72c5f7b366f0a47770fe4
fb5c17e0db6a48dcc02034f511b7d0cbd6821773
diff --git a/src/Local/LocalFilesystemAdapter.php b/src/Local/LocalFilesystemAdapter.php index f01c2c5dc..36700dd2a 100644 --- a/src/Local/LocalFilesystemAdapter.php +++ b/src/Local/LocalFilesystemAdapter.php @@ -252,6 +252,7 @@ public function move(string $source, string $destination, Config $config): void ...
[ "src/Local/LocalFilesystemAdapter.php" ]
[]
true
thephpleague/flysystem
1,881
issue_to_patch
Test against php 8.5
2203e3151755d874bb2943649dae1eb8533ac93e
c4e29bbf18fe9e776d36806e158b6352fd548546
diff --git a/.github/workflows/quality-assurance.yml b/.github/workflows/quality-assurance.yml index 5fececfc0..73d1a4225 100644 --- a/.github/workflows/quality-assurance.yml +++ b/.github/workflows/quality-assurance.yml @@ -57,6 +57,10 @@ jobs: phpstan: false phpunit-flags: '--no-coverage' ...
[ ".github/workflows/quality-assurance.yml" ]
[]
true
thephpleague/flysystem
1,873
issue_to_patch
LocalFilesystemAdapter::fileSize(),fileExists(),directoryExists and possible other method uses cached values ### Bug Report <!-- Fill in the relevant information below to help triage your issue. --> | Q | A | |-------------------|---------| | Flysystem Version | 3.29.1 | | Adapter Name...
LocalFilesystemAdapter. Call clearstatcache in several methods
Php's statcache caches the results of some file functions like `is_file` or `filesize`. For the `visibility()` method, a `clearstatcache` is already used to clear this cache, but this is not the case for several other methods. Fixes #1826
3b8d678324d7651955483d7f416af8b97f121196
8f1ea674f772a2e49e9d7d57b5ca617c8026054c
diff --git a/src/Local/LocalFilesystemAdapter.php b/src/Local/LocalFilesystemAdapter.php index aa7f7d65e..f01c2c5dc 100644 --- a/src/Local/LocalFilesystemAdapter.php +++ b/src/Local/LocalFilesystemAdapter.php @@ -337,14 +337,14 @@ protected function ensureDirectoryExists(string $dirname, int $visibility): void pub...
[ "src/Local/LocalFilesystemAdapter.php" ]
[]
true
thephpleague/flysystem
1,864
issue_to_patch
Add option to disconnect on destruct
When using flysystem in worker (never stopped) the connection stay active. Add an option to disconnect on object destruction.
235ae805a26f6fbd4d7a5f1c8e3bdf2c386adab3
33e9c0182680a5e4118571fddda6a41e2d9b5d60
diff --git a/src/PhpseclibV3/SftpAdapter.php b/src/PhpseclibV3/SftpAdapter.php index fe9f8bb87..164af5aa8 100644 --- a/src/PhpseclibV3/SftpAdapter.php +++ b/src/PhpseclibV3/SftpAdapter.php @@ -41,6 +41,7 @@ public function __construct( ?VisibilityConverter $visibilityConverter = null, ?MimeTypeDetecto...
[ "src/PhpseclibV3/SftpAdapter.php" ]
[]
true
thephpleague/flysystem
1,859
issue_to_patch
a more tangible example for getting started (docs)
Hey there, I think adding a more specific example on the getting started page might make the packge easier to understand to people using it the first time.
07cf45f1fcf212f465e3a305925f8cd07c469d51
78c2eb70c0838127560b68c72e43ca38a68d7e2f
diff --git a/docs/getting-started.md b/docs/getting-started.md index ce1cf7d51..352850a53 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -13,22 +13,23 @@ Flysystem can be installed using composer. composer require league/flysystem:^3.0 ``` -Additionally, you may want to install an extra adapt...
[ "docs/getting-started.md" ]
[]
true
thephpleague/flysystem
1,868
issue_to_patch
AsyncAws S3: Replace special characters by XML entity codes
When calling `deleteDirectory()`, we want to make sure that special characters (`'`, `"`, `&`, `<` and `>`) are replaced by their XML entity code. If not, the following code will result in the error below: ```php $client = new AsyncAws\S3\S3Client([ 'accessKeyId' => '...', 'accessKeySecret' => '...', ...
235ae805a26f6fbd4d7a5f1c8e3bdf2c386adab3
ce81fe879d4da5b4c3aecbbe9e5d640fe3c84154
diff --git a/src/AsyncAwsS3/AsyncAwsS3Adapter.php b/src/AsyncAwsS3/AsyncAwsS3Adapter.php index 23890f534..fe49c8031 100644 --- a/src/AsyncAwsS3/AsyncAwsS3Adapter.php +++ b/src/AsyncAwsS3/AsyncAwsS3Adapter.php @@ -188,7 +188,7 @@ public function deleteDirectory(string $path): void foreach ($result->getConte...
[ "src/AsyncAwsS3/AsyncAwsS3Adapter.php", "src/AsyncAwsS3/AsyncAwsS3AdapterTest.php" ]
[]
true
thephpleague/flysystem
1,862
issue_to_patch
AsyncAws S3: URL-encode the CopySource argument
We ran into an issue moving objects that have non-ASCII characters in their name. AWS S3 expects the `CopySource` argument to be URL-encoded. For example: ```php $client = new AsyncAws\S3\S3Client([ 'accessKeyId' => '...', 'accessKeySecret' => '...', 'region' => 'eu-west-1', ]); $adapter = new L...
235ae805a26f6fbd4d7a5f1c8e3bdf2c386adab3
9c0e129e7f1022c8090a4280fa3ed16c79748493
diff --git a/src/AsyncAwsS3/AsyncAwsS3Adapter.php b/src/AsyncAwsS3/AsyncAwsS3Adapter.php index 23890f534..198a0ea1d 100644 --- a/src/AsyncAwsS3/AsyncAwsS3Adapter.php +++ b/src/AsyncAwsS3/AsyncAwsS3Adapter.php @@ -357,7 +357,7 @@ public function copy(string $source, string $destination, Config $config): void ...
[ "src/AsyncAwsS3/AsyncAwsS3Adapter.php", "src/AsyncAwsS3/AsyncAwsS3AdapterTest.php" ]
[]
true
thephpleague/flysystem
1,860
issue_to_patch
Update readme.md
Added azure-oss adapter in favour of deprecated one
9d6fc2cf27bf7525e50e0a109e5f768a17038670
0c14272e733e0df86e4bead16356c99400fcf9f8
diff --git a/readme.md b/readme.md index c46554847..15c1cb6d1 100644 --- a/readme.md +++ b/readme.md @@ -31,13 +31,13 @@ for which ever storage is right for you. * **[AWS S3](https://flysystem.thephpleague.com/docs/adapter/aws-s3-v3/)** * **[AsyncAws S3](https://flysystem.thephpleague.com/docs/adapter/async-aws-s3/)*...
[ "readme.md" ]
[]
true
thephpleague/flysystem
1,858
issue_to_patch
Fix minor typo on Path Prefixing Adapter Decorator page
One of the Usage examples is missing an "i" in the "PathPrefixing" namespace segment.
a2130a0b47fbd27a4f806302515e30ca3e9e5c25
e0a8dbc0ce96691e19fb9fcb4e3a9db9a6615f16
diff --git a/docs/adapter/path-prefixed.md b/docs/adapter/path-prefixed.md index 94f98651d..840691a89 100644 --- a/docs/adapter/path-prefixed.md +++ b/docs/adapter/path-prefixed.md @@ -20,7 +20,7 @@ composer require league/flysystem-path-prefixing:^3.3 $adapter = new League\Flysystem\InMemory\InMemoryFilesystemAdapter...
[ "docs/adapter/path-prefixed.md" ]
[]
true
thephpleague/flysystem
1,853
issue_to_patch
Abandon the azure blob storage adapter
We created an open source alternative to the official (deprecated) azure packages. This would close the following issues * https://github.com/thephpleague/flysystem/issues/1680 * https://github.com/thephpleague/flysystem/issues/1802 * https://github.com/thephpleague/flysystem/issues/1805 * https://github.com/the...
e96dfacd788ed9595245b84e99ebe0df3d67bfea
b3aed07cbf084f456f5bd737a32a262bdbedaef2
diff --git a/src/AzureBlobStorage/composer.json b/src/AzureBlobStorage/composer.json index cff0448ad..7d5e93667 100644 --- a/src/AzureBlobStorage/composer.json +++ b/src/AzureBlobStorage/composer.json @@ -16,5 +16,6 @@ "name": "Frank de Jonge", "email": "info@frankdejonge.nl" } - ]...
[ "src/AzureBlobStorage/composer.json" ]
[]
true
thephpleague/flysystem
1,854
issue_to_patch
Update readme.md to suggest Metadata Cache adapter under 3rd party ad…
…apters. This metadata cache adapter can be used to improve performance.
e96dfacd788ed9595245b84e99ebe0df3d67bfea
2be9f457d7ef5abe0442392fa7bb4f6637375af8
diff --git a/readme.md b/readme.md index ab5931e4e..c46554847 100644 --- a/readme.md +++ b/readme.md @@ -47,6 +47,8 @@ for which ever storage is right for you. * **[ReplicateAdapter](https://github.com/ajgarlag/flysystem-replicate)** * **[Uploadcare](https://github.com/vormkracht10/flysystem-uploadcare)** * **[Usefu...
[ "readme.md" ]
[]
true
thephpleague/flysystem
1,848
issue_to_patch
[GCS] Add option to stream reads
Adds a `streamReads` option to the `GoogleCloudStorageAdapter` (similar to the `AwsS3V3Adapter`). It makes sure that `readStream` will actually stream the read instead of downloading the whole file. When set to `true` the behaviour will be the same as with the official [GCS StreamWrapper](https://github.com/googlea...
a8d9ba957842f2a4e8311feff8a1e791d65e1ccd
91ecc62cd11c26de8b4426c64dda20f017e39ba5
diff --git a/src/GoogleCloudStorage/GoogleCloudStorageAdapter.php b/src/GoogleCloudStorage/GoogleCloudStorageAdapter.php index b180f72b5..a8b1b5a03 100644 --- a/src/GoogleCloudStorage/GoogleCloudStorageAdapter.php +++ b/src/GoogleCloudStorage/GoogleCloudStorageAdapter.php @@ -60,7 +60,8 @@ public function __construct( ...
[ "src/GoogleCloudStorage/GoogleCloudStorageAdapter.php" ]
[]
true
thephpleague/flysystem
1,097
issue_to_patch
Updating API doc to reflect directory operations
Given #117, at least since 2014 the docs were missing clearer information on whether it's possible to delete/rename/move directories as well as files.
b494919b0fe5c0aeecebb50dcad5cecfa243881c
38a5c0f7d15274badb9b4490364f854bc8099b35
diff --git a/docs/usage/filesystem-api.md b/docs/usage/filesystem-api.md index ca31c8015..e37a727aa 100644 --- a/docs/usage/filesystem-api.md +++ b/docs/usage/filesystem-api.md @@ -125,7 +125,7 @@ param | description | type --- -## Check if a file exists +## Check if a fil...
[ "docs/usage/filesystem-api.md" ]
[ { "comment": "We should add a note here that this is not consistent behaviour across adapters (for local it works, for AWS it doesn't for example.", "path": "docs/usage/filesystem-api.md", "hunk": "@@ -168,29 +168,29 @@ param | description | type\n \n ---\n \n-#...
true
thephpleague/flysystem
1,827
issue_to_patch
[GridFS] Allow installation with mongodb lib v2
The extension mongodb and the library mongodb/mongodb will soon have a version 2.0 that brings breaking changes (see [extension changes](https://jira.mongodb.org/issues/?jql=project%20%3D%20PHPC%20AND%20fixVersion%20%3D%202.0.0) and [library changes](https://jira.mongodb.org/issues/?jql=project%20%3D%20PHPLIB%20AND%20f...
1af5c0b7ed66967cb4ff9d88fb91aeb11cbf8888
f7183eae5c39b19b8ca5eb248cfa9ca37a2664ee
diff --git a/composer.json b/composer.json index 81a39c4ed..700b0ffdf 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "ext-zip": "*", "ext-fileinfo": "*", "ext-ftp": "*", - "ext-mongodb": "^1.3", + "ext-mongodb": "^1.3|^2", "microsoft/azure-storage-blob...
[ "composer.json", "src/GridFS/composer.json" ]
[]
true
thephpleague/flysystem
1,823
issue_to_patch
[WebDAV] createDirectory - not throw if got 405
If a part of prefix path already exists then WebDAV server returns status 405 (The resource you tried to create already exists). https://github.com/sabre-io/dav/blob/a6ff5932012d5064b4c04b4543be7c3d119a5199/lib/DAV/Server.php#L1184
edc1bb7c86fab0776c3287dbd19b5fa278347319
1eb13cba7ec0b1e6ba2bcebd994530dce649d403
diff --git a/src/WebDAV/WebDAVAdapter.php b/src/WebDAV/WebDAVAdapter.php index 935972692..ac5f08e03 100644 --- a/src/WebDAV/WebDAVAdapter.php +++ b/src/WebDAV/WebDAVAdapter.php @@ -233,6 +233,10 @@ public function createDirectory(string $path, Config $config): void throw UnableToCreateDirectory::dueToF...
[ "src/WebDAV/WebDAVAdapter.php", "src/WebDAV/WebDAVAdapterTestCase.php" ]
[]
true
thephpleague/flysystem
1,819
issue_to_patch
AsyncS3: throw FilesystemOperationFailed exceptions in case upload or listContent fails
Currently, the async s3 adapter throws a `Symfony\Component\HttpClient\Exception\TransportException` in case a request fails. To match other adapters, this PR converts those exceptions to `FilesystemOperationFailed`.
22af5a392e46bdf7e48fc74f711a02a1e09ee9cf
67bfd18acbf93d09abd5ec024d3a207ed6694434
diff --git a/src/AsyncAwsS3/AsyncAwsS3Adapter.php b/src/AsyncAwsS3/AsyncAwsS3Adapter.php index ab52be10d..23890f534 100644 --- a/src/AsyncAwsS3/AsyncAwsS3Adapter.php +++ b/src/AsyncAwsS3/AsyncAwsS3Adapter.php @@ -27,14 +27,18 @@ use League\Flysystem\UnableToCheckDirectoryExistence; use League\Flysystem\UnableToCheckF...
[ "src/AsyncAwsS3/AsyncAwsS3Adapter.php", "src/AsyncAwsS3/AsyncAwsS3AdapterTest.php" ]
[]
true
thephpleague/flysystem
1,682
issue_to_patch
Fix SftpAdapter not overwriting on move
Currently the `SftpAdapter` doesn't overwrite existing files when moving, unlike other adapters. This PR adds that ability.
072735c56cc0da00e10716dd90d5a7f7b40b36be
8bcdcb7640dc63319a59babcdc081547968dc37c
diff --git a/src/PhpseclibV3/SftpAdapter.php b/src/PhpseclibV3/SftpAdapter.php index 2f6012751..5797ffbde 100644 --- a/src/PhpseclibV3/SftpAdapter.php +++ b/src/PhpseclibV3/SftpAdapter.php @@ -323,9 +323,19 @@ public function move(string $source, string $destination, Config $config): void throw UnableToMov...
[ "src/PhpseclibV3/SftpAdapter.php", "src/PhpseclibV3/SftpAdapterTest.php" ]
[]
true
thephpleague/flysystem
1,808
issue_to_patch
feat: add dedicated test cases to ensure copy and move methods to always overwrite target
see https://github.com/thephpleague/flysystem/issues/1764 from docs: https://flysystem.thephpleague.com/docs/usage/filesystem-api/ > Moving and copying are both deterministic operations. This means they will always overwrite the target location, and parent directories are always created (if and when needed) We m...
c6cc4fec70551c007e3f37280eb91716e51562b5
f650a7b63d3c3db819d0af6dd9b16e5375fa2780
diff --git a/src/AdapterTestUtilities/FilesystemAdapterTestCase.php b/src/AdapterTestUtilities/FilesystemAdapterTestCase.php index 69d0530a8..25fc93cea 100644 --- a/src/AdapterTestUtilities/FilesystemAdapterTestCase.php +++ b/src/AdapterTestUtilities/FilesystemAdapterTestCase.php @@ -824,6 +824,58 @@ public function co...
[ "src/AdapterTestUtilities/FilesystemAdapterTestCase.php", "src/FilesystemTest.php", "src/GridFS/GridFSAdapter.php", "src/GridFS/GridFSAdapterTest.php", "src/InMemory/InMemoryFilesystemAdapter.php", "src/InMemory/InMemoryFilesystemAdapterTest.php", "src/Local/LocalFilesystemAdapter.php", "src/Phpseclib...
[]
true
thephpleague/flysystem
1,794
issue_to_patch
Add MongoDB GridFS Adapter
[GridFS](https://www.mongodb.com/docs/manual/core/gridfs/) is a file system that uses MongoDB as storage. I would like to propose this adapter which uses the [MongoDB PHP Library](https://github.com/mongodb/mongo-php-library/). Docs PR: https://github.com/thephpleague/flysystem/pull/1795 The [legacy GridFS Flysys...
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/.github/workflows/quality-assurance.yml b/.github/workflows/quality-assurance.yml index 36c2eb1e0..5fececfc0 100644 --- a/.github/workflows/quality-assurance.yml +++ b/.github/workflows/quality-assurance.yml @@ -25,6 +25,7 @@ env: FLYSYSTEM_AWS_S3_KEY: '${{ secrets.FLYSYSTEM_AWS_S3_KEY }}' FLYSYSTEM_...
[ ".github/workflows/quality-assurance.yml", "composer.json", "docker-compose.yml", "src/AdapterTestUtilities/FilesystemAdapterTestCase.php", "src/GridFS/.gitattributes", "src/GridFS/.github/workflows/close-subsplit-prs.yaml", "src/GridFS/GridFSAdapter.php", "src/GridFS/GridFSAdapterTest.php", "src/Gr...
[ { "comment": "Is this file relevant? It doesn't appear in other providers under `src/`: https://github.com/thephpleague/flysystem/tree/3.x/src", "path": "src/GridFS/.github/FUNDING.yml", "hunk": "@@ -0,0 +1,2 @@\n+github: [frankdejonge]\n+custom: \"https://ecologi.com/frankdejonge\"", "resolving_sha...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
Just confirming: this is intended to catch _any_ exception from PHPC _or_ PHPLIB (noting the PHPLIB exceptions all extend the PHPC interface as well). Basically, anything from this provider gets proxied by a Flysystem exception.
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "Just confirming: this is intended to catch _any_ exception from PHPC _or_ PHPLIB (noting the PHPLIB exceptions all extend the PHPC interface as well). Basically, anything from this provider gets proxied by a Flysystem exception.", "path": "src/GridFS/GridFSAdapter.php", "hunk": "@@ -0,0 +1...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
```suggestion // Exclude files that do not start with the expected path ``` Subject/verb agreement.
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "```suggestion\r\n // Exclude files that do not start with the expected path\r\n```\r\n\r\nSubject/verb agreement.", "path": "src/GridFS/GridFSAdapter.php", "hunk": "@@ -0,0 +1,404 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+namespace League\\Flysystem\\GridFS;\n+\n+use League\...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
```suggestion // Get the metadata of the last revision of each file ``` For consistency with the earlier pipeline construction. I assume these should be consistent.
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "```suggestion\r\n // Get the metadata of the last revision of each file\r\n```\r\n\r\nFor consistency with the earlier pipeline construction. I assume these should be consistent.", "path": "src/GridFS/GridFSAdapter.php", "hunk": "@@ -0,0 +1,404 @@\n+<?php\n+\n+declare(strict_typ...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
```suggestion Copyright (c) 2024-present Frank de Jonge ``` Assuming this was copied from elsewhere.
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/LICENSE b/src/GridFS/LICENSE new file mode 100644 index 000000000..fbb2ef58b --- /dev/null +++ b/src/GridFS/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2024 Frank de Jonge + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation f...
[ "src/GridFS/LICENSE" ]
[ { "comment": "```suggestion\r\nCopyright (c) 2024-present Frank de Jonge\r\n```\r\n\r\nAssuming this was copied from elsewhere.", "path": "src/GridFS/LICENSE", "hunk": "@@ -0,0 +1,19 @@\n+Copyright (c) 2013-2023 Frank de Jonge", "resolving_sha": "612b104db7d49158ca92d5d2a48eeaefe9edcd22", "resol...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
Is there something particular in the [1.15.0 release](https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=12483&version=34330) that is required by this adapter, or was this an arbitrary choice?
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/composer.json b/src/GridFS/composer.json new file mode 100644 index 000000000..f07098866 --- /dev/null +++ b/src/GridFS/composer.json @@ -0,0 +1,25 @@ +{ + "name": "league/flysystem-gridfs", + "autoload": { + "psr-4": { + "League\\Flysystem\\GridFS\\": "" + } + ...
[ "src/GridFS/composer.json" ]
[ { "comment": "Is there something particular in the [1.15.0 release](https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=12483&version=34330) that is required by this adapter, or was this an arbitrary choice?", "path": "src/GridFS/composer.json", "hunk": "@@ -0,0 +1,21 @@\n+{\n+ \"name\": \"lea...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
in some PHP environments, the stream opened is not automatically closed, an implementation like to following is needed: ```php public function read(string $path): string { $readStream = $this->readStream($path); $contents = stream_get_contents($readStream); fclose($readStream); ...
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "in some PHP environments, the stream opened is not automatically closed, an implementation like to following is needed:\r\n\r\n```php\r\n public function read(string $path): string\r\n {\r\n $readStream = $this->readStream($path);\r\n $contents = stream_get_contents($readStream...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
the last constructor parameter is an "extra metadata" field, I'd recommend putting the entire metadata value there
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "the last constructor parameter is an \"extra metadata\" field, I'd recommend putting the entire metadata value there", "path": "src/GridFS/GridFSAdapter.php", "hunk": "@@ -0,0 +1,413 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+namespace League\\Flysystem\\GridFS;\n+\n+use League\\Flysyst...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
this mapping, if extracted into a method could be the implementation of the before mentioned `metadata` method
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "this mapping, if extracted into a method could be the implementation of the before mentioned `metadata` method", "path": "src/GridFS/GridFSAdapter.php", "hunk": "@@ -0,0 +1,413 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+namespace League\\Flysystem\\GridFS;\n+\n+use League\\Flysystem\\Co...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
I noticed this was done in `write()` as well, but what's the point of inferring a mime type from the destination filename? Shouldn't this be inferred from the actual contents, like [file(1)](https://man7.org/linux/man-pages/man1/file.1.html)? Maybe this doesn't matter at all since `detectMimeTypeFromPath()` is only ...
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "I noticed this was done in `write()` as well, but what's the point of inferring a mime type from the destination filename? Shouldn't this be inferred from the actual contents, like [file(1)](https://man7.org/linux/man-pages/man1/file.1.html)?\r\n\r\nMaybe this doesn't matter at all since `detectMi...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
Why not [`openDownloadStreamByName()`](https://www.mongodb.com/docs/php-library/current/reference/method/MongoDBGridFSBucket-openDownloadStreamByName/)?
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "Why not [`openDownloadStreamByName()`](https://www.mongodb.com/docs/php-library/current/reference/method/MongoDBGridFSBucket-openDownloadStreamByName/)?", "path": "src/GridFS/GridFSAdapter.php", "hunk": "@@ -0,0 +1,443 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+namespace League\\Flysyst...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
Should this use `mapFileAttributes()`?
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "Should this use `mapFileAttributes()`?", "path": "src/GridFS/GridFSAdapter.php", "hunk": "@@ -0,0 +1,443 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+namespace League\\Flysystem\\GridFS;\n+\n+use League\\Flysystem\\Config;\n+use League\\Flysystem\\DirectoryAttributes;\n+use League\\Flysys...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
Is `listContents()` always expected to sort on the filename? Just curious since this isn't mentioned in the comment.
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "Is `listContents()` always expected to sort on the filename? Just curious since this isn't mentioned in the comment.", "path": "src/GridFS/GridFSAdapter.php", "hunk": "@@ -0,0 +1,443 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+namespace League\\Flysystem\\GridFS;\n+\n+use League\\Flysyst...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
Does this pipeline correctly filter out documents _above_ the target directory? Consider: ``` > db.foo.insertOne({filename:'/a/file.txt'}) > db.foo.insertOne({filename:'/a/b/file.txt'}) > db.foo.insertOne({filename:'/a/b/c/file.txt'}) > db.foo.aggregate([ {$addFields:{splitpath:{$split:['$filename','/']}}}...
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "Does this pipeline correctly filter out documents _above_ the target directory?\r\n\r\nConsider:\r\n\r\n```\r\n> db.foo.insertOne({filename:'/a/file.txt'})\r\n> db.foo.insertOne({filename:'/a/b/file.txt'})\r\n> db.foo.insertOne({filename:'/a/b/c/file.txt'})\r\n> db.foo.aggregate([\r\n {$addFields...
true
thephpleague/flysystem
1,794
comment_to_fix
Add MongoDB GridFS Adapter
Does this function behave consistently irrespective of a trailing `/` in `$path`?
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
612b104db7d49158ca92d5d2a48eeaefe9edcd22
diff --git a/src/GridFS/GridFSAdapter.php b/src/GridFS/GridFSAdapter.php new file mode 100644 index 000000000..cff68b188 --- /dev/null +++ b/src/GridFS/GridFSAdapter.php @@ -0,0 +1,438 @@ +<?php + +declare(strict_types=1); + +namespace League\Flysystem\GridFS; + +use League\Flysystem\Config; +use League\Flysystem\Direc...
[ "src/GridFS/GridFSAdapter.php" ]
[ { "comment": "Does this function behave consistently irrespective of a trailing `/` in `$path`?", "path": "src/GridFS/GridFSAdapter.php", "hunk": "@@ -0,0 +1,443 @@\n+<?php\n+\n+declare(strict_types=1);\n+\n+namespace League\\Flysystem\\GridFS;\n+\n+use League\\Flysystem\\Config;\n+use League\\Flysystem...
true
thephpleague/flysystem
1,800
issue_to_patch
Don't hide ftp_connect error behind ftp_close error
If connection to an FTP-server fails, it should throw an execption with the original reason from `error_get_last()`. But before we throw the exception, we try to close the (potentially not established) connection [here](https://github.com/thephpleague/flysystem/blob/60ce12e4cb19fd324038149aa02ca83c1278eba8/src/Ftp/F...
60ce12e4cb19fd324038149aa02ca83c1278eba8
06b55a8c4c5df612acbb660ce619e9680dcf50f0
diff --git a/src/Ftp/FtpConnectionProvider.php b/src/Ftp/FtpConnectionProvider.php index 65ca716d3..ff13f17fe 100644 --- a/src/Ftp/FtpConnectionProvider.php +++ b/src/Ftp/FtpConnectionProvider.php @@ -30,7 +30,7 @@ public function createConnection(FtpConnectionOptions $options) $this->ignorePassiveAddress(...
[ "src/Ftp/FtpConnectionProvider.php" ]
[]
true
thephpleague/flysystem
1,798
issue_to_patch
Fix broken link to gridfs doc
I forgot it when I renamed the page, sorry for the fragmented PRs.
6dd3be6f2e47fc3cb9d03033ea6a76ff0d189f05
63ee50101a2627eec67aa0332f54152016971cce
diff --git a/docs/index.md b/docs/index.md index 86d8fab1b..156a17dd1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -40,7 +40,7 @@ for which ever storage is right for you. * **[AsyncAws S3](/docs/adapter/async-aws-s3/)** * **[Google Cloud Storage](/docs/adapter/google-cloud-storage/)** * **[Azure Blob Storage](/...
[ "docs/index.md" ]
[]
true
thephpleague/flysystem
1,795
issue_to_patch
Add docs for GridFS adapter
Docs for https://github.com/thephpleague/flysystem/pull/1794
f95ea3acb76e02c242e120b2845ebd232981c3ab
e5c3c4608836d18c9b082d5c3acccce6f7c4a59e
diff --git a/_data/menu_v2.yml b/_data/menu_v2.yml index 86ff7a3f1..b1d937ed0 100644 --- a/_data/menu_v2.yml +++ b/_data/menu_v2.yml @@ -26,6 +26,7 @@ Official Adapters: AsyncAws S3: '/docs/adapter/async-aws-s3/' Azure Blob Storage: '/docs/adapter/azure-blob-storage/' Google Cloud Storage: '/docs/adapter...
[ "_data/menu_v2.yml", "docs/adapter/gridfs.md", "docs/index.md" ]
[ { "comment": "this misses the flysystem infix. Come to think of it, we could also name it `league/flysystem-gridfs` in line with the v1 adapter and unabandon it. WDYT?", "path": "docs/adapter/mongodb-gridfs.md", "hunk": "@@ -0,0 +1,69 @@\n+---\n+layout: default\n+title: MongoDB GridFS Adapter\n+permalin...
true
thephpleague/flysystem
1,797
issue_to_patch
Add GridFS adapter to the readme
Depends on the doc PR: https://github.com/thephpleague/flysystem/pull/1795
1d7f31a38163e83ec93037c62c47688dd62266bd
48b532c718dcfec3ebad6188e2882456ef1a5ec0
diff --git a/readme.md b/readme.md index 7112e4cd0..ab5931e4e 100644 --- a/readme.md +++ b/readme.md @@ -32,6 +32,7 @@ for which ever storage is right for you. * **[AsyncAws S3](https://flysystem.thephpleague.com/docs/adapter/async-aws-s3/)** * **[Google Cloud Storage](https://flysystem.thephpleague.com/docs/adapter/...
[ "readme.md" ]
[]
true
thephpleague/flysystem
1,793
issue_to_patch
Add CS rule to prevent regression on non-explicit nullable
Following #1772, the rule [`nullable_type_declaration_for_default_null_value`](https://cs.symfony.com/doc/rules/function_notation/nullable_type_declaration_for_default_null_value.html) ensure the code stays ready for PHP 8.4
0487c25a61e9b17ce82559af9bc1fc7934ee53b0
b8849809cfcd5f40703f0a8f4178f3992cf7df5c
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 00535eb4c..1fbf5ae3f 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -34,5 +34,6 @@ ], 'no_extra_blank_lines' => true, 'no_whitespace_in_blank_line' => true, + 'nullable_type_declaration_for_default_...
[ ".php-cs-fixer.dist.php" ]
[]
true
thephpleague/flysystem
1,789
issue_to_patch
chore: add tests to test fileExists onto directory and vice-versa
Saw adapters failing on these things, which results were not good :-)
b7445317465135b1c94de288f70e31cc51d71132
bf3934f15e4ed5b9a1851a5927af75eba1bd4bac
diff --git a/src/AdapterTestUtilities/FilesystemAdapterTestCase.php b/src/AdapterTestUtilities/FilesystemAdapterTestCase.php index 5361d30f4..80ac79260 100644 --- a/src/AdapterTestUtilities/FilesystemAdapterTestCase.php +++ b/src/AdapterTestUtilities/FilesystemAdapterTestCase.php @@ -644,6 +644,38 @@ public function mo...
[ "src/AdapterTestUtilities/FilesystemAdapterTestCase.php" ]
[]
true
thephpleague/flysystem
1,779
issue_to_patch
Fix: AWS Copy SSE-C Options + Send all options to copy instead of just params
Hi @frankdejonge, This is the right MR with all changes. I tested in with the official S3 SDK, not with AsyncAWS. Not sure we have to do changes for params with AsyncAWS. Thanks in advance for review :pray:
072735c56cc0da00e10716dd90d5a7f7b40b36be
691dd9f3dfd3563133a59bb386deca42dee1901a
diff --git a/src/AsyncAwsS3/AsyncAwsS3Adapter.php b/src/AsyncAwsS3/AsyncAwsS3Adapter.php index f1dab79fb..b8248fb06 100644 --- a/src/AsyncAwsS3/AsyncAwsS3Adapter.php +++ b/src/AsyncAwsS3/AsyncAwsS3Adapter.php @@ -73,9 +73,9 @@ class AsyncAwsS3Adapter implements FilesystemAdapter, PublicUrlGenerator, Checks 'Ta...
[ "src/AsyncAwsS3/AsyncAwsS3Adapter.php", "src/AwsS3V3/AwsS3V3Adapter.php" ]
[]
true
thephpleague/flysystem
1,773
issue_to_patch
Add missing AWS SSE-C Options
Hi, Some options are missing to allow using AWS SSE-C with copy method. Thanks
abbd664eb4381102c559d358420989f835208f18
452b941fb880b331293d1e5e94862e13895b5716
diff --git a/src/AsyncAwsS3/AsyncAwsS3Adapter.php b/src/AsyncAwsS3/AsyncAwsS3Adapter.php index 87427c98a..f1dab79fb 100644 --- a/src/AsyncAwsS3/AsyncAwsS3Adapter.php +++ b/src/AsyncAwsS3/AsyncAwsS3Adapter.php @@ -73,6 +73,9 @@ class AsyncAwsS3Adapter implements FilesystemAdapter, PublicUrlGenerator, Checks 'Ta...
[ "src/AsyncAwsS3/AsyncAwsS3Adapter.php", "src/AwsS3V3/AwsS3V3Adapter.php" ]
[]
true
thephpleague/flysystem
1,774
issue_to_patch
Added supported 'add_content_md5' option to AwsS3V3Adapter.php
As of January 2023, the `aws-sdk-php` for S3 now supports a 'add_content_md5` option for multipart uploads. (See [this commit](https://github.com/aws/aws-sdk-php/commit/91e8d4376b6c1805a2a83e4bd75b02aa79ae971c) and the [related issue](https://github.com/aws/aws-sdk-php/issues/2256).) On S3 buckets with object locks...
abbd664eb4381102c559d358420989f835208f18
6e7765fcdcf5fc61e12a600781b9f7b96613cae1
diff --git a/src/AwsS3V3/AwsS3V3Adapter.php b/src/AwsS3V3/AwsS3V3Adapter.php index 21936b063..693295506 100644 --- a/src/AwsS3V3/AwsS3V3Adapter.php +++ b/src/AwsS3V3/AwsS3V3Adapter.php @@ -51,7 +51,6 @@ class AwsS3V3Adapter implements FilesystemAdapter, PublicUrlGenerator, ChecksumP 'ContentEncoding', ...
[ "src/AwsS3V3/AwsS3V3Adapter.php" ]
[]
true
thephpleague/flysystem
1,768
issue_to_patch
Purpose new third party adapter
Purpose new third party adapter in README.md.
4c44347133618cccd9b3df1729647a1577b4ad99
b6fb5f1329e6a6735c0f25a43782963cd3a2f688
diff --git a/readme.md b/readme.md index 0c3042d5b..7112e4cd0 100644 --- a/readme.md +++ b/readme.md @@ -45,6 +45,7 @@ for which ever storage is right for you. * **[Dropbox](https://github.com/spatie/flysystem-dropbox)** * **[ReplicateAdapter](https://github.com/ajgarlag/flysystem-replicate)** * **[Uploadcare](https...
[ "readme.md" ]
[]
true
thephpleague/flysystem
1,772
issue_to_patch
[PHP 8.4] Fixes for implicit nullability deprecation
Fixes all issues that emit deprecation notices on PHP 8.4 for implicit nullable parameter type declarations. See: - [RFC](https://wiki.php.net/rfc/deprecate-implicitly-nullable-types) - [PHP 8.4: Implicitly nullable parameter declarations deprecated](https://php.watch/versions/8.4/implicitly-marking-parameter-ty...
4c44347133618cccd9b3df1729647a1577b4ad99
2df5d73d846400fb332caf009288407e625b77c3
diff --git a/src/AsyncAwsS3/AsyncAwsS3Adapter.php b/src/AsyncAwsS3/AsyncAwsS3Adapter.php index cfa11910c..87427c98a 100644 --- a/src/AsyncAwsS3/AsyncAwsS3Adapter.php +++ b/src/AsyncAwsS3/AsyncAwsS3Adapter.php @@ -106,8 +106,8 @@ public function __construct( private S3Client $client, private string $bu...
[ "src/AsyncAwsS3/AsyncAwsS3Adapter.php", "src/AsyncAwsS3/S3ClientStub.php", "src/AwsS3V3/AwsS3V3Adapter.php", "src/AwsS3V3/S3ClientStub.php", "src/AzureBlobStorage/AzureBlobStorageAdapter.php", "src/Filesystem.php", "src/Ftp/FtpAdapter.php", "src/Ftp/UnableToResolveConnectionRoot.php", "src/GoogleClo...
[]
true
thephpleague/flysystem
1,766
issue_to_patch
Node20 actions upgrade
This PR updates several `uses` in the GitHub Actions workflow in this repository to no longer run on Node16. You can checkout https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/#what-you-need-to-do for more reasoning about the replacements.
4c44347133618cccd9b3df1729647a1577b4ad99
b5a6d31b466a14070192152c1718b0ccd308cb34
diff --git a/.github/workflows/publish-subsplits.yml b/.github/workflows/publish-subsplits.yml index 476c2e34e..78d9dab40 100644 --- a/.github/workflows/publish-subsplits.yml +++ b/.github/workflows/publish-subsplits.yml @@ -16,22 +16,22 @@ jobs: runs-on: ubuntu-latest name: Publish package sub-splits st...
[ ".github/workflows/publish-subsplits.yml", ".github/workflows/quality-assurance.yml", ".github/workflows/set-subsplit-default-branch.yml" ]
[]
true
thephpleague/flysystem
1,763
issue_to_patch
Add ability to proactively close FTP and SFTP connections.
383e17d1373262b2a3d0fe7eb435c1015407518d
13969affae52fafbfe1da1a2423217f841925bb9
diff --git a/src/Ftp/FtpAdapter.php b/src/Ftp/FtpAdapter.php index 2f0e6dc8e..09c14f71e 100644 --- a/src/Ftp/FtpAdapter.php +++ b/src/Ftp/FtpAdapter.php @@ -30,6 +30,7 @@ use function error_clear_last; use function error_get_last; use function ftp_chdir; +use function ftp_close; use function is_string; class Ftp...
[ "src/Ftp/FtpAdapter.php", "src/Ftp/FtpAdapterTest.php", "src/Ftp/FtpAdapterTestCase.php", "src/Ftp/FtpConnectionProvider.php", "src/Ftp/NoopCommandConnectivityCheckerTest.php", "src/Ftp/StubConnectionProvider.php", "src/Ftp/UnableToConnectToFtpHost.php", "src/PhpseclibV3/ConnectionProvider.php", "sr...
[]
true
thephpleague/flysystem
1,760
issue_to_patch
[Fix] Update phpseclib because of security issues.
Issues are fixed in 3.0.36 https://github.com/advisories/GHSA-hg35-mp25-qf6h
b25a361508c407563b34fac6f64a8a17a8819675
1edf823542f810eeaec244dc229687d6fe808627
diff --git a/composer.json b/composer.json index 7bac714e9..99a3cd389 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "microsoft/azure-storage-blob": "^1.1", "phpunit/phpunit": "^9.5.11|^10.0", "phpstan/phpstan": "^1.10", - "phpseclib/phpseclib": "^3.0.34", + "p...
[ "composer.json" ]
[]
true
thephpleague/flysystem
1,753
issue_to_patch
gh-pages: Correct case, "FTP" to "Ftp"
Correct the case in the code samples.
c41f93554aeba7804f10932eb1896a7761ba3592
72a3ffcacae25b92eb8144ec0aac47ee156e95e6
diff --git a/docs/adapter/ftp.md b/docs/adapter/ftp.md index 4945d04b9..952083733 100644 --- a/docs/adapter/ftp.md +++ b/docs/adapter/ftp.md @@ -48,16 +48,16 @@ $filesystem = new League\Flysystem\Filesystem($adapter); ```php // The internal adapter -$adapter = new League\Flysystem\FTP\FtpAdapter( +$adapter = new Le...
[ "docs/adapter/ftp.md" ]
[]
true
thephpleague/flysystem
1,751
issue_to_patch
chore: run quality assurance regularly
That way we can tackle problems earlier and faster, right?
369ad841ecdf1c845929f4aafd55f0944a79f1af
418490126ec8c45fa5da81c4bf45cc29694b7862
diff --git a/.github/workflows/quality-assurance.yml b/.github/workflows/quality-assurance.yml index 3a08884af..bd20606ae 100644 --- a/.github/workflows/quality-assurance.yml +++ b/.github/workflows/quality-assurance.yml @@ -17,6 +17,8 @@ on: branches: - 2.x - 3.x + schedule: + - cron: "5 1 * * *...
[ ".github/workflows/quality-assurance.yml" ]
[]
true
thephpleague/flysystem
1,746
issue_to_patch
fix: update sabre/dav to fix return type annotation
> PHP Fatal error: Declaration of League\Flysystem\WebDAV\UrlPrefixingClientStub::propFind($url, array $properties, $depth = 0) must be compatible with Sabre\DAV\Client::propFind($url, array $properties, $depth = 0): array in /home/runner/work/flysystem/flysystem/src/WebDAV/UrlPrefixingClientStub.php on line 10
369ad841ecdf1c845929f4aafd55f0944a79f1af
bdf06b5cbbab520188fe14b8e1935959276c3258
diff --git a/composer.json b/composer.json index 1b9bfbb15..7bac714e9 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "google/cloud-storage": "^1.23", "async-aws/s3": "^1.5 || ^2.0", "async-aws/simple-s3": "^1.1 || ^2.0", - "sabre/dav": "^4.3.1" + "sabre/dav": "...
[ "composer.json", "src/WebDAV/UrlPrefixingClientStub.php", "src/WebDAV/composer.json" ]
[]
true
thephpleague/flysystem
1,747
issue_to_patch
fix: [FTP] ensure prefixer in method directoryExists
369ad841ecdf1c845929f4aafd55f0944a79f1af
67086c1f1c76c9f355df6cae3d4cae2f06f979f7
diff --git a/src/Ftp/FtpAdapter.php b/src/Ftp/FtpAdapter.php index 079dd010a..2f0e6dc8e 100644 --- a/src/Ftp/FtpAdapter.php +++ b/src/Ftp/FtpAdapter.php @@ -275,7 +275,7 @@ private function fetchMetadata(string $path, string $type): FileAttributes $object = @ftp_raw($this->connection(), 'STAT ' . $location);...
[ "src/Ftp/FtpAdapter.php" ]
[]
true
thephpleague/flysystem
1,748
issue_to_patch
fix: [AsyncAwsS3] update simpleS3 for test and adjust getPresignedUrl declaration
Fixes the tests. > PHP Fatal error: Declaration of League\Flysystem\AsyncAwsS3\S3ClientStub::getPresignedUrl(string $bucket, string $key, ?DateTimeImmutable $expires = null): string must be compatible with AsyncAws\SimpleS3\SimpleS3Client::getPresignedUrl(string $bucket, string $key, ?DateTimeImmutable $expires = n...
369ad841ecdf1c845929f4aafd55f0944a79f1af
f9cb517ea52a0a6e099a5e6b6e9c0a556aff7247
diff --git a/src/AsyncAwsS3/S3ClientStub.php b/src/AsyncAwsS3/S3ClientStub.php index f83e7c815..064485728 100644 --- a/src/AsyncAwsS3/S3ClientStub.php +++ b/src/AsyncAwsS3/S3ClientStub.php @@ -181,7 +181,7 @@ public function getUrl(string $bucket, string $key): string return $this->actualClient->getUrl($bucket...
[ "src/AsyncAwsS3/S3ClientStub.php", "src/AsyncAwsS3/composer.json" ]
[]
true
thephpleague/flysystem
1,749
issue_to_patch
style: [InMemory] update method usages to PHP 8.0
369ad841ecdf1c845929f4aafd55f0944a79f1af
0f7fa06c4c341c5de13d1281774a8dd3654528c5
diff --git a/src/InMemory/InMemoryFilesystemAdapter.php b/src/InMemory/InMemoryFilesystemAdapter.php index 76de6ad9f..4d1182060 100644 --- a/src/InMemory/InMemoryFilesystemAdapter.php +++ b/src/InMemory/InMemoryFilesystemAdapter.php @@ -19,11 +19,10 @@ use function array_keys; use function rtrim; -use function strp...
[ "src/InMemory/InMemoryFilesystemAdapter.php" ]
[]
true
thephpleague/flysystem
1,750
issue_to_patch
style: [ZipArchive] update method usages to PHP 8.0
369ad841ecdf1c845929f4aafd55f0944a79f1af
fc217acf9e32698885aa03ea0fb7603e5ed3ff9a
diff --git a/src/ZipArchive/ZipArchiveAdapter.php b/src/ZipArchive/ZipArchiveAdapter.php index c73ca55cc..0826dd90e 100644 --- a/src/ZipArchive/ZipArchiveAdapter.php +++ b/src/ZipArchive/ZipArchiveAdapter.php @@ -155,7 +155,7 @@ public function deleteDirectory(string $path): void $itemPath = $stats['name...
[ "src/ZipArchive/ZipArchiveAdapter.php" ]
[]
true
thephpleague/flysystem
1,741
issue_to_patch
fix: update aws/aws-sdk-php to newest version to fix CVE-2023-51651
Updated the aws/aws-sdk-php package to the newest version to fix the given CVE: ![Screenshot from 2024-01-12 10-24-44](https://github.com/thephpleague/flysystem/assets/8778012/fe4a9ba3-5ab3-4255-8747-254b4eb27e86) This issue has been patched in version 3.288.1. https://nvd.nist.gov/vuln/detail/CVE-2023-51651
d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc
90d6805eb0ecd5f15925057640810b6d24f31ae5
diff --git a/composer.json b/composer.json index c2f8f800a..1b9bfbb15 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "phpunit/phpunit": "^9.5.11|^10.0", "phpstan/phpstan": "^1.10", "phpseclib/phpseclib": "^3.0.34", - "aws/aws-sdk-php": "^3.220.0", + "aws/aws-sd...
[ "composer.json", "src/AwsS3V3/composer.json" ]
[]
true
thingsboard/thingsboard
789
issue_to_patch
Cluster Mode Refactoring
25f82d384b8d4d1a1847016360388688a1750d48
36f4fb03a4e88f5d147d1f7ea9d1891a54e87f00
diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index 864059892b2..b4f910265dd 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src...
[ "application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java", "application/src/main/java/org/thingsboard/server/actors/app/AppActor.java", "application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java", "application/src/main/java/org/thingsboard/server/a...
[]
diff --git a/application/src/test/java/org/thingsboard/server/mqtt/DbConfigurationTestRule.java b/application/src/test/java/org/thingsboard/server/mqtt/DbConfigurationTestRule.java new file mode 100644 index 00000000000..4b71cae015a --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/mqtt/DbConfigurati...
true
thingsboard/thingsboard
15,759
issue_to_patch
Fix typos: 'resereved' -> 'reserved' and fix protobuf comment grammar
## Description Simple typo fix in two files: 1. **DeviceCredentialsFilter.java**: Fixed `resereved` → `reserved` in Javadoc comment 2. **pom.xml**: Fixed grammar in Protobuf version comment from "A Major v4 does not support by the pubsub yet" → "Protobuf v4 is not yet supported by the pubsub" ## General checklist -...
3b845b9e1ba015af4004e17d7cf260b97ee5d423
b2e82b7c880f35e686964fe8ba8c2b54a5f1f545
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentialsFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentialsFilter.java index 201615eb981..6d7188733e3 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/se...
[ "common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentialsFilter.java", "pom.xml" ]
[]
true
thingsboard/thingsboard
15,757
issue_to_patch
Fixed CVE-2026-45799
## Summary Fixes **1 high-severity CVE** (CVE-2026-45799) flagged by the security scan, plus housekeeping of the Spring Boot CVE-override cluster. `com.squareup.wire:wire-schema` is bumped 3.7.1 → 6.3.0, which transitively raises the vulnerable `wire-runtime` to 6.3.0. Spring Boot is bumped 3.5.14 → 3.5.15; its BOM no...
68b4c01f9b2e3f8a9fae9be3f5cd3369c1a50a20
fadad06407b9ba3946a15a42a59237646f715efc
diff --git a/common/data/pom.xml b/common/data/pom.xml index a9ca14a2d6e..450a0826b98 100644 --- a/common/data/pom.xml +++ b/common/data/pom.xml @@ -84,8 +84,11 @@ <scope>test</scope> </dependency> <dependency> + <!-- wire-schema-jvm (not wire-schema): from Wire 4.x the plain w...
[ "common/data/pom.xml", "pom.xml" ]
[]
true
thingsboard/thingsboard
15,758
issue_to_patch
Fixed CVE-2026-45799
## Summary lts-4.3 counterpart of the CVE fixes in #15757. Brings the same changes onto lts-4.3 via merge: `com.squareup.wire:wire-schema` 3.7.1 → 6.3.0 (fixes CVE-2026-45799 on the transitive `wire-runtime`), and Spring Boot 3.5.14 → 3.5.15 with removal of the now-redundant `postgresql.version` / `tomcat.version` ove...
b234daf6b8d8f70540205232b5f5a8c9a2f3fa4f
95c10f33f691cc2260dc3d0783a31530d8884354
diff --git a/common/data/pom.xml b/common/data/pom.xml index 0e9d306b85f..81bf55ffd7e 100644 --- a/common/data/pom.xml +++ b/common/data/pom.xml @@ -84,8 +84,11 @@ <scope>test</scope> </dependency> <dependency> + <!-- wire-schema-jvm (not wire-schema): from Wire 4.x the plain w...
[ "common/data/pom.xml", "pom.xml" ]
[]
true
thingsboard/thingsboard
15,721
issue_to_patch
Fixed CVE-2026-44705 and CVE-2026-46625
## Pull Request description Put your PR description here instead of this sentence. ## General checklist - [x] You have reviewed the guidelines [document](https://docs.google.com/document/d/1wqcOafLx5hth8SAg4dqV_LV3un3m5WYR8RdTJ4MbbUM/edit?usp=sharing). - [x] [Labels](https://docs.github.com/en/issues/using...
b84f58a8af080cc5added74b74bd98dc85571194
26e05aeaf1c730197502226f7423528c254a1a91
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock index 6b5f48283ba..ed3de52ba48 100644 --- a/ui-ngx/yarn.lock +++ b/ui-ngx/yarn.lock @@ -7232,9 +7232,9 @@ js-beautify@1.15.4: nopt "^7.2.1" js-cookie@^3.0.5: - version "3.0.5" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c015...
[ "ui-ngx/yarn.lock" ]
[]
true
thingsboard/thingsboard
15,771
issue_to_patch
Merge rc into master
Automated cascade merge: rc → master
f421f91b30c5f11eb658e9f04640941da680a65d
f64e1837334604a016d1de93eac718e43f146b18
[]
[]
true
thingsboard/thingsboard
15,769
issue_to_patch
Merged with lts 4.3
## Pull Request description Put your PR description here instead of this sentence. ## General checklist - [ ] You have reviewed the guidelines [document](https://docs.google.com/document/d/1wqcOafLx5hth8SAg4dqV_LV3un3m5WYR8RdTJ4MbbUM/edit?usp=sharing). - [ ] [Labels](https://docs.github.com/en/issues/using...
1b20d62033b174838718490ce201321999703b97
901550b92c7c347bd35dcab25aee943114fb98a3
[]
[]
true
thingsboard/thingsboard
15,768
issue_to_patch
Merged with lts 4.2
## Pull Request description Put your PR description here instead of this sentence. ## General checklist - [ ] You have reviewed the guidelines [document](https://docs.google.com/document/d/1wqcOafLx5hth8SAg4dqV_LV3un3m5WYR8RdTJ4MbbUM/edit?usp=sharing). - [ ] [Labels](https://docs.github.com/en/issues/using...
5d4a11694ce6bb9abf384ba7f5a9c76e3695da56
66aabeed018fa66d542a5e28555b0e43954f98a3
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java index 1f2d378d728..67c0a19e66c 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGr...
[ "application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java" ]
[]
true
thingsboard/thingsboard
15,766
issue_to_patch
Fixed edge event loss for kafka edges during sync
## Pull Request description Put your PR description here instead of this sentence. ## General checklist - [ ] You have reviewed the guidelines [document](https://docs.google.com/document/d/1wqcOafLx5hth8SAg4dqV_LV3un3m5WYR8RdTJ4MbbUM/edit?usp=sharing). - [ ] [Labels](https://docs.github.com/en/issues/using...
b60fb96983d224bee6e86d66f297a069d811e0b1
4f8dcb3dceaff18716b6cda93ea0ca8b23b9df17
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java index ebc55313205..f42f48421a1 100644 --- a/application/src/main/...
[ "application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java", "application/src/test/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManagerTest.java", "common/queue/src/main/java/org/thingsboard/server/queue/commo...
[]
diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManagerTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManagerTest.java new file mode 100644 index 00000000000..7ddc2af192e --- /...
true
thingsboard/thingsboard
15,765
issue_to_patch
Fixed edge event loss for kafka edges during sync
https://github.com/thingsboard/thingsboard/pull/15756
b234daf6b8d8f70540205232b5f5a8c9a2f3fa4f
48ff41b57b1d6861c67ee7e43a2af1ce298d028b
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java index f7e729c6b79..1f2d378d728 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGr...
[ "application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java", "application/src/test/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSessionTest.java", "common/queue/src/main/java/org/thingsboard/server/queue/common/consumer/QueueConsumerManager.java", "common/queue/s...
[]
diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSessionTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSessionTest.java new file mode 100644 index 00000000000..39ba71b927b --- /dev/null +++ b/application/src/test/java/org/thingsboard...
true
thingsboard/thingsboard
15,756
issue_to_patch
Fixed edge event loss for kafka edges during sync
## Pull Request description On Kafka-based edges, an edge event can be silently dropped if it gets polled from the edge-event topic right as an edge sync (or high-priority processing) starts. The event is read from Kafka, skipped without being committed, and the consumer position moves past it — so it's never re-deliv...
68b4c01f9b2e3f8a9fae9be3f5cd3369c1a50a20
2186aebf90e04547d61e8388e0d60ec9e6c5ecd9
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java index f7e729c6b79..67c0a19e66c 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGr...
[ "application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java", "application/src/test/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSessionTest.java", "common/queue/src/main/java/org/thingsboard/server/queue/common/consumer/QueueConsumerManager.java", "common/queue/s...
[ { "comment": "Now that the consumer loop gates on `isReadyToProcessGeneralEvents()` *before* polling, this guard becomes the second line of defense rather than the primary one. Worth keeping — but worth being explicit about what it now protects. The only way execution reaches here while not-ready is if readines...
diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSessionTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSessionTest.java new file mode 100644 index 00000000000..98931df8137 --- /dev/null +++ b/application/src/test/java/org/thingsboard...
true
thingsboard/thingsboard
15,730
issue_to_patch
AI models: structured output support for more providers; fix Vertex AI location routing
See: https://github.com/thingsboard/thingsboard/pull/15728
5c74a0616a32dfd4d90099f55f2769eb8494cd05
1bcc10963099463d448ee4bc026746d1e5a2ee21
diff --git a/application/pom.xml b/application/pom.xml index 99c460bb455..f6ceba95a14 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -395,11 +395,7 @@ </dependency> <dependency> <groupId>org.thingsboard.langchain4j</groupId> - <artifactId>langchain4j-google-ai-ge...
[ "application/pom.xml", "application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java", "application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java", "application/src/test/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerIm...
[]
diff --git a/application/src/test/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImplTest.java b/application/src/test/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImplTest.java index fb9807a2a89..c2f7c39ce53 100644 --- a/application/src/test/java/org/thingsboard/server/serv...
true
thingsboard/thingsboard
15,728
issue_to_patch
AI models: structured output support for more providers; fix Vertex AI location routing
## Summary Upgrades LangChain4j to `1.15.1-TB1` and migrates GitHub Models to the official OpenAI integration, which unlocks JSON Schema (structured output) support for additional AI providers in the AI request rule node. Fixes https://github.com/thingsboard/thingsboard/issues/15705: the previous Vertex AI Gemini...
b84f58a8af080cc5added74b74bd98dc85571194
ba40d6135ce24a71acdb2e063e6ef77b1f6c2954
diff --git a/application/pom.xml b/application/pom.xml index 8e5e6b25647..c1d4e5e14d8 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -390,11 +390,7 @@ </dependency> <dependency> <groupId>org.thingsboard.langchain4j</groupId> - <artifactId>langchain4j-google-ai-ge...
[ "application/pom.xml", "application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java", "application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java", "application/src/test/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerIm...
[]
diff --git a/application/src/test/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImplTest.java b/application/src/test/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImplTest.java index fb9807a2a89..c2f7c39ce53 100644 --- a/application/src/test/java/org/thingsboard/server/serv...
true
thingsboard/thingsboard
15,753
issue_to_patch
sparkplug_fix_bug_for_unique-device-names
## Pull Request description Put your PR description here instead of this sentence. ## General checklist - [x] You have reviewed the guidelines [document](https://docs.google.com/document/d/1wqcOafLx5hth8SAg4dqV_LV3un3m5WYR8RdTJ4MbbUM/edit?usp=sharing). - [x] [Labels](https://docs.github.com/en/issues/using...
3b845b9e1ba015af4004e17d7cf260b97ee5d423
f3f76496c61bc16d745d1abc78abecaf90eeac1d
diff --git a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java index ed43c710279..5c210968626 100644 --- a/application/src/main/java/org/thingsboard/server/service/transp...
[ "application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java", "application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/AbstractMqttV5ClientSparkplugTest.java", "application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/attributes/MqttV5Cl...
[ { "comment": "This assertion flip (from `isNotFound` to `isOk`) correctly reflects the new behavior — an unauthorized gateway no longer aborts; it just gets its own namespaced device created. But notice what's now *not* covered: this wired test only checks that the full-path device appears. The actual security ...
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/AbstractMqttV5ClientSparkplugTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/AbstractMqttV5ClientSparkplugTest.java index 2adc7b08a51..68237a1839c 100644 --- a/application/src/test/java/org/thing...
true
thingsboard/thingsboard
14,987
issue_to_patch
sparkplug-unique-device-names
## Pull Request description https://thingsboard-portal.atlassian.net/browse/PROD-7630 https://github.com/thingsboard/thingsboard/issues/15492 ### Pull Request Description Update Backward Compatibility & Migration The migration from short names to full-path names is implicit and occurs automatically upon rece...
9c634348321212c4e5a490768d9139467a420945
7e7d5cea12e1a4351013ccc306c1a306a08dbad5
diff --git a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java index 48bd497c6ea..ed43c710279 100644 --- a/application/src/main/java/org/thingsboard/server/service/transp...
[ "application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java", "application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java", "application/src/test/java/org/thingsboard/server/transport/mqtt/sparkplug/AbstractMqttV5ClientSparkplugTest.j...
[ { "comment": "This throw worries me as a behavioral regression. The relation check only proves *this* gateway didn't create the short-named device — but a device sharing that name isn't necessarily an attack. Consider a tenant that already has an unrelated device named `temperature` (created manually, or owned ...
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java index 962d85ec7c6..2ed3e0d161e 100644 --- a/application/src/test/java/org/thingsboard/server/transport/mqtt/Abs...
true
thingsboard/thingsboard
15,750
issue_to_patch
Merge rc into master
Automated cascade merge: rc → master
0286909d43707855a8306a9433497f022d211d64
83b498f8c1c3b34b0e2564066684bc30cc0157a7
diff --git a/application/pom.xml b/application/pom.xml index 9489c627a17..60186c3d3b3 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -395,11 +395,7 @@ </dependency> <dependency> <groupId>org.thingsboard.langchain4j</groupId> - <artifactId>langchain4j-google-ai-ge...
[ "application/pom.xml", "application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java", "application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java", "application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java", ...
[]
diff --git a/application/src/test/java/org/thingsboard/server/client/AlarmCommentApiClientTest.java b/application/src/test/java/org/thingsboard/server/client/AlarmCommentApiClientTest.java index 31da96b7b40..50707e4c389 100644 --- a/application/src/test/java/org/thingsboard/server/client/AlarmCommentApiClientTest.java ...
true
thingsboard/thingsboard
15,670
issue_to_patch
Added Kafka OAUTHBEARER (OAuth2) support
## Pull Request description This PR builds on Jonas Koch's work in #15098, which first added Kafka OAUTHBEARER support to the js-executor. I started from that branch (merged into the current master), then finished and extended it ## General checklist - [x] You have reviewed the guidelines [document](https://do...
4386bbf2d7262f050006afeae4f725e9b96cc2ce
782af42ca14d4a3f3794c9cef1d06cac676b9483
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 6ceef7bc2e8..ca450417ddf 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -1782,11 +1782,23 @@ queue: # The endpoint identification...
[ "application/src/main/resources/thingsboard.yml", "common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaSettings.java", "common/queue/src/test/java/org/thingsboard/server/queue/kafka/TbKafkaSettingsTest.java", "edqs/src/main/resources/edqs.yml", "msa/js-executor/config/custom-environment-var...
[ { "comment": "When a scheduled refresh runs, `tokenPromise` is replaced with the new in-flight promise (line 72), and this getter awaits it. If that refresh fails, every call here rejects until a retry succeeds — even though the previously fetched token is typically still valid (the refresh fires `refreshThresh...
diff --git a/common/queue/src/test/java/org/thingsboard/server/queue/kafka/TbKafkaSettingsTest.java b/common/queue/src/test/java/org/thingsboard/server/queue/kafka/TbKafkaSettingsTest.java index 0175c459062..3792d76366a 100644 --- a/common/queue/src/test/java/org/thingsboard/server/queue/kafka/TbKafkaSettingsTest.java ...
true
thingsboard/thingsboard
15,098
issue_to_patch
Added Kafka OAUTHBEARER (OAuth2) support
## Pull Request description Add the ability for JS-executors to connect to kafka services, which are using OAUTH and Bearer Tokens as authentication method. Adding provider to handle the token request and refresh. Adding custom environment variables Extend kafkaTemplate to set kafkaConfig accordingly if sasl m...
64c2bc051b2c3557ee986e2cb2d09ea7f8304635
0b6cef9c5338891695c7cb1e067217e4b0f72de3
diff --git a/msa/js-executor/config/custom-environment-variables.yml b/msa/js-executor/config/custom-environment-variables.yml index 6a98361c723..9e759f2b2fb 100644 --- a/msa/js-executor/config/custom-environment-variables.yml +++ b/msa/js-executor/config/custom-environment-variables.yml @@ -54,6 +54,16 @@ kafka: ...
[ "msa/js-executor/config/custom-environment-variables.yml", "msa/js-executor/package.json", "msa/js-executor/queue/kafkaTemplate.ts", "msa/js-executor/queue/oAuthBearerProvider.ts", "msa/js-executor/yarn.lock" ]
[]
true
thingsboard/thingsboard
15,744
issue_to_patch
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
## Problem The defective code lives in `common/transport/transport-api` and is shared by **all transports** (MQTT, HTTP, CoAP, LwM2M, SNMP). The production incident happened to surface on MQTT, but the fix is not MQTT-specific. On a cold tenant-profile cache (e.g. after a transport cache clear + restart), a device re...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 2c24caa1f2f..22f52aff03c 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -1138,6 +1138,8 @@ transport: timeout: "${CLIENT_SIDE_RPC_T...
[ "application/src/main/resources/thingsboard.yml", "common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java", "common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/TransportLimitsType.java", "common...
[ { "comment": "Minor: the stripe count `1024` is a magic number that controls both the memory footprint and the per-tenant collision probability of these locks. Once a deployment has well over ~1k active tenants, birthday-paradox collisions start reintroducing exactly the cross-tenant serialization this change r...
diff --git a/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitServiceTest.java b/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitServiceTest.java new file mode 100644 index 0000000000...
true
thingsboard/thingsboard
15,744
comment_to_fix
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
Minor: the stripe count `1024` is a magic number that controls both the memory footprint and the per-tenant collision probability of these locks. Once a deployment has well over ~1k active tenants, birthday-paradox collisions start reintroducing exactly the cross-tenant serialization this change removes — two unrelated...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java index 4923bcd9a21..ac2fd4c28a7 100644 -...
[ "common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java" ]
[ { "comment": "Minor: the stripe count `1024` is a magic number that controls both the memory footprint and the per-tenant collision probability of these locks. Once a deployment has well over ~1k active tenants, birthday-paradox collisions start reintroducing exactly the cross-tenant serialization this change r...
true
thingsboard/thingsboard
15,744
comment_to_fix
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
This comment reads as self-contradictory. The first sentence correctly describes the new per-tenant striped lock, but the next one — 'A single global lock here serializes the synchronous cross-service fetch below across the entire process' — describes the old behavior this PR is removing. A future reader won't know whi...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java index 4923bcd9a21..ac2fd4c28a7 100644 -...
[ "common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java" ]
[ { "comment": "This comment reads as self-contradictory. The first sentence correctly describes the new per-tenant striped lock, but the next one — 'A single global lock here serializes the synchronous cross-service fetch below across the entire process' — describes the old behavior this PR is removing. A future...
true
thingsboard/thingsboard
15,744
comment_to_fix
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
The `onCreate` name suggests this runs only when a new entry is actually created, but here it fires on every cache-miss branch — including when `computeIfAbsent` returns a value another thread inserted first. It's harmless because the registration into the tenant device/gateway set is idempotent, but the name oversells...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java index e6c3cab1ba9..e7ef634c72c 100644 --- a/c...
[ "common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java" ]
[ { "comment": "The `onCreate` name suggests this runs only when a new entry is actually created, but here it fires on every cache-miss branch — including when `computeIfAbsent` returns a value another thread inserted first. It's harmless because the registration into the tenant device/gateway set is idempotent, ...
true
thingsboard/thingsboard
15,744
comment_to_fix
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
Nice cleanup over the switch. One gap: nothing asserts that each constant resolves to the correct profile field — e.g. that `GATEWAY_DEVICE_LIMITS` points at the `getTransportGatewayDevice*` getters and not the plain gateway ones. The four constructor-arg blocks are near-identical, so a transposed method reference woul...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/TransportLimitsType.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/TransportLimitsType.java index 29077877a8e..3a124da2b6c 100644 --- a/common/transport/transport-...
[ "common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/TransportLimitsType.java" ]
[ { "comment": "Nice cleanup over the switch. One gap: nothing asserts that each constant resolves to the correct profile field — e.g. that `GATEWAY_DEVICE_LIMITS` points at the `getTransportGatewayDevice*` getters and not the plain gateway ones. The four constructor-arg blocks are near-identical, so a transposed...
true
thingsboard/thingsboard
15,744
comment_to_fix
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
This is the only new test for the service, and it exercises just the tenant-limits path (`getTenantRateLimits`, where `onCreate == null`). The three other refactored paths — `getDeviceRateLimits` / `getGatewayRateLimits` / `getGatewayDeviceRateLimits` — and their `onCreate` callbacks that register the entity into the p...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitServiceTest.java b/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitServiceTest.java new file mode 100644 index 0000000000...
[ "common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitServiceTest.java" ]
[ { "comment": "This is the only new test for the service, and it exercises just the tenant-limits path (`getTenantRateLimits`, where `onCreate == null`). The three other refactored paths — `getDeviceRateLimits` / `getGatewayRateLimits` / `getGatewayDeviceRateLimits` — and their `onCreate` callbacks that register...
true
thingsboard/thingsboard
15,744
comment_to_fix
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
Heads-up on a small flake window: this test proves non-blocking only if `tenantA` and `tenantB` land on different stripes of `Striped.lock(1024)`. Since both are random UUIDs, there's roughly a 1/1024 (~0.1%) chance they hash to the same stripe — and when they do, `tenantB`'s resolution blocks on `tenantA`'s held lock ...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCacheTest.java b/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCacheTest.java new file mode 100644 index 0000...
[ "common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCacheTest.java" ]
[ { "comment": "Heads-up on a small flake window: this test proves non-blocking only if `tenantA` and `tenantB` land on different stripes of `Striped.lock(1024)`. Since both are random UUIDs, there's roughly a 1/1024 (~0.1%) chance they hash to the same stripe — and when they do, `tenantB`'s resolution blocks on ...
true
thingsboard/thingsboard
15,744
comment_to_fix
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
The established idiom for per-key locking in this codebase is a `ConcurrentReferenceHashMap` (weak/soft) keyed by id with `computeIfAbsent(k -> new ReentrantLock())` — see `AbstractGatewaySessionHandler.createWeakMap()`, `DefaultTbActorSystem.actorCreationLocks`, `DefaultClusterVersionControlService.tenantRepoLocks`. `...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java index 4923bcd9a21..ac2fd4c28a7 100644 -...
[ "common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java" ]
[ { "comment": "The established idiom for per-key locking in this codebase is a `ConcurrentReferenceHashMap` (weak/soft) keyed by id with `computeIfAbsent(k -> new ReentrantLock())` — see `AbstractGatewaySessionHandler.createWeakMap()`, `DefaultTbActorSystem.actorCreationLocks`, `DefaultClusterVersionControlServi...
true
thingsboard/thingsboard
15,744
comment_to_fix
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
Passing `tenantId` twice — `getRateLimits(perTenantLimits, tenantId, tenantId, TENANT_LIMITS, null)` — reads like it could be a copy-paste slip until you confirm the lookup key and the profile key really are the same object for the tenant case. The 5-arg helper with two same-typed ids plus a nullable trailing `Runnable...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java index e6c3cab1ba9..e7ef634c72c 100644 --- a/c...
[ "common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java" ]
[ { "comment": "Passing `tenantId` twice — `getRateLimits(perTenantLimits, tenantId, tenantId, TENANT_LIMITS, null)` — reads like it could be a copy-paste slip until you confirm the lookup key and the profile key really are the same object for the tenant case. The 5-arg helper with two same-typed ids plus a nulla...
true
thingsboard/thingsboard
15,744
comment_to_fix
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
`onCreate` reads as "run when this call created the entry", but it actually runs for every caller that observed `limits == null` at the top — including a thread that lost the `computeIfAbsent` race and got an existing value back. It's safe today only because all three callbacks are idempotent set-adds (`getTenantDevice...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java index e6c3cab1ba9..e7ef634c72c 100644 --- a/c...
[ "common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java" ]
[ { "comment": "`onCreate` reads as \"run when this call created the entry\", but it actually runs for every caller that observed `limits == null` at the top — including a thread that lost the `computeIfAbsent` race and got an existing value back. It's safe today only because all three callbacks are idempotent se...
true
thingsboard/thingsboard
15,744
comment_to_fix
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
Nice, targeted test for the cross-tenant win. Two gaps worth closing: (1) the other half of the contract — that concurrent misses for the **same** tenant dedupe to a single `getEntityProfile` round-trip — isn't covered, yet that dedup is the entire reason the per-tenant lock still exists (vs. going lock-free); a siblin...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCacheTest.java b/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCacheTest.java new file mode 100644 index 0000...
[ "common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCacheTest.java" ]
[ { "comment": "Nice, targeted test for the cross-tenant win. Two gaps worth closing: (1) the other half of the contract — that concurrent misses for the **same** tenant dedupe to a single `getEntityProfile` round-trip — isn't covered, yet that dedup is the entire reason the per-tenant lock still exists (vs. goin...
true
thingsboard/thingsboard
15,744
comment_to_fix
Fixed transport tenant-profile lock convoy under cold-cache reconnect storm
This drives only the tenant-level path (`gatewayId`/`deviceId` null), which is the single `getRateLimits` variant that passes a `null` `onCreate`. The device/gateway variants — whose `() -> getTenantDevices(...).add(...)` callbacks the refactor newly moved outside `computeIfAbsent` — get no focused assertion that the t...
d011b611f6d44739397715e4410fcf580cdc485b
a1bf69cd2767a282a5031d6442aba70abab9303d
diff --git a/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitServiceTest.java b/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitServiceTest.java new file mode 100644 index 0000000000...
[ "common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitServiceTest.java" ]
[ { "comment": "This drives only the tenant-level path (`gatewayId`/`deviceId` null), which is the single `getRateLimits` variant that passes a `null` `onCreate`. The device/gateway variants — whose `() -> getTenantDevices(...).add(...)` callbacks the refactor newly moved outside `computeIfAbsent` — get no focuse...
true
thingsboard/thingsboard
15,748
issue_to_patch
Test fixes
## Pull Request description Put your PR description here instead of this sentence. ## General checklist - [ ] You have reviewed the guidelines [document](https://docs.google.com/document/d/1wqcOafLx5hth8SAg4dqV_LV3un3m5WYR8RdTJ4MbbUM/edit?usp=sharing). - [ ] [Labels](https://docs.github.com/en/issues/using...
db4c2198533ce32c0c4bca8b6ab629b44f448f5a
4007b85ce46a9330a9d3925a16f23aadba4478dd
[ "application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java", "application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java" ]
[]
diff --git a/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java index ee2aefc81a2..d1621b29ec7 100644 --- a/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java +++ b/application/...
true
thingsboard/thingsboard
15,550
issue_to_patch
Hardened device credentials validation
## Pull Request description Fixed CWE-93, CWE-94: 1. Enhanced device credential validation 2. Added sanitize logic for YAML sink lines. ## General checklist - [ ] You have reviewed the guidelines [document](https://docs.google.com/document/d/1wqcOafLx5hth8SAg4dqV_LV3un3m5WYR8RdTJ4MbbUM/edit?usp=sharing). - ...
93b706bffde99e0027c68ec14e6e498377478db3
4ea25be79b7c366282750865a0373cafeb5b2dda
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java b/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java index 37242dfa1d3..48b0efe16b2 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java +++ b/common/data/src/main/...
[ "common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java", "dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceCredentialsDataValidator.java", "dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java", "dao/src/test/java/org/thingsboard/server/dao/...
[ { "comment": "`sanitize` is only wired into the docker-compose path. The sibling command builders in this same class — `getHttpPublishCommand` (line 60), `getMqttPublishCommand` (lines 74/81/84/87) and `getCoapPublishCommand` (line 209) — interpolate the same untrusted fields (`credentialsId`, `clientId`, `user...
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceCredentialsDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceCredentialsDataValidatorTest.java new file mode 100644 index 00000000000..5eca84a466d --- /dev/null +++ b/dao/src/test/java/org/thing...
true
thingsboard/thingsboard
15,550
comment_to_fix
Hardened device credentials validation
`sanitize` is only wired into the docker-compose path. The sibling command builders in this same class — `getHttpPublishCommand` (line 60), `getMqttPublishCommand` (lines 74/81/84/87) and `getCoapPublishCommand` (line 209) — interpolate the same untrusted fields (`credentialsId`, `clientId`, `userName`, `password`) int...
93b706bffde99e0027c68ec14e6e498377478db3
4ea25be79b7c366282750865a0373cafeb5b2dda
diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java b/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java index d1d31c4745d..80012562f35 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java +++ b/dao/src/main/java/org...
[ "dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java" ]
[ { "comment": "`sanitize` is only wired into the docker-compose path. The sibling command builders in this same class — `getHttpPublishCommand` (line 60), `getMqttPublishCommand` (lines 74/81/84/87) and `getCoapPublishCommand` (line 209) — interpolate the same untrusted fields (`credentialsId`, `clientId`, `user...
true
thingsboard/thingsboard
15,550
comment_to_fix
Hardened device credentials validation
This `CONTROL_CHARS` pattern is duplicated verbatim in `DeviceConnectivityUtil` (line 53). Since both halves are part of the same fix (reject on save, replace on render), consider hoisting it to a single shared constant so the two definitions can't drift apart later.
93b706bffde99e0027c68ec14e6e498377478db3
4ea25be79b7c366282750865a0373cafeb5b2dda
diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceCredentialsDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceCredentialsDataValidator.java index 7035fcfd9bb..c053f36d5bc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/...
[ "dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceCredentialsDataValidator.java" ]
[ { "comment": "This `CONTROL_CHARS` pattern is duplicated verbatim in `DeviceConnectivityUtil` (line 53). Since both halves are part of the same fix (reject on save, replace on render), consider hoisting it to a single shared constant so the two definitions can't drift apart later.", "path": "dao/src/main/ja...
true
thingsboard/thingsboard
15,550
comment_to_fix
Hardened device credentials validation
The suite asserts rejection for each MQTT_BASIC field, but the only accepting case is an ACCESS_TOKEN. A happy-path test for a clean MQTT_BASIC credential — valid `clientId`/`userName`/`password` passing through the new parse-and-check branch and reaching `findDeviceById` without throwing — would guard against that bra...
93b706bffde99e0027c68ec14e6e498377478db3
4ea25be79b7c366282750865a0373cafeb5b2dda
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceCredentialsDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceCredentialsDataValidatorTest.java new file mode 100644 index 00000000000..5eca84a466d --- /dev/null +++ b/dao/src/test/java/org/thing...
[ "dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceCredentialsDataValidatorTest.java" ]
[ { "comment": "The suite asserts rejection for each MQTT_BASIC field, but the only accepting case is an ACCESS_TOKEN. A happy-path test for a clean MQTT_BASIC credential — valid `clientId`/`userName`/`password` passing through the new parse-and-check branch and reaching `findDeviceById` without throwing — would ...
true
thingsboard/thingsboard
15,715
issue_to_patch
Fixed permission check on alarm comment edit
## Pull Request description A user can edit and delete comments posted by other users by manipulating request parameters. Although the application is designed to restrict users to managing only their own comments, this control can be bypassed by modifying comment identifiers in intercepted API requests. Fixed. ...
be3207ab65da16e3c189be517f5d19ea20b53ec8
8082d60ffe163a987f25ad7ab9950dc645eb9193
diff --git a/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java b/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java index 8a113fb424f..998ca1cfa5a 100644 --- a/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.ja...
[ "application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java", "application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmCommentService.java", "application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java", "application/src/test/java/...
[]
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java index bbf3a3467ed..2b70e04a855 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java +++ b/application/...
true
thingsboard/thingsboard
15,651
issue_to_patch
Fixed app hanging on transport port conflict at startup
This PR fixes two cases where ThingsBoard's JVM hangs after a transport bind failure at startup because non-daemon Californium threads survive a failed `init()`. Both transports are addressed with the same pattern: release Californium resources in a `try/catch` so the bean fails cleanly and the JVM exits with code 1. ...
71379ece5aaec9d4bef0006e23dd2e8bb30d3a82
a0f5b3bc5b6496dcab4248b15a038a39766b45ae
diff --git a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java index 3b7248ee722..8ffa489f7bc 100644 --- a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/...
[ "common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java", "common/coap-server/src/test/java/org/thingsboard/server/coapserver/DefaultCoapServerServiceTest.java", "common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstr...
[ { "comment": "`server = new CoapServer(networkConfig)` runs outside the `try`. If the Californium `CoapServer` constructor spawns the non-daemon protocol-stage threads (as the PR description notes for the LwM2M `CoapServer`), a failure thrown by the constructor itself would leak them, since the catch's `server....
diff --git a/common/coap-server/src/test/java/org/thingsboard/server/coapserver/DefaultCoapServerServiceTest.java b/common/coap-server/src/test/java/org/thingsboard/server/coapserver/DefaultCoapServerServiceTest.java new file mode 100644 index 00000000000..0c9e9fc29d2 --- /dev/null +++ b/common/coap-server/src/test/jav...
true
thingsboard/thingsboard
15,651
comment_to_fix
Fixed app hanging on transport port conflict at startup
`server = new CoapServer(networkConfig)` runs outside the `try`. If the Californium `CoapServer` constructor spawns the non-daemon protocol-stage threads (as the PR description notes for the LwM2M `CoapServer`), a failure thrown by the constructor itself would leak them, since the catch's `server.destroy()` only covers...
71379ece5aaec9d4bef0006e23dd2e8bb30d3a82
a0f5b3bc5b6496dcab4248b15a038a39766b45ae
diff --git a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java index 3b7248ee722..8ffa489f7bc 100644 --- a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/...
[ "common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java" ]
[ { "comment": "`server = new CoapServer(networkConfig)` runs outside the `try`. If the Californium `CoapServer` constructor spawns the non-daemon protocol-stage threads (as the PR description notes for the LwM2M `CoapServer`), a failure thrown by the constructor itself would leak them, since the catch's `server....
true
thingsboard/thingsboard
15,651
comment_to_fix
Fixed app hanging on transport port conflict at startup
`getLhBootstrapServer()` (which calls `builder.build()`, constructing the Californium `CoapServer` that — per your own description — spawns the non-daemon protocol-stage threads in its constructor) runs outside the `try`. If `build()` throws after constructing that server, the threads it already spawned would leak beca...
71379ece5aaec9d4bef0006e23dd2e8bb30d3a82
a0f5b3bc5b6496dcab4248b15a038a39766b45ae
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java index 9b370d0b717..639e0bf74a9 100644 --- a/common/transport/...
[ "common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java" ]
[ { "comment": "`getLhBootstrapServer()` (which calls `builder.build()`, constructing the Californium `CoapServer` that — per your own description — spawns the non-daemon protocol-stage threads in its constructor) runs outside the `try`. If `build()` throws after constructing that server, the threads it already s...
true
thingsboard/thingsboard
15,651
comment_to_fix
Fixed app hanging on transport port conflict at startup
With `getDtlsSettings()` stubbed to `null`, `isDtlsEnabled()` is false, so `dtlsSessionsExecutor`, `dtlsConnector`, `dtlsCoapEndpoint`, and `tbDtlsCertificateVerifier` are never assigned during `init()`. These four assertions therefore pass trivially — they aren't exercising the DTLS cleanup branch of the catch (the `d...
71379ece5aaec9d4bef0006e23dd2e8bb30d3a82
a0f5b3bc5b6496dcab4248b15a038a39766b45ae
diff --git a/common/coap-server/src/test/java/org/thingsboard/server/coapserver/DefaultCoapServerServiceTest.java b/common/coap-server/src/test/java/org/thingsboard/server/coapserver/DefaultCoapServerServiceTest.java new file mode 100644 index 00000000000..0c9e9fc29d2 --- /dev/null +++ b/common/coap-server/src/test/jav...
[ "common/coap-server/src/test/java/org/thingsboard/server/coapserver/DefaultCoapServerServiceTest.java" ]
[ { "comment": "With `getDtlsSettings()` stubbed to `null`, `isDtlsEnabled()` is false, so `dtlsSessionsExecutor`, `dtlsConnector`, `dtlsCoapEndpoint`, and `tbDtlsCertificateVerifier` are never assigned during `init()`. These four assertions therefore pass trivially — they aren't exercising the DTLS cleanup branc...
true
thingsboard/thingsboard
15,451
issue_to_patch
Fixed app hanging on MQTT port conflict at startup
## Summary If the MQTT transport fails to start (for example, because `transport.mqtt.bind_port` is already in use), the JVM currently hangs instead of exiting. `MqttTransportService.init()` creates two `NioEventLoopGroup` instances before calling `bind(...).sync()`. When `bind` throws `BindException`, Spring treats t...
2e65353d764b5765a90dd3f2c6ee0436ef18cbe3
5b4d4270084d8d4f8abe75c180bfd3a0c626f3ad
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java index 8b780c6ab4f..4e41fa7ecaa 100644 --- a/common/transport/mqtt/src/main/java/org/thingsboard/server/tr...
[ "common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java", "common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/MqttTransportServiceTest.java" ]
[ { "comment": "Minor follow-up: these two `NioEventLoopGroup` allocations are still outside the new `try` block. If `new NioEventLoopGroup(workerGroupThreadCount)` throws (e.g., resource exhaustion / `OutOfMemoryError`) after `bossGroup` has already been created, `bossGroup` is leaked — the catch below never run...
diff --git a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/MqttTransportServiceTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/MqttTransportServiceTest.java new file mode 100644 index 00000000000..ab21209a487 --- /dev/null +++ b/common/transport/mqtt/src...
true
thingsboard/thingsboard
15,662
issue_to_patch
Fixed RPC call request rule node returning null body
## Pull Request description Initial issue: TbSendRPCRequestNode produces empty string as data instead of empty JSON in cluster mode. After investigation, the issue was found in handling FromDeviceRpcResponse.response. - queue.proto: string response → optional string response (wire-compatible; only adds a presence...
71379ece5aaec9d4bef0006e23dd2e8bb30d3a82
93df85a78c2583527788e7ce5600f663ab734ce7
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java index de2e65723ea..9eacd83e627 100644 --- a/application/src/main/java/org/thingsboard/server/service/queue/Defa...
[ "application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java", "application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java", "application/src/test/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerServiceTest.java", ...
[ { "comment": "Good regression test for the null-response round-trip. Worth noting it only exercises the `ProtoUtils.toProto`/`fromProto` actor-message path. The change this PR is actually about — the `error > 0` → `error >= 0` fix (recovering `NOT_FOUND`) and the `hasResponse()` guard in `DefaultTbCoreConsumerS...
diff --git a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerServiceTest.java b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerServiceTest.java index 86b5ae2cf83..53c855aa4dd 100644 --- a/application/src/test/java/org/thingsboard/server/service/qu...
true
thingsboard/thingsboard
15,662
comment_to_fix
Fixed RPC call request rule node returning null body
Good regression test for the null-response round-trip. Worth noting it only exercises the `ProtoUtils.toProto`/`fromProto` actor-message path. The change this PR is actually about — the `error > 0` → `error >= 0` fix (recovering `NOT_FOUND`) and the `hasResponse()` guard in `DefaultTbCoreConsumerService.forwardToCoreRp...
71379ece5aaec9d4bef0006e23dd2e8bb30d3a82
93df85a78c2583527788e7ce5600f663ab734ce7
diff --git a/common/proto/src/test/java/org/thingsboard/server/common/util/ProtoUtilsTest.java b/common/proto/src/test/java/org/thingsboard/server/common/util/ProtoUtilsTest.java index e779632088d..a438c62dc71 100644 --- a/common/proto/src/test/java/org/thingsboard/server/common/util/ProtoUtilsTest.java +++ b/common/pr...
[ "common/proto/src/test/java/org/thingsboard/server/common/util/ProtoUtilsTest.java" ]
[ { "comment": "Good regression test for the null-response round-trip. Worth noting it only exercises the `ProtoUtils.toProto`/`fromProto` actor-message path. The change this PR is actually about — the `error > 0` → `error >= 0` fix (recovering `NOT_FOUND`) and the `hasResponse()` guard in `DefaultTbCoreConsumerS...
true
thingsboard/thingsboard
15,662
comment_to_fix
Fixed RPC call request rule node returning null body
`RpcError.values()[proto.getError()]` now guards the lower bound (`>= 0`) but still has no upper bound. With today's senders only emitting `-1..4` this can't trip, but in a mixed-version cluster a newer node that adds an `RpcError` constant would send an ordinal this older node can't index, throwing `ArrayIndexOutOfBou...
71379ece5aaec9d4bef0006e23dd2e8bb30d3a82
93df85a78c2583527788e7ce5600f663ab734ce7
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java index de2e65723ea..9eacd83e627 100644 --- a/application/src/main/java/org/thingsboard/server/service/queue/Defa...
[ "application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java" ]
[ { "comment": "`RpcError.values()[proto.getError()]` now guards the lower bound (`>= 0`) but still has no upper bound. With today's senders only emitting `-1..4` this can't trip, but in a mixed-version cluster a newer node that adds an `RpcError` constant would send an ordinal this older node can't index, throwi...
true
thingsboard/thingsboard
15,735
issue_to_patch
Merge rc into master
Automated cascade merge: rc → master
2eb8b5dff7465c99359c1d5ca76ca83bf6dfe780
572ba38d760dcb32d8ab961ed6ea0c16687b80aa
diff --git a/application/src/main/data/json/system/widget_types/html_container.json b/application/src/main/data/json/system/widget_types/html_container.json index 25b9e5ac5d4..a27996593b9 100644 --- a/application/src/main/data/json/system/widget_types/html_container.json +++ b/application/src/main/data/json/system/widg...
[ "application/src/main/data/json/system/widget_types/html_container.json", "application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java", "application/src/main/java/org/thingsboard/server/service/entitiy/queue/DefaultTbQueueService.java", "application/src/test/java/org...
[]
diff --git a/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldStateTest.java b/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldStateTest.java index 4454d41e6e7..35f637dc09f 100644 --- a/application/src/test/java/org/thingsboard/server/...
true