!277 修复 压缩包特殊符文无法访问问题 调整统一url输出为url编码解决特殊符号问题 调整跨域方法和下载方法为一样 支持重定向

Merge pull request !277 from 高雄/master

pom.xml

@@ -35,6 +35,7 @@
         <aspose-cad.version>23.9</aspose-cad.version>
         <bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
         <juniversalchardet.version>1.0.3</juniversalchardet.version>
+        <httpcomponents.version>4.5.14</httpcomponents.version>
 
         <commons-cli.version>1.5.0</commons-cli.version>
         <commons-net.version>3.9.0</commons-net.version>

server/pom.xml

@@ -99,6 +99,11 @@
             <version>${xdocreport.version}</version>
         </dependency>
         <!-- poi start -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+             <version>${httpcomponents.version}</version>
+        </dependency>
 
         <!-- 对 rar5 的支持 和其他众多压缩支持 可参考 package net.sf.sevenzipjbinding.ArchiveFormat; -->
         <dependency>

server/src/main/java/cn/keking/service/FileHandlerService.java

@@ -421,7 +421,7 @@ public class FileHandlerService implements InitializingBean {
     public static String getSubString(String str, String posStr) {
         return str.substring(str.indexOf(posStr) + posStr.length());
     }
-    
+
     /**
      * 获取文件属性
      *

server/src/main/java/cn/keking/utils/DownloadUtils.java

@@ -6,23 +6,22 @@ import cn.keking.model.ReturnResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.mola.galimatias.GalimatiasParseException;
 import org.apache.commons.io.FileUtils;
+import org.apache.http.client.HttpClient;
+import org.apache.http.impl.client.DefaultRedirectStrategy;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RequestCallback;
-import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.URI;
 import java.net.URL;
-import java.net.URLEncoder;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.UUID;
@@ -41,6 +40,7 @@ public class DownloadUtils {
     private static final String URL_PARAM_FTP_PASSWORD = "ftp.password";
     private static final String URL_PARAM_FTP_CONTROL_ENCODING = "ftp.control.encoding";
     private static final RestTemplate restTemplate = new RestTemplate();
+    private static  final HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
     private static final ObjectMapper mapper = new ObjectMapper();
 
 
@@ -90,12 +90,12 @@ public class DownloadUtils {
             if (!fileAttribute.getSkipDownLoad()) {
                 if (isHttpUrl(url)) {
                     File realFile = new File(realPath);
-                    SimpleClientHttpRequestFactory httpFactory = new SimpleClientHttpRequestFactory();
+                    factory.setConnectionRequestTimeout(2000);  //设置超时时间
-                    //连接超时10秒，默认无限制，单位：毫秒
+                    factory.setConnectTimeout(10000);
-                    httpFactory.setConnectTimeout(60 * 1000);
+                    factory.setReadTimeout(72000);
-                    //读取超时5秒,默认无限限制,单位：毫秒
+                    HttpClient httpClient = HttpClientBuilder.create().setRedirectStrategy(new DefaultRedirectStrategy()).build();
-                    httpFactory.setReadTimeout(60 * 1000);
+                    factory.setHttpClient(httpClient);  //加入重定向方法
-                    restTemplate.setRequestFactory(httpFactory);
+                    restTemplate.setRequestFactory(factory);
                     RequestCallback requestCallback = request -> {
                         request.getHeaders().setAccept(Arrays.asList(MediaType.APPLICATION_OCTET_STREAM, MediaType.ALL));
                         String proxyAuthorization = fileAttribute.getKkProxyAuthorization();

server/src/main/java/cn/keking/utils/RarUtils.java

@@ -75,15 +75,18 @@ public class RarUtils {
     public static boolean judge(char c){
         return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z');
     }
+    public static String specialSymbols(String str) {
+        //去除压缩包文件字符串中特殊符号
+        Pattern p = Pattern.compile("\\s|\t|\r|\n|\\+|#|&|=|\\p{P}");
+  //    Pattern p = Pattern.compile("\\s|\\+|#|&|=|\\p{P}");
+        Matcher m = p.matcher(str);
+        return m.replaceAll("");
+    }
     public static boolean isMessyCode(String strName) {
         //去除字符串中的空格 制表符 换行 回车
-        Pattern p = Pattern.compile("\\s*|\t*|\r*|\n*");
+        strName = specialSymbols(strName);
-        Matcher m = p.matcher(strName);
-        String after = m.replaceAll("").replaceAll("\\+", "").replaceAll("#", "").replaceAll("&", "");
-        //去除字符串中的标点符号
-        String temp = after.replaceAll("\\p{P}", "");
         //处理之后转换成字符数组
-        char[] ch = temp.trim().toCharArray();
+        char[] ch = strName.trim().toCharArray();
         for (char c : ch) {
             //判断是否是数字或者英文字符
             if (!judge(c)) {

server/src/main/java/cn/keking/utils/WebUtils.java

@@ -5,7 +5,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.Base64Utils;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.util.HtmlUtils;
 
@@ -74,15 +73,20 @@ public class WebUtils {
      */
     public static String  urlEncoderencode(String urlStr) {
 
-        String fullFileName = getUrlParameterReg(urlStr, "fullfilename");  //获取文件名
+        String fullFileName = getUrlParameterReg(urlStr, "fullfilename");  //获取流文件名
-        if (!ObjectUtils.isEmpty(fullFileName)) {  //判断是否启用了 流接入方法
+        if (org.springframework.util.StringUtils.hasText(fullFileName)) {
-            urlStr = clearFullfilenameParam(urlStr);   //去掉流接入 拼接命令
+            // 移除fullfilename参数
+            urlStr = clearFullfilenameParam(urlStr);
+        } else {
+            fullFileName = getFileNameFromURL(urlStr); //获取文件名
+
         }
-        try {
+        if (!UrlEncoderUtils.hasUrlEncoded(fullFileName)) {  //判断文件名是否转义
-            urlStr = URLEncoder.encode(urlStr, "UTF-8").replaceAll("\\+", "%20");
+            try {
-            urlStr = urlStr.replaceAll("%3A", ":").replaceAll("%2F", "/").replaceAll("%3F", "?").replaceAll("%26", "&");
+                urlStr = URLEncoder.encode(urlStr, "UTF-8").replaceAll("\\+", "%20").replaceAll("%3A", ":").replaceAll("%2F", "/").replaceAll("%3F", "?").replaceAll("%26", "&");
-        } catch (UnsupportedEncodingException e) {
+            } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
+                e.printStackTrace();
+            }
         }
         return urlStr;
     }

server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java

@@ -8,28 +8,33 @@ import cn.keking.service.cache.CacheService;
 import cn.keking.service.impl.OtherFilePreviewImpl;
 import cn.keking.utils.KkFileUtils;
 import cn.keking.utils.WebUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import fr.opensagres.xdocreport.core.io.IOUtils;
-import io.mola.galimatias.GalimatiasParseException;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.http.client.HttpClient;
+import org.apache.http.impl.client.DefaultRedirectStrategy;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.client.RequestCallback;
+import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import static cn.keking.service.FilePreview.PICTURE_FILE_PREVIEW_PAGE;
 
@@ -46,6 +51,9 @@ public class OnlinePreviewController {
     private final CacheService cacheService;
     private final FileHandlerService fileHandlerService;
     private final OtherFilePreviewImpl otherFilePreview;
+    private static final RestTemplate restTemplate = new RestTemplate();
+    private static  final HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
+    private static final ObjectMapper mapper = new ObjectMapper();
 
     public OnlinePreviewController(FilePreviewFactory filePreviewFactory, FileHandlerService fileHandlerService, CacheService cacheService, OtherFilePreviewImpl otherFilePreview) {
         this.previewFactory = filePreviewFactory;
@@ -106,83 +114,53 @@ public class OnlinePreviewController {
      * @param response response
      */
     @GetMapping("/getCorsFile")
-    public void getCorsFile(String urlPath, HttpServletResponse response) throws IOException {
+    public void getCorsFile(String urlPath, HttpServletResponse response,FileAttribute fileAttribute) throws IOException {
+        URL url;
         try {
             urlPath = WebUtils.decodeUrl(urlPath);
+            url = WebUtils.normalizedURL(urlPath);
         } catch (Exception ex) {
             logger.error(String.format(BASE64_DECODE_ERROR_MSG, urlPath),ex);
             return;
         }
-        HttpURLConnection urlcon = null;
-        InputStream inputStream = null;
-        String urlStr;
         assert urlPath != null;
         if (!urlPath.toLowerCase().startsWith("http") && !urlPath.toLowerCase().startsWith("https") && !urlPath.toLowerCase().startsWith("ftp")) {
             logger.info("读取跨域文件异常，可能存在非法访问，urlPath：{}", urlPath);
             return;
         }
-        logger.info("下载跨域pdf文件url：{}", urlPath);
+        InputStream inputStream = null;
-        if (!urlPath.toLowerCase().startsWith("ftp:")){
+        logger.info("读取跨域pdf文件url：{}", urlPath);
+        if (!urlPath.toLowerCase().startsWith("ftp:")) {
+            factory.setConnectionRequestTimeout(2000);
+            factory.setConnectTimeout(10000);
+            factory.setReadTimeout(72000);
+            HttpClient httpClient = HttpClientBuilder.create().setRedirectStrategy(new DefaultRedirectStrategy()).build();
+            factory.setHttpClient(httpClient);
+            restTemplate.setRequestFactory(factory);
+            RequestCallback requestCallback = request -> {
+                request.getHeaders().setAccept(Arrays.asList(MediaType.APPLICATION_OCTET_STREAM, MediaType.ALL));
+                String proxyAuthorization = fileAttribute.getKkProxyAuthorization();
+                if(StringUtils.hasText(proxyAuthorization)){
+                    Map<String,String> proxyAuthorizationMap = mapper.readValue(proxyAuthorization, Map.class);
+                    proxyAuthorizationMap.forEach((key, value) -> request.getHeaders().set(key, value));
+                }
+            };
             try {
-                URL url = WebUtils.normalizedURL(urlPath);
+                restTemplate.execute(url.toURI(), HttpMethod.GET, requestCallback, fileResponse -> {
-                urlcon=(HttpURLConnection)url.openConnection();
+                    IOUtils.copy(fileResponse.getBody(), response.getOutputStream());
-                urlcon.setConnectTimeout(30000);
+                    return null;
-                urlcon.setReadTimeout(30000);
+                });
-                urlcon.setInstanceFollowRedirects(false);
+            }  catch (Exception e) {
-                int responseCode = urlcon.getResponseCode();
+                System.out.println(e);
-                if ( responseCode == 403  || responseCode == 500) { //403  500
-                    logger.error("读取跨域文件异常，url：{}，错误：{}", urlPath,responseCode);
-                    return ;
-                }
-                if (responseCode == HttpURLConnection.HTTP_MOVED_PERM || responseCode == HttpURLConnection.HTTP_MOVED_TEMP) { //301 302
-                    url =new URL(urlcon.getHeaderField("Location"));
-                    urlcon=(HttpURLConnection)url.openConnection();
-                } if (responseCode  == 404 ) {  //404
-                    try {
-                        urlStr = URLDecoder.decode(urlPath, StandardCharsets.UTF_8.name());
-                        urlStr = URLDecoder.decode(urlStr, StandardCharsets.UTF_8.name());
-                        url = WebUtils.normalizedURL(urlStr);
-                        urlcon=(HttpURLConnection)url.openConnection();
-                        urlcon.setConnectTimeout(30000);
-                        urlcon.setReadTimeout(30000);
-                        urlcon.setInstanceFollowRedirects(false);
-                        responseCode = urlcon.getResponseCode();
-                        if (responseCode == HttpURLConnection.HTTP_MOVED_PERM || responseCode == HttpURLConnection.HTTP_MOVED_TEMP) { //301 302
-                            url =new URL(urlcon.getHeaderField("Location"));
-                        }
-                        if(responseCode == 404 ||responseCode  == 403  || responseCode == 500 ){
-                            logger.error("读取跨域文件异常，url：{}，错误：{}", urlPath,responseCode);
-                            return ;
-                        }
-                    } catch (UnsupportedEncodingException e) {
-                        e.printStackTrace();
-                    }finally {
-                        assert urlcon != null;
-                        urlcon.disconnect();
-                    }
-                }
-                    if(urlPath.contains( ".svg")) {
-                        response.setContentType("image/svg+xml");
-                    }
-                    inputStream=(url).openStream();
-                    IOUtils.copy(inputStream, response.getOutputStream());
-
-            } catch (IOException | GalimatiasParseException e) {
-                logger.error("读取跨域文件异常，url：{}", urlPath);
-            } finally {
-                assert urlcon != null;
-                urlcon.disconnect();
-                IOUtils.closeQuietly(inputStream);
             }
-        } else {
+        }else{
             try {
-                URL url = WebUtils.normalizedURL(urlPath);
                 if(urlPath.contains(".svg")) {
                     response.setContentType("image/svg+xml");
                 }
                 inputStream = (url).openStream();
                 IOUtils.copy(inputStream, response.getOutputStream());
-            } catch (IOException | GalimatiasParseException e) {
+            } catch (IOException e) {
                 logger.error("读取跨域文件异常，url：{}", urlPath);
             } finally {
                 IOUtils.closeQuietly(inputStream);

server/src/main/resources/web/compress.ftl

@@ -51,7 +51,7 @@
     };
     function chooseNode(event, treeId, treeNode) {
         if (!treeNode.isParent) {
-            var path = '${baseUrl}' + treeNode.id + "?kkCompressfileKey=" + '${fileTree}'+"&kkCompressfilepath=" + treeNode.id+"&fullfilename="+treeNode.name;
+            var path = '${baseUrl}' + treeNode.id +  "?kkCompressfileKey=" + encodeURIComponent('${fileTree}')+"&kkCompressfilepath=" + encodeURIComponent(treeNode.id)+"&fullfilename="+encodeURIComponent(treeNode.name);
             location.href = "${baseUrl}onlinePreview?url=" + encodeURIComponent(Base64.encode(path));
         }
     }