Skip to content

Commit 250e902

Browse files
author
Will Toozs
committed
alternative ssl check approach proposal
1 parent e028eb2 commit 250e902

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

lib/api/apiUtils/authorization/permissionChecks.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,14 @@ function _checkBucketPolicyConditions(request, conditions, log) {
247247
if (!conditions) {
248248
return true;
249249
}
250+
const extractProtocolFromHeader = config.requests.extractProtocolFromHeader;
251+
252+
const sslEnabled = (extractProtocolFromHeader ?
253+
extractProtocolFromHeader === 'https' : request.connection.encrypted);
250254
// build request context from the request!
251255
const requestContext = new RequestContext(request.headers, request.query,
252256
request.bucketName, request.objectKey, ip,
253-
request.connection.encrypted, request.resourceType, 's3', null, null,
257+
sslEnabled, request.resourceType, 's3', null, null,
254258
null, null, null, null, null, null, null, null, null,
255259
request.objectLockRetentionDays);
256260
return evaluators.meetConditions(requestContext, conditions, log);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"homepage": "https://github.com/scality/S3#readme",
2121
"dependencies": {
2222
"@hapi/joi": "^17.1.0",
23-
"arsenal": "git+https://github.com/scality/arsenal#7.10.62",
23+
"arsenal": "git+https://github.com/scality/arsenal#0466eb4d82624796190338e8892bc3ea2c0908e5",
2424
"async": "~2.5.0",
2525
"aws-sdk": "2.905.0",
2626
"azure-storage": "^2.1.0",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -488,9 +488,9 @@ arraybuffer.slice@~0.0.7:
488488
optionalDependencies:
489489
ioctl "^2.0.2"
490490

491-
"arsenal@git+https://github.com/scality/arsenal#7.10.62":
492-
version "7.10.62"
493-
resolved "git+https://github.com/scality/arsenal#e9d815cc9d212932924a5388173548ff804edc6b"
491+
"arsenal@git+https://github.com/scality/arsenal#0466eb4d82624796190338e8892bc3ea2c0908e5":
492+
version "7.10.59"
493+
resolved "git+https://github.com/scality/arsenal#0466eb4d82624796190338e8892bc3ea2c0908e5"
494494
dependencies:
495495
"@types/async" "^3.2.12"
496496
"@types/utf8" "^3.0.1"
@@ -523,7 +523,7 @@ arraybuffer.slice@~0.0.7:
523523
sproxydclient "github:scality/sproxydclient#8.0.4"
524524
utf8 "2.1.2"
525525
uuid "^3.0.1"
526-
werelogs scality/werelogs#8.1.4
526+
werelogs scality/werelogs#8.1.0
527527
xml2js "~0.4.23"
528528
optionalDependencies:
529529
ioctl "^2.0.2"

0 commit comments

Comments
 (0)