kopia lustrzana https://github.com/gaul/s3proxy
Address Checkstyle violations
rodzic
84c33c9b42
commit
5346e5e181
|
@ -108,9 +108,13 @@ final class S3ProxyHandler extends AbstractHandler {
|
||||||
if (identity != null) {
|
if (identity != null) {
|
||||||
String expectedAuthorization = createAuthorizationHeader(request,
|
String expectedAuthorization = createAuthorizationHeader(request,
|
||||||
identity, credential);
|
identity, credential);
|
||||||
if (!expectedAuthorization.equals(request.getHeader(
|
String headerAuthorization = request.getHeader(
|
||||||
HttpHeaders.AUTHORIZATION)) &&
|
HttpHeaders.AUTHORIZATION);
|
||||||
!expectedAuthorization.equals("AWS " + request.getParameter("AWSAccessKeyId") + ":" + request.getParameter("Signature"))) {
|
String queryStringAuthorization = "AWS " +
|
||||||
|
request.getParameter("AWSAccessKeyId") + ":" +
|
||||||
|
request.getParameter("Signature");
|
||||||
|
if (!expectedAuthorization.equals(headerAuthorization) &&
|
||||||
|
!expectedAuthorization.equals(queryStringAuthorization)) {
|
||||||
sendSimpleErrorResponse(response,
|
sendSimpleErrorResponse(response,
|
||||||
HttpServletResponse.SC_FORBIDDEN,
|
HttpServletResponse.SC_FORBIDDEN,
|
||||||
"SignatureDoesNotMatch", "Forbidden");
|
"SignatureDoesNotMatch", "Forbidden");
|
||||||
|
|
|
@ -271,7 +271,8 @@ public final class S3ProxyTest {
|
||||||
assertThat(putResponse.getStatusCode())
|
assertThat(putResponse.getStatusCode())
|
||||||
.isEqualTo(HttpServletResponse.SC_OK);
|
.isEqualTo(HttpServletResponse.SC_OK);
|
||||||
|
|
||||||
HttpRequest getRequest = signer.signGetBlob(containerName, blobName, 10);
|
HttpRequest getRequest = signer.signGetBlob(containerName, blobName,
|
||||||
|
10);
|
||||||
HttpResponse getResponse = httpClient.invoke(getRequest);
|
HttpResponse getResponse = httpClient.invoke(getRequest);
|
||||||
assertThat(getResponse.getStatusCode())
|
assertThat(getResponse.getStatusCode())
|
||||||
.isEqualTo(HttpServletResponse.SC_OK);
|
.isEqualTo(HttpServletResponse.SC_OK);
|
||||||
|
|
Ładowanie…
Reference in New Issue