From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001 From: xubinbin <1323875150@qq.com> Date: 星期二, 12 十二月 2023 17:09:04 +0800 Subject: [PATCH] bugfix:请求头带token, SecurityUtils 获取用户id 一直为0 #1195 --- src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 191 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 175 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java index c543e6e..a7416a8 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java @@ -1,11 +1,11 @@ package com.genersoft.iot.vmp.conf; -import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem; +import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; import com.genersoft.iot.vmp.service.IMediaServerService; -import org.apache.catalina.connector.ClientAbortException; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; +import org.springframework.core.annotation.Order; import org.mitre.dsmiley.httpproxy.ProxyServlet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,15 +14,20 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.util.StringUtils; +import org.springframework.util.ObjectUtils; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.ConnectException; +/** + * @author lin + */ @SuppressWarnings(value = {"rawtypes", "unchecked"}) @Configuration +@Order(1) public class ProxyServletConfig { private final static Logger logger = LoggerFactory.getLogger(ProxyServletConfig.class); @@ -35,7 +40,7 @@ @Bean public ServletRegistrationBean zlmServletRegistrationBean(){ - ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new ZLMProxySerlet(),"/zlm/*"); + ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new ZlmProxyServlet(),"/zlm/*"); servletRegistrationBean.setName("zlm_Proxy"); servletRegistrationBean.addInitParameter("targetUri", "http://127.0.0.1:6080"); servletRegistrationBean.addUrlMappings(); @@ -45,19 +50,31 @@ return servletRegistrationBean; } - class ZLMProxySerlet extends ProxyServlet{ + class ZlmProxyServlet extends ProxyServlet{ @Override protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) { String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString); - IMediaServerItem mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI()); + MediaServerItem mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI()); if (mediaInfo != null) { - if (!StringUtils.isEmpty(queryStr)) { + if (!ObjectUtils.isEmpty(queryStr)) { queryStr += "&secret=" + mediaInfo.getSecret(); }else { queryStr = "secret=" + mediaInfo.getSecret(); } } return queryStr; + } + + + @Override + protected HttpResponse doExecute(HttpServletRequest servletRequest, HttpServletResponse servletResponse, + HttpRequest proxyRequest) throws IOException { + HttpResponse response = super.doExecute(servletRequest, servletResponse, proxyRequest); + response.removeHeaders("Access-Control-Allow-Origin"); + response.setHeader("Access-Control-Allow-Credentials","true"); + response.removeHeaders("Access-Control-Allow-Credentials"); + + return response; } /** @@ -72,9 +89,7 @@ } catch (IOException ioException) { if (ioException instanceof ConnectException) { logger.error("zlm 杩炴帴澶辫触"); - } else if (ioException instanceof ClientAbortException) { - logger.error("鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠g悊缁堟"); - } else { + } else { logger.error("zlm 浠g悊澶辫触锛� ", e); } } catch (RuntimeException exception){ @@ -88,7 +103,7 @@ @Override protected String getTargetUri(HttpServletRequest servletRequest) { String requestURI = servletRequest.getRequestURI(); - IMediaServerItem mediaInfo = getMediaInfoByUri(requestURI); + MediaServerItem mediaInfo = getMediaInfoByUri(requestURI); String uri = null; if (mediaInfo != null) { @@ -106,7 +121,7 @@ @Override protected HttpHost getTargetHost(HttpServletRequest servletRequest) { String requestURI = servletRequest.getRequestURI(); - IMediaServerItem mediaInfo = getMediaInfoByUri(requestURI); + MediaServerItem mediaInfo = getMediaInfoByUri(requestURI); HttpHost host; if (mediaInfo != null) { host = new HttpHost(mediaInfo.getIp(), mediaInfo.getHttpPort()); @@ -120,10 +135,14 @@ /** * 鏍规嵁uri鑾峰彇娴佸獟浣撲俊鎭� */ - IMediaServerItem getMediaInfoByUri(String uri){ + MediaServerItem getMediaInfoByUri(String uri){ String[] split = uri.split("/"); String mediaServerId = split[2]; - return mediaServerService.getOne(mediaServerId); + if ("default".equalsIgnoreCase(mediaServerId)) { + return mediaServerService.getDefaultMediaServer(); + }else { + return mediaServerService.getOne(mediaServerId); + } } /** @@ -132,12 +151,152 @@ @Override protected String rewriteUrlFromRequest(HttpServletRequest servletRequest) { String requestURI = servletRequest.getRequestURI(); - IMediaServerItem mediaInfo = getMediaInfoByUri(requestURI); + MediaServerItem mediaInfo = getMediaInfoByUri(requestURI); String url = super.rewriteUrlFromRequest(servletRequest); if (mediaInfo == null) { + logger.error("[ZLM鏈嶅姟璁块棶浠g悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI); return url; } - return url.replace(mediaInfo.getId() + "/", ""); + if (!ObjectUtils.isEmpty(mediaInfo.getId())) { + url = url.replace(mediaInfo.getId() + "/", ""); + } + return url.replace("default/", ""); + } + } + + @Bean + public ServletRegistrationBean recordServletRegistrationBean(){ + ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new RecordProxyServlet(),"/record_proxy/*"); + servletRegistrationBean.setName("record_proxy"); + servletRegistrationBean.addInitParameter("targetUri", "http://127.0.0.1:18081"); + servletRegistrationBean.addUrlMappings(); + if (logger.isDebugEnabled()) { + servletRegistrationBean.addInitParameter("log", "true"); + } + return servletRegistrationBean; + } + + class RecordProxyServlet extends ProxyServlet{ + + @Override + protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) { + String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString); + MediaServerItem mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI()); + if (mediaInfo == null) { + return null; + } + String remoteHost = String.format("http://%s:%s", mediaInfo.getStreamIp(), mediaInfo.getRecordAssistPort()); + if (!ObjectUtils.isEmpty(queryStr)) { + queryStr += "&remoteHost=" + remoteHost; + }else { + queryStr = "remoteHost=" + remoteHost; + } + return queryStr; + } + + + @Override + protected HttpResponse doExecute(HttpServletRequest servletRequest, HttpServletResponse servletResponse, + HttpRequest proxyRequest) throws IOException { + HttpResponse response = super.doExecute(servletRequest, servletResponse, proxyRequest); + String origin = servletRequest.getHeader("origin"); + response.setHeader("Access-Control-Allow-Origin",origin); + response.setHeader("Access-Control-Allow-Credentials","true"); + + return response; + } + + /** + * 寮傚父澶勭悊 + */ + @Override + protected void handleRequestException(HttpRequest proxyRequest, HttpResponse proxyResponse, Exception e){ + try { + super.handleRequestException(proxyRequest, proxyResponse, e); + } catch (ServletException servletException) { + logger.error("褰曞儚鏈嶅姟 浠g悊澶辫触锛� ", e); + } catch (IOException ioException) { + if (ioException instanceof ConnectException) { + logger.error("褰曞儚鏈嶅姟 杩炴帴澶辫触"); +// }else if (ioException instanceof ClientAbortException) { +// /** +// * TODO 浣跨敤杩欎釜浠g悊搴撳疄鐜颁唬鐞嗗湪閬囧埌浠g悊瑙嗛鏂囦欢鏃讹紝濡傛灉鏄�206缁撴灉锛屼細閬囧埌鎶ラ敊铔嬪競鐩墠鍔熻兘姝e父锛� +// * TODO 鏆傛椂鍘婚櫎寮傚父澶勭悊銆傚悗缁娇鐢ㄥ叾浠栦唬鐞嗘鏋朵慨鏀规祴璇� +// */ + + }else { + logger.error("褰曞儚鏈嶅姟 浠g悊澶辫触锛� ", e); + } + } catch (RuntimeException exception){ + logger.error("褰曞儚鏈嶅姟 浠g悊澶辫触锛� ", e); + } + } + + /** + * 瀵逛簬涓烘寜鐓ф牸寮忚姹傜殑鍙互鐩存帴杩斿洖404 + */ + @Override + protected String getTargetUri(HttpServletRequest servletRequest) { + String requestURI = servletRequest.getRequestURI(); + MediaServerItem mediaInfo = getMediaInfoByUri(requestURI); + + String uri = null; + if (mediaInfo != null) { +// String realRequestURI = requestURI.substring(requestURI.indexOf(mediaInfo.getId())+ mediaInfo.getId().length()); + uri = String.format("http://%s:%s", mediaInfo.getIp(), mediaInfo.getRecordAssistPort()); + }else { + uri = "http://127.0.0.1:" + serverPort +"/index/hook/null"; // 鍙槸涓�涓兘杩斿洖404鐨勮姹傝�屽凡锛� 鍏朵粬鐨勪篃鍙互 + } + return uri; + } + + /** + * 鍔ㄦ�佹浛鎹㈣姹傜洰鏍� + */ + @Override + protected HttpHost getTargetHost(HttpServletRequest servletRequest) { + String requestURI = servletRequest.getRequestURI(); + MediaServerItem mediaInfo = getMediaInfoByUri(requestURI); + HttpHost host; + if (mediaInfo != null) { + host = new HttpHost(mediaInfo.getIp(), mediaInfo.getRecordAssistPort()); + }else { + host = new HttpHost("127.0.0.1", serverPort); + } + return host; + + } + + /** + * 鏍规嵁uri鑾峰彇娴佸獟浣撲俊鎭� + */ + MediaServerItem getMediaInfoByUri(String uri){ + String[] split = uri.split("/"); + String mediaServerId = split[2]; + if ("default".equalsIgnoreCase(mediaServerId)) { + return mediaServerService.getDefaultMediaServer(); + }else { + return mediaServerService.getOne(mediaServerId); + } + + } + + /** + * 鍘绘帀url涓殑鏍囧織淇℃伅 + */ + @Override + protected String rewriteUrlFromRequest(HttpServletRequest servletRequest) { + String requestURI = servletRequest.getRequestURI(); + MediaServerItem mediaInfo = getMediaInfoByUri(requestURI); + String url = super.rewriteUrlFromRequest(servletRequest); + if (mediaInfo == null) { + logger.error("[褰曞儚鏈嶅姟璁块棶浠g悊]锛岄敊璇細澶勭悊url淇℃伅鏃舵湭鎵惧埌娴佸獟浣撲俊鎭�=>{}", requestURI); + return url; + } + if (!ObjectUtils.isEmpty(mediaInfo.getId())) { + url = url.replace(mediaInfo.getId() + "/", ""); + } + return url.replace("default/", ""); } } -- Gitblit v1.8.0