Skip to content
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

Add proto validation for cursor indexes #4891

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Add proto validation for cursor indexes #4891

merged 2 commits into from
Nov 6, 2024

Conversation

rdimitrov
Copy link
Member

Summary

The following PR adds proto validation for cursor indexes ensuring only base64 encoded strings are accepted.

Ref https://github.com/stacklok/minder-stories/issues/94

Change Type

Mark the type of change your PR introduces:

  • Bug fix (resolves an issue without affecting existing features)
  • Feature (adds new functionality without breaking changes)
  • Breaking change (may impact existing functionalities or require documentation updates)
  • Documentation (updates or additions to documentation)
  • Refactoring or test improvements (no bug fixes or new functionality)

Testing

Outline how the changes were tested, including steps to reproduce and any relevant configurations.
Attach screenshots if helpful.

Review Checklist:

  • Reviewed my own code for quality and clarity.
  • Added comments to complex or tricky code sections.
  • Updated any affected documentation.
  • Included tests that validate the fix or feature.
  • Checked that related changes are merged.

@rdimitrov rdimitrov self-assigned this Nov 6, 2024
@rdimitrov rdimitrov requested a review from a team as a code owner November 6, 2024 13:50
eleftherias
eleftherias previously approved these changes Nov 6, 2024
proto/minder/v1/minder.proto Outdated Show resolved Hide resolved
// an per-rpc basis. Note it is base64 encoded.
string cursor = 1 [
(buf.validate.field).string = {
pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$",
Copy link
Member

Choose a reason for hiding this comment

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

Can we simplify this to "^[[:word:]=]*$"?

Copy link
Member Author

Choose a reason for hiding this comment

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

The one you suggest seems more loose?

Copy link
Member

Choose a reason for hiding this comment

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

It is. We're concerned with very unexpected input, but presumably we will validate the cursor more completely after base64-decoding it, so we just want to rule out truly unexpected characters here.

Copy link
Member Author

@rdimitrov rdimitrov Nov 6, 2024

Choose a reason for hiding this comment

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

I see. Alright, makes sense 👍

@coveralls
Copy link

coveralls commented Nov 6, 2024

Pull Request Test Coverage Report for Build 11708419494

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 2 unchanged lines in 1 file lost coverage.
  • Overall coverage remained the same at 54.763%

Files with Coverage Reduction New Missed Lines %
internal/eea/eea.go 2 73.73%
Totals Coverage Status
Change from base Build 11708262450: 0.0%
Covered Lines: 15534
Relevant Lines: 28366

💛 - Coveralls

Signed-off-by: Radoslav Dimitrov <[email protected]>
pattern: "^[[:word:]=]*$",
max_len: 200,
},
(buf.validate.field).ignore = IGNORE_IF_DEFAULT_VALUE
Copy link
Member

Choose a reason for hiding this comment

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

If you use * as the pattern, you don't actually need this, since it will match a zero-length string. It's fine to leave it, though.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed it in #4895 👍

@rdimitrov rdimitrov merged commit 8c9cbb1 into main Nov 6, 2024
25 checks passed
@rdimitrov rdimitrov deleted the validate-cursor branch November 6, 2024 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants