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

Add expiration to query string authorization 

Also repair support for query string authorization, regression from
d74a409.
pull/16/head
Andrew Gaul 2014-08-23 18:28:03 -07:00
rodzic 84bfb27d66
commit ce3d7edad3
1 zmienionych plików z 31 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -151,19 +151,38 @@ final class S3ProxyHandler extends AbstractHandler {
identity, credential); identity, credential);
String headerAuthorization = request.getHeader( String headerAuthorization = request.getHeader(
HttpHeaders.AUTHORIZATION); HttpHeaders.AUTHORIZATION);
if (headerAuthorization == null) { String parameterSignature = request.getParameter("Signature");
sendSimpleErrorResponse(response, S3ErrorCode.ACCESS_DENIED); if (headerAuthorization != null) {
baseRequest.setHandled(true); if (!expectedAuthorization.equals(headerAuthorization)) {
return; sendSimpleErrorResponse(response,
} S3ErrorCode.SIGNATURE_DOES_NOT_MATCH);
baseRequest.setHandled(true);
return;
}
} else if (parameterSignature != null) {
String queryStringAuthorization = "AWS " +
request.getParameter("AWSAccessKeyId") + ":" +
parameterSignature;
if (!expectedAuthorization.equals(queryStringAuthorization)) {
sendSimpleErrorResponse(response,
S3ErrorCode.SIGNATURE_DOES_NOT_MATCH);
baseRequest.setHandled(true);
return;
}
String queryStringAuthorization = "AWS " + String expiresString = request.getParameter("Expires");
request.getParameter("AWSAccessKeyId") + ":" + if (expiresString != null) {
request.getParameter("Signature"); long expires = Long.parseLong(expiresString);
if (!expectedAuthorization.equals(headerAuthorization) && long nowSeconds = System.currentTimeMillis() / 1000;
!expectedAuthorization.equals(queryStringAuthorization)) { if (nowSeconds > expires) {
sendSimpleErrorResponse(response, sendSimpleErrorResponse(response,
S3ErrorCode.SIGNATURE_DOES_NOT_MATCH); S3ErrorCode.ACCESS_DENIED);
baseRequest.setHandled(true);
return;
}
}
} else {
sendSimpleErrorResponse(response, S3ErrorCode.ACCESS_DENIED);
baseRequest.setHandled(true); baseRequest.setHandled(true);
return; return;
} }