Fix encoding filename

leonardovannucci

2020-05-13 74967f038707374661a6765245c062cb9f7bc7d7

Fix encoding filename

 dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/DownloadFileCaptchaController.java
..
..
@@ -1,6 +1,7 @@
1
1
 package it.digione.dg1cloud.controller;
2
2
 
3
3
 import java.io.FileNotFoundException;
4
+import java.io.UnsupportedEncodingException;
4
5
 
5
6
 import javax.validation.Valid;
6
7
 
..
..
@@ -28,7 +29,7 @@
28
29
 
29
30
 	@PostMapping
30
31
 	public Object handleDownloadFileCaptcha(@ModelAttribute("downloadFileCaptchaForm") @Valid DownloadFileCaptchaForm form,
31
-									BindingResult result) throws FileNotFoundException{
32
+									BindingResult result) throws FileNotFoundException, UnsupportedEncodingException{
32
33
 		
33
34
 		ModelAndView modelAndView;
34
35
 		if (result.hasErrors()){
 dg1cloud-core/src/main/java/it/digione/dg1cloud/service/Utils.java
..
..
@@ -4,6 +4,7 @@
4
4
 import java.io.FileInputStream;
5
5
 import java.io.FileNotFoundException;
6
6
 import java.io.IOException;
7
+import java.io.UnsupportedEncodingException;
7
8
 import java.net.MalformedURLException;
8
9
 import java.net.URL;
9
10
 
..
..
@@ -33,7 +34,7 @@
33
34
 	@Autowired private RegDocumentRepository regDocumentRepository;
34
35
 	@Autowired private ServletContext servletContext;
35
36
 	
36
-	private static final Logger logger = LoggerFactory.getLogger(CloudService.class);
37
+	private static final Logger logger = LoggerFactory.getLogger(Utils.class);
37
38
 	
38
39
 	public URL generateUrl(RegDocument regDocument) throws MalformedURLException {
39
40
 		logger.debug("Genero l'url per il record file {} con id {}", regDocument.getFileName(), regDocument.getDocumentId());
..
..
@@ -66,7 +67,7 @@
66
67
 	}
67
68
 	
68
69
 	public ResponseEntity<InputStreamResource> getDownloadResponseEntity(String fileName, long id, String secretKey)
69
-			throws FileNotFoundException {
70
+			throws FileNotFoundException, UnsupportedEncodingException {
70
71
 		logger.debug("Avvio download file {} con id {}", fileName, id);
71
72
 		
72
73
 		MediaType mediaType = MediaType.APPLICATION_OCTET_STREAM;
..
..
@@ -104,7 +105,7 @@
104
105
 		InputStreamResource isr = new InputStreamResource(fis);
105
106
 		return ResponseEntity.ok()
106
107
 				// Content-Disposition
107
-				.header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + file.getName())
108
+				.header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename*=UTF-8''" + java.net.URLEncoder.encode(file.getName(),"UTF-8").replaceAll("\\+", "%20"))
108
109
 				// Content-Type
109
110
 				.contentType(mediaType)
110
111
 				// Contet-Length