配置清理，增加vpn信息清理

dns欺骗增加一个初始化无策略-默认组-欺骗ip配置(存储+下发)

src/main/java/com/nis/util/Constants.java

@@ -761,4 +761,8 @@ public final class Constants {
 	//日志查询接口URL
 	public static final String IR_SNAT_LOG = Configurations.getStringProperty("irSnatLog","");
 	public static final String IR_DNAT_LOG = Configurations.getStringProperty("irDnatLog","");
+	
+	//日志查询接口URL
+	public static final String DNS_SPOOFING_IP_DESC = Configurations.getStringProperty("dns_spoofing_ip_desc","");
+	public static final String DNS_SPOOFING_IP_IP = Configurations.getStringProperty("dns_spoofing_ip_ip","");
 }

src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
@@ -29,6 +30,8 @@ import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.DnsIpCfg;
 import com.nis.domain.configuration.RequestInfo;
 import com.nis.exceptions.MaatConvertException;
+import com.nis.util.AsnCacheUtils;
+import com.nis.util.CacheUtils;
 import com.nis.util.Constants;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
@@ -69,6 +72,34 @@ public class DnsIpCfgController extends BaseController {
 		return "/cfg/dnsIpCfgForm";
 	}
 	
+	/**
+	 * 初始化一条dns fakeip配置
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = {"initSpoofingIp"})
+	public String initSpoofingIp(){
+		Properties msg=getMsgProp();
+		try {
+			DnsIpCfg entity=new DnsIpCfg();
+			entity.setIsAudit(1);
+			entity.setIsValid(1);
+			entity.setDnsStrategyId(0);
+			List<DnsIpCfg> list=dnsIpCfgService.findDnsIpCfg(entity);
+			if(StringUtil.isEmpty(list)) {
+				dnsIpCfgService.saveAndAudit();
+			}
+		} catch (Exception e) {
+			logger.error("初始化Spoofing ip失败",e);
+			e.printStackTrace();
+			if(e instanceof MaatConvertException) {
+				return msg.getProperty("request_service_failed");
+			}else {
+				return msg.getProperty("save_failed");
+			}
+		}
+		return "success";
+	}
 	@RequestMapping(value = {"/saveOrUpdate"})
 	@RequiresPermissions(value={"dns:fake:ip:config"})
 	public String saveOrUpdate(Model model,HttpServletRequest request

src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.java

@@ -12,4 +12,5 @@ import com.nis.web.dao.MyBatisDao;
 public interface DnsIpCfgDao extends CrudDao<DnsIpCfg> {
 	List<DnsIpCfg> findPage(DnsIpCfg dnsIpCfg);
 	DnsIpCfg getDnsIpCfg(Long cfgId);
+	List<DnsIpCfg> findDnsIpCfg(DnsIpCfg entity);
 }

src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml

@@ -186,6 +186,22 @@
     	from dns_ip_cfg r
     	where r.cfg_id=#{cfgId}
     </select>
+    <select id="findDnsIpCfg" resultMap="dnsIpCfgMap">
+    	select 
+    		<include refid="columns"></include>
+    	from dns_ip_cfg r
+    	<where>
+    		<if test="isAudit != null">
+	    		AND r.is_audit=#{isAudit,jdbcType=INTEGER}
+	    	</if>
+    		<if test="isValid != null">
+	    		AND r.is_valid=#{isValid,jdbcType=INTEGER}
+	    	</if>
+    		<if test="dnsStrategyId != null">
+	    		AND r.dns_strategy_id=#{dnsStrategyId,jdbcType=INTEGER}
+	    	</if>
+    	</where>
+    </select>
     
   <insert id="insert" parameterType="com.nis.domain.configuration.DnsIpCfg" >
     insert into dns_ip_cfg (

src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java

@@ -21,6 +21,7 @@ import com.nis.domain.configuration.DnsIpCfg;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
+import com.nis.util.Constants;
 import com.nis.web.dao.configuration.DnsIpCfgDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
@@ -47,6 +48,9 @@ public class DnsIpCfgService extends BaseService{
 		return page;
 	}
 	
+	public List<DnsIpCfg> findDnsIpCfg(DnsIpCfg entity) {
+		return dnsIpCfgDao.findDnsIpCfg(entity);
+	}
 	public DnsIpCfg getDnsIpCfg(Long cfgId) {
 		return dnsIpCfgDao.getDnsIpCfg(cfgId);
 	}
@@ -115,6 +119,75 @@ public class DnsIpCfgService extends BaseService{
 			dnsIpCfgDao.update(entity);
 		}
 	}
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveAndAudit(){
+		DnsIpCfg dnsIp=new DnsIpCfg();
+		dnsIp.setIpType(4);
+		dnsIp.setDirection(0);
+		dnsIp.setProtocolId(0);
+		dnsIp.setProtocol(0);
+		dnsIp.setIsValid(1);
+		dnsIp.setIsAudit(1);
+		dnsIp.setRequestId(0);
+		dnsIp.setClassify("0");
+		dnsIp.setAttribute("0");
+		dnsIp.setLable("0");
+		dnsIp.setFunctionId(401);
+		dnsIp.setCfgRegionCode(1);
+		dnsIp.setCfgType("dns_fake_ip");
+		dnsIp.setIpPattern(3);
+		dnsIp.setSrcIpAddress("0.0.0.0");
+		dnsIp.setDestPort("0");
+		dnsIp.setSrcPort("0");
+		dnsIp.setPortPattern(1);
+		dnsIp.setDnsStrategyId(0);
+		dnsIp.setAction(16);
+		dnsIp.setServiceId(64);
+		dnsIp.setIsAreaEffective(0);
+		dnsIp.setAreaEffectiveIds("");
+		dnsIp.setCreateTime(new Date());
+		dnsIp.setCreatorId(UserUtils.getUser().getId());
+		dnsIp.setAuditorId(UserUtils.getUser().getId());
+		dnsIp.setAuditTime(new Date());
+		dnsIp.setCfgDesc(Constants.DNS_SPOOFING_IP_DESC);
+		dnsIp.setDestIpAddress(Constants.DNS_SPOOFING_IP_IP);
+		//调用服务接口获取compileId
+		List<Integer> compileIds = new ArrayList<Integer>();
+		try {
+			compileIds = ConfigServiceUtil.getId(1,1);
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.info("获取编译ID出错");
+			throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
+		}
+		if(compileIds != null && compileIds.size() >0  && compileIds.get(0) != 0){
+			dnsIp.setCompileId(compileIds.get(0));
+			
+		}else{
+			throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
+		}
+		
+		dnsIpCfgDao.insert(dnsIp);
+		
+		String json="";
+		List<InlineIp> resStrategyList=new ArrayList<InlineIp>();
+		InlineIp resStrategy=convertCallBackIp(dnsIp,dnsIp.getDnsStrategyId());
+		resStrategyList.add(resStrategy);
+		//调用服务接口下发配置数据
+		json=gsonToJson(resStrategyList);
+		logger.info("DNS欺骗ip配置下发配置参数："+json);
+		//调用服务接口下发配置
+		try {
+			ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+			if(result!=null){
+				logger.info("DNS欺骗ip配置下发响应信息："+result.getMsg());
+			}
+		} catch (Exception e) {
+			logger.error("DNS欺骗ip配置下发失败",e);
+			throw e;
+		}
+		
+	}
 	/**
 	 * 
 	 * @param isAudit

src/main/resources/nis.properties

@@ -576,4 +576,6 @@ irDnatLog=irDnatLogs
 trafficBandwidthTrans=trafficBandwidthTrans
 trafficProtocolList=trafficProtocolList
 trafficAppList=trafficAppList
-ntcActionEntranceReport=ntcActionEntranceReport
+ntcActionEntranceReport=ntcActionEntranceReport
+dns_spoofing_ip_desc=Default Spoofing IP
+dns_spoofing_ip_ip=1.1.1.1

src/main/resources/sql/truncate_tables.sql

@@ -63,4 +63,6 @@ UPDATE specific_service_cfg SET group_id=0;
 DELETE FROM ip_reuse_addr_pool;
 DELETE FROM ip_reuse_ip_cfg;
 DELETE FROM ip_reuse_policy_cfg;
-DELETE FROM user_manage;
+DELETE FROM user_manage;
+#clear vpn
+DELETE FROM service_dict_info  where item_type='5';

src/main/webapp/WEB-INF/views/home.jsp

@@ -213,6 +213,21 @@ function refreshCache(cacheName){
 		}
 	})
 }
+function initSpoofingIp(){
+	$.ajax({
+		type:'post',
+		url:'${ctx}/cfg/dnsIp/initSpoofingIp',
+		dataType:'text',
+		async:false,
+		success:function(data,textStatus){
+			if(data=="success"){
+				alert("success");
+			}else{
+				alert(data);
+			}
+		}
+	})
+}
 </script>
 <style type="text/css">
 .bodyhi{
@@ -332,6 +347,9 @@ background:#3d3d3d;
 								<li>
 									<a href="javascript:refreshCache('asnNoCache')">refresh ASN no</a>
 								</li>
+								<li>
+									<a href="javascript:initSpoofingIp()">Init Spoofing Ip</a>
+								</li>
 							</ul>
 						</li>
 					</c:if>