Skip to content

feat: add support for bitbucket #1899

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.

Sign up for GitHub

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

Draft
leafty wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

feat: add support for bitbucket #1899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeccaba
feat: add support for bitbucket
leafty Jun 10, 2024
78a63df
update git-proxy
leafty Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions git-https-proxy/tokenstore/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ func (s *TokenStore) GetGitAccessToken(provider string, encode bool) (string, er
s.gitAccessTokensLock.RLock()
defer s.gitAccessTokensLock.RUnlock()
if encode {
return encodeGitCredentials(s.gitAccessTokens[provider].AccessToken), nil
gitUser := getGitUser(provider)
return encodeGitCredentials(gitUser, s.gitAccessTokens[provider].AccessToken), nil
}
return s.gitAccessTokens[provider].AccessToken, nil
}
Expand Down Expand Up @@ -228,6 +229,13 @@ func (s *TokenStore) periodicTokenRefresh() {
}
}

func encodeGitCredentials(token string) string {
return base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("oauth2:%s", token)))
func encodeGitCredentials(user string, token string) string {
return base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", user, token)))
}

func getGitUser(provider string) string {
if provider == "bitbucket.org" {
return "x-token-auth"
}
return "oauth2"
}
2 changes: 2 additions & 0 deletions git_services/git_services/init/cloner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ def run_helper(self, repository: Repository, *, storage_mounts: list[str]):

# TODO: Is this something else for non-GitLab providers?
git_user = "oauth2"
if repository.provider == "bitbucket.org":
git_user = "x-token-auth"
git_access_token = (
self._get_access_token(repository.provider) if repository.provider else None
)
Expand Down