HttpURLConnectionDownloaderService: don't check file for emptiness and pass it along to validators.

Correction for 874d709

Author: php-coder

src/main/java/ru/mystamps/web/service/HttpURLConnectionDownloaderService.java

@@ -184,17 +184,6 @@ private Code validateConnection(HttpURLConnection conn) throws IOException {
 			return Code.INVALID_FILE_TYPE;
 		}
 
-		// TODO: add protection against huge files
-		// When the content length is not known, methods returns -1. It also happens for gzipped
-		// response. In this case, we allow to download a file and relies to a form validation
-		// that will take place later.
-		int contentLength = conn.getContentLength();
-		if (contentLength == 0) {
-			// TODO(security): fix possible log injection
-			LOG.debug("Couldn't download file: invalid Content-Length: {}", contentLength);
-			return Code.INVALID_FILE_SIZE;
-		}
-		
 		return Code.SUCCESS;
 	}
 

src/main/java/ru/mystamps/web/service/dto/DownloadResult.java

@@ -48,7 +48,6 @@ public enum Code {
 		INVALID_URL,
 		INVALID_REDIRECT,
 		INVALID_FILE_TYPE,
-		INVALID_FILE_SIZE,
 		FILE_NOT_FOUND,
 		INSUFFICIENT_PERMISSIONS,
 		UNEXPECTED_ERROR,

src/main/resources/ru/mystamps/i18n/ValidationMessages.properties

@@ -28,7 +28,6 @@ ru.mystamps.web.support.beanvalidation.RequireImageOrImageUrl.message = Image or
 ru.mystamps.web.service.dto.DownloadResult.INVALID_URL = Invalid URL
 ru.mystamps.web.service.dto.DownloadResult.INVALID_REDIRECT = URL must not redirect to another address
 ru.mystamps.web.service.dto.DownloadResult.INVALID_FILE_TYPE = Invalid file type
-ru.mystamps.web.service.dto.DownloadResult.INVALID_FILE_SIZE = Invalid file size
 ru.mystamps.web.service.dto.DownloadResult.FILE_NOT_FOUND = File not found
 ru.mystamps.web.service.dto.DownloadResult.UNEXPECTED_ERROR = Could not download file
 

src/main/resources/ru/mystamps/i18n/ValidationMessages_ru.properties

@@ -28,7 +28,6 @@ ru.mystamps.web.support.beanvalidation.RequireImageOrImageUrl.message = Необ
 ru.mystamps.web.service.dto.DownloadResult.INVALID_URL = Неправильный URL
 ru.mystamps.web.service.dto.DownloadResult.INVALID_REDIRECT = URL не должен перенаправлять на другой адрес
 ru.mystamps.web.service.dto.DownloadResult.INVALID_FILE_TYPE = Недопустимый тип файла
-ru.mystamps.web.service.dto.DownloadResult.INVALID_FILE_SIZE = Недопустимый размер файла
 ru.mystamps.web.service.dto.DownloadResult.FILE_NOT_FOUND = Файл не найден
 ru.mystamps.web.service.dto.DownloadResult.UNEXPECTED_ERROR = Не удалось скачать файл