Skip to content

Commit 1fccbd3

Browse files
author
Will Toozs
committed
variable name change
1 parent 3f21e42 commit 1fccbd3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+183
-79
lines changed

config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
"clusters": 10,
4949
"log": {
50-
"logLevel": "info",
50+
"logLevel": "trace",
5151
"dumpLevel": "error"
5252
},
5353
"healthChecks": {

lib/api/apiUtils/object/abortMultipartUpload.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ function abortMultipartUpload(authInfo, bucketName, objectKey, uploadId, log,
2222
// but the requestType is the more general 'objectDelete'
2323
const metadataValParams = Object.assign({}, metadataValMPUparams);
2424
metadataValParams.requestType = 'objectPut';
25+
const authzIdentityResult = request ? request.actionImplicitDenies : true;
2526

2627
async.waterfall([
2728
function checkDestBucketVal(next) {
@@ -56,9 +57,15 @@ function abortMultipartUpload(authInfo, bucketName, objectKey, uploadId, log,
5657
function abortExternalMpu(mpuBucket, mpuOverviewObj, destBucket,
5758
next) {
5859
const location = mpuOverviewObj.controllingLocationConstraint;
60+
const originalIdentityImpDenies = request.actionImplicitDenies;
61+
// eslint-disable-next-line no-param-reassign
62+
// eslint-disable-next-line no-param-reassign
63+
delete request.actionImplicitDenies;
5964
return data.abortMPU(objectKey, uploadId, location, bucketName,
6065
request, destBucket, locationConstraintCheck, log,
6166
(err, skipDataDelete) => {
67+
// eslint-disable-next-line no-param-reassign
68+
request.actionImplicitDenies = originalIdentityImpDenies;
6269
if (err) {
6370
return next(err, destBucket);
6471
}

lib/api/bucketGet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ function bucketGet(authInfo, request, log, callback) {
345345
listParams.marker = params.marker;
346346
}
347347

348-
metadataValidateBucket(metadataValParams, request.iamAuthzResults, log, (err, bucket) => {
348+
metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, (err, bucket) => {
349349
const corsHeaders = collectCorsHeaders(request.headers.origin,
350350
request.method, bucket);
351351
if (err) {

lib/api/bucketGetACL.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function bucketGetACL(authInfo, request, log, callback) {
5454
},
5555
};
5656

57-
metadataValidateBucket(metadataValParams, request.iamAuthzResults, log, (err, bucket) => {
57+
metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, (err, bucket) => {
5858
const corsHeaders = collectCorsHeaders(request.headers.origin,
5959
request.method, bucket);
6060
if (err) {

lib/api/bucketGetCors.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function bucketGetCors(authInfo, request, log, callback) {
3535
request.method, bucket);
3636

3737
if (!isBucketAuthorized(bucket, requestType, canonicalID, authInfo,
38-
request.iamAuthzResults, log, request)) {
38+
request.actionImplicitDenies, log, request)) {
3939
log.debug('access denied for user on bucket', {
4040
requestType,
4141
method: 'bucketGetCors',

lib/api/bucketGetEncryption.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function bucketGetEncryption(authInfo, request, log, callback) {
2727
};
2828

2929
return async.waterfall([
30-
next => metadataValidateBucket(metadataValParams, request.iamAuthzResults, log, next),
30+
next => metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, next),
3131
(bucket, next) => checkExpectedBucketOwner(request.headers, bucket, log, err => next(err, bucket)),
3232
(bucket, next) => {
3333
// If sseInfo is present but the `mandatory` flag is not set

lib/api/bucketGetLifecycle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function bucketGetLifecycle(authInfo, request, log, callback) {
2323
requestType: 'bucketGetLifecycle',
2424
request,
2525
};
26-
return metadataValidateBucket(metadataValParams, request.iamAuthzResults, log, (err, bucket) => {
26+
return metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, (err, bucket) => {
2727
const corsHeaders = collectCorsHeaders(headers.origin, method, bucket);
2828
if (err) {
2929
log.debug('error processing request', {

lib/api/bucketGetLocation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function bucketGetLocation(authInfo, request, log, callback) {
3737
request.method, bucket);
3838

3939
if (!isBucketAuthorized(bucket, requestType, canonicalID, authInfo,
40-
request.iamAuthzResults, log, request)) {
40+
request.actionImplicitDenies, log, request)) {
4141
log.debug('access denied for account on bucket', {
4242
requestType,
4343
method: 'bucketGetLocation',

lib/api/bucketGetNotification.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function bucketGetNotification(authInfo, request, log, callback) {
4141
request,
4242
};
4343

44-
return metadataValidateBucket(metadataValParams, request.iamAuthzResults, log, (err, bucket) => {
44+
return metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, (err, bucket) => {
4545
const corsHeaders = collectCorsHeaders(headers.origin, method, bucket);
4646
if (err) {
4747
log.debug('error processing request', {

lib/api/bucketGetObjectLock.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function bucketGetObjectLock(authInfo, request, log, callback) {
3636
requestType: 'bucketGetObjectLock',
3737
request,
3838
};
39-
return metadataValidateBucket(metadataValParams, request.iamAuthzResults, log, (err, bucket) => {
39+
return metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, (err, bucket) => {
4040
const corsHeaders = collectCorsHeaders(headers.origin, method, bucket);
4141
if (err) {
4242
log.debug('error processing request', {

0 commit comments

Comments
 (0)