From f86b1c1890dc869c487498a2c901f7d766a792a5 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Wed, 29 Nov 2023 17:45:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ip=E9=BB=91=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lihongjie/coal/common/Constants.java | 1 + .../lihongjie/coal/filter/IpListFilter.java | 61 ++++++++++++++ .../ipList/controller/IpListController.java | 52 ++++++++++++ .../coal/ipList/dto/CreateIpListDto.java | 27 +++++++ .../lihongjie/coal/ipList/dto/IpListDto.java | 27 +++++++ .../coal/ipList/dto/UpdateIpListDto.java | 27 +++++++ .../coal/ipList/entity/IpListEntity.java | 31 +++++++ .../coal/ipList/mapper/IpListMapper.java | 18 +++++ .../ipList/repository/IpListRepository.java | 13 +++ .../coal/ipList/service/IpListService.java | 81 +++++++++++++++++++ .../coal/spring/config/JacksonConfig.java | 25 ++++++ 11 files changed, 363 insertions(+) create mode 100644 src/main/java/cn/lihongjie/coal/filter/IpListFilter.java create mode 100644 src/main/java/cn/lihongjie/coal/ipList/controller/IpListController.java create mode 100644 src/main/java/cn/lihongjie/coal/ipList/dto/CreateIpListDto.java create mode 100644 src/main/java/cn/lihongjie/coal/ipList/dto/IpListDto.java create mode 100644 src/main/java/cn/lihongjie/coal/ipList/dto/UpdateIpListDto.java create mode 100644 src/main/java/cn/lihongjie/coal/ipList/entity/IpListEntity.java create mode 100644 src/main/java/cn/lihongjie/coal/ipList/mapper/IpListMapper.java create mode 100644 src/main/java/cn/lihongjie/coal/ipList/repository/IpListRepository.java create mode 100644 src/main/java/cn/lihongjie/coal/ipList/service/IpListService.java diff --git a/src/main/java/cn/lihongjie/coal/common/Constants.java b/src/main/java/cn/lihongjie/coal/common/Constants.java index b17adf2d..343cd623 100644 --- a/src/main/java/cn/lihongjie/coal/common/Constants.java +++ b/src/main/java/cn/lihongjie/coal/common/Constants.java @@ -15,6 +15,7 @@ public class Constants { public static final String HTTP_HEADER_TS = "X-TS"; public static final String RATE_LIMIT_GLOBAL_SESSION_PREFIX = "global-session-rl-"; public static final String RATE_LIMIT_GLOBAL_USER_PREFIX = "global-user-rl-"; + public static final String CACHE_ADDRESS_TYPE = "addressType"; public static String SYSCONFIG_ENABLE_CAPTCHA = "enable_captcha"; public static String SYSCONFIG_ENABLE_REQUEST_SIGN = "enable_request_sign"; public static String SYSCONFIG_SESSION_TIMEOUT = "session_timeout"; diff --git a/src/main/java/cn/lihongjie/coal/filter/IpListFilter.java b/src/main/java/cn/lihongjie/coal/filter/IpListFilter.java new file mode 100644 index 00000000..1a85045a --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/filter/IpListFilter.java @@ -0,0 +1,61 @@ +package cn.lihongjie.coal.filter; + +import cn.lihongjie.coal.common.RequestUtils; +import cn.lihongjie.coal.exception.BizException; +import cn.lihongjie.coal.ipList.service.IpListService; +import cn.lihongjie.coal.syslog.service.SysLogService; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import lombok.extern.slf4j.Slf4j; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.Objects; + +/** +* +*/ +@Component +@Order(5) +@Slf4j +public class IpListFilter extends OncePerRequestFilter { + + @Autowired IpListService ipListService; + + @Autowired SysLogService sysLogService; + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + + String ip = RequestUtils.getIp(request); + + if (StringUtils.isEmpty(ip)) { + + RequestUtils.writeResponse(new BizException("无法获取请求IP"), response); + return; + } + + String addressType = ipListService.getAddressType(ip); + + + if (Objects.equals(addressType, "0")) { + sysLogService.saveSysLog(request, "IP名单", "黑名单", ""); + RequestUtils.writeResponse(new BizException("IP地址: " + ip + "已被拉黑, 请联系管理员处理"), response); + return; + } + + + + + filterChain.doFilter(request, response); + } +} diff --git a/src/main/java/cn/lihongjie/coal/ipList/controller/IpListController.java b/src/main/java/cn/lihongjie/coal/ipList/controller/IpListController.java new file mode 100644 index 00000000..8a22c93b --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/ipList/controller/IpListController.java @@ -0,0 +1,52 @@ +package cn.lihongjie.coal.ipList.controller; + +import cn.lihongjie.coal.annotation.SysLog; +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.ipList.dto.CreateIpListDto; +import cn.lihongjie.coal.ipList.dto.IpListDto; +import cn.lihongjie.coal.ipList.dto.UpdateIpListDto; +import cn.lihongjie.coal.ipList.service.IpListService; + +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/ipList") +@SysLog(module = "IP名单") +@Slf4j +public class IpListController { + @Autowired private IpListService service; + + @PostMapping("/create") + public IpListDto create(@RequestBody CreateIpListDto request) { + return this.service.create(request); + } + + @PostMapping("/update") + public IpListDto update(@RequestBody UpdateIpListDto request) { + return this.service.update(request); + } + + @PostMapping("/delete") + public Object delete(@RequestBody IdRequest request) { + this.service.delete(request); + return true; + } + + @PostMapping("/getById") + public IpListDto getById(@RequestBody IdRequest request) { + return this.service.getById(request.getId()); + } + + @PostMapping("/list") + public Page list(@RequestBody CommonQuery request) { + return this.service.list(request); + } +} diff --git a/src/main/java/cn/lihongjie/coal/ipList/dto/CreateIpListDto.java b/src/main/java/cn/lihongjie/coal/ipList/dto/CreateIpListDto.java new file mode 100644 index 00000000..bf97ab1e --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/ipList/dto/CreateIpListDto.java @@ -0,0 +1,27 @@ +package cn.lihongjie.coal.ipList.dto; + +import cn.lihongjie.coal.base.dto.CommonDto; + +import io.hypersistence.utils.hibernate.type.basic.Inet; +import io.hypersistence.utils.hibernate.type.basic.PostgreSQLInetType; + +import jakarta.persistence.Column; + +import lombok.Data; + +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Type; + +@Data +public class CreateIpListDto extends CommonDto { + @Type(PostgreSQLInetType.class) + @Column( + columnDefinition = "inet" + ) + private Inet address; + + + + @Comment("地址类型 0:黑名单 1:白名单") + private String addressType; +} diff --git a/src/main/java/cn/lihongjie/coal/ipList/dto/IpListDto.java b/src/main/java/cn/lihongjie/coal/ipList/dto/IpListDto.java new file mode 100644 index 00000000..71109470 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/ipList/dto/IpListDto.java @@ -0,0 +1,27 @@ +package cn.lihongjie.coal.ipList.dto; + +import cn.lihongjie.coal.base.dto.CommonDto; + +import io.hypersistence.utils.hibernate.type.basic.Inet; +import io.hypersistence.utils.hibernate.type.basic.PostgreSQLInetType; + +import jakarta.persistence.Column; + +import lombok.Data; + +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Type; + +@Data +public class IpListDto extends CommonDto { + @Type(PostgreSQLInetType.class) + @Column( + columnDefinition = "inet" + ) + private Inet address; + + + + @Comment("地址类型 0:黑名单 1:白名单") + private String addressType; +} diff --git a/src/main/java/cn/lihongjie/coal/ipList/dto/UpdateIpListDto.java b/src/main/java/cn/lihongjie/coal/ipList/dto/UpdateIpListDto.java new file mode 100644 index 00000000..072cc5ea --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/ipList/dto/UpdateIpListDto.java @@ -0,0 +1,27 @@ +package cn.lihongjie.coal.ipList.dto; + +import cn.lihongjie.coal.base.dto.CommonDto; + +import io.hypersistence.utils.hibernate.type.basic.Inet; +import io.hypersistence.utils.hibernate.type.basic.PostgreSQLInetType; + +import jakarta.persistence.Column; + +import lombok.Data; + +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Type; + +@Data +public class UpdateIpListDto extends CommonDto { + @Type(PostgreSQLInetType.class) + @Column( + columnDefinition = "inet" + ) + private Inet address; + + + + @Comment("地址类型 0:黑名单 1:白名单") + private String addressType; +} diff --git a/src/main/java/cn/lihongjie/coal/ipList/entity/IpListEntity.java b/src/main/java/cn/lihongjie/coal/ipList/entity/IpListEntity.java new file mode 100644 index 00000000..e4aaba7d --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/ipList/entity/IpListEntity.java @@ -0,0 +1,31 @@ +package cn.lihongjie.coal.ipList.entity; + +import cn.lihongjie.coal.base.entity.CommonEntity; + +import io.hypersistence.utils.hibernate.type.basic.Inet; +import io.hypersistence.utils.hibernate.type.basic.PostgreSQLInetType; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; + +import lombok.Data; + +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Type; + +@Data +@Entity +public class IpListEntity extends CommonEntity { + + @Type(PostgreSQLInetType.class) + @Column( + columnDefinition = "inet" + ) + private Inet address; + + + + @Comment("地址类型 0:黑名单 1:白名单") + private String addressType; + +} diff --git a/src/main/java/cn/lihongjie/coal/ipList/mapper/IpListMapper.java b/src/main/java/cn/lihongjie/coal/ipList/mapper/IpListMapper.java new file mode 100644 index 00000000..7498b3eb --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/ipList/mapper/IpListMapper.java @@ -0,0 +1,18 @@ +package cn.lihongjie.coal.ipList.mapper; + +import cn.lihongjie.coal.base.mapper.BaseMapper; +import cn.lihongjie.coal.base.mapper.CommonMapper; +import cn.lihongjie.coal.ipList.dto.CreateIpListDto; +import cn.lihongjie.coal.ipList.dto.IpListDto; +import cn.lihongjie.coal.ipList.dto.UpdateIpListDto; +import cn.lihongjie.coal.ipList.entity.IpListEntity; + +import org.mapstruct.Mapper; +import org.mapstruct.control.DeepClone; + +@Mapper( + componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING, + uses = {CommonMapper.class}, + mappingControl = DeepClone.class) +public interface IpListMapper + extends BaseMapper {} diff --git a/src/main/java/cn/lihongjie/coal/ipList/repository/IpListRepository.java b/src/main/java/cn/lihongjie/coal/ipList/repository/IpListRepository.java new file mode 100644 index 00000000..a9418231 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/ipList/repository/IpListRepository.java @@ -0,0 +1,13 @@ +package cn.lihongjie.coal.ipList.repository; + +import cn.lihongjie.coal.base.dao.BaseRepository; +import cn.lihongjie.coal.ipList.entity.IpListEntity; + +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +@Repository +public interface IpListRepository extends BaseRepository { + @Query(value = "select address_type from t_ip_list where address >>= cast(?1 as inet) order by address_type limit 1 ", nativeQuery = true) + String getAddressType(String address); +} diff --git a/src/main/java/cn/lihongjie/coal/ipList/service/IpListService.java b/src/main/java/cn/lihongjie/coal/ipList/service/IpListService.java new file mode 100644 index 00000000..0c6682c3 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/ipList/service/IpListService.java @@ -0,0 +1,81 @@ +package cn.lihongjie.coal.ipList.service; + +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.base.service.BaseService; +import cn.lihongjie.coal.common.Constants; +import cn.lihongjie.coal.ipList.dto.CreateIpListDto; +import cn.lihongjie.coal.ipList.dto.IpListDto; +import cn.lihongjie.coal.ipList.dto.UpdateIpListDto; +import cn.lihongjie.coal.ipList.entity.IpListEntity; +import cn.lihongjie.coal.ipList.mapper.IpListMapper; +import cn.lihongjie.coal.ipList.repository.IpListRepository; + +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.core.convert.ConversionService; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Slf4j +@Transactional +public class IpListService extends BaseService { + @Autowired private IpListRepository repository; + + @Autowired private IpListMapper mapper; + + @Autowired private ConversionService conversionService; + + @CacheEvict(value = Constants.CACHE_ADDRESS_TYPE, allEntries = true) + public IpListDto create(CreateIpListDto request) { + IpListEntity entity = mapper.toEntity(request); + + this.repository.save(entity); + return getById(entity.getId()); + } + @CacheEvict(value = Constants.CACHE_ADDRESS_TYPE, allEntries = true) + + public IpListDto update(UpdateIpListDto request) { + IpListEntity entity = this.repository.get(request.getId()); + this.mapper.updateEntity(entity, request); + + this.repository.save(entity); + + return getById(entity.getId()); + } + @CacheEvict(value = Constants.CACHE_ADDRESS_TYPE, allEntries = true) + public void delete(IdRequest request) { + this.repository.deleteAllById(request.getIds()); + } + + public IpListDto getById(String id) { + IpListEntity entity = repository.get(id); + + return mapper.toDto(entity); + } + + public Page list(CommonQuery query) { + Page page = + repository.findAll( + query.specification(conversionService), + PageRequest.of( + query.getPageNo(), + query.getPageSize(), + Sort.by(query.getOrders()))); + + return page.map(this.mapper::toDto); + } + + @Cacheable(value = Constants.CACHE_ADDRESS_TYPE, key = "#address") + public String getAddressType(String address) { + return this.repository.getAddressType(address); + + } +} diff --git a/src/main/java/cn/lihongjie/coal/spring/config/JacksonConfig.java b/src/main/java/cn/lihongjie/coal/spring/config/JacksonConfig.java index 29f2a932..9487fd0e 100644 --- a/src/main/java/cn/lihongjie/coal/spring/config/JacksonConfig.java +++ b/src/main/java/cn/lihongjie/coal/spring/config/JacksonConfig.java @@ -1,13 +1,23 @@ package cn.lihongjie.coal.spring.config; +import com.fasterxml.jackson.core.JacksonException; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import io.hypersistence.utils.hibernate.type.basic.Inet; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import java.io.IOException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -25,6 +35,21 @@ public class JacksonConfig { LocalDateTime.class, new LocalDateTimeDeserializer(dateTimeFormatter)); module.addDeserializer(String.class, new CustomStringDeserializer()); + module.addSerializer(Inet.class, new JsonSerializer() { + @Override + public void serialize(Inet value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + + gen.writeString(value.getAddress()); + } + }); + + module.addDeserializer(Inet.class, new JsonDeserializer() { + @Override + public Inet deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + return new Inet(p.getText()); + } + + }); return module; } }