merge

노현종
Commit 3f450f804fa285d7afe0856c5cd2d8b61dca5193 3f450f80 2 parents 42632ac7 43ab9f58
Showing 1 changed file with 63 additions and 5 deletions
Vulnerablity_DB/VulnUserCodeAnalyzer/Program.cs
--- a/Vulnerablity_DB/VulnUserCodeAnalyzer/Program.cs
View file @3f450f8
+++ b/Vulnerablity_DB/VulnUserCodeAnalyzer/Program.cs
View file @3f450f8
@@ -224,7 +224,25 @@ namespace VulnUserCodeAnalyzer
                 Console.WriteLine($"{userName}, {repository}");
             }
-            Console.ReadLine();
+                        repoPath = repoDir.FullName;
+                        userId = userName;
+<<<<<<<<< Temporary merge branch 1
+                    }
+                    if (!string.IsNullOrWhiteSpace(repoPath) && !string.IsNullOrWhiteSpace(userId))
+                    {
+                        break;
+                    }
+=========
+                    }
+                    if (!string.IsNullOrWhiteSpace(repoPath) && !string.IsNullOrWhiteSpace(userId))
+                    {
+                        break;
+                    }
+>>>>>>>>> Temporary merge branch 2
+                    repoWatch.Restart();
+                }
+                //Console.WriteLine("엔터를 누르세요");
+                //Console.ReadLine();
                 /* hashDict = 사용된 사용자 함수 정보 */
                 var hashDict = new Dictionary<int, HashSet<VulnAbstractCrawler.UserBlock>>();
@@ -283,7 +301,11 @@ namespace VulnUserCodeAnalyzer
                              * CVE를 가지고 있다고 인정하는 프로그램 정책 때문 
                              */
                             var searchedCveHashList = VulnRDS.SelectVulnbyCve(cve);
+<<<<<<<<< Temporary merge branch 1
                             Console.WriteLine($"cve:{cve}, {searchedCveHashList.Count()}개 가져옴");
+=========
+                            Console.WriteLine($"CVE:{cve}, Received Count : {searchedCveHashList.Count()}");
+>>>>>>>>> Temporary merge branch 2
                             foreach (var s in searchedCveHashList)
                             {
                                 vulnHashSet.Add(s);
@@ -297,7 +319,7 @@ namespace VulnUserCodeAnalyzer
                 /* 본격적인 취약점 매칭 부분 */
                 foreach (var vulnSet in vulnDict)
                 {
-                //Console.WriteLine($"-----cve:{vulnSet.Key}");
+                    Console.WriteLine($"-----cve:{vulnSet.Key}");
                     bool match = false;
                     foreach (var vuln in vulnSet.Value)
                     {
@@ -309,6 +331,11 @@ namespace VulnUserCodeAnalyzer
                         {
                             if (hashDict.ContainsKey(vuln.LenFunc))
                             {
+<<<<<<<<< Temporary merge branch 1
+                                Console.WriteLine("찾음");
+=========
+                                //Console.WriteLine("찾음");
+>>>>>>>>> Temporary merge branch 2
                                 /* Bloom Filter는 아쉽게도 포함 여부만 알 수 있기에 
                                  * 포함되었음을 알았다면 검색해서 정보를 구한다. */
                                 var userBlock = hashDict[vuln.LenFunc].FirstOrDefault(b => b.Hash == vuln.BlockHash);
@@ -337,13 +364,21 @@ namespace VulnUserCodeAnalyzer
                     /* 취약점 레코드가 전부 있어야 CVE 찾음 인정 */
                     if (match)
                     {
+<<<<<<<<< Temporary merge branch 1
                         Console.WriteLine($"CVE 찾음 {vulnSet.Key}");
+=========
+                        Console.WriteLine($"Matched CVE : {vulnSet.Key}");
+>>>>>>>>> Temporary merge branch 2
                         /* 찾았으면 cve값을 기록함 밑에서 찾은 cve 정보 전송하기 위해 */
                         findCveList.Add(vulnSet.Key);
                     }
                     else
                     {
+<<<<<<<<< Temporary merge branch 1
                         Console.WriteLine("없음");
+=========
+                        Console.WriteLine("Not");
+>>>>>>>>> Temporary merge branch 2
                     }
                 }
                 stopwatch.Stop();
@@ -351,8 +386,15 @@ namespace VulnUserCodeAnalyzer
                 var hours = stopwatch.Elapsed.Hours;
                 var minutes = stopwatch.Elapsed.Minutes;
                 var seconds = stopwatch.Elapsed.Seconds;
+<<<<<<<<< Temporary merge branch 1
                 Console.WriteLine($"경과 시간 {hours.ToString("00")}:{minutes.ToString("00")}:{seconds.ToString("00")}");
                 Console.WriteLine($"찾은 CVE 개수 : {findCveList.Count}");
+=========
+                Console.WriteLine($"Elapsed Time : {hours.ToString("00")}:{minutes.ToString("00")}:{seconds.ToString("00")}");
+                Console.WriteLine($"Matched CVE Count : {findCveList.Count}");
+>>>>>>>>> Temporary merge branch 2
+                //Console.ReadLine();
+
                 var yearMatch = new Regex(@"CVE-(\d{4})-(\d+)");
                 foreach (var cve in findCveList)
                 {
@@ -406,9 +448,15 @@ namespace VulnUserCodeAnalyzer
                     var urlBytes = Convert.FromBase64String(findCveDict[cve].FirstOrDefault().Url);
                     string url = Encoding.Unicode.GetString(urlBytes);
-
+<<<<<<<<< Temporary merge branch 1
+                    Console.WriteLine(findCveDict[cve].FirstOrDefault().Path.Replace(repoPath, ""));
                     /* DB 전송 */
                     VulnRDS.InsertVulnDetail(new VulnRDS.Vuln_detail
+=========
+                    //Console.WriteLine(findCveDict[cve].FirstOrDefault().Path.Replace(repoPath, ""));
+
+                    var vulnDetail = new VulnRDS.Vuln_detail
+>>>>>>>>> Temporary merge branch 2
                     {
                         CveName = data.Code,
                         Type = type,
@@ -417,13 +465,23 @@ namespace VulnUserCodeAnalyzer
                         CveDetail = data.Detail,
                         Publish_date = data.Publish_Date.ToString("yyyy-MM-dd"),
                         Update_date = data.Update_Date.ToString("yyyy-MM-dd"),
-                    UserName = "samsung",
+                        UserName = userId,
                         Url = url,
-                    FileName = findCveDict[cve].FirstOrDefault().Path.Replace(@"C:\code", ""),
+                        FileName = findCveDict[cve].FirstOrDefault().Path.Replace(repoPath, ""),
                         FuncName = findCveDict[cve].FirstOrDefault().FuncName,
                         Product = data.Type,
+<<<<<<<<< Temporary merge branch 1
                     });
                     Console.WriteLine("추가 완료");
+=========
+                    };
+
+                    /* DB 전송 */
+                    VulnRDS.InsertVulnDetail(vulnDetail);
+
+                    Console.WriteLine($"Added CVE: {vulnDetail.CveName}, Type: {vulnDetail.Type}, CVSS: {vulnDetail.Level}");
+>>>>>>>>> Temporary merge branch 2
+                }
             }
         }
     }