This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Fix broken diff search if sub-repo perms are enabled#53210
Merged
Conversation
Contributor
|
Codenotify: Notifying subscribers in CODENOTIFY files for diff cf3321c...5ab84e8.
|
erzhtor
approved these changes
Jun 9, 2023
github-actions Bot
pushed a commit
that referenced
this pull request
Jun 9, 2023
(cherry picked from commit 24c34a1)
keegancsmith
reviewed
Jun 9, 2023
keegancsmith
left a comment
Member
There was a problem hiding this comment.
It is surprising to me that authz.CanReadAnyPath doesn't return true if subrepoperms are disabled. That feels like the proper fix?
| - SAML assertions to get user display name are now compared case insensitively and we do not always return an error. [#52992](https://github.com/sourcegraph/sourcegraph/pull/52992) | ||
| - The braindot menu on the blob view no longer fetches data eagerly to prevent performance issues for larger monorepo users. [#53039](https://github.com/sourcegraph/sourcegraph/pull/53039) | ||
| - Fixed an issue where commenting out redacted site-config secrets would re-add the secrets. [#53152](https://github.com/sourcegraph/sourcegraph/pull/53152) | ||
| - Fixed an issue where `type:diff` search would not work when sub-repo permissions are enabeld. [#53210](https://github.com/sourcegraph/sourcegraph/pull/53210) |
| for _, m := range matches { | ||
| enabled, err := authz.SubRepoEnabledForRepo(ctx, checker, m.Key().Repo) | ||
| if err != nil { | ||
| logger.Warn(fmt.Sprintf("Could not determine if sub-repo permissions are enabled for repo %s. Skipping.", m.Key().Repo)) |
Member
There was a problem hiding this comment.
this is not how you should use logger. Pass a message then use log.String("repo", m.Key().Repo) as a parameter
Contributor
Author
There was a problem hiding this comment.
Woops, let me make a follow-up PR. Thanks!
Member
unknwon
pushed a commit
that referenced
this pull request
Jun 14, 2023
…53218) When sub-repo permissions are enabled, the sub-repo permissions filter would be applied to repositories where sub-repo permissions are relevant. This lead to `type:diff` search being broken when sub-repo permissions are enabled, since it would try to filter repositories for which sub-repo permissions do not apply. This PR changes the check to confirm that sub-repo permissions are enabled for the repository being filtered before doing the sub-repo filter, and if the repository does not have sub-repo permissions enabled, the repository is skipped. ## Test plan Verified with manual checks. Added unit test. <!-- All pull requests REQUIRE a test plan: https://docs.sourcegraph.com/dev/background-information/testing_principles --> <br> Backport 24c34a1 from #53210 Co-authored-by: Petri-Johan Last <petri.last@sourcegraph.com>
ErikaRS
pushed a commit
that referenced
this pull request
Jun 22, 2023
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
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.
When sub-repo permissions are enabled, the sub-repo permissions filter would be applied to repositories where sub-repo permissions are relevant. This lead to
type:diffsearch being broken when sub-repo permissions are enabled, since it would try to filter repositories for which sub-repo permissions do not apply.This PR changes the check to confirm that sub-repo permissions are enabled for the repository being filtered before doing the sub-repo filter, and if the repository does not have sub-repo permissions enabled, the repository is skipped.
Test plan
Verified with manual checks. Added unit test.