Merge pull request #49 from bit4woo/dev2022

重构代码合并到master分支

pom.xml

@@ -7,10 +7,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bit4woo.burp</groupId>
 	<artifactId>domain_hunter_pro</artifactId>
-	<version>v1.8</version>
+	<version>v1.9-alpha</version>
 
-	<!-- <repositories> <repository> <id>jitpack.io</id> <url>https://jitpack.io</url> 
-		</repository> </repositories> -->
+
+	<!-- <repositories>
+		<repository>
+			<id>jitpack.io</id>
+			<url>https://jitpack.io</url>
+		</repository>
+	</repositories> -->
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
@@ -23,6 +28,11 @@
 					<!-- 这是JDK的版本 -->
 					<source>1.8</source>
 					<target>1.8</target>
+					<excludes>
+						<!-- 编译时排除Deprecated包及下面的资源 -->
+						<exclude>**/Deprecated/**</exclude>
+						<exclude>**/test/**</exclude>
+					</excludes>
 				</configuration>
 			</plugin>
 
@@ -206,5 +216,13 @@
 			<artifactId>ipaddress</artifactId>
 			<version>5.3.3</version>
 		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.springframework/spring-jdbc -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+			<version>5.3.21</version>
+		</dependency>
+
 	</dependencies>
 </project>

src/ASN/ASNEntry.java

@@ -122,7 +122,7 @@ public boolean contains(String IP){
             try {
                 String start = prefix.split("-")[0];
                 String end = prefix.split("-")[1];
-                return IPAddressUtils.checkIPIsInGivenRange(IP,start,end);
+                return IPAddressUtils.checkIPIsInGivenRange(IP,start,end);//
             } catch (AddressStringException e) {
                 e.printStackTrace();
                 return false;

src/burp/DBHelper.java → src/Deprecated/DBHelper.java

@@ -21,7 +21,7 @@
 
 import domain.DomainManager;
 import domain.target.TargetTableModel;
-import title.IndexedLinkedHashMap;
+import title.IndexedHashMap;
 import title.LineEntry;
 
 /*
@@ -308,7 +308,7 @@ public synchronized boolean addTitle(LineEntry entry){
 
 
 
-	public synchronized boolean addTitles(LinkedHashMap<String,LineEntry> lineEntries){
+	public boolean addTitles(IndexedHashMap<String,LineEntry> lineEntries){
 		try {
 			conn = getConnection();
 			String sql="insert into Title(NAME,Content) values(?,?)";
@@ -340,8 +340,8 @@ public synchronized boolean addTitles(LinkedHashMap<String,LineEntry> lineEntrie
 	}
 
 
-	public IndexedLinkedHashMap<String,LineEntry> getTitles(){
-		IndexedLinkedHashMap<String,LineEntry> lineEntriesMap=new IndexedLinkedHashMap<String,LineEntry>();
+	public IndexedHashMap<String,LineEntry> getTitles(){
+		IndexedHashMap<String,LineEntry> lineEntriesMap=new IndexedHashMap<String,LineEntry>();
 		try {
 			conn = getConnection();
 			String sql="select * from Title";

src/GUI/RunnerGUI.java → src/Deprecated/RunnerGUI.java

@@ -148,7 +148,8 @@ public RunnerGUI(boolean Alone) {//传递一个参数以示区分
 	 * 数据源都来自Domain Hunter
 	 * @param messageInfo
 	 */
-	public RunnerGUI() {
+	public RunnerGUI(IHttpRequestResponse messageInfo) {
+		this.messageInfo = messageInfo;
 		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 		//if use "EXIT_ON_CLOSE",burp will exit!!
 		setVisible(true);
@@ -195,7 +196,7 @@ public void windowOpened(WindowEvent e) {
 			public void windowClosing(WindowEvent e) {
 				// TODO 关闭多线程
 				try{
-					runnerTableModel.clear(false);
+					runnerTableModel = null;
 				}catch (Exception e1){
 					e1.printStackTrace();
 				}
@@ -249,12 +250,6 @@ public void windowDeactivated(WindowEvent e) {
 		//准备工作
 	}
 
-	public RunnerGUI(IHttpRequestResponse messageInfo) {
-		this();
-		this.messageInfo = messageInfo;
-	}
-
-
 	/**
 	 * 对所有收集到的域名和IP进行Host碰撞
 	 */

src/domain/SubDomainEntry.java → src/Deprecated/SubDomainEntry.java

@@ -1,9 +1,5 @@
 package domain;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
 @Deprecated //暂未启用
 public class SubDomainEntry {
 

src/thread/ThreadBypassGatewayForAll.java → src/Deprecated/ThreadBypassGatewayForAll.java

@@ -9,6 +9,7 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import GUI.GUIMain;
 import GUI.RunnerGUI;
 import burp.BurpExtender;
 import burp.Commons;
@@ -40,7 +41,7 @@ public ThreadBypassGatewayForAll(RunnerGUI runnerGUI) {
 
 	public static HashSet<String> getDomainsForBypassCheck(){
 		HashSet<String> tmpSet = new HashSet<String>();//所有子域名列表
-		tmpSet.addAll(DomainPanel.getDomainResult().getSubDomainSet());
+		tmpSet.addAll(GUIMain.instance.getDomainPanel().getDomainResult().getSubDomainSet());
 
 		HashSet<String> unreachableSet = new HashSet<String>();
 		Collection<LineEntry> entries = TitlePanel.getTitleTableModel().getLineEntries().values();