노현종 / 2018-1-Capstone1-VulnNotti

Go to a project
Toggle navigation Toggle navigation pinning
노현종
2729bb2e 1 parent 4b7e2f37

GetCriticalBlock 문법 버그 수정

Inline Side-by-side
Showing 2 changed files with 46 additions and 53 deletions
......@@ -127,8 +127,6 @@ namespace VulnCrawler
using (var reader = new StreamReader(oldStream))
{
bool found = false;
bool found2 = false;
bool commentLine = false;
......@@ -142,8 +140,6 @@ namespace VulnCrawler
while (!reader.EndOfStream)
{
string line = reader.ReadLine();
if (readCount++ < start)
{
tempQ.Enqueue(line);
......@@ -157,16 +153,13 @@ namespace VulnCrawler
string method = Regex.Escape(methodName);
if (Regex.Match(s, $"{method}").Success)
{
break;
}
}
while (tempStack.Count > 0)
{
string s = tempStack.Pop();
string trim = s.Trim();
if (commentLine)
{
if (Regex.IsMatch(trim, commentPattern3))
......@@ -176,27 +169,21 @@ namespace VulnCrawler
}
continue;
}
string removeString = Regex.Replace(trim, stringPattern, "");
// /* ~ 패턴
if (Regex.IsMatch(trim, commentPattern2))
{
// /* ~ */ 패턴이 아닌 경우
if (!Regex.IsMatch(trim, commentPattern))
{
commentLine = true;
}
trim = Regex.Split(trim, "/*")[0];
}
if (string.IsNullOrWhiteSpace(trim))
{
continue;
}
int openBracketCount = removeString.Count(c => c == '{');
int closeBracketCount = removeString.Count(c => c == '}');
int subtract = openBracketCount - closeBracketCount;
......@@ -222,10 +209,7 @@ namespace VulnCrawler
}
oldBuilder.AppendLine(s);
}
}
}
Console.WriteLine("찾음");
Console.WriteLine(oldBuilder.ToString());
......@@ -233,8 +217,6 @@ namespace VulnCrawler
return oldBuilder.ToString();
}
public abstract IDictionary<string, IEnumerable<string>> ExtractGitCriticalMethodTable(string srcCode);
/// <summary>
......
......@@ -229,9 +229,7 @@ namespace VulnCrawler
protected override IList<Block> GetCriticalBlocks(string srcCode, IEnumerable<string> criticalList)
{
// srcCode = Regex.Replace(srcCode, @"if.+\n\{", @"if.+\{", RegexOptions.Multiline);
var split = srcCode.Split('\n');
var blockList = new List<Block>();
StringBuilder builder = new StringBuilder();
var crList = criticalList as HashSet<string>;
......@@ -239,34 +237,33 @@ namespace VulnCrawler
{
return null;
}
var split = srcCode.Split('\n');
var mainQ = new Queue<string>();
var groupQ = new Queue<string>();
bool mainLine = true;
int crNum = 1;
int bracketCount = 1;
bool prevStartBlock = false;
int totalSoBracketCount = 0;
foreach (var line in split)
{
bool criticalBlock = false;
string trimLine = line.Trim();
if (mainLine)
{
if (trimLine.EndsWith("&&") || trimLine.EndsWith("||"))
if (string.IsNullOrWhiteSpace(trimLine))
{
mainQ.Enqueue(line);
continue;
}
if (trimLine.StartsWith("&&") || trimLine.StartsWith("||"))
if (mainLine)
{
bracketCount = 1;
if (trimLine.StartsWith("else"))
{
groupQ.Enqueue(line);
mainLine = false;
continue;
}
bracketCount = 1;
StringBuilder groupBuilder = new StringBuilder();
while(groupQ.Count > 0)
{
......@@ -284,15 +281,23 @@ namespace VulnCrawler
}
groupBuilder.AppendLine(s);
}
if (groupBuilder.Length > 0)
if (!string.IsNullOrWhiteSpace(groupBuilder.ToString()))
{
blockList.Add(new Block { Code = groupBuilder.ToString(), HasCritical = criticalBlock, Num = crNum++});
}
if (Regex.IsMatch(trimLine, @"(if|for|while|switch|do)\s*"))
if (Regex.IsMatch(trimLine, @"^(if|for|while|switch|do)\s*"))
{
/* syntax를 만났을 때 끝에 {가 없으면 */
if (!trimLine.EndsWith("{"))
{
int soBracketOpenCount = trimLine.Count(c => c == '(');
int soBracketCloseCount = trimLine.Count(c => c == ')');
totalSoBracketCount = (soBracketOpenCount - soBracketCloseCount);
/* if(s()
* && b)
* 이렇게 소괄호가 안맞고 밑 라인에서 이어서 작성하는 경우
*/
mainLine = false;
prevStartBlock = true;
......@@ -312,36 +317,31 @@ namespace VulnCrawler
continue;
}
mainQ.Enqueue(line);
}
else
{
/* 소괄호 수 세기 */
int soBracketOpenCount = trimLine.Count(c => c == '(');
int soBracketCloseCount = trimLine.Count(c => c == ')');
/* 중괄호 수 세기 */
int openBracketCount = trimLine.Count(c => c == '{');
int closeBracketCount = trimLine.Count(c => c == '}');
int subtract = openBracketCount - closeBracketCount;
bracketCount += subtract;
if (trimLine.EndsWith("&&") || trimLine.EndsWith("||"))
{
groupQ.Enqueue(line);
continue;
}
//if (trimLine.StartsWith("&&") || trimLine.StartsWith("||"))
//{
// mainQ.Enqueue(line);
// continue;
//}
groupQ.Enqueue(line);
if (prevStartBlock)
{
totalSoBracketCount += (soBracketOpenCount - soBracketCloseCount);
prevStartBlock = false;
if (Regex.IsMatch(trimLine, @"(if|for|while|switch|do)\s*\("))
if(totalSoBracketCount > 0)
{
prevStartBlock = true;
continue;
}
else if (Regex.IsMatch(trimLine, @"^(if|for|while|switch|do)\s*"))
{
prevStartBlock = true;
continue;
......@@ -355,6 +355,15 @@ namespace VulnCrawler
if (bracketCount <= 1)
{
if (soBracketOpenCount > soBracketCloseCount)
{
continue;
}
if (!(trimLine.EndsWith("}") || trimLine.EndsWith(";")))
{
continue;
}
if (trimLine.Contains("else"))
{
bracketCount++;
......@@ -365,12 +374,14 @@ namespace VulnCrawler
mainLine = true;
}
/* 메인 라인 블록 추가 */
StringBuilder mainBuilder = new StringBuilder();
while (mainQ.Count > 0)
{
string s = mainQ.Dequeue();
if (!criticalBlock)
{
/* 크리티칼 블록 선정 */
foreach (var item in ExtractCriticalVariant(s))
{
if (crList.Contains(item))
......@@ -382,10 +393,10 @@ namespace VulnCrawler
}
mainBuilder.AppendLine(s);
}
if (mainBuilder.Length > 0)
string mains = mainBuilder.ToString();
if (!string.IsNullOrWhiteSpace(mains))
{
blockList.Add(new Block { Code = mainBuilder.ToString(), HasCritical = criticalBlock, Num = crNum++ });
blockList.Add(new Block { Code = mains, HasCritical = criticalBlock, Num = crNum++ });
}
......