allow https

Author: php-coder

src/main/java/ru/mystamps/web/controller/SeriesController.java

@@ -196,8 +196,7 @@ public String processInput(
 			DownloadResult.Code code = (DownloadResult.Code)downloadResultErrorCode;
 			switch (code) {
 				case INVALID_URL:
-				case INVALID_PROTOCOL:
-					// Protocol is being validated by @URL, to avoid showing error message
+					// Url is being validated by @URL, to avoid showing error message
 					// twice we're skipping error from an interceptor
 					break;
 				case INSUFFICIENT_PERMISSIONS:

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

@@ -53,11 +53,6 @@ public DownloadResult download(String fileUrl) {
 		try {
 			URL url = new URL(fileUrl);
 
-			Code validationResult = validateUrl(url);
-			if (validationResult != Code.SUCCESS) {
-				return DownloadResult.failed(validationResult);
-			}
-			
 			HttpURLConnection conn = openConnection(url);
 			if (conn == null) {
 				return DownloadResult.failed(Code.UNEXPECTED_ERROR);
@@ -73,7 +68,7 @@ public DownloadResult download(String fileUrl) {
 			}
 
 			try (InputStream stream = new BufferedInputStream(conn.getInputStream())) {
-				validationResult = validateConnection(conn);
+				Code validationResult = validateConnection(conn);
 				if (validationResult != Code.SUCCESS) {
 					return DownloadResult.failed(validationResult);
 				}
@@ -98,17 +93,6 @@ public DownloadResult download(String fileUrl) {
 
 	}
 
-	private static Code validateUrl(URL url) {
-		// TODO: make it configurable
-		String protocol = url.getProtocol();
-		if ("http".equals(protocol)) {
-			return Code.SUCCESS;
-		}
-		
-		LOG.debug("Couldn't download file: unsupported protocol '{}'", protocol);
-		return Code.INVALID_PROTOCOL;
-	}
-	
 	private static HttpURLConnection openConnection(URL url) throws IOException {
 		URLConnection connection = url.openConnection();
 		if (!(connection instanceof HttpURLConnection)) {

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

@@ -46,7 +46,6 @@ public boolean hasFailed() {
 	public enum Code {
 		SUCCESS,
 		INVALID_URL,
-		INVALID_PROTOCOL,
 		INVALID_REDIRECT,
 		INVALID_FILE_TYPE,
 		INVALID_FILE_SIZE,

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

@@ -26,7 +26,6 @@ ru.mystamps.web.validation.jsr303.MaxFileSize.message = File size must be not gr
 ru.mystamps.web.validation.jsr303.RequireImageOrImageUrl.message = Image or image URL must be specified
 
 ru.mystamps.web.service.dto.DownloadResult.INVALID_URL = Invalid URL
-ru.mystamps.web.service.dto.DownloadResult.INVALID_PROTOCOL = Invalid protocol in the 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

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

@@ -26,7 +26,6 @@ ru.mystamps.web.validation.jsr303.MaxFileSize.message = Размер файла
 ru.mystamps.web.validation.jsr303.RequireImageOrImageUrl.message = Необходимо выбрать изображение либо указать ссылку на него
 
 ru.mystamps.web.service.dto.DownloadResult.INVALID_URL = Неправильный URL
-ru.mystamps.web.service.dto.DownloadResult.INVALID_PROTOCOL = Недопустимый протокол в 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 = Недопустимый размер файла

src/test/robotframework/series/creation/validation.robot

@@ -38,12 +38,6 @@ Create series with empty image
 	Submit Form             id=add-series-form
 	Element Text Should Be  id=image.errors  File must not be empty
 
-Create series with unsupported protocol in the image URL
-	[Documentation]         Verify validation of URL with unsupported protocol
-	Input Text              id=image-url  https://127.0.0.1:8080/invalid-imge-url-protocol
-	Submit Form             id=add-series-form
-	Element Text Should Be  id=image-url.errors  Value must be a valid URL
-
 Create series with image URL with invalid response
 	[Documentation]         Verify validation of invalid response from a server
 	Input Text              id=image-url  ${SITE_URL}/test/invalid/response-400