Skip to content

Address Security issues in Connector and Agent #4380

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Address Security issues in Connector and Agent #4380

wants to merge 1 commit into from
+92 −18

Conversation

@rithin-pullela-aws
Copy link
Contributor

@rithin-pullela-aws rithin-pullela-aws commented Oct 30, 2025 •
edited
Loading

Description

This PR addresses some security issues:
Connector:

  • Prevent 500 errors when connector params like Action type, method, and URL are NULL.
  • Prevent User input reflection in connector. protocol
  • Prevent 500 level errors when Connector creds and backend roles are not not valid

Agent:

  • Prevent printing unknown Agent ID
  • Prevent printing unknown trace/ message ID in traces API
  • Prevent 500 error when agent ID is unknown

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@rithin-pullela-aws
Address Security issues
caee2ef 
Signed-off-by: rithin-pullela-aws <[email protected]>
@rithin-pullela-aws rithin-pullela-aws temporarily deployed to ml-commons-cicd-env-require-approval October 30, 2025 22:41 — with GitHub Actions Inactive
@rithin-pullela-aws rithin-pullela-aws temporarily deployed to ml-commons-cicd-env-require-approval October 30, 2025 22:41 — with GitHub Actions Inactive
@rithin-pullela-aws rithin-pullela-aws had a problem deploying to ml-commons-cicd-env-require-approval October 30, 2025 22:41 — with GitHub Actions Error
@rithin-pullela-aws rithin-pullela-aws had a problem deploying to ml-commons-cicd-env-require-approval October 30, 2025 22:41 — with GitHub Actions Failure
mingshl
mingshl approved these changes Oct 30, 2025
View reviewed changes
Copy link
Collaborator

@mingshl mingshl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@rithin-pullela-aws
Copy link
Contributor Author

rithin-pullela-aws commented Oct 31, 2025

Failed because of irrelevant error:

REPRODUCE WITH: ./gradlew ':opensearch-ml-plugin:test' --tests 'org.opensearch.ml.action.prediction.PredictionITTests.testPredictionWithDataFrame_FitRCF' -Dtests.seed=29336B35042075 -Dtests.security.manager=false -Dtests.locale=en-MV -Dtests.timezone=Europe/Samara -Druntime.java=24

PredictionITTests > testPredictionWithDataFrame_FitRCF FAILED
    CircuitBreakingException[Disk Circuit Breaker is open, please check your resources!]
        at __randomizedtesting.SeedInfo.seed([29336B35042075:981D7B7DE6199531]:0)
        at app//org.opensearch.ml.utils.MLNodeUtils.checkOpenCircuitBreaker(MLNodeUtils.java:138)
        at app//org.opensearch.ml.task.MLTaskRunner.checkCBAndExecute(MLTaskRunner.java:157)
        at app//org.opensearch.ml.task.MLTaskRunner.lambda$dispatchTask$0(MLTaskRunner.java:116)
        at app//org.opensearch.core.action.ActionListener$1.onResponse(ActionListener.java:82)
        at app//org.opensearch.ml.task.MLTaskDispatcher.dispatchTaskWithRoundRobin(MLTaskDispatcher.java:99)
        at app//org.opensearch.ml.task.MLTaskDispatcher.dispatchTaskWithRoundRobin(MLTaskDispatcher.java:177)
        at app//org.opensearch.ml.task.MLTaskDispatcher.dispatch(MLTaskDispatcher.java:69)
        at app//org.opensearch.ml.task.MLTaskRunner.dispatchTask(MLTaskRunner.java:111)
        at app//org.opensearch.ml.task.MLTaskRunner.run(MLTaskRunner.java:94)
        at app//org.opensearch.ml.action.training.TransportTrainingTaskAction.doExecute(TransportTrainingTaskAction.java:42)
        at app//org.opensearch.action.support.TransportAction$RequestFilterChain.proceed(TransportAction.java:220)
        at app//org.opensearch.action.support.TransportAction.execute(TransportAction.java:190)
        at app//org.opensearch.action.support.TransportAction.execute(TransportAction.java:109)
        at app//org.opensearch.transport.client.node.NodeClient.executeLocally(NodeClient.java:113)
        at app//org.opensearch.transport.client.node.NodeClient.doExecute(NodeClient.java:100)
        at app//org.opensearch.transport.client.support.AbstractClient.execute(AbstractClient.java:501)
        at app//org.opensearch.transport.client.FilterClient.doExecute(FilterClient.java:83)
        at app//org.opensearch.transport.client.support.AbstractClient.execute(AbstractClient.java:501)
        at app//org.opensearch.transport.client.support.AbstractClient.execute(AbstractClient.java:488)
        at app//org.opensearch.ml.action.MLCommonsIntegTestCase.trainModel(MLCommonsIntegTestCase.java:263)
        at app//org.opensearch.ml.action.MLCommonsIntegTestCase.trainBatchRCFWithDataFrame(MLCommonsIntegTestCase.java:233)
        at app//org.opensearch.ml.action.prediction.PredictionITTests.setUp(PredictionITTests.java:77)

@rithin-pullela-aws rithin-pullela-aws had a problem deploying to ml-commons-cicd-env-require-approval October 31, 2025 00:20 — with GitHub Actions Failure
@rithin-pullela-aws rithin-pullela-aws had a problem deploying to ml-commons-cicd-env-require-approval October 31, 2025 00:20 — with GitHub Actions Error
@rithin-pullela-aws rithin-pullela-aws had a problem deploying to ml-commons-cicd-env-require-approval October 31, 2025 01:07 — with GitHub Actions Failure
@rithin-pullela-aws rithin-pullela-aws had a problem deploying to ml-commons-cicd-env-require-approval October 31, 2025 06:10 — with GitHub Actions Failure
@rithin-pullela-aws rithin-pullela-aws had a problem deploying to ml-commons-cicd-env-require-approval October 31, 2025 06:10 — with GitHub Actions Error
akolarkunnu
akolarkunnu reviewed Oct 31, 2025
View reviewed changes
common/src/main/java/org/opensearch/ml/common/transport/connector/MLCreateConnectorInput.java
if (parser.currentToken() != XContentParser.Token.VALUE_STRING
&& parser.currentToken() != XContentParser.Token.VALUE_NULL) {
throw new IllegalArgumentException(
"Credential values must be strings, found invalid type: " + parser.currentToken()
Copy link
Contributor

@akolarkunnu akolarkunnu Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to avoid putting credential token in the exception string ?

Copy link
Contributor Author

@rithin-pullela-aws rithin-pullela-aws Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

parser.currentToken does not print the value itself but rather the type of object.

.../src/test/java/org/opensearch/ml/common/transport/connector/MLCreateConnectorInputTests.java
});
assertEquals("Connector protocol is null", exception.getMessage());
assertEquals(
"Connector protocol is null. Please use one of [aws_sigv4, http, mcp_sse, mcp_streamable_http]",
Copy link
Contributor

@akolarkunnu akolarkunnu Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to use ConnectorProtocols.VALID_PROTOCOLS here also, Otherwise we need to keep on changing this exception string here whenever we add new protocols.
Or use contains() API and remove the protocol list part.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ylwu-amzn ylwu-amzn ylwu-amzn approved these changes

@mingshl mingshl mingshl approved these changes

@b4sjoo b4sjoo Awaiting requested review from b4sjoo b4sjoo is a code owner

@dhrubo-os dhrubo-os Awaiting requested review from dhrubo-os dhrubo-os is a code owner

@jngz-es jngz-es Awaiting requested review from jngz-es jngz-es is a code owner

@model-collapse model-collapse Awaiting requested review from model-collapse model-collapse is a code owner

@rbhavna rbhavna Awaiting requested review from rbhavna rbhavna is a code owner

@zane-neo zane-neo Awaiting requested review from zane-neo zane-neo is a code owner

@Zhangxunmt Zhangxunmt Awaiting requested review from Zhangxunmt Zhangxunmt is a code owner

@austintlee austintlee Awaiting requested review from austintlee austintlee is a code owner

@HenryL27 HenryL27 Awaiting requested review from HenryL27 HenryL27 is a code owner

@sam-herman sam-herman Awaiting requested review from sam-herman sam-herman is a code owner

@xinyual xinyual Awaiting requested review from xinyual xinyual is a code owner

@pyek-bot pyek-bot Awaiting requested review from pyek-bot pyek-bot is a code owner

+1 more reviewer

@akolarkunnu akolarkunnu akolarkunnu left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport 3.3

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@rithin-pullela-aws @akolarkunnu @ylwu-amzn @mingshl @pyek-bot