gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
zhangwei
2018-11-29 11:00:04 +08:00
parent 5a8d54fe13 17d44080dc
commit 9bd196547e
14 changed files with 1008 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/util/Constants.java
View File

@@ -750,4 +750,7 @@ public final class Constants {
public static final String NTC_IP_REUSE_USER_DELETE = Configurations.getStringProperty("userDelete","");
public static final String NTC_IP_REUSE_USER_GET = Configurations.getStringProperty("userGet","");
public static final String NTC_IP_REUSE_USER_LIST = Configurations.getStringProperty("userList","");
// IP复用模块调用相关CGI接口URL
public static final String IP_REUSE_CALL_CGI_URL = Configurations.getStringProperty("ip_reuse_call_cgi_url","");
}

3
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -126,6 +126,7 @@ import com.nis.web.service.configuration.FileTransferCfgService;
import com.nis.web.service.configuration.GroupAreaService;
import com.nis.web.service.configuration.HttpRedirectCfgService;
import com.nis.web.service.configuration.InterceptCfgService;
import com.nis.web.service.configuration.IpAddrPoolCfgService;
import com.nis.web.service.configuration.IpCfgService;
import com.nis.web.service.configuration.IpMultiplexPoolCfgService;
import com.nis.web.service.configuration.MailCfgService;
@@ -261,6 +262,8 @@ public class BaseController {
protected UserManageService userManageService;
@Autowired
protected IpReuseIpCfgService ipReuseIpCfgService;
@Autowired
protected IpAddrPoolCfgService ipAddrPoolCfgService;// 地址池管理service
/**
* 管理基础路径
*/

52
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -9,6 +9,7 @@
package com.nis.web.controller.configuration.manipulation;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,9 +32,12 @@ import com.nis.domain.Page;
import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.IpAddrPoolCfg;
import com.nis.domain.configuration.IpMultiplexPoolCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.UserManage;
import com.nis.domain.configuration.template.IpMultiplexPolicyTemplate;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.StringUtil;
@@ -126,24 +130,35 @@ public class IpMultiplexController extends CommonController {
@RequestMapping(value = {"/snatPolicyList"})
public String snatPolicyList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._ipList(cfgName,model, cfg, request, response);
return "/cfg/manipulation/ipmulitiplex/snatPolicyList";
// 获取地址池、用户信息
List<UserManage> users = userManageService.findUsers();
List<IpAddrPoolCfg> addrPools = ipAddrPoolCfgService.getEffectiveAddrPool();
model.addAttribute("users", users);
model.addAttribute("addrPools", addrPools);
return "/cfg/manipulation/ipmulitiplex/snatPolicyList2";
}
@RequestMapping(value = {"/snatPolicyForm"})
@RequiresPermissions(value={"snat_policy:config"})
public String snatPolicyForm(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) {
public String snatPolicyForm(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity, HttpServletRequest request,HttpServletResponse response) {
this._ipForm(cfgName,model, ids, functionId, entity);
// 获取拥有区域信息的策略分组
List<PolicyGroupInfo> policyGroups = policyGroupInfoService.getHasAreaPolicyGroups(2);
model.addAttribute("policyGroups", policyGroups);
// 获取用户信息 地址池信息
List<UserManage> users = userManageService.findUsers();
List<IpAddrPoolCfg> addrPools = ipAddrPoolCfgService.getEffectiveAddrPool();
model.addAttribute("users", users);
model.addAttribute("addrPools", addrPools);
model.addAttribute("urlPrefix","/manipulation/ipmulitiplex");
return "/cfg/manipulation/ipmulitiplex/snatPolicyForm";
return "/cfg/manipulation/ipmulitiplex/snatPolicyForm2";
}
@RequestMapping(value = {"/saveOrUpdateSnat"})
public String saveOrUpdateSnat(String cfgName,RedirectAttributes model, IpPortCfg cfg) {
// 设置生效区域信息
groupAreaService.setAreaEffective(cfg);
//groupAreaService.setAreaEffective(cfg);
this._saveOrUpdateIp(cfgName,model, cfg);
return "redirect:" + adminPath +"/manipulation/ipmulitiplex/snatPolicyList?functionId="+cfg.getFunctionId();
}
@@ -158,7 +173,26 @@ public class IpMultiplexController extends CommonController {
@RequestMapping(value = {"/auditSnat"})
@RequiresPermissions("snat_policy:confirm")
public String auditSnat(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) {
this._auditIp(cfgName,ids, cfg, redirectAttributes);
//this._auditIp(cfgName,ids, cfg, redirectAttributes);
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
for(String id :idArray){
try {
ipAddrPoolCfgService.auditSnatStrategy(id, cfg, auditTime);
} catch (Exception e) {
e.printStackTrace();
logger.error("SNAT策略配置下发失败："+e.getMessage());
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "audit_failed");
}
}
}
}
return "redirect:" + adminPath +"/manipulation/ipmulitiplex/snatPolicyList?functionId="+cfg.getFunctionId();
}
@@ -234,7 +268,7 @@ public class IpMultiplexController extends CommonController {
}
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), BaseIpCfg.class);
String snatNoExport=",server_ip,ip_type,ip_pattern,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,whether_area_block,userregion1,userregion2,userregion3,userregion4,userregion5,";
String snatNoExport=",client_ip,group_name,server_ip,ip_type,ip_pattern,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,whether_area_block,userregion1,userregion2,userregion3,userregion4,userregion5,";
noExportMap.put(entity.getMenuNameCode(),snatNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList());
/*}*/

7
src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java
View File

@@ -1,8 +1,11 @@
package com.nis.web.dao.configuration;
import java.util.Date;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
@@ -28,4 +31,8 @@ public interface CommonPolicyDao {
public void deleteComplexStringCfg(CfgIndexInfo entity);
public void updateCfgValid(BaseCfg entity);
public void auditCfg(BaseCfg entity);
public void auditCfgBatch(@Param("tableName")String tableName,
@Param("entity")BaseCfg baseCfg,
@Param("compileIds")List compileIds,
@Param("requestId")Integer requestId);
}

26
src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
View File

@@ -733,4 +733,30 @@
</trim>
</update>
<update id="auditCfgBatch">
update ${tableName} set is_audit = #{entity.isAudit,jdbcType=INTEGER},
auditor_id = #{entity.auditorId,jdbcType=INTEGER},
audit_time = #{entity.auditTime,jdbcType=TIMESTAMP}
<if test="entity.isValid != null" >
,is_valid = #{entity.isValid,jdbcType=INTEGER}
</if>
<if test="requestId != null" >
,cancel_request_id = #{requestId,jdbcType=INTEGER}
</if>
<where>
<if test="tableName == 'asn_ip_cfg'" >
and asn_ip_group in
<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
#{compileId}
</foreach>
</if>
<if test="tableName != 'asn_ip_cfg'" >
and compile_id in
<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
#{compileId}
</foreach>
</if>
</where>
</update>
</mapper>

2
src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.java
View File

@@ -33,4 +33,6 @@ public interface IpAddrPoolCfgDao extends CrudDao<IpAddrPoolCfgDao>{
IpAddrPoolCfg getCfgInfo(IpAddrPoolCfg cfg);
List<IpAddrPoolCfg> findAddrPoolCfg();
}

6
src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
View File

@@ -439,4 +439,10 @@
</if>
</trim>
</select>
<select id="findAddrPoolCfg" resultMap="addrPoolMap">
SELECT
<include refid="addrPoolColumns"/>,r.ADDR_POOL_NAME
FROM ip_reuse_addr_pool r WHERE r.is_valid !=-1
</select>
</mapper>

9
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -272,6 +272,15 @@ public class ConfigSynchronizationService extends BaseService{
commonPolicyDao.auditCfgBatch( tableName, entity,compileIds,null);
}
}
if(isUpdateCfg) {
if(tableName.equals("asn_ip_cfg")){
if(!StringUtil.isEmpty(asnGroupIds)) {
commonPolicyDao.auditCfgBatch(tableName, entity,asnGroupIds,null);
}
}else{
commonPolicyDao.auditCfgBatch( tableName, entity,compileIds,null);
}
}
}
}
//批量获取regionId,groupId(相同编译下的IP类配置多条ip只获取一个组号），分组复用的域配置不需要重新获取regionId,groupId

116
src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java
View File

@@ -21,20 +21,25 @@ import com.nis.domain.Page;
import com.nis.domain.callback.InlineIp;
import com.nis.domain.callback.IpAddrPool;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpAddrPoolCfg;
import com.nis.domain.configuration.IpMultiplexPoolCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.UserManage;
import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.maat.MaatCfg.IpCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.dao.configuration.IpAddrPoolCfgDao;
import com.nis.web.dao.configuration.IpCfgDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
import com.nis.web.service.SpringContextHolder;
import com.nis.web.service.basics.PolicyGroupInfoService;
import com.nis.web.service.basics.SysDictInfoService;
import jersey.repackaged.com.google.common.collect.Maps;
@@ -282,4 +287,115 @@ public class IpAddrPoolCfgService extends BaseService{
return ipAddrPoolCfgDao.getCfgInfo(cfg);
}
/**
* 策略管理获取地址池信息（至少有1个IP地址有效状态该地址池才能被使用）
* @param response
* @param request
* @return
*/
public List<IpAddrPoolCfg> getEffectiveAddrPool() {
List<IpAddrPoolCfg> addrPools = ipAddrPoolCfgDao.findAddrPoolCfg();
/*String cgiUrl = "http://localhost:8080/gwall/nis/maintenance/ipMultiplexPoolCfg/cgiCall";
if(StringUtils.isNotBlank(Constants.IP_REUSE_CGI_URL)){
cgiUrl = Constants.IP_REUSE_CGI_URL;
}
for (IpAddrPoolCfg cfg : addrPools) {
Map<String, Object> params = new HashMap<String, Object>();
params.put("cmd", "IpNumGet");
params.put("addr_pool_id", cfg.getAddrPoolId());
try {
String resJson = HttpClientUtil.getMsg(cgiUrl, params, req);
} catch (Exception e) {
logger.error("获取地址池信息失败！", e);
e.printStackTrace();
}
}*/
return addrPools;
}
/**
* 策略配置审核
* @param ids
* @param cfg
* @param auditTime
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void auditSnatStrategy(String id, IpPortCfg cfg, Date auditTime) {
cfg.setCfgId(Long.valueOf(id));
cfg.setTableName(IpPortCfg.getTablename());
cfg.setAuditorId(UserUtils.getUser().getId());
cfg.setAuditTime(auditTime);
// 更新配置审核状态
IpCfgDao ipCfgDao = SpringContextHolder.getBean(IpCfgDao.class);
IpCfgService IpCfgService = SpringContextHolder.getBean(IpCfgService.class);
ipCfgDao.auditCfg(cfg);
// 获取配置信息
BaseIpCfg ipCfg = IpCfgService.getIpCfgById(cfg);
SysDictInfoService sysDictInfoService = SpringContextHolder.getBean(SysDictInfoService.class);
UserManageService userManageService = SpringContextHolder.getBean(UserManageService.class);
UserManage user = userManageService.getUserById(ipCfg.getUserRegion1());
String json="";
if(cfg.getIsAudit() == Constants.AUDIT_YES){
Map<String, Object> params = new HashMap<String,Object>();
params.put("configId", ipCfg.getCompileId());
params.put("addrPoolId", ipCfg.getUserRegion2());
params.put("userType", user.getUserType());
params.put("userId", user.getId());
params.put("isValid", 1);
params.put("opTime", auditTime);
if(ipCfg.getIsAreaEffective() == 1){
params.put("effectiveRange", sysDictInfoService.setEffectiveRange(ipCfg.getAreaEffectiveIds()));
}
List list = Lists.newArrayList();
list.add(params);
//调用服务接口下发配置数据
json=gsonToJson(list);
logger.info("SNAT策略配置下发参数："+json);
//调用服务接口下发配置
try {
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
if(result!=null){
logger.info("SNAT地址池配置下发响应信息："+result.getMsg());
}
} catch (Exception e) {
logger.error("SNAT策略配置下发失败",e);
throw e;
}
}else if(cfg.getIsAudit() == Constants.AUDIT_NOT_YES){
Map<String, Object> params = new HashMap<String,Object>();
params.put("configId", ipCfg.getCompileId());
params.put("addrPoolId", ipCfg.getUserRegion2());
params.put("userType", user.getUserType());
params.put("userId", user.getId());
params.put("isValid", 0);
params.put("opTime", auditTime);
if(ipCfg.getIsAreaEffective() == 1){
params.put("effectiveRange", sysDictInfoService.setEffectiveRange(ipCfg.getAreaEffectiveIds()));
}
List list = Lists.newArrayList();
list.add(params);
//调用服务接口取消配置
json=gsonToJson(list);
logger.info("SNAT策略配置下发参数："+json);
//调用服务接口取消配置
try {
ToMaatResult result = ConfigServiceUtil.put(json, 2);
logger.info("SNAT策略配置响应信息："+result.getMsg());
} catch (Exception e) {
e.printStackTrace();
logger.info("SNAT策略配置配置失败");
throw e;
}
}
}
}