From 5f21899c627c7331359af60aba4d2932b4a1d092 Mon Sep 17 00:00:00 2001 From: luozhun <2025254074@qq.com> Date: Wed, 20 Nov 2024 11:31:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=9C=AA?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E8=BF=87=E6=BB=A4=E5=99=A8=E5=92=8C?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了 BodyWrapperFilter、CustomHttpServletRequestWrapper 和 SignInterceptor 类 - 这些类可能在其他地方通过配置引用，建议检查相关配置并进行相应调整 --- .../support/filter/BodyWrapperFilter.java | 29 ----- .../CustomHttpServletRequestWrapper.java | 65 ---------- .../support/interceptor/SignInterceptor.java | 122 ------------------ 3 files changed, 216 deletions(-) delete mode 100644 policeSecurityServer/src/main/java/com/changhu/support/filter/BodyWrapperFilter.java delete mode 100644 policeSecurityServer/src/main/java/com/changhu/support/filter/CustomHttpServletRequestWrapper.java delete mode 100644 policeSecurityServer/src/main/java/com/changhu/support/interceptor/SignInterceptor.java diff --git a/policeSecurityServer/src/main/java/com/changhu/support/filter/BodyWrapperFilter.java b/policeSecurityServer/src/main/java/com/changhu/support/filter/BodyWrapperFilter.java deleted file mode 100644 index 2acfb14..0000000 --- a/policeSecurityServer/src/main/java/com/changhu/support/filter/BodyWrapperFilter.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.changhu.support.filter; - -import jakarta.servlet.*; -import jakarta.servlet.http.HttpServletRequest; -import lombok.extern.slf4j.Slf4j; - -import java.io.IOException; - -/** - * @author 20252 - * @createTime 2024/11/19 下午3:07 - * @desc BodyWrapperFilter... - */ -@Slf4j -public class BodyWrapperFilter implements Filter { - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - ServletRequest requestWrapper = null; - if (servletRequest instanceof HttpServletRequest) { - requestWrapper = new CustomHttpServletRequestWrapper((HttpServletRequest) servletRequest); - } - if (requestWrapper == null) { - filterChain.doFilter(servletRequest, servletResponse); - } else { - filterChain.doFilter(requestWrapper, servletResponse); - } - - } -} diff --git a/policeSecurityServer/src/main/java/com/changhu/support/filter/CustomHttpServletRequestWrapper.java b/policeSecurityServer/src/main/java/com/changhu/support/filter/CustomHttpServletRequestWrapper.java deleted file mode 100644 index a4c11ba..0000000 --- a/policeSecurityServer/src/main/java/com/changhu/support/filter/CustomHttpServletRequestWrapper.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.changhu.support.filter; - -import jakarta.servlet.ReadListener; -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; - -import java.io.*; -import java.nio.charset.StandardCharsets; - -/** - * @author 20252 - * @createTime 2024/11/19 下午3:12 - * @desc CustomHttpServletRequestWrapper... - */ -public class CustomHttpServletRequestWrapper extends HttpServletRequestWrapper { - private final byte[] body; - - public CustomHttpServletRequestWrapper(HttpServletRequest request) throws IOException { - super(request); - BufferedReader reader = request.getReader(); - try (StringWriter writer = new StringWriter()) { - int read; - char[] buf = new char[1024 * 8]; - while ((read = reader.read(buf)) != -1) { - writer.write(buf, 0, read); - } - this.body = writer.getBuffer().toString().getBytes(); - } - } - - public String getBody() { - return new String(body, StandardCharsets.UTF_8); - } - - @Override - public ServletInputStream getInputStream() { - final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body); - return new ServletInputStream() { - @Override - public boolean isFinished() { - return false; - } - - @Override - public boolean isReady() { - return false; - } - - @Override - public void setReadListener(ReadListener readListener) { - } - - @Override - public int read() { - return byteArrayInputStream.read(); - } - }; - } - - @Override - public BufferedReader getReader() { - return new BufferedReader(new InputStreamReader(this.getInputStream())); - } -} diff --git a/policeSecurityServer/src/main/java/com/changhu/support/interceptor/SignInterceptor.java b/policeSecurityServer/src/main/java/com/changhu/support/interceptor/SignInterceptor.java deleted file mode 100644 index 4e78e36..0000000 --- a/policeSecurityServer/src/main/java/com/changhu/support/interceptor/SignInterceptor.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.changhu.support.interceptor; - -import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.URLUtil; -import cn.hutool.crypto.digest.MD5; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson2.TypeReference; -import com.baomidou.mybatisplus.extension.toolkit.Db; -import com.changhu.common.db.enums.IsEnable; -import com.changhu.common.exception.MessageException; -import com.changhu.common.utils.IpUtil; -import com.changhu.pojo.entity.AccessKeys; -import com.changhu.support.filter.CustomHttpServletRequestWrapper; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; -import org.springframework.web.servlet.HandlerInterceptor; - -import java.nio.charset.StandardCharsets; -import java.time.LocalDateTime; -import java.util.*; - -/** - * @author 20252 - * @createTime 2024/11/19 下午1:58 - * @desc SignInterceptor... - */ -@Slf4j -public class SignInterceptor implements HandlerInterceptor { - - private static final String ACCESS_KEY = "access-key";//调用者身份唯一标识 - private static final String TIMESTAMP = "time-stamp";//时间戳 - private static final String SIGN = "sign";//签名 - - @Override - public boolean preHandle(@NotNull HttpServletRequest request, - @NotNull HttpServletResponse response, - @NotNull Object handler) throws Exception { - String ip = IpUtil.getIp(request); - try { - checkSign(request); - } catch (MessageException e) { - log.error("开放接口访问失败:{} 访问时间:{} IP:{} 访问接口:{} ", e.getMessage(), LocalDateTime.now(), ip, request.getRequestURI()); - throw e; - } - - - return true; - } - - private void checkSign(HttpServletRequest request) throws MessageException { - - String accessKey = request.getHeader(ACCESS_KEY); - String timestamp = request.getHeader(TIMESTAMP); - String sign = request.getHeader(SIGN); - - if (StrUtil.isBlank(accessKey) || StrUtil.isBlank(timestamp) || StrUtil.isBlank(sign)) { - throw new MessageException("请求体缺失"); - } - - AccessKeys accessKeyEntity = Db.lambdaQuery(AccessKeys.class) - .eq(AccessKeys::getAccessKey, accessKey) - .oneOpt() - .orElseThrow(() -> new MessageException("无效的accessKey")); - - if (IsEnable.FALSE.equals(accessKeyEntity.getIsEnable())) { - throw new MessageException("无效的accessKey"); - } - - List allowedResources = Optional.ofNullable(accessKeyEntity.getAllowedResources()).orElseThrow(() -> new MessageException("暂无允许访问的资源")); - if (!allowedResources.contains(request.getRequestURI())) { - throw new MessageException("无效的请求资源"); - } - - Map hashMap = new HashMap<>(); - //添加请求url参数 - Map map = HttpUtil.decodeParamMap(request.getQueryString(), StandardCharsets.UTF_8); - if (!map.isEmpty()) { - hashMap.putAll(map); - } - - hashMap.put(ACCESS_KEY, accessKey); - hashMap.put(TIMESTAMP, timestamp); - //添加body参数 - CustomHttpServletRequestWrapper c = (CustomHttpServletRequestWrapper) request; - Optional.ofNullable(new TypeReference>() { - }.parseObject(c.getBody())).ifPresent(hashMap::putAll); - - String nowSign = generatedSign(hashMap, accessKeyEntity.getSecretKey()); - if (!sign.equals(nowSign)) { - throw new MessageException("签名错误"); - } - } - - /** - * 获取签名 - * - * @param map 参数结果 - * @param secretKey 密钥 - * @return 签名字符串 - */ - private String generatedSign(Map map, String secretKey) { - List> infoIds = new ArrayList<>(map.entrySet()); - infoIds.sort(Map.Entry.comparingByKey()); - - StringBuilder sb = new StringBuilder(); - for (Map.Entry m : infoIds) { - if (null == m.getValue() || StrUtil.isNotBlank(m.getValue().toString())) { - sb.append(m.getKey()).append("=").append(URLUtil.encodeAll(m.getValue().toString())).append("&"); - } - } - sb.append("secret-key=").append(secretKey); - return MD5.create().digestHex(sb.toString()).toUpperCase(); - } - - public static void main(String[] args) { - String str1 = "access-key=w2wzi0wefmmo6s735z2el8tfzitya5gj&addr=%E6%B9%96%E5%8D%97%E7%9C%81%E9%95%BF%E6%B2%99%E5%B8%82&age=14&name=zhangsan&time-stamp=1732067854476&secret-key=db1b5214-02ee-497f-957c-88323b4351bf"; - String str2 = "access-key=w2wzi0wefmmo6s735z2el8tfzitya5gj&addr=%E6%B9%96%E5%8D%97%E7%9C%81%E9%95%BF%E6%B2%99%E5%B8%82&age=14&name=zhangsan&time-stamp=1732067854476&secret-key=db1b5214-02ee-497f-957c-88323b4351bf"; - } - -}