Ensure repository names don't start with ~
#16564
Closed
Conversation
This file contains 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
fmeum
force-pushed
the
one-does-not-simply-start-with-a-tilde
branch
3 times, most recently
from
f943c03 to
a66e356
Compare
fmeum
changed the title
~~
ShreeM01
added
team-ExternalDeps
| } else { | ||
| nonEmptyRepoPart = repoName; | ||
| } | ||
| String bestName = nonEmptyRepoPart + "~" + id.getExtensionName(); |
There was a problem hiding this comment.
Nit: Maybe we also check if id.getExtensionName() is empty? It probably should be done early: https://cs.opensource.google/bazel/bazel/+/master:src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileGlobals.java;l=407
There was a problem hiding this comment.
It's not strictly necessary since a path ending but not starting with a tilde should not require escaping.
Wouldn't an empty extensionName already lead to an error since it needs to name a Starlark export in the file and these cannot have empty names?
| // not start with a tilde. | ||
| String repoName = id.getBzlFileLabel().getRepository().getName(); | ||
| String nonEmptyRepoPart; | ||
| if (repoName.isEmpty()) { |
There was a problem hiding this comment.
Nit: maybe id.getBzlFileLabel().getRepository().isMain() is a bit more clear? Since other Bazel modules should have a non-empty repo name
fmeum
force-pushed
the
one-does-not-simply-start-with-a-tilde
branch
from
a66e356 to
445de0b
Compare
meteorcloudy
approved these changes
Oct 27, 2022
| } else { | ||
| nonEmptyRepoPart = repoName; | ||
| } | ||
| String bestName = nonEmptyRepoPart + "~" + id.getExtensionName(); |
Wyverald
approved these changes
Oct 27, 2022
Wyverald
added
awaiting-PR-merge
|
@bazel-io flag |
bazel-io
added
the
potential release blocker
|
@bazel-io fork 6.0.0 |
bazel-io
removed
the
potential release blocker
sgowroji
removed
the
awaiting-PR-merge
fmeum
added a commit
to fmeum/bazel
that referenced
this pull request
Oct 27, 2022
By ensuring that repository names do not start with `~`, runfiles paths are certain not to begin with tildes, which means that they don't need to be shell escaped. Prevents bazelbuild#16560 (comment) Closes bazelbuild#16564. PiperOrigin-RevId: 484232215 Change-Id: Ie70940aa709f6c7a886564189a3579780731dca6
ShreeM01
pushed a commit
that referenced
this pull request
Oct 27, 2022
By ensuring that repository names do not start with `~`, runfiles paths are certain not to begin with tildes, which means that they don't need to be shell escaped. Prevents #16560 (comment) Closes #16564. PiperOrigin-RevId: 484232215 Change-Id: Ie70940aa709f6c7a886564189a3579780731dca6
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
By ensuring that repository names do not start with
~, runfiles paths are certain not to begin with tildes, which means that they don't need to be shell escaped.Prevents #16560 (comment)