You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by "oscerd (via GitHub)" <gi...@apache.org> on 2026/07/28 08:15:37 UTC
[PR] CAMEL-24279: camel-google-storage - contain downloadFileName downloads within the configured directory [camel]
oscerd opened a new pull request, #25179:
URL: https://github.com/apache/camel/pull/25179
# CAMEL-24279
`GoogleCloudStorageConsumer` builds the local download destination by appending the remote object
name to the configured `downloadFileName` directory via the `${file:name}` token, which returns the
name unchanged. A remote object name containing path segments could therefore resolve outside the
configured directory.
## Change
* New `GoogleCloudStorageFileNameHelper.assertWithinDirectory(...)` (package-private, no new public
API, no new module dependency): normalizes the resolved path lexically and compares it against the
configured directory on path-segment boundaries, throwing `IllegalArgumentException` when it
resolves outside.
* Wired into `GoogleCloudStorageConsumer.evaluateFileExpression`, guarded so it applies to the branch
where the object name is appended to a plain directory.
This aligns the component with the containment already applied to the file/FTP/SFTP/SMB consumers
(CAMEL-23765, CAMEL-23868) and to the Azure Storage Blob/DataLake download paths (CAMEL-23942) —
the same approach as `AzureFileNameHelper.resolveWithinDirectory`.
## Design notes
* **Containment rather than stripping the path component.** Google Cloud Storage object names
commonly use `/` as a pseudo-directory separator, so using `${file:onlyname}` /
`FileUtil.stripPath` would flatten nested names and make distinct objects collide on the same
local file. Nested names keep mapping to sub-directories exactly as before; only names resolving
outside the configured directory are rejected.
* **A `downloadFileName` that already contains an expression is deliberately out of scope** — that
local path is constructed by the route author.
## Tests
* `GoogleCloudStorageFileNameHelperTest` (8) — plain, nested and normalizing-back-inside names
accepted; parent-directory segments (leading, repeated, nested in the key) rejected; plus a
sibling-directory case that a plain `String.startsWith` check would wrongly accept.
* `GoogleCloudStorageConsumerDownloadPathTest` (5) — exercises the consumer path itself, including
the route-author-expression case.
* Full module suite green (25 tests), including the pre-existing `ConsumerDownloadLocalTest`.
* Full reactor build `mvn clean install -DskipTests` green, no regenerated-file drift.
Upgrade-guide note added to `camel-4x-upgrade-guide-4_22.adoc`.
Backports to `camel-4.18.x` and `camel-4.14.x` to follow — the same code is present on both.
_Claude Code on behalf of oscerd_
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] CAMEL-24279: camel-google-storage - contain downloadFileName downloads within the configured directory [camel]
Posted by "oscerd (via GitHub)" <gi...@apache.org>.
oscerd merged PR #25179:
URL: https://github.com/apache/camel/pull/25179
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] CAMEL-24279: camel-google-storage - contain downloadFileName downloads within the configured directory [camel]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #25179:
URL: https://github.com/apache/camel/pull/25179#issuecomment-5102285636
<!-- ci-tested-modules -->
:test_tube: **CI tested the following changed modules:**
- `components/camel-google/camel-google-storage`
- `docs`
---
<details><summary>:microscope: Scalpel shadow comparison — Scalpel: 10 tested, 28 compile-only — current: 9 all tested</summary>
[Maveniverse Scalpel](https://github.com/maveniverse/scalpel) detected **38 affected modules** (current approach: 9).
<details><summary>:warning: Modules only in Scalpel (29)</summary>
- `apache-camel`
- `camel-allcomponents`
- `camel-catalog`
- `camel-catalog-console`
- `camel-catalog-lucene`
- `camel-catalog-maven`
- `camel-catalog-suggest`
- `camel-componentdsl`
- `camel-csimple-maven-plugin`
- `camel-endpointdsl`
- `camel-endpointdsl-support`
- `camel-itest`
- `camel-jbang-core`
- `camel-jbang-it`
- `camel-jbang-main`
- `camel-jbang-plugin-edit`
- `camel-jbang-plugin-generate`
- `camel-jbang-plugin-kubernetes`
- `camel-jbang-plugin-test`
- `camel-kamelet-main`
- `camel-launcher`
- `camel-report-maven-plugin`
- `camel-route-parser`
- `camel-yaml-dsl`
- `camel-yaml-dsl-deserializers`
- `camel-yaml-dsl-maven-plugin`
- `coverage`
- `docs`
- `dummy-component`
</details>
**Skip-tests mode would test 10 modules** (2 direct + 8 downstream), **skip tests for 28** (generated code, meta-modules)
<details><summary>Modules Scalpel would test (10)</summary>
- `camel-google-storage`
- `camel-jbang-mcp`
- `camel-jbang-plugin-mcp`
- `camel-jbang-plugin-route-parser`
- `camel-jbang-plugin-tui`
- `camel-jbang-plugin-validate`
- `camel-launcher-container`
- `camel-yaml-dsl-validator`
- `camel-yaml-dsl-validator-maven-plugin`
- `docs`
</details>
<details><summary>Modules with tests skipped (28)</summary>
- `apache-camel`
- `camel-allcomponents`
- `camel-catalog`
- `camel-catalog-console`
- `camel-catalog-lucene`
- `camel-catalog-maven`
- `camel-catalog-suggest`
- `camel-componentdsl`
- `camel-csimple-maven-plugin`
- `camel-endpointdsl`
- `camel-endpointdsl-support`
- `camel-itest`
- `camel-jbang-core`
- `camel-jbang-it`
- `camel-jbang-main`
- `camel-jbang-plugin-edit`
- `camel-jbang-plugin-generate`
- `camel-jbang-plugin-kubernetes`
- `camel-jbang-plugin-test`
- `camel-kamelet-main`
- `camel-launcher`
- `camel-report-maven-plugin`
- `camel-route-parser`
- `camel-yaml-dsl`
- `camel-yaml-dsl-deserializers`
- `camel-yaml-dsl-maven-plugin`
- `coverage`
- `dummy-component`
</details>
> :information_source: Shadow mode — Scalpel observes but does not affect test execution. [Learn more](https://github.com/maveniverse/scalpel)
</details>
<details><summary>All tested modules (38 modules)</summary>
- Camel :: All Components Sync point
- Camel :: Assembly
- Camel :: Catalog :: CSimple Maven Plugin (deprecated)
- Camel :: Catalog :: Camel Catalog
- Camel :: Catalog :: Camel Report Maven Plugin
- Camel :: Catalog :: Camel Route Parser
- Camel :: Catalog :: Console
- Camel :: Catalog :: Dummy Component
- Camel :: Catalog :: Lucene (deprecated)
- Camel :: Catalog :: Maven
- Camel :: Catalog :: Suggest
- Camel :: Component DSL
- Camel :: Coverage
- Camel :: Docs
- Camel :: Endpoint DSL
- Camel :: Endpoint DSL :: Support
- Camel :: Google :: Storage
- Camel :: Integration Tests
- Camel :: JBang :: Core
- Camel :: JBang :: Integration tests
- Camel :: JBang :: MCP
- Camel :: JBang :: Main
- Camel :: JBang :: Plugin :: Edit
- Camel :: JBang :: Plugin :: Generate
- Camel :: JBang :: Plugin :: Kubernetes
- Camel :: JBang :: Plugin :: MCP
- Camel :: JBang :: Plugin :: Route Parser
- Camel :: JBang :: Plugin :: TUI
- Camel :: JBang :: Plugin :: Testing
- Camel :: JBang :: Plugin :: Validate
- Camel :: Kamelet Main
- Camel :: Launcher
- Camel :: Launcher :: Container
- Camel :: YAML DSL
- Camel :: YAML DSL :: Deserializers
- Camel :: YAML DSL :: Maven Plugins
- Camel :: YAML DSL :: Validator
- Camel :: YAML DSL :: Validator Maven Plugin
</details>
---
:gear: [View full build and test results](https://github.com/apache/camel/actions/runs/30341666263)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] CAMEL-24279: camel-google-storage - contain downloadFileName downloads within the configured directory [camel]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #25179:
URL: https://github.com/apache/camel/pull/25179#issuecomment-5102042159
:star2: Thank you for your contribution to the Apache Camel project! :star2:
:robot: CI automation will test this PR automatically.
:camel: Apache Camel Committers, please review the following items:
* First-time contributors **require MANUAL approval** for the GitHub Actions to run
* You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot although they are normally detected and executed by CI.
* You can label PRs using `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR.
* Build and test logs are available in the summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary.
:warning: Be careful when sharing logs. Review their contents before sharing them publicly.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org