final commit

이경수
Commit b98d9c59c399ef1491c5277ccf7b38adb6b3c80e b98d9c59 2 parents 31f27046 c5e3f4d6
Showing 9 changed files with 29 additions and 9 deletions
VulnNotti/VulnNotti/views.py
VulnNotti/myapp/templates/static.html
VulnNotti/myapp/views.py
VulnNotti/templates/index.html
Vulnerablity_DB/VulnCrawler/Program.cs
Vulnerablity_DB/VulnCrawler/VulnWorker.cs
Vulnerablity_DB/VulnUserCodeAnalyzer/Program.cs
Vulnerablity_DB/VulnUserCodeAnalyzer/VulnUserCodeAnalyzer.csproj
Vulnerablity_DB/VulnUserCodeAnalyzer/packages.config
--- a/VulnNotti/VulnNotti/views.py
View file @b98d9c5
+++ b/VulnNotti/VulnNotti/views.py
View file @b98d9c5
@@ -32,9 +32,10 @@ class HomeView(View):
         #     context['form'] = ServerList_form
         #     context['object_list'] = object_list
+        context = {}
+        context['user_name'] = str(request.user)
-
+        return render(self.request, self.template_name, context)
-        return render(self.request, self.template_name)
     def post(self, request, *args, **kwargs):
--- a/VulnNotti/myapp/templates/static.html
View file @b98d9c5
+++ b/VulnNotti/myapp/templates/static.html
View file @b98d9c5
@@ -97,7 +97,9 @@
               <td>{{ object.update_date }}</td>
               <td>{{ object.fileName }}</td>
               <td>{{ object.funcName }}</td>
-              <td>{{ object.url }}</td>
+              <td>
+                <a href="{{ object.url }}">{{ object.url }}</a>
+              </td>
               <td>{{ object.cveDetail }}</td>
             </tr>
             {% endfor %}
@@ -107,7 +109,7 @@
       <button id="prev" class="btn btn-primary" style="background-color: #FF0066; border: #FF0066;"><< Prev</button>
       <button id="next" class="btn btn-primary" style="margin-left: 200px; background-color: #FF0066; border: #FF0066;">Next >></button>
     </div> -->
-  
+
     <!-- {% for object in object_list %}
     <div class="portfolio-modal mfp-hide" id="portfolio-modal-{{ forloop.counter }}">
--- a/VulnNotti/myapp/views.py
View file @b98d9c5
+++ b/VulnNotti/myapp/views.py
View file @b98d9c5
@@ -534,5 +534,7 @@ class StaticView(TemplateView):
         context['level8'] = level8
         context['level9'] = level9
+        context['logined_user'] = str(request.user)
+
         return render(self.request, self.template_name, context)
--- a/VulnNotti/templates/index.html
View file @b98d9c5
+++ b/VulnNotti/templates/index.html
View file @b98d9c5
@@ -47,6 +47,10 @@
             <li class="nav-item mx-0 mx-lg-1">
               <a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger" href="{% url 'edit' %}">Mypage</a>
             </li>
+            <li class="nav-item mx-0 mx-lg-1">
+              <a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger" style="color: yellow;" href="#">Welcome! {{ user_name }}</a>
+            </li>
+
             {% else %}
             <li class="nav-item mx-0 mx-lg-1">
               <a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger" href="/accounts/login">Login</a>
--- a/Vulnerablity_DB/VulnCrawler/Program.cs
View file @b98d9c5
+++ b/Vulnerablity_DB/VulnCrawler/Program.cs
View file @b98d9c5
@@ -35,7 +35,7 @@ namespace VulnCrawler
             AWS.Account account = AWS.account;
             /* AWS 정보 출력 */
-            Console.WriteLine($"Endpoint: {account.Endpoint}, ID: {account.Id}, PW: {account.Pw}");
+            Console.WriteLine($"Endpoint: {account.Endpoint}, ID: {account.Id}");
             try
             {
                 /* DB 접속 시도 */
--- a/Vulnerablity_DB/VulnCrawler/VulnWorker.cs
View file @b98d9c5
+++ b/Vulnerablity_DB/VulnCrawler/VulnWorker.cs
View file @b98d9c5
@@ -41,14 +41,11 @@ namespace VulnCrawler
                 if (string.IsNullOrEmpty(cve)) {
                     continue;
                 }
-
                 string commitUrl = $"{crawler.PushUrl}/commit/{commit.Sha}";
                 foreach (var parent in commit.Parents) {
                     try
                     {
-             
-
                         // 부모 커밋과 현재 커밋을 Compare 하여 패치 내역을 가져옴
                         var patch = crawler.Repository.Diff.Compare<Patch>(parent.Tree, commit.Tree);
@@ -132,7 +129,7 @@ namespace VulnCrawler
                             };
                             /* VulnDB에 추가 */
-                            VulnRDS._InsertVulnData(vuln);
+                            //VulnRDS._InsertVulnData(vuln);
                         }
                     }
--- a/Vulnerablity_DB/VulnUserCodeAnalyzer/Program.cs
View file @b98d9c5
+++ b/Vulnerablity_DB/VulnUserCodeAnalyzer/Program.cs
View file @b98d9c5
--- a/Vulnerablity_DB/VulnUserCodeAnalyzer/VulnUserCodeAnalyzer.csproj
View file @b98d9c5
+++ b/Vulnerablity_DB/VulnUserCodeAnalyzer/VulnUserCodeAnalyzer.csproj
View file @b98d9c5
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.217\build\net461\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.217\build\net461\LibGit2Sharp.NativeBinaries.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +12,8 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,6 +35,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="LibGit2Sharp, Version=0.25.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibGit2Sharp.0.25.2\lib\netstandard2.0\LibGit2Sharp.dll</HintPath>
+    </Reference>
     <Reference Include="MySql.Data, Version=8.0.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" />
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -64,4 +70,10 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.217\build\net461\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.217\build\net461\LibGit2Sharp.NativeBinaries.props'))" />
+  </Target>
 </Project>
\ No newline at end of file
--- a/Vulnerablity_DB/VulnUserCodeAnalyzer/packages.config
View file @b98d9c5
+++ b/Vulnerablity_DB/VulnUserCodeAnalyzer/packages.config
View file @b98d9c5
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="LibGit2Sharp" version="0.25.2" targetFramework="net461" />
+  <package id="LibGit2Sharp.NativeBinaries" version="1.0.217" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>
\ No newline at end of file