Thanks to visit codestin.com
Credit goes to github.com

Skip to content

PXP-11248 PXP-11258 using POST auth/mapping instead of GET to support client credentials authentication #254

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
paulineribeyre merged 6 commits into from
Mar 12, 2024
Merged

PXP-11248 PXP-11258 using POST auth/mapping instead of GET to support client credentials authentication #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ecfd5f2
using POST auth/mapping instead of GET
grugna Feb 7, 2024
d9f8b44
requested changes
grugna Mar 1, 2024
3af1972
remove comment
grugna Mar 6, 2024
9124967
call GET instead of POST /auth/mapping
grugna Mar 6, 2024
632b289
use GET for older version of Arborist where post returns 400 because …
grugna Mar 6, 2024
fd83fbc
fix eslint
grugna Mar 7, 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
2 changes: 1 addition & 1 deletion src/server/__mocks__/mockDataFromES.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ const mockResourcePath = () => {
const mockArborist = () => {
nock(config.arboristEndpoint)
.persist()
.get('/auth/mapping')
.post('/auth/mapping')
.reply(200, {
'internal-project-1': [ // accessible
{
Expand Down
23 changes: 21 additions & 2 deletions src/server/auth/arboristClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,34 @@ class ArboristClient {
// Make request to arborist for list of resources with access
const resourcesEndpoint = `${this.baseEndpoint}/auth/mapping`;
log.debug('[ArboristClient] listAuthorizedResources jwt: ', jwt);

const headers = (jwt) ? { Authorization: `bearer ${jwt}` } : {};
return fetch(
resourcesEndpoint,
{
method: 'GET',
method: 'POST',
Copy link
Contributor

@paulineribeyre paulineribeyre Mar 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a breaking change since the POST endpoint in older Arborist versions does not accept a token. I think we should add a retry here to make it backwards compatible - if the POST request doesn't work, try a GET request.

And a comment explaining the situation - we can remove the retry in a little while, when it will likely not cause issues

headers,
},
).then(
(response) => response.json(),
(response) => {
if (response.status === 400) {
// Retry with GET instead of POST. Older version of Arborist POST auth/mapping
// didn't support token authentication.
// This catch block can be removed in a little while, when it will likely not cause issues
return fetch(
resourcesEndpoint,
{
method: 'GET',
headers,
},
).then((res) => res.json());
}
return response.json();
},
(err) => {
log.error(err);
throw new CodedError(500, err);
},
).then(
(result) => {
const data = {
Expand Down