Skip to content

Commit 3a19d6c

Browse files
shack2shack2
committed
update20190902
update20190902
1 parent 07138cf commit 3a19d6c

4 files changed

Lines changed: 30 additions & 14 deletions

File tree

‎SuperSQLInjection/Main.cs‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ public void HttpDownloadFile(string url, string path)
286286
responseStream.Close();
287287
}
288288

289-
public static int version = 20190901;
289+
public static int version = 20190902;
290290
public static string versionURL = "http://www.shack2.org/soft/getNewVersion?ENNAME=SSuperSQLInjection&NO=" + URLEncode.UrlEncode(Tools.getSystemSid()) + "&VERSION=" + version;
291291
//检查更新
292292
public void checkUpdate()
@@ -9695,7 +9695,13 @@ public void addItemToScanDomain(Object path)
96959695

96969696
public void stopScan()
96979697
{
9698-
StopThread();
9698+
status = -1;
9699+
if (this.currentThread != null)
9700+
{
9701+
this.txt_log.Invoke(new showLogDelegate(log), "发出停止线程信号！", LogLevel.info);
9702+
stp.Cancel();
9703+
}
9704+
96999705
this.scanInjection_btn_scan.Enabled = false;
97009706
this.scanInjection_btn_scan.Text = "正在停止...";
97019707
while (stp.InUseThreads > 0)
@@ -9704,11 +9710,18 @@ public void stopScan()
97049710
}
97059711
this.scanInjection_btn_scan.Text = "开始扫描";
97069712
this.scanInjection_btn_scan.Enabled = true;
9713+
status = 0;
97079714
}
97089715

97099716
public void stopSpider()
97109717
{
9711-
StopThread();
9718+
status = -1;
9719+
if (this.currentThread != null)
9720+
{
9721+
this.txt_log.Invoke(new showLogDelegate(log), "发出停止线程信号！", LogLevel.info);
9722+
stp.Cancel();
9723+
}
9724+
97129725
this.scanInjection_btn_spider.Enabled = false;
97139726
this.scanInjection_btn_spider.Text = "正在停止...";
97149727
while (stp.InUseThreads > 0)
@@ -9718,6 +9731,7 @@ public void stopSpider()
97189731
this.scanInjection_btn_spider.Text = "爬行链接";
97199732
this.scanInjection_domainsCount.Text = this.scanInject_lsb_links.Items.Count.ToString();
97209733
this.scanInjection_btn_spider.Enabled = true;
9734+
status = 0;
97219735
}
97229736
public void spider()
97239737
{

‎SuperSQLInjection/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
3333
// 方法是按如下所示使用“*”:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.2019.09.01")]
36-
[assembly: AssemblyFileVersion("1.2019.09.01")]
35+
[assembly: AssemblyVersion("1.2019.09.02")]
36+
[assembly: AssemblyFileVersion("1.2019.09.02")]

‎SuperSQLInjection/scan/Spider.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@ public void findLinks(String url)
7676
{
7777
continue;
7878
}
79-
if (curl.Contains(".css") || curl.Contains(".js") || curl.Contains(".jpg") || curl.Contains(".png") || curl.Contains(".ico") || curl.Contains(".gif"))
80-
{
81-
continue;
82-
}
79+
8380
curl = curl.Replace("&", "&");
8481
if (curl.StartsWith("//"))
8582
{
@@ -111,6 +108,11 @@ public void findLinks(String url)
111108
try
112109
{
113110
Uri cu = new Uri(curl);
111+
String cupath = cu.AbsolutePath;
112+
if (cupath.EndsWith(".css") || cupath.EndsWith(".js") || cupath.EndsWith(".jpg") || cupath.EndsWith(".png") || cupath.EndsWith(".ico") || cupath.EndsWith(".gif"))
113+
{
114+
continue;
115+
}
114116
if (!AllURL.Contains(curl) && !AllNoParamaValURL.Contains(noValURL)&&AllURL.Count<config.maxSpiderCount)
115117
{
116118
AllURL.Add(curl);

‎SuperSQLInjection/tools/InjectionTools.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public static Injection testInjection(String url, Config config, Boolean justSca
8080
String curl = uri.PathAndQuery.Replace(param, payload);
8181
injection.testUrl = testUrl.Replace(param, payload);
8282
injection.paramName = sprarm[0];
83-
String oldrequest = Spider.reqestGetTemplate.Replace("{url}", uri.PathAndQuery).Replace("{host}", uri.Host + ":" + uri.Port);
84-
String request = Spider.reqestGetTemplate.Replace("{url}", curl).Replace("{host}", uri.Host + ":" + uri.Port);
83+
String oldrequest = Spider.reqestGetTemplate.Replace("{url}", uri.PathAndQuery).Replace("{host}", uri.Host);
84+
String request = Spider.reqestGetTemplate.Replace("{url}", curl).Replace("{host}", uri.Host);
8585
//通过错误显示判断
8686
if (timeout >= 3)
8787
{
@@ -129,7 +129,7 @@ public static Injection testInjection(String url, Config config, Boolean justSca
129129

130130
foreach (String bool_payload in bool_payloads)
131131
{
132-
String[] bool_ps = bool_payload.Split(':');
132+
String[] bool_ps = bool_payload.Split('：');
133133

134134
String flasePayload = pramName + "=" + URLEncode.UrlEncode(pramValue + bool_ps[1]);
135135
String falseURL = uri.PathAndQuery.Replace(param, flasePayload);
@@ -139,7 +139,7 @@ public static Injection testInjection(String url, Config config, Boolean justSca
139139
{
140140
break;//超时3次，认为此URL为坏死URL
141141
}
142-
String falserequest = Spider.reqestGetTemplate.Replace("{url}", falseURL).Replace("{host}", uri.Host + ":" + uri.Port);
142+
String falserequest = Spider.reqestGetTemplate.Replace("{url}", falseURL).Replace("{host}", uri.Host);
143143
ServerInfo falseServer = HTTP.sendRequestRetry(isSSL, config.reTry, uri.Host, uri.Port, flasePayload, falserequest, config.timeOut, HTTP.AutoGetEncoding, false, config.redirectDoGet);
144144
if (falseServer.runTime > config.timeOut * 1000) timeout++;
145145
decimal pfalse = Tools.getLike(oserver.body, falseServer.body);
@@ -151,7 +151,7 @@ public static Injection testInjection(String url, Config config, Boolean justSca
151151

152152
String truePayload = pramName + "=" + URLEncode.UrlEncode(pramValue + bool_ps[0]);
153153
String trueURL = uri.PathAndQuery.Replace(param, truePayload);
154-
String truerequest = Spider.reqestGetTemplate.Replace("{url}", trueURL).Replace("{host}", uri.Host + ":" + uri.Port);
154+
String truerequest = Spider.reqestGetTemplate.Replace("{url}", trueURL).Replace("{host}", uri.Host);
155155
if (timeout >= 3)
156156
{
157157
break;//超时3次，认为此URL为坏死URL

0 commit comments

Comments
 (0)