fix: change clone URL check for gitlab to account for possible subpath #5177
+29
−2
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
…ted with subpath Signed-off-by: Philipp Winkler <[email protected]>
philslab-ninja
requested review from
GenPage,
lukemassa and
nitrocode
and removed request for
a team
chenrui333
previously approved these changes
Dec 31, 2024
jamengual
added
waiting-on-response
…ab instances hosted with subpath Signed-off-by: Philipp Winkler <[email protected]>
Hi @chenrui333 - thanks for your review and apololgies for taking so long. I have now added a test for the new functionality |
X-Guardian
requested changes
Jan 25, 2025
| if vcsHostType == Gitlab { | ||
| // For GitLab, we need to check if the path ends with our expected path | ||
| // This handles cases where GitLab is hosted at a subpath (e.g., acme.com/gitlab) | ||
| if !strings.HasSuffix(cloneURLParsed.Path, expClonePath) { |
There was a problem hiding this comment.
This is now not checking that the hostname is as expected, so needs adding as a second check. A test also needs adding for this scenario.
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.
what
This change allows GitLab URLs that include a subpath in the hostname while maintaining the security checks for repository path validation. The validation will pass as long as the full URL path ends with the expected repository path, which accommodates the case where ATLANTIS_GITLAB_HOSTNAME includes a path component.
why
In one of my projects github enterprise unfortunately was setup with a basepath (like git.acme.com/gitlab). Setting ATLANTIS_GITLAB_HOSTNAME to git.acme.com/gitlab results in an error like:
expected clone url to have path "/path/to/repo.git" but had "/gitlab/path/to/repo.git"
tests
references
closes #1450