Skip to content

Fixing SAST vulnerabilities. #390

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

Merged
1 commit merged into from
Apr 14, 2022
Merged

Fixing SAST vulnerabilities. #390

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 33 additions & 9 deletions internal/wrappers/bitbucket-http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,34 +38,49 @@ func NewBitbucketWrapper() BitBucketWrapper {
}
}

func (g *BitBucketHTTPWrapper) GetworkspaceUUID(bitBucketURL, workspaceName, bitBucketUsername, bitBucketPassword string) (BitBucketRootWorkspace, error) {
func (g *BitBucketHTTPWrapper) GetworkspaceUUID(bitBucketURL, workspaceName, bitBucketUsername, bitBucketPassword string) (
BitBucketRootWorkspace, error,
) {
var err error
var workspace BitBucketRootWorkspace
var queryParams = make(map[string]string)

workspaceURL := fmt.Sprintf(bitBucketBaseWorkspaceURL, bitBucketURL, workspaceName)

err = g.get(workspaceURL, encodeBitBucketAuth(bitBucketUsername, bitBucketPassword), &workspace, queryParams)
err = g.getFromBitBucket(
workspaceURL,
encodeBitBucketAuth(bitBucketUsername, bitBucketPassword),
&workspace,
queryParams)

return workspace, err
}

func (g *BitBucketHTTPWrapper) GetRepoUUID(bitBucketURL, workspaceName, repoName, bitBucketUsername, bitBucketPassword string) (BitBucketRootRepo, error) {
func (g *BitBucketHTTPWrapper) GetRepoUUID(bitBucketURL, workspaceName, repoName, bitBucketUsername, bitBucketPassword string) (
BitBucketRootRepo, error,
) {
var err error
var repo BitBucketRootRepo
var queryParams = make(map[string]string)

repoURL := fmt.Sprintf(bitBucketBaseRepoNameURL, bitBucketURL, workspaceName, repoName)
err = g.get(repoURL, encodeBitBucketAuth(bitBucketUsername, bitBucketPassword), &repo, queryParams)
err = g.getFromBitBucket(repoURL, encodeBitBucketAuth(bitBucketUsername, bitBucketPassword), &repo, queryParams)

return repo, err
}

func (g *BitBucketHTTPWrapper) GetCommits(bitBucketURL, workspaceUUID, repoUUID, bitBucketUsername, bitBucketPassword string) (BitBucketRootCommit, error) {
func (g *BitBucketHTTPWrapper) GetCommits(bitBucketURL, workspaceUUID, repoUUID, bitBucketUsername, bitBucketPassword string) (
BitBucketRootCommit, error,
) {
var commits BitBucketRootCommit
var queryParams = make(map[string]string)
repoURL := fmt.Sprintf(bitBucketBaseCommitURL, bitBucketURL, workspaceUUID, repoUUID)
pages, err := getWithPaginationBitBucket(g.client, repoURL, encodeBitBucketAuth(bitBucketUsername, bitBucketPassword), commitType, queryParams)
pages, err := getWithPaginationBitBucket(
g.client,
repoURL,
encodeBitBucketAuth(bitBucketUsername, bitBucketPassword),
commitType,
queryParams)
if err != nil {
return commits, err
}
Expand Down Expand Up @@ -93,11 +108,18 @@ func (g *BitBucketHTTPWrapper) GetCommits(bitBucketURL, workspaceUUID, repoUUID,
return commits, err
}

func (g *BitBucketHTTPWrapper) GetRepositories(bitBucketURL, workspaceName, bitBucketUsername, bitBucketPassword string) (BitBucketRootRepoList, error) {
func (g *BitBucketHTTPWrapper) GetRepositories(bitBucketURL, workspaceName, bitBucketUsername, bitBucketPassword string) (
BitBucketRootRepoList, error,
) {
var repos BitBucketRootRepoList
var queryParams = make(map[string]string)
repoURL := fmt.Sprintf(bitBucketBaseRepoURL, bitBucketURL, workspaceName)
pages, err := getWithPaginationBitBucket(g.client, repoURL, encodeBitBucketAuth(bitBucketUsername, bitBucketPassword), repoType, queryParams)
pages, err := getWithPaginationBitBucket(
g.client,
repoURL,
encodeBitBucketAuth(bitBucketUsername, bitBucketPassword),
repoType,
queryParams)
if err != nil {
return repos, err
}
Expand All @@ -117,7 +139,9 @@ func (g *BitBucketHTTPWrapper) GetRepositories(bitBucketURL, workspaceName, bitB
return repos, err
}

func (g *BitBucketHTTPWrapper) get(url, token string, target interface{}, queryParams map[string]string) error {
func (g *BitBucketHTTPWrapper) getFromBitBucket(
url, token string, target interface{}, queryParams map[string]string,
) error {
var err error

PrintIfVerbose(fmt.Sprintf("Request to %s", url))
Expand Down