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

Emit InvalidAccessKeyId on access key mismatch 

References #5.
pull/28/head
Andrew Gaul 2014-12-03 22:39:27 -08:00
rodzic 40c4d099d9
commit ae3598dbfb
2 zmienionych plików z 13 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
src/main/java/org/gaul/s3proxy/S3ErrorCode.java
Wyświetl plik

@ -36,6 +36,7 @@ enum S3ErrorCode {
"Your previous request to create the named bucket" + "Your previous request to create the named bucket" +
" succeeded and you already own it."), " succeeded and you already own it."),
BUCKET_NOT_EMPTY(HttpServletResponse.SC_CONFLICT, "Conflict"), BUCKET_NOT_EMPTY(HttpServletResponse.SC_CONFLICT, "Conflict"),
INVALID_ACCESS_KEY_ID(HttpServletResponse.SC_FORBIDDEN, "Forbidden"),
INVALID_ARGUMENT(HttpServletResponse.SC_BAD_REQUEST, "Bad Request"), INVALID_ARGUMENT(HttpServletResponse.SC_BAD_REQUEST, "Bad Request"),
INVALID_BUCKET_NAME(HttpServletResponse.SC_BAD_REQUEST, "Bad Request"), INVALID_BUCKET_NAME(HttpServletResponse.SC_BAD_REQUEST, "Bad Request"),
INVALID_DIGEST(HttpServletResponse.SC_BAD_REQUEST, "Bad Request"), INVALID_DIGEST(HttpServletResponse.SC_BAD_REQUEST, "Bad Request"),

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

@ -211,8 +211,12 @@ final class S3ProxyHandler extends AbstractHandler {
String parameterSignature = request.getParameter("Signature"); String parameterSignature = request.getParameter("Signature");
if (headerIdentity != null && headerSignature != null) { if (headerIdentity != null && headerSignature != null) {
if (!identity.equals(headerIdentity) || if (!identity.equals(headerIdentity)) {
!expectedSignature.equals(headerSignature)) { sendSimpleErrorResponse(response,
S3ErrorCode.INVALID_ACCESS_KEY_ID);
baseRequest.setHandled(true);
return;
} else if (!expectedSignature.equals(headerSignature)) {
sendSimpleErrorResponse(response, sendSimpleErrorResponse(response,
S3ErrorCode.SIGNATURE_DOES_NOT_MATCH); S3ErrorCode.SIGNATURE_DOES_NOT_MATCH);
baseRequest.setHandled(true); baseRequest.setHandled(true);
@ -220,8 +224,12 @@ final class S3ProxyHandler extends AbstractHandler {
} }
} else if (parameterIdentity != null && } else if (parameterIdentity != null &&
parameterSignature != null) { parameterSignature != null) {
if (!identity.equals(parameterIdentity) || if (!identity.equals(parameterIdentity)) {
!expectedSignature.equals(parameterSignature)) { sendSimpleErrorResponse(response,
S3ErrorCode.INVALID_ACCESS_KEY_ID);
baseRequest.setHandled(true);
return;
} else if (!expectedSignature.equals(parameterSignature)) {
sendSimpleErrorResponse(response, sendSimpleErrorResponse(response,
S3ErrorCode.SIGNATURE_DOES_NOT_MATCH); S3ErrorCode.SIGNATURE_DOES_NOT_MATCH);
baseRequest.setHandled(true); baseRequest.setHandled(true);