Skip to content

Commit

Permalink
update variable name
Browse files Browse the repository at this point in the history
  • Loading branch information
Will Toozs committed Sep 18, 2023
1 parent 6f7b2d6 commit a7ce187
Show file tree
Hide file tree
Showing 17 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion lib/api/bucketDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function bucketDelete(authInfo, request, log, cb) {
request,
};

return metadataValidateBucket(metadataValParams, request.iamAuthzResults, log,
return metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log,
(err, bucketMD) => {
const corsHeaders = collectCorsHeaders(request.headers.origin,
request.method, bucketMD);
Expand Down
2 changes: 1 addition & 1 deletion lib/api/bucketDeleteCors.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function bucketDeleteCors(authInfo, request, log, callback) {
log.trace('found bucket in metadata');

if (!isBucketAuthorized(bucket, requestType, canonicalID, authInfo,
request.iamAuthzResults, log, request)) {
request.actionImplicitDenies, log, request)) {
log.debug('access denied for user on bucket', {
requestType,
method: 'bucketDeleteCors',
Expand Down
2 changes: 1 addition & 1 deletion lib/api/bucketDeleteEncryption.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function bucketDeleteEncryption(authInfo, request, log, callback) {
};

return async.waterfall([
next => metadataValidateBucket(metadataValParams, request.iamAuthzResults, log, next),
next => metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, next),
(bucket, next) => checkExpectedBucketOwner(request.headers, bucket, log, err => next(err, bucket)),
(bucket, next) => {
const sseConfig = bucket.getServerSideEncryption();
Expand Down
2 changes: 1 addition & 1 deletion lib/api/bucketDeleteLifecycle.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function bucketDeleteLifecycle(authInfo, request, log, callback) {
requestType: 'bucketDeleteLifecycle',
request,
};
return metadataValidateBucket(metadataValParams, request.iamAuthzResults, log, (err, bucket) => {
return metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, (err, bucket) => {
const corsHeaders = collectCorsHeaders(headers.origin, method, bucket);
if (err) {
log.debug('error processing request', {
Expand Down
2 changes: 1 addition & 1 deletion lib/api/bucketDeletePolicy.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function bucketDeletePolicy(authInfo, request, log, callback) {
requestType: 'bucketDeletePolicy',
request,
};
return metadataValidateBucket(metadataValParams, request.iamAuthzResults, log, (err, bucket) => {
return metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, (err, bucket) => {
const corsHeaders = collectCorsHeaders(headers.origin, method, bucket);
if (err) {
log.debug('error processing request', {
Expand Down
2 changes: 1 addition & 1 deletion lib/api/bucketDeleteReplication.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function bucketDeleteReplication(authInfo, request, log, callback) {
requestType: 'bucketDeleteReplication',
request,
};
return metadataValidateBucket(metadataValParams, request.iamAuthzResults, log, (err, bucket) => {
return metadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, (err, bucket) => {
const corsHeaders = collectCorsHeaders(headers.origin, method, bucket);
if (err) {
log.debug('error processing request', {
Expand Down
2 changes: 1 addition & 1 deletion lib/api/bucketDeleteWebsite.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function bucketDeleteWebsite(authInfo, request, log, callback) {
log.trace('found bucket in metadata');

if (!isBucketAuthorized(bucket, requestType, canonicalID, authInfo,
request.iamAuthzResults, log, request)) {
request.actionImplicitDenies, log, request)) {
log.debug('access denied for user on bucket', {
requestType,
method: 'bucketDeleteWebsite',
Expand Down
2 changes: 1 addition & 1 deletion lib/api/multiObjectDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ function multiObjectDelete(authInfo, request, log, callback) {
bucketMD);
}
if (!isBucketAuthorized(bucketMD, 'objectDelete', canonicalID, authInfo,
request.iamAuthzResults, log, request)) {
request.actionImplicitDenies, log, request)) {
log.trace("access denied due to bucket acl's");
// if access denied at the bucket level, no access for
// any of the objects so all results will be error results
Expand Down
2 changes: 1 addition & 1 deletion lib/api/objectDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function objectDelete(authInfo, request, log, cb) {
const canonicalID = authInfo.getCanonicalID();
return async.waterfall([
function validateBucketAndObj(next) {
return metadataValidateBucketAndObj(valParams, request.iamAuthzResults, log,
return metadataValidateBucketAndObj(valParams, request.actionImplicitDenies, log,
(err, bucketMD, objMD) => {
if (err) {
return next(err, bucketMD);
Expand Down
2 changes: 1 addition & 1 deletion lib/api/objectDeleteTagging.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function objectDeleteTagging(authInfo, request, log, callback) {
};

return async.waterfall([
next => metadataValidateBucketAndObj(metadataValParams, request.iamAuthzResults, log,
next => metadataValidateBucketAndObj(metadataValParams, request.actionImplicitDenies, log,
(err, bucket, objectMD) => {
if (err) {
log.trace('request authorization failed',
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/api/bucketDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ describe('bucketDelete API', () => {
namespace,
headers: {},
url: `/${bucketName}`,
iamAuthzResults: false,
actionImplicitDenies: false,
};

const initiateRequest = {
Expand All @@ -96,7 +96,7 @@ describe('bucketDelete API', () => {
objectKey: objectName,
headers: { host: `${bucketName}.s3.amazonaws.com` },
url: `/${objectName}?uploads`,
iamAuthzResults: false,
actionImplicitDenies: false,
};

it('should return an error if the bucket is not empty', done => {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/api/bucketDeleteCors.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const testBucketPutRequest = {
bucketName,
headers: { host: `${bucketName}.s3.amazonaws.com` },
url: '/',
iamAuthzResults: false,
actionImplicitDenies: false,
};
const testBucketPutCorsRequest =
corsUtil.createBucketCorsRequest('PUT', bucketName);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/api/bucketDeleteEncryption.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const bucketPutRequest = {
bucketName,
headers: { host: `${bucketName}.s3.amazonaws.com` },
url: '/',
iamAuthzResults: false,
actionImplicitDenies: false,
};
describe('bucketDeleteEncryption API', () => {
before(() => cleanup());
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/api/bucketDeleteLifecycle.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function _makeRequest(includeXml) {
bucketName,
headers: { host: `${bucketName}.s3.amazonaws.com` },
url: '/',
iamAuthzResults: false,
actionImplicitDenies: false,
};
if (includeXml) {
request.post = '<LifecycleConfiguration ' +
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/api/bucketDeletePolicy.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function _makeRequest(includePolicy) {
bucketName,
headers: { host: `${bucketName}.s3.amazonaws.com` },
url: '/',
iamAuthzResults: false,
actionImplicitDenies: false,
};
if (includePolicy) {
const examplePolicy = {
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/api/bucketDeleteWebsite.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const testBucketPutRequest = {
bucketName,
headers: { host: `${bucketName}.s3.amazonaws.com` },
url: '/',
iamAuthzResults: false,
actionImplicitDenies: false,
};
const testBucketDeleteWebsiteRequest = {
bucketName,
Expand All @@ -29,7 +29,7 @@ const testBucketDeleteWebsiteRequest = {
},
url: '/?website',
query: { website: '' },
iamAuthzResults: false,
actionImplicitDenies: false,
};
const testBucketPutWebsiteRequest = Object.assign({ post: config.getXml() },
testBucketDeleteWebsiteRequest);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/api/objectDeleteTagging.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const testBucketPutRequest = {
bucketName,
headers: { host: `${bucketName}.s3.amazonaws.com` },
url: '/',
iamAuthzResults: false,
actionImplicitDenies: false,
};

const testPutObjectRequest = new DummyRequest({
Expand Down

0 comments on commit a7ce187

Please sign in to comment.