-
Notifications
You must be signed in to change notification settings - Fork 5.1k
CAMEL-23979: Expose published CVE security advisories via camel-catalog and camel-jbang-mcp #24573
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
oscerd
wants to merge
2
commits into
apache:main
Choose a base branch
from
oscerd:fix/CAMEL-23979
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1,032 changes: 1,032 additions & 0 deletions
1,032
...rc/generated/resources/org/apache/camel/catalog/advisories/camel-security-advisories.json
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
...ang-mcp/src/main/java/org/apache/camel/dsl/jbang/core/commands/mcp/AdvisoryResources.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.camel.dsl.jbang.core.commands.mcp; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import jakarta.enterprise.context.ApplicationScoped; | ||
| import jakarta.inject.Inject; | ||
|
|
||
| import io.quarkiverse.mcp.server.Resource; | ||
| import io.quarkiverse.mcp.server.ResourceTemplate; | ||
| import io.quarkiverse.mcp.server.ResourceTemplateArg; | ||
| import io.quarkiverse.mcp.server.TextResourceContents; | ||
| import org.apache.camel.tooling.model.SecurityAdvisoryModel; | ||
| import org.apache.camel.util.json.JsonArray; | ||
| import org.apache.camel.util.json.JsonObject; | ||
|
|
||
| /** | ||
| * MCP Resources exposing the published Apache Camel CVE security advisories from | ||
| * <a href="https://camel.apache.org/security/">camel.apache.org/security</a> (shipped with the Camel catalog). | ||
| * <p> | ||
| * These resources provide browseable advisory data that clients can pull into context independently of route analysis. | ||
| * When the catalog carries no advisory data, the resources return an explicit {@code advisoryDataUnavailable} marker | ||
| * instead of an empty list, so a missing data set is never mistaken for "no known CVEs". | ||
| */ | ||
| @ApplicationScoped | ||
| public class AdvisoryResources { | ||
|
|
||
| @Inject | ||
| AdvisoryService advisoryService; | ||
|
|
||
| /** | ||
| * All published security advisories (one summary entry per CVE). | ||
| */ | ||
| @Resource(uri = "camel://security/advisories", | ||
| name = "camel_security_advisories_list", | ||
| title = "Published Camel CVE Security Advisories", | ||
| description = "List of all published Apache Camel CVE security advisories (the data behind " | ||
| + "https://camel.apache.org/security/) with severity, summary, fixed versions and link. " | ||
| + "The data ships with the Camel catalog bundled in this MCP server.", | ||
| mimeType = "application/json") | ||
| public TextResourceContents securityAdvisories() { | ||
| JsonObject result = new JsonObject(); | ||
| try { | ||
| JsonArray advisories = new JsonArray(); | ||
| for (SecurityAdvisoryModel advisory : advisoryService.advisories()) { | ||
| JsonObject json = new JsonObject(); | ||
| json.put("cve", advisory.getCve()); | ||
| json.put("severity", advisory.getSeverity()); | ||
| json.put("summary", advisory.getSummary()); | ||
| json.put("fixed", advisory.getFixed()); | ||
| json.put("url", advisory.getUrl()); | ||
| advisories.add(json); | ||
| } | ||
| result.put("advisories", advisories); | ||
| result.put("totalCount", advisories.size()); | ||
| result.put("source", AdvisoryService.SECURITY_PAGE_URL); | ||
| } catch (Exception e) { | ||
| result.put("advisoryDataUnavailable", true); | ||
| result.put("message", e.getMessage()); | ||
| } | ||
| return new TextResourceContents("camel://security/advisories", result.toJson(), "application/json"); | ||
| } | ||
|
|
||
| /** | ||
| * Full detail for a single published security advisory. | ||
| */ | ||
| @ResourceTemplate(uriTemplate = "camel://security/advisory/{cve}", | ||
| name = "camel_security_advisory_detail", | ||
| title = "Camel CVE Security Advisory Detail", | ||
| description = "Full detail for a single published Apache Camel security advisory (by CVE id, " | ||
| + "e.g. CVE-2025-27636) including affected and fixed versions, mitigation and " | ||
| + "affected components.", | ||
| mimeType = "application/json") | ||
| public TextResourceContents securityAdvisoryDetail( | ||
| @ResourceTemplateArg(name = "cve") String cve) { | ||
|
|
||
| String uri = "camel://security/advisory/" + cve; | ||
| String wanted = cve == null ? "" : cve.trim(); | ||
|
|
||
| JsonObject result = new JsonObject(); | ||
| try { | ||
| Optional<SecurityAdvisoryModel> found = advisoryService.advisories().stream() | ||
| .filter(advisory -> advisory.getCve().equalsIgnoreCase(wanted)) | ||
| .findFirst(); | ||
|
|
||
| if (found.isEmpty()) { | ||
| result.put("cve", cve); | ||
| result.put("found", false); | ||
| result.put("message", "No published Apache Camel security advisory found for '" + cve + "'. " | ||
| + "See " + AdvisoryService.SECURITY_PAGE_URL + " for the full list."); | ||
| } else { | ||
| SecurityAdvisoryModel advisory = found.get(); | ||
| result.put("cve", advisory.getCve()); | ||
| result.put("found", true); | ||
| result.put("severity", advisory.getSeverity()); | ||
| result.put("summary", advisory.getSummary()); | ||
| result.put("affected", advisory.getAffected()); | ||
| result.put("fixed", advisory.getFixed()); | ||
| result.put("mitigation", advisory.getMitigation()); | ||
| result.put("date", advisory.getDate()); | ||
| result.put("url", advisory.getUrl()); | ||
| JsonArray components = new JsonArray(); | ||
| components.addAll(advisory.getComponents()); | ||
| result.put("components", components); | ||
| } | ||
| } catch (Exception e) { | ||
| result.put("advisoryDataUnavailable", true); | ||
| result.put("message", e.getMessage()); | ||
| } | ||
| return new TextResourceContents(uri, result.toJson(), "application/json"); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor: per project conventions, new public methods on API interfaces should include a
@sinceJavadoc tag. Consider adding@since 4.22to the method Javadoc.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added
@since 4.22in 3531d80.Claude Code on behalf of oscerd