Skip to content

Commit 9bf9130

Browse files
author
Will Toozs
committed
change variable name
1 parent b4a986e commit 9bf9130

27 files changed

+109
-109
lines changed

‎lib/api/apiUtils/object/abortMultipartUpload.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +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.iamAuthzResults : true;
25+
const authzIdentityResult = request ? request.actionImplicitDenies : true;
2626

2727
async.waterfall([
2828
function checkDestBucketVal(next) {
@@ -57,15 +57,15 @@ function abortMultipartUpload(authInfo, bucketName, objectKey, uploadId, log,
5757
function abortExternalMpu(mpuBucket, mpuOverviewObj, destBucket,
5858
next) {
5959
const location = mpuOverviewObj.controllingLocationConstraint;
60-
const originalIdentityAuthzResults = request.iamAuthzResults;
60+
const originalIdentityImpDenies = request.actionImplicitDenies;
6161
// eslint-disable-next-line no-param-reassign
6262
// eslint-disable-next-line no-param-reassign
63-
delete request.iamAuthzResults;
63+
delete request.actionImplicitDenies;
6464
return data.abortMPU(objectKey, uploadId, location, bucketName,
6565
request, destBucket, locationConstraintCheck, log,
6666
(err, skipDataDelete) => {
6767
// eslint-disable-next-line no-param-reassign
68-
request.iamAuthzResults = originalIdentityAuthzResults;
68+
request.actionImplicitDenies = originalIdentityImpDenies;
6969
if (err) {
7070
return next(err, destBucket);
7171
}

‎lib/api/bucketHead.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function bucketHead(authInfo, request, log, callback) {
2121
requestType: 'bucketHead',
2222
request,
2323
};
24-
metadataValidateBucket(metadataValParams, request.iamAuthzResults, log, (err, bucket) => {
24+
metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, (err, bucket) => {
2525
const corsHeaders = collectCorsHeaders(request.headers.origin,
2626
request.method, bucket);
2727
if (err) {

‎lib/api/completeMultipartUpload.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ function completeMultipartUpload(authInfo, request, log, callback) {
120120
// at the destinationBucket level are same as objectPut
121121
requestType: 'objectPut',
122122
};
123-
metadataValidateBucketAndObj(metadataValParams, request.iamAuthzResults, log, next);
123+
metadataValidateBucketAndObj(metadataValParams, request.actionImplicitDenies, log, next);
124124
},
125125
function validateMultipart(destBucket, objMD, next) {
126126
if (objMD) {
@@ -190,14 +190,14 @@ function completeMultipartUpload(authInfo, request, log, callback) {
190190
const mdInfo = { storedParts, mpuOverviewKey, splitter };
191191
const mpuInfo =
192192
{ objectKey, uploadId, jsonList, bucketName, destBucket };
193-
const originalIdentityAuthzResults = request.iamAuthzResults;
193+
const originalIdentityImpDenies = request.actionImplicitDenies;
194194
// eslint-disable-next-line no-param-reassign
195-
delete request.iamAuthzResults;
195+
delete request.actionImplicitDenies;
196196
return data.completeMPU(request, mpuInfo, mdInfo, location,
197197
null, null, null, locationConstraintCheck, log,
198198
(err, completeObjData) => {
199199
// eslint-disable-next-line no-param-reassign
200-
request.iamAuthzResults = originalIdentityAuthzResults;
200+
request.actionImplicitDenies = originalIdentityImpDenies;
201201
if (err) {
202202
return next(err, destBucket);
203203
}

‎lib/api/initiateMultipartUpload.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ function initiateMultipartUpload(authInfo, request, log, callback) {
253253
}
254254

255255
async.waterfall([
256-
next => metadataValidateBucketAndObj(metadataValParams, request.iamAuthzResults, log,
256+
next => metadataValidateBucketAndObj(metadataValParams, request.actionImplicitDenies, log,
257257
(error, destinationBucket) => {
258258
const corsHeaders = collectCorsHeaders(request.headers.origin,
259259
request.method, destinationBucket);

‎lib/api/listMultipartUploads.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ function listMultipartUploads(authInfo, request, log, callback) {
104104
function waterfall1(next) {
105105
// Check final destination bucket for authorization rather
106106
// than multipart upload bucket
107-
metadataValidateBucket(metadataValParams, request.iamAuthzResults, log,
107+
metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log,
108108
(err, bucket) => next(err, bucket));
109109
},
110110
function getMPUBucket(bucket, next) {

‎lib/api/listParts.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function listParts(authInfo, request, log, callback) {
112112

113113
async.waterfall([
114114
function checkDestBucketVal(next) {
115-
metadataValidateBucketAndObj(metadataValParams, request.iamAuthzResults, log,
115+
metadataValidateBucketAndObj(metadataValParams, request.actionImplicitDenies, log,
116116
(err, destinationBucket) => {
117117
if (err) {
118118
return next(err, destinationBucket, null);
@@ -150,13 +150,13 @@ function listParts(authInfo, request, log, callback) {
150150
mpuOverviewObj,
151151
destBucket,
152152
};
153-
const originalIdentityAuthzResults = request.iamAuthzResults;
153+
const originalIdentityImpDenies = request.actionImplicitDenies;
154154
// eslint-disable-next-line no-param-reassign
155-
delete request.iamAuthzResults;
155+
delete request.actionImplicitDenies;
156156
return data.listParts(mpuInfo, request, locationConstraintCheck,
157157
log, (err, backendPartList) => {
158158
// eslint-disable-next-line no-param-reassign
159-
request.iamAuthzResults = originalIdentityAuthzResults;
159+
request.actionImplicitDenies = originalIdentityImpDenies;
160160
if (err) {
161161
return next(err, destBucket);
162162
}

‎lib/api/objectCopy.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ function objectCopy(authInfo, request, sourceBucket,
245245
}
246246
return async.waterfall([
247247
function checkDestAuth(next) {
248-
return metadataValidateBucketAndObj(valPutParams, request.iamAuthzResults, log,
248+
return metadataValidateBucketAndObj(valPutParams, request.actionImplicitDenies, log,
249249
(err, destBucketMD, destObjMD) => {
250250
if (err) {
251251
log.debug('error validating put part of request',
@@ -263,7 +263,7 @@ function objectCopy(authInfo, request, sourceBucket,
263263
});
264264
},
265265
function checkSourceAuthorization(destBucketMD, destObjMD, next) {
266-
return metadataValidateBucketAndObj(valGetParams, request.iamAuthzResults, log,
266+
return metadataValidateBucketAndObj(valGetParams, request.actionImplicitDenies, log,
267267
(err, sourceBucketMD, sourceObjMD) => {
268268
if (err) {
269269
log.debug('error validating get part of request',
@@ -408,15 +408,15 @@ function objectCopy(authInfo, request, sourceBucket,
408408
return next(null, storeMetadataParams, dataLocator, destObjMD,
409409
serverSideEncryption, destBucketMD);
410410
}
411-
const originalIdentityAuthzResults = request.iamAuthzResults;
411+
const originalIdentityImpDenies = request.actionImplicitDenies;
412412
// eslint-disable-next-line no-param-reassign
413-
delete request.iamAuthzResults;
413+
delete request.actionImplicitDenies;
414414
return data.copyObject(request, sourceLocationConstraintName,
415415
storeMetadataParams, dataLocator, dataStoreContext,
416416
backendInfoDest, sourceBucketMD, destBucketMD, serverSideEncryption, log,
417417
(err, results) => {
418418
// eslint-disable-next-line no-param-reassign
419-
request.iamAuthzResults = originalIdentityAuthzResults;
419+
request.actionImplicitDenies = originalIdentityImpDenies;
420420
if (err) {
421421
return next(err, destBucketMD);
422422
}

‎lib/api/objectHead.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function objectHead(authInfo, request, log, callback) {
4848
request,
4949
};
5050

51-
return metadataValidateBucketAndObj(mdValParams, request.iamAuthzResults, log,
51+
return metadataValidateBucketAndObj(mdValParams, request.actionImplicitDenies, log,
5252
(err, bucket, objMD) => {
5353
const corsHeaders = collectCorsHeaders(request.headers.origin,
5454
request.method, bucket);

‎lib/api/websiteHead.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ function websiteHead(request, log, callback) {
104104
{ error: err });
105105
let returnErr = err;
106106
const bucketAuthorized = isBucketAuthorized(bucket,
107-
'bucketGet', constants.publicId, null, request.iamAuthzResults, log, request);
107+
'bucketGet', constants.publicId, null, request.actionImplicitDenies, log, request);
108108
// if index object does not exist and bucket is private AWS
109109
// returns 403 - AccessDenied error.
110110
if (err.is.NoSuchKey && !bucketAuthorized) {
@@ -114,7 +114,7 @@ function websiteHead(request, log, callback) {
114114
reqObjectKey, corsHeaders, log, callback);
115115
}
116116
if (!isObjAuthorized(bucket, objMD, 'objectGet',
117-
constants.publicId, null, request.iamAuthzResults, log, request)) {
117+
constants.publicId, null, request.actionImplicitDenies, log, request)) {
118118
const err = errors.AccessDenied;
119119
log.trace('request not authorized', { error: err });
120120
return _errorActions(err, routingRules, reqObjectKey,

‎lib/routes/routeBackbeat.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,7 @@ function routeBackbeat(clientIP, request, response, log) {
11501150
// eslint-disable-next-line no-param-reassign
11511151
request.apiMethod = 'routeBackbeat';
11521152
// eslint-disable-next-line no-param-reassign
1153-
request.iamAuthzResults = false;
1153+
request.actionImplicitDenies = false;
11541154

11551155
log.debug('routing request', {
11561156
method: 'routeBackbeat',
@@ -1275,7 +1275,7 @@ function routeBackbeat(clientIP, request, response, log) {
12751275
requestType: 'ReplicateObject',
12761276
request,
12771277
};
1278-
return metadataValidateBucketAndObj(mdValParams, request.iamAuthzResults, log, next);
1278+
return metadataValidateBucketAndObj(mdValParams, request.actionImplicitDenies, log, next);
12791279
},
12801280
(bucketInfo, objMd, next) => {
12811281
if (useMultipleBackend) {

0 commit comments

Comments
 (0)