From e5828a194b64ced184ba7285b49bd6ed5013265c Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Tue, 13 Oct 2026 11:00:51 -0400 Subject: [PATCH] =?UTF-8?q?--author:scott--date:20261013--for:=E3=80=90?= =?UTF-8?q?=E5=AE=89=E5=85=A8=20GHSA-63v7-3c98-c3mj=E3=80=91=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B6=8A=E6=9D=83=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=9C=AA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84list/add/queryById=E6=B3=A8=E9=87=8A=E5=81=9C?= =?UTF-8?q?=E7=94=A8=EF=BC=8Cedit/getOne=E6=A0=A1=E9=AA=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=BD=92=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.8 --- .../SysAnnouncementSendController.java | 128 ++++++++++-------- 1 file changed, 71 insertions(+), 57 deletions(-) diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java index 9a3edbf82..ea67f0ffe 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java @@ -61,52 +61,51 @@ public class SysAnnouncementSendController { * @param req * @return */ - @GetMapping(value = "/list") - public Result> queryPageList(SysAnnouncementSend sysAnnouncementSend, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = new QueryWrapper(sysAnnouncementSend); - Page page = new Page(pageNo,pageSize); - //排序逻辑 处理 - String column = req.getParameter("column"); - String order = req.getParameter("order"); + // update---author:scott ---date:20261013 for:【安全 GHSA-63v7-3c98-c3mj】该接口前端与服务端均未使用,整体注释停用,避免越权列出全部用户的消息发送记录 + // @GetMapping(value = "/list") + // public Result> queryPageList(SysAnnouncementSend sysAnnouncementSend, + // @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + // @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + // HttpServletRequest req) { + // Result> result = new Result>(); + // QueryWrapper queryWrapper = new QueryWrapper(sysAnnouncementSend); + // Page page = new Page(pageNo,pageSize); + // //排序逻辑 处理 + // String column = req.getParameter("column"); + // String order = req.getParameter("order"); +// + // if(oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) { + // if(DataBaseConstant.SQL_ASC.equals(order)) { + // queryWrapper.orderByAsc(SqlInjectionUtil.getSqlInjectSortField(column)); + // }else { + // queryWrapper.orderByDesc(SqlInjectionUtil.getSqlInjectSortField(column)); + // } + // } + // IPage pageList = sysAnnouncementSendService.page(page, queryWrapper); + // //log.info("查询当前页:"+pageList.getCurrent()); + // //log.info("查询当前页数量:"+pageList.getSize()); + // //log.info("查询结果数量:"+pageList.getRecords().size()); + // //log.info("数据总数:"+pageList.getTotal()); + // result.setSuccess(true); + // result.setResult(pageList); + // return result; + // } + // update-end---author:scott ---date:20261013 for:【安全 GHSA-63v7-3c98-c3mj】未使用接口注释停用 - if(oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) { - if(DataBaseConstant.SQL_ASC.equals(order)) { - queryWrapper.orderByAsc(SqlInjectionUtil.getSqlInjectSortField(column)); - }else { - queryWrapper.orderByDesc(SqlInjectionUtil.getSqlInjectSortField(column)); - } - } - IPage pageList = sysAnnouncementSendService.page(page, queryWrapper); - //log.info("查询当前页:"+pageList.getCurrent()); - //log.info("查询当前页数量:"+pageList.getSize()); - //log.info("查询结果数量:"+pageList.getRecords().size()); - //log.info("数据总数:"+pageList.getTotal()); - result.setSuccess(true); - result.setResult(pageList); - return result; - } - - /** - * 添加 - * @param sysAnnouncementSend - * @return - */ - @PostMapping(value = "/add") - public Result add(@RequestBody SysAnnouncementSend sysAnnouncementSend) { - Result result = new Result(); - try { - sysAnnouncementSendService.save(sysAnnouncementSend); - result.success("添加成功!"); - } catch (Exception e) { - log.error(e.getMessage(),e); - result.error500("操作失败"); - } - return result; - } + // update---author:scott ---date:20261013 for:【安全 GHSA-63v7-3c98-c3mj】该接口前端与服务端均未使用,整体注释停用,避免为他人伪造消息记录 + // @PostMapping(value = "/add") + // public Result add(@RequestBody SysAnnouncementSend sysAnnouncementSend) { + // Result result = new Result(); + // try { + // sysAnnouncementSendService.save(sysAnnouncementSend); + // result.success("添加成功!"); + // } catch (Exception e) { + // log.error(e.getMessage(),e); + // result.error500("操作失败"); + // } + // return result; + // } + // update-end---author:scott ---date:20261013 for:【安全 GHSA-63v7-3c98-c3mj】未使用接口注释停用 /** * 编辑 @@ -120,6 +119,12 @@ public class SysAnnouncementSendController { if(sysAnnouncementSendEntity==null) { result.error500("未找到对应实体"); }else { + //update-begin---author:scott ---date:20261013 for:【安全 GHSA-63v7-3c98-c3mj】只能修改本人的消息发送记录,防止越权篡改他人记录----------- + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!loginUser.getId().equals(sysAnnouncementSendEntity.getUserId())){ + return result.error500("无权修改他人的消息记录"); + } + //update-end---author:scott ---date:20261013 for:【安全 GHSA-63v7-3c98-c3mj】只能修改本人的消息发送记录,防止越权篡改他人记录----------- boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend); //TODO 返回false说明什么? if(ok) { @@ -174,18 +179,20 @@ public class SysAnnouncementSendController { * @param id * @return */ - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); - SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); - if(sysAnnouncementSend==null) { - result.error500("未找到对应实体"); - }else { - result.setResult(sysAnnouncementSend); - result.setSuccess(true); - } - return result; - } + // update---author:scott ---date:20261013 for:【安全 GHSA-63v7-3c98-c3mj】该接口前端与服务端均未使用,整体注释停用,避免越权查看他人的消息发送记录 + // @GetMapping(value = "/queryById") + // public Result queryById(@RequestParam(name="id",required=true) String id) { + // Result result = new Result(); + // SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); + // if(sysAnnouncementSend==null) { + // result.error500("未找到对应实体"); + // }else { + // result.setResult(sysAnnouncementSend); + // result.setSuccess(true); + // } + // return result; + // } + // update-end---author:scott ---date:20261013 for:【安全 GHSA-63v7-3c98-c3mj】未使用接口注释停用 /** * @功能:更新用户系统消息阅读状态 @@ -271,6 +278,13 @@ public class SysAnnouncementSendController { */ @GetMapping(value = "/getOne") public Result getOne(@RequestParam(name="sendId",required=true) String sendId) { + //update-begin---author:scott ---date:20261013 for:【安全 GHSA-63v7-3c98-c3mj】按sendId获取消息正文前校验归属,只能查看本人收到的消息----------- + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysAnnouncementSend sendEntity = sysAnnouncementSendService.getById(sendId); + if(sendEntity==null || !loginUser.getId().equals(sendEntity.getUserId())){ + return Result.error("无权查看该消息"); + } + //update-end---author:scott ---date:20261013 for:【安全 GHSA-63v7-3c98-c3mj】按sendId获取消息正文前校验归属,只能查看本人收到的消息----------- AnnouncementSendModel model = sysAnnouncementSendService.getOne(sendId); return Result.ok(model); }