Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 lib/api/apiUtils/authorization/prepareRequestContexts.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ function prepareRequestContexts(apiMethod, request, sourceBucket,
requestContexts.push(generateRequestContext('listObjectsV2OptionalAttributes'));
}
} else if (apiMethodAfterVersionCheck === 'objectGetAttributes') {
if (request.headers['x-amz-version-id']) {
if (request.query?.versionId) {
requestContexts.push(
generateRequestContext('objectGetVersion'),
generateRequestContext('objectGetVersionAttributes'),
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenko/cloudserver",
"version": "9.3.3",
"version": "9.3.4",
"description": "Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol",
"main": "index.js",
"engines": {
Expand Down
18 changes: 8 additions & 10 deletions tests/unit/api/apiUtils/authorization/prepareRequestContexts.js
Original file line number Diff line number Diff line change
Expand Up @@ -448,25 +448,23 @@ describe('prepareRequestContexts', () => {
});
});

describe('x-amz-version-id header', () => {
it('should return version-specific actions with x-amz-version-id', () => {
describe('versionId query param', () => {
it('should return version-specific actions with versionId query param', () => {
const apiMethod = 'objectGetAttributes';
const request = makeRequest({
'x-amz-version-id': '0987654323456789',
});
const request = makeRequest({}, { versionId: '0987654323456789' });
const results = prepareRequestContexts(apiMethod, request, sourceBucket, sourceObject, sourceVersionId);

assert.strictEqual(results.length, 2);
assert.strictEqual(results[0].getAction(), 's3:GetObjectVersion');
assert.strictEqual(results[1].getAction(), 's3:GetObjectVersionAttributes');
});

it('should include scality:GetObjectAttributes with x-amz-version-id and x-amz-meta', () => {
it('should include scality:GetObjectAttributes with versionId query param and x-amz-meta', () => {
const apiMethod = 'objectGetAttributes';
const request = makeRequest({
'x-amz-version-id': '0987654323456789',
'x-amz-object-attributes': 'x-amz-meta-department',
});
const request = makeRequest(
{ 'x-amz-object-attributes': 'x-amz-meta-department' },
{ versionId: '0987654323456789' }
);
const results = prepareRequestContexts(apiMethod, request, sourceBucket, sourceObject, sourceVersionId);

assert.strictEqual(results.length, 3);
Expand Down
Loading