Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[edit] CLDSRV-504: update arsenal package #5546

Draft
wants to merge 1 commit into
base: development/7.10
Choose a base branch
from
Draft

[edit] CLDSRV-504: update arsenal package #5546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/api/apiUtils/authorization/permissionChecks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,14 @@ function _checkBucketPolicyConditions(request, conditions, log) {
if (!conditions) {
return true;
}
const extractProtocolFromHeader = config.requests.extractProtocolFromHeader;

const sslEnabled = (extractProtocolFromHeader ?
extractProtocolFromHeader === 'https' : request.connection.encrypted);
// build request context from the request!
const requestContext = new RequestContext(request.headers, request.query,
request.bucketName, request.objectKey, ip,
request.connection.encrypted, request.resourceType, 's3', null, null,
sslEnabled, request.resourceType, 's3', null, null,
null, null, null, null, null, null, null, null, null,
request.objectLockRetentionDays);
return evaluators.meetConditions(requestContext, conditions, log);
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"homepage": "https://github.com/scality/S3#readme",
"dependencies": {
"@hapi/joi": "^17.1.0",
"arsenal": "git+https://github.com/scality/arsenal#7.10.62",
"arsenal": "git+https://github.com/scality/arsenal#0466eb4d82624796190338e8892bc3ea2c0908e5",
"async": "~2.5.0",
"aws-sdk": "2.905.0",
"azure-storage": "^2.1.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,9 +488,9 @@ arraybuffer.slice@~0.0.7:
optionalDependencies:
ioctl "^2.0.2"

"arsenal@git+https://github.com/scality/arsenal#7.10.62":
version "7.10.62"
resolved "git+https://github.com/scality/arsenal#e9d815cc9d212932924a5388173548ff804edc6b"
"arsenal@git+https://github.com/scality/arsenal#0466eb4d82624796190338e8892bc3ea2c0908e5":
version "7.10.59"
resolved "git+https://github.com/scality/arsenal#0466eb4d82624796190338e8892bc3ea2c0908e5"
dependencies:
"@types/async" "^3.2.12"
"@types/utf8" "^3.0.1"
Expand Down Expand Up @@ -523,7 +523,7 @@ arraybuffer.slice@~0.0.7:
sproxydclient "github:scality/sproxydclient#8.0.4"
utf8 "2.1.2"
uuid "^3.0.1"
werelogs scality/werelogs#8.1.4
werelogs scality/werelogs#8.1.0
xml2js "~0.4.23"
optionalDependencies:
ioctl "^2.0.2"
Expand Down
Loading