mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Use original uri to compute canonical_request in s3v4 signature 

Currently canonical_request is based on a canonical_uri for which bucket name is prepend
if dns path style is used which is not compatible with s3v4 signature mechanism
pull/332/head
n.fraison 2020-04-17 09:52:07 +02:00 zatwierdzone przez Andrew Gaul
rodzic 0ff8ec0e97
commit 9d21a73591
1 zmienionych plików z 7 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
Wyświetl plik

@ -276,6 +276,7 @@ public class S3ProxyHandler {
InputStream is) throws IOException, S3Exception {
String method = request.getMethod();
String uri = request.getRequestURI();
String originalUri = request.getRequestURI();
if (!this.servicePath.isEmpty()) {
if (uri.length() > this.servicePath.length()) {
@ -535,9 +536,11 @@ public class S3ProxyHandler {
String expectedSignature = null;
// When presigned url is generated, it doesn't consider service path
String uriForSigning = presignedUrl ? uri : this.servicePath + uri;
if (authHeader.hmacAlgorithm == null) { //v2
// When presigned url is generated, it doesn't consider
// service path
String uriForSigning = presignedUrl ? uri : this.servicePath +
uri;
expectedSignature = AwsSignature.createAuthorizationSignature(
request, uriForSigning, credential, presignedUrl,
haveBothDateHeader);
@ -579,6 +582,8 @@ public class S3ProxyHandler {
is = new ByteArrayInputStream(payload);
}
String uriForSigning = presignedUrl ? originalUri :
this.servicePath + originalUri;
expectedSignature = AwsSignature
.createAuthorizationSignatureV4(// v4 sign
baseRequest, authHeader, payload, uriForSigning,