Skip to content
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

Bitbucket Server: Send password as Bearer instead of Basic Auth #2461

Merged
merged 3 commits into from
Oct 31, 2022
Merged

Bitbucket Server: Send password as Bearer instead of Basic Auth #2461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cba73b0
Bitbucket Server: Send password as Bearer instead of Basic Auth
Dev25 Aug 19, 2022
fea8ed5
docs: Add Bearer note for Bitbucket Server auth
Dev25 Oct 31, 2022
5846c70
Merge branch 'master' into bitbucket-bearer-auth
Dev25 Oct 31, 2022
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
2 changes: 2 additions & 0 deletions runatlantis.io/docs/access-credentials.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ Since v0.19.7, a new permission for `Administration` has been added. If you have
- Give the token **Read** Project permissions and **Write** Pull request permissions
- Click **Create** and record the access token

NOTE: Atlantis will send the token as a [Bearer Auth to the Bitbucket API](https://confluence.atlassian.com/bitbucketserver/http-access-tokens-939515499.html#HTTPaccesstokens-UsingHTTPaccesstokens) instead of using Basic Auth.

### Azure DevOps
- Create a Personal access token by following [https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate?view=azure-devops](https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate?view=azure-devops)
- Label the password "atlantis"
Expand Down
6 changes: 5 additions & 1 deletion server/events/vcs/bitbucketserver/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,11 @@ func (b *Client) prepRequest(method string, path string, body io.Reader) (*http.
if err != nil {
return nil, err
}
req.SetBasicAuth(b.Username, b.Password)

// Personal access tokens can be sent as basic auth or bearer
bearer := "Bearer " + b.Password
req.Header.Add("Authorization", bearer)

if body != nil {
req.Header.Add("Content-Type", "application/json")
}
Expand Down