Skip to content

Commit b652cc9

Browse files
author
Will Toozs
committed
alternative ssl check approach proposal
1 parent c5e5fcf commit b652cc9

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

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 extractProtoFromHeader = config.requests.extractProtoFromHeader;
251+
252+
const sslEnabled = (extractProtoFromHeader ?
253+
extractProtoFromHeader === '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);

0 commit comments

Comments
 (0)