Merge pull request #8392 from NuGet/dev

[ReleasePrep][2021.01.24]NuGetGallery of dev into master

Author: zhhyu

NuGet.config

@@ -8,6 +8,7 @@
     <add key="automatic" value="True" />
   </packageRestore>
   <packageSources>
+    <clear />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
     <add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
   </packageSources>

src/AccountDeleter/Configuration/GalleryConfiguration.cs

@@ -32,6 +32,7 @@ public string SiteRoot
         public string AzureStorage_Packages_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_FlatContainer_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_Statistics_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public string AzureStorage_Statistics_ConnectionString_Alternate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_Uploads_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_Revalidation_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public bool AzureStorageReadAccessGeoRedundant { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

src/Bootstrap/dist/css/bootstrap-theme.css

@@ -320,6 +320,10 @@ img.reserved-indicator-icon {
   margin-right: auto;
 }
 
+.table-container {
+  overflow-x: auto;
+}
+
 .package-list {
   margin-top: 8px;
   margin-bottom: 8px;

src/Bootstrap/less/theme/base.less

@@ -40,7 +40,6 @@
 
   .login-account-row {
     padding-top: 10px;
-    display: flex;
     align-items: center;
     justify-content: space-between;
   }

src/Bootstrap/less/theme/page-account-settings.less

@@ -63,6 +63,50 @@
     }
   }
 
+  .vulnerabilities-container {
+    .vulnerabilities-expander {
+      display: flex;
+      justify-content: space-between;
+      vertical-align: middle;
+      width: 100%;
+
+      .vulnerabilities-expander-container {
+        display: flex;
+
+        .vulnerabilities-expander-icon {
+          position: unset;
+          top: unset;
+        }
+
+        .vulnerabilities-expander-info-right {
+          padding-left: 15px;
+        }
+      }
+    }
+
+    .vulnerabilities-content-container {
+      margin-top: 15px;
+      padding-top: 15px;
+      border-top: 1px solid lightgray;
+
+      .vulnerabilities-list {
+        border-collapse: unset;
+      }
+    }
+
+    .vulnerabilities-severity-critical {
+      color: red
+    }
+
+    .vulnerabilities-severity-high {
+      color: red
+    }
+
+    .vulnerabilities-severity-moderate {
+      color: blue
+    }
+  }
+
   .failed-validation-alert-list {
     margin-top: 15px;
     margin-bottom: 15px;

src/Bootstrap/less/theme/page-display-package.less

@@ -13,11 +13,11 @@ namespace GitHubVulnerabilities2Db.Ingest
 {
     public class AdvisoryIngestor : IAdvisoryIngestor
     {
-        private readonly IPackageVulnerabilityService _packageVulnerabilityService;
+        private readonly IPackageVulnerabilitiesManagementService _packageVulnerabilityService;
         private readonly IGitHubVersionRangeParser _gitHubVersionRangeParser;
 
         public AdvisoryIngestor(
-            IPackageVulnerabilityService packageVulnerabilityService,
+            IPackageVulnerabilitiesManagementService packageVulnerabilityService,
             IGitHubVersionRangeParser gitHubVersionRangeParser)
         {
             _packageVulnerabilityService = packageVulnerabilityService ?? throw new ArgumentNullException(nameof(packageVulnerabilityService));

src/GitHubVulnerabilities2Db/Ingest/AdvisoryIngestor.cs

@@ -64,8 +64,8 @@ protected void ConfigureIngestionServices(ContainerBuilder containerBuilder)
             ConfigureGalleryServices(containerBuilder);
 
             containerBuilder
-                .RegisterType<PackageVulnerabilityService>()
-                .As<IPackageVulnerabilityService>();
+                .RegisterType<PackageVulnerabilitiesManagementService>()
+                .As<IPackageVulnerabilitiesManagementService>();
 
             containerBuilder
                 .RegisterType<GitHubVersionRangeParser>()

src/GitHubVulnerabilities2Db/Job.cs

@@ -24,7 +24,7 @@ public Package()
             SymbolPackages = new HashSet<SymbolPackage>();
             Deprecations = new HashSet<PackageDeprecation>();
             AlternativeOf = new HashSet<PackageDeprecation>();
-            Vulnerabilities = new HashSet<VulnerablePackageVersionRange>();
+            VulnerablePackageRanges = new HashSet<VulnerablePackageVersionRange>();
             Listed = true;
         }
 #pragma warning restore 618
@@ -156,6 +156,18 @@ public bool HasReadMe
             }
         }
 
+        /// <summary>
+        /// Signifies whether or not the embedded Readme exists
+        /// </summary>
+        [NotMapped]
+        public bool HasEmbeddedReadme
+        {
+            get
+            {
+                return HasReadMe && EmbeddedReadmeType != EmbeddedReadmeFileType.Absent;
+            }
+        }
+
         public bool RequiresLicenseAcceptance { get; set; }
 
         public bool DevelopmentDependency { get; set; }
@@ -277,9 +289,9 @@ public bool HasReadMe
         public virtual ICollection<PackageDeprecation> AlternativeOf { get; set; }
 
         /// <summary>
-        /// Gets or sets the list of vulnerabilites that this package has.
+        /// Gets or sets the list of vulnerable package ranges connecting this package to vulnerabilities.
         /// </summary>
-        public ICollection<VulnerablePackageVersionRange> Vulnerabilities { get; set; }
+        public ICollection<VulnerablePackageVersionRange> VulnerablePackageRanges { get; set; }
 
         /// <summary>
         /// A flag that indicates that the package metadata had an embedded icon specified.

src/NuGet.Services.Entities/Package.cs

@@ -482,7 +482,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
             modelBuilder.Entity<VulnerablePackageVersionRange>()
                 .HasKey(pv => pv.Key)
                 .HasMany(pv => pv.Packages)
-                .WithMany(p => p.Vulnerabilities);
+                .WithMany(p => p.VulnerablePackageRanges);
 
             modelBuilder.Entity<VulnerablePackageVersionRange>()
                 .HasIndex(pv => pv.PackageId);