Skip to content

OCPBUGS-79905: Bump google.golang.org/grpc#398

Open
sbiradar10 wants to merge 1 commit into
openshift:release-4.15from
sbiradar10:OCPBUGS-79905-4.15
Open

OCPBUGS-79905: Bump google.golang.org/grpc#398
sbiradar10 wants to merge 1 commit into
openshift:release-4.15from
sbiradar10:OCPBUGS-79905-4.15

Conversation

@sbiradar10

@sbiradar10 sbiradar10 commented May 26, 2026

Copy link
Copy Markdown

https://redhat.atlassian.net/browse/OCPBUGS-79905

Bump google.golang.org/grpc to v1.67.3-sec.1 using below command:

go mod edit -replace google.golang.org/grpc=github.com/openshift-sustaining/grpc-go@v1.64.1-sec.1

Summary by CodeRabbit

  • Bug Fixes
    • Improved gRPC server request handling by adding validation to ensure proper request path formatting across the Cinder CSI driver, Manila CSI driver, and KMS server components.

@coderabbitai

coderabbitai Bot commented May 26, 2026

Copy link
Copy Markdown

Walkthrough

Three OpenStack service drivers (Cinder CSI, Manila CSI, and KMS) are updated with identical gRPC unary interceptors that validate request FullMethod formatting. Each adds the required imports and implements a validation interceptor that rejects requests with empty or malformed paths, returning codes.Unimplemented errors to mitigate CVE-2026-33186.

Changes

gRPC path validation across services

Layer / File(s) Summary
Cinder CSI path validation
pkg/csi/cinder/server.go
Cinder CSI driver adds gRPC codes/status imports and a pathValidationInterceptor that validates FullMethod format before delegating to the handler; wires it via grpc.ChainUnaryInterceptor.
Manila CSI path validation
pkg/csi/manila/driver.go
Manila CSI driver adds gRPC codes/status imports and a pathValidationInterceptor that validates FullMethod format before delegating to the handler; wires it via grpc.ChainUnaryInterceptor.
KMS server path validation
pkg/kms/server/server.go
KMS server adds gRPC codes/status imports and a unary interceptor that validates FullMethod format; replaces default gRPC server creation with one that uses grpc.UnaryInterceptor.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes


Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 error, 1 warning)

Check name Status Explanation Resolution
Ote Binary Stdout Contract ❌ Error pkg/kms/server/server.go line 100 contains fmt.Println() in the Run() function (process-level entry point), which writes non-JSON data to stdout, corrupting OTE test communication. Replace fmt.Println("force stop, shutting down grpc server") with klog.Infof() or write to os.Stderr to maintain OTE stdout contract.
Test Structure And Quality ⚠️ Warning Ginkgo tests in tests/e2e/csi/manila/manilavolume.go lack assertion messages at lines 66 and 91, violating the requirement for meaningful failure messages. Add meaningful failure messages to Expect() assertions in Ginkgo tests to help diagnose failures, per the custom check requirement for assertion messages.
✅ Passed checks (13 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The PR title references a ticket (OCPBUGS-79905) and mentions bumping a gRPC dependency, which aligns with the actual changes that add gRPC interceptors for CVE-2026-33186 mitigation across multiple files.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed This PR modifies gRPC server files for CVE mitigation. No Ginkgo tests exist in the repository - the codebase uses standard Go testing with testify, not Ginkgo.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests added. PR contains only gRPC server code changes for CVE-2026-33186 mitigation, not test files.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests were added in this PR. Changes are only to production code files (CSI/KMS servers), so the SNO compatibility check does not apply.
Topology-Aware Scheduling Compatibility ✅ Passed PR only modifies gRPC server interceptors for CVE-2026-33186 mitigation; introduces no Kubernetes scheduling constraints, deployment manifests, or topology-assuming code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No Ginkgo e2e tests are added in this PR. Changes are limited to gRPC server interceptor additions in production code (cinder, manila, kms servers) for CVE mitigation. Check does not apply.
No-Weak-Crypto ✅ Passed No weak cryptography, custom crypto implementations, or improper secret comparisons found. Changes only add gRPC method name validation as CVE-2026-33186 mitigation.
Container-Privileges ✅ Passed PR modifies only Go source code (gRPC interceptors for CVE mitigation); no container/K8s manifest privilege settings were added or modified.
No-Sensitive-Data-In-Logs ✅ Passed New pathValidationInterceptor only logs "malformed method name" error. Existing logging uses protosanitizer.StripSecrets(). No sensitive data exposure introduced.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (2.12.2)

Error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions
The command is terminated due to an error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions


Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 26, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@sbiradar10: This pull request references Jira Issue OCPBUGS-79905, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected dependent Jira Issue OCPBUGS-79978 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ASSIGNED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

https://redhat.atlassian.net/browse/OCPBUGS-79905

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot

Copy link
Copy Markdown

@sbiradar10: An error was encountered searching for bug OCPBUGS-79905 on the Jira server at https://redhat.atlassian.net. No known errors were detected, please see the full error message for details.

Full error message. No response returned: Get "https://redhat.atlassian.net/rest/api/2/issue/OCPBUGS-79905": GET https://redhat.atlassian.net/rest/api/2/issue/OCPBUGS-79905 giving up after 5 attempt(s)

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

Details

In response to this:

https://redhat.atlassian.net/browse/OCPBUGS-79905

Bump google.golang.org/grpc to v1.67.3-sec.1 using below command:

go mod edit -replace google.golang.org/grpc=github.com/openshift-sustaining/grpc-go@v1.64.1-sec.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot requested review from mdbooth and stephenfin May 26, 2026 17:49
@sbiradar10

Copy link
Copy Markdown
Author

/test e2e-openstack

1 similar comment
@sbiradar10

Copy link
Copy Markdown
Author

/test e2e-openstack

@ekuris-redhat ekuris-redhat left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM. The grpc bump and all transitive dependencies (otel, proto/otlp, grpc-gateway) are aligned coherently , no version mismatches. All CI checks pass.

@stephenfin

Copy link
Copy Markdown

/lgtm
/approve
/verified by CI
/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 4, 2026
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 4, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@stephenfin: This PR has been marked as verified by CI.

Details

In response to this:

/lgtm
/approve
/verified by CI
/label backport-risk-assessed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 4, 2026
@openshift-ci

openshift-ci Bot commented Jun 4, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbiradar10, stephenfin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 4, 2026
@sbiradar10

Copy link
Copy Markdown
Author

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 5, 2026
…y with lower versions where fork can't be used
@rh-akhatavk rh-akhatavk force-pushed the OCPBUGS-79905-4.15 branch from 4a89594 to 76a4166 Compare June 9, 2026 13:51
@openshift-ci-robot openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Jun 9, 2026
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 9, 2026
@openshift-ci

openshift-ci Bot commented Jun 9, 2026

Copy link
Copy Markdown

New changes are detected. LGTM label has been removed.

@rh-akhatavk

Copy link
Copy Markdown

@coderabbitai review

@coderabbitai

coderabbitai Bot commented Jun 9, 2026

Copy link
Copy Markdown
✅ Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@openshift-ci-robot

Copy link
Copy Markdown

@sbiradar10: This pull request references Jira Issue OCPBUGS-79905, which is invalid:

  • expected dependent Jira Issue OCPBUGS-79978 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ASSIGNED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

https://redhat.atlassian.net/browse/OCPBUGS-79905

Bump google.golang.org/grpc to v1.67.3-sec.1 using below command:

go mod edit -replace google.golang.org/grpc=github.com/openshift-sustaining/grpc-go@v1.64.1-sec.1

Summary by CodeRabbit

  • Bug Fixes
  • Improved gRPC server request handling by adding validation to ensure proper request path formatting across the Cinder CSI driver, Manila CSI driver, and KMS server components.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🧹 Nitpick comments (3)
pkg/csi/cinder/server.go (1)

28-31: 💤 Low value

Import grouping: context should be with standard library imports.

The context package is part of the Go standard library and should be grouped with net, os, and sync at the top of the import block for idiomatic Go style.

Suggested fix
 import (
+	"context"
 	"net"
 	"os"
 	"sync"

 	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	"k8s.io/klog/v2"

 	"github.com/container-storage-interface/spec/lib/go/csi"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"context"
 )
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@pkg/csi/cinder/server.go` around lines 28 - 31, Move the "context" import
into the standard-library import group at the top of the import block so it sits
with other stdlib packages (e.g., net/os/sync) instead of the gRPC imports;
adjust the import grouping in pkg/csi/cinder/server.go so "context" is listed in
the first import group and the grpc packages ("google.golang.org/grpc/codes",
"google.golang.org/grpc/status") remain in the third-party group.
pkg/kms/server/server.go (1)

16-18: 💤 Low value

Minor: Remove extra blank line before new imports.

Same grouping suggestion as the other files - place these imports directly with the google.golang.org/grpc import at line 10.

Suggested fix
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	gcfg "gopkg.in/gcfg.v1"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@pkg/kms/server/server.go` around lines 16 - 18, Remove the extra blank line
in the import block so the grpc subpackages "google.golang.org/grpc/codes" and
"google.golang.org/grpc/status" are grouped with the existing
"google.golang.org/grpc" import; update the import block containing those
symbols to be contiguous (no blank line) to match the import grouping used
elsewhere.
pkg/csi/manila/driver.go (1)

36-38: 💤 Low value

Minor: Remove extra blank line before new imports.

The blank line at line 36 before the new imports is unnecessary. The grpc/codes and grpc/status imports should be grouped directly with the other google.golang.org/grpc import.

Suggested fix
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	"k8s.io/cloud-provider-openstack/pkg/csi/manila/csiclient"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@pkg/csi/manila/driver.go` around lines 36 - 38, Remove the stray blank line
in the import block so the new imports "google.golang.org/grpc/codes" and
"google.golang.org/grpc/status" are grouped with the existing
"google.golang.org/grpc" import; edit the import block in
pkg/csi/manila/driver.go (the file-level import section) to place those two
imports directly alongside the other google.golang.org/grpc import entries
without extra spacing.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In `@pkg/csi/cinder/server.go`:
- Around line 28-31: Move the "context" import into the standard-library import
group at the top of the import block so it sits with other stdlib packages
(e.g., net/os/sync) instead of the gRPC imports; adjust the import grouping in
pkg/csi/cinder/server.go so "context" is listed in the first import group and
the grpc packages ("google.golang.org/grpc/codes",
"google.golang.org/grpc/status") remain in the third-party group.

In `@pkg/csi/manila/driver.go`:
- Around line 36-38: Remove the stray blank line in the import block so the new
imports "google.golang.org/grpc/codes" and "google.golang.org/grpc/status" are
grouped with the existing "google.golang.org/grpc" import; edit the import block
in pkg/csi/manila/driver.go (the file-level import section) to place those two
imports directly alongside the other google.golang.org/grpc import entries
without extra spacing.

In `@pkg/kms/server/server.go`:
- Around line 16-18: Remove the extra blank line in the import block so the grpc
subpackages "google.golang.org/grpc/codes" and "google.golang.org/grpc/status"
are grouped with the existing "google.golang.org/grpc" import; update the import
block containing those symbols to be contiguous (no blank line) to match the
import grouping used elsewhere.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 3e81c164-ac41-4261-b92a-531cb4293a37

📥 Commits

Reviewing files that changed from the base of the PR and between 3cd8085 and 76a4166.

📒 Files selected for processing (3)
  • pkg/csi/cinder/server.go
  • pkg/csi/manila/driver.go
  • pkg/kms/server/server.go

@rh-akhatavk

Copy link
Copy Markdown

/test e2e-openstack-csi-manila

@rh-akhatavk

Copy link
Copy Markdown

/test e2e-openstack-csi-cinder

@openshift-ci

openshift-ci Bot commented Jun 10, 2026

Copy link
Copy Markdown

@sbiradar10: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@rh-akhatavk

Copy link
Copy Markdown

/verified by CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 10, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@rh-akhatavk: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@rh-akhatavk

Copy link
Copy Markdown

/unhold

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 10, 2026
@kunalmemane

Copy link
Copy Markdown
Member

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 11, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@kunalmemane: This pull request references Jira Issue OCPBUGS-79905, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-79978 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-79978 targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (ocp-sustaining-admins@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@sbiradar10

Copy link
Copy Markdown
Author

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants