Merge branch 'dev' into lilixie-2087140

.pipelines/Release-trigger.yml

@@ -8,12 +8,32 @@ trigger:
 
 pr: none
 
+parameters:
+- name: TargetPipelines
+  type: object
+  default:
+  - id: 21120
+    paramName: NuGetGallerySubmoduleBranch
+  - id: 21280
+    paramName: NuGetGalleryBranch
+
 variables:
 - name: NugetMultifeedWarnLevel
   value: none
-  
+
 pool:
   vmImage: 'windows-latest'
 
 steps:
-- powershell: Write-Host "Dummy task"
+- ${{ each pipeline in parameters.TargetPipelines }}:
+  - powershell: |-
+      $body = @{
+        "templateParameters" = @{
+          "${{ pipeline.paramName }}" = "$(Build.SourceBranchName)"
+        }
+      }
+      $headers = @{ "Authorization" = "Bearer $env:ACCESS_TOKEN" };
+      $url = "$(System.CollectionUri)$(System.TeamProject)/_apis/pipelines/${{ pipeline.id }}/runs?api-version=7.0"
+      Invoke-RestMethod -Uri $url -Method POST -Headers $headers -Body ($body | ConvertTo-Json) -ContentType "application/json"
+    env:
+      ACCESS_TOKEN: $(System.AccessToken)

src/AccountDeleter/Configuration/GalleryConfiguration.cs

@@ -35,6 +35,8 @@ public string SiteRoot
         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(); }
+        public bool AzureStorageUseMsi { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public string AzureStorageMsiClientId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public TimeSpan FeatureFlagsRefreshInterval { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public bool AdminPanelEnabled { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public bool AdminPanelDatabaseAccessEnabled { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

src/NuGetGallery.Core/NuGetGallery.Core.csproj

@@ -41,8 +41,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
-
     <PackageReference Include="Azure.Core" Version="1.39.0" />
     <PackageReference Include="Azure.Identity" Version="1.11.3" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.20.0" />

src/NuGetGallery.Core/Services/CloudBlobClientWrapper.cs

@@ -72,6 +72,20 @@ public static CloudBlobClientWrapper UsingServicePrincipal(
             return new CloudBlobClientWrapper(storageConnectionString, tokenCredential, readAccessGeoRedundant, requestTimeout);
         }
 
+        public static CloudBlobClientWrapper UsingDefaultAzureCredential(
+            string storageConnectionString,
+            string clientId = null,
+            bool readAccessGeoRedundant = false,
+            TimeSpan? requestTimeout = null)
+        {
+            var options = new DefaultAzureCredentialOptions
+            {
+                ManagedIdentityClientId = clientId,
+            };
+            var tokenCredential = new DefaultAzureCredential(options);
+            return new CloudBlobClientWrapper(storageConnectionString, tokenCredential, readAccessGeoRedundant, requestTimeout);
+        }
+
         public ISimpleCloudBlob GetBlobFromUri(Uri uri)
         {
             // For Azure blobs, the query string is assumed to be the SAS token.

src/NuGetGallery.Core/Services/CloudBlobReadOnlyProperties.cs

@@ -31,5 +31,14 @@ public CloudBlobReadOnlyProperties(BlobItem blobItem)
             CopyStatus = null;
             CopyStatusDescription = null;
         }
+
+        public CloudBlobReadOnlyProperties(BlobDownloadDetails details)
+        {
+            LastModifiedUtc = details.LastModified.UtcDateTime;
+            Length = details.ContentLength;
+            IsSnapshot = false;
+            CopyStatus = details.CopyStatus;
+            CopyStatusDescription = details.CopyStatusDescription;
+        }
     }
 }

src/NuGetGallery.Core/Services/CloudBlobWrapper.cs

@@ -522,6 +522,7 @@ private void UpdateEtag(BlobDownloadDetails details)
             if (details != null)
             {
                 _lastSeenEtag = EtagToString(details.ETag);
+                BlobProperties = new CloudBlobReadOnlyProperties(details);
                 ReplaceHttpHeaders(details);
                 ReplaceMetadata(details.Metadata);
             }

src/NuGetGallery.Services/AccountManagement/DeleteAccountService.cs

@@ -373,7 +373,7 @@ private async Task<DeleteAccountStatus> RunAccountDeletionTask(Func<Task> getTas
                 await _featureFlagService.RemoveUserAsync(userToBeDeleted);
                 await RemoveSupportRequests(userToBeDeleted);
 
-                using (var strategy = new SuspendDbExecutionStrategy())
+                using (new SuspendDbExecutionStrategy())
                 using (var transaction = _entitiesContext.GetDatabase().BeginTransaction())
                 {
                     await getTask();

src/NuGetGallery.Services/Configuration/AppConfiguration.cs

@@ -71,6 +71,10 @@ public class AppConfiguration : IAppConfiguration
         /// </summary>
         public bool AzureStorageReadAccessGeoRedundant { get; set; }
 
+        public bool AzureStorageUseMsi { get; set; } = false;
+
+        public string AzureStorageMsiClientId { get; set; } = null;
+
         public TimeSpan FeatureFlagsRefreshInterval { get; set; }
 
         [DefaultValue(true)]

src/NuGetGallery.Services/Configuration/IAppConfiguration.cs

@@ -90,6 +90,20 @@ public interface IAppConfiguration : IMessageServiceConfiguration
         /// </summary>
         bool AzureStorageReadAccessGeoRedundant { get; set; }
 
+        /// <summary>
+        /// Indicates whether Managed Service Identity should be used to access Azure Storage.
+        /// If false, the presumption is that connection strings contain the necessary credentials.
+        /// If true, single MSI is going to be used for all storage connections.
+        /// </summary>
+        bool AzureStorageUseMsi { get; set; }
+
+        /// <summary>
+        /// Client ID of the MSI to use for Azure storage access.
+        /// If empty or not specified, the default MSI will be used in Release builds
+        /// and <see cref="Azure.Identity.DefaultAzureCredential"/> in Debug builds.
+        /// </summary>
+        string AzureStorageMsiClientId { get; set; }
+
         /// <summary>
         /// How frequently the feature flags should be refreshed.
         /// </summary>

src/NuGetGallery.Services/PackageManagement/PackageOwnershipManagementService.cs

@@ -77,7 +77,7 @@ public async Task AddPackageOwnerAsync(PackageRegistration packageRegistration,
 
             if (commitChanges)
             {
-                using (var strategy = new SuspendDbExecutionStrategy())
+                using (new SuspendDbExecutionStrategy())
                 using (var transaction = _entitiesContext.GetDatabase().BeginTransaction())
                 {
                     await AddPackageOwnerTask(packageRegistration, user, commitChanges);
@@ -288,7 +288,7 @@ private async Task RemovePackageOwnerAsync(
             {
                 if (commitChanges)
                 {
-                    using (var strategy = new SuspendDbExecutionStrategy())
+                    using (new SuspendDbExecutionStrategy())
                     using (var transaction = _entitiesContext.GetDatabase().BeginTransaction())
                     {
                         await RemovePackageOwnerImplAsync(packageRegistration, ownerToBeRemoved);

src/NuGetGallery.Services/PackageManagement/PackageUpdateService.cs

@@ -58,7 +58,7 @@ public async Task UpdateListedInBulkAsync(IReadOnlyList<Package> packages, bool
                 throw new ArgumentException("All packages to change the listing status of must have the same ID.", nameof(packages));
             }
 
-            using (var strategy = new SuspendDbExecutionStrategy())
+            using (new SuspendDbExecutionStrategy())
             using (var transaction = _entitiesContext.GetDatabase().BeginTransaction())
             {
                 foreach (var package in packages)

src/NuGetGallery.Services/PackageManagement/PackageVulnerabilitiesManagementService.cs

@@ -58,7 +58,7 @@ public async Task UpdateVulnerabilityAsync(PackageVulnerability vulnerability, b
                 throw new ArgumentNullException(nameof(vulnerability));
             }
 
-            using (var strategy = new SuspendDbExecutionStrategy())
+            using (new SuspendDbExecutionStrategy())
             using (var transaction = _entitiesContext.GetDatabase().BeginTransaction())
             {
                 var packagesToUpdate = UpdateVulnerabilityInternal(vulnerability, withdrawn);

src/NuGetGallery.Services/PackageManagement/ReservedNamespaceService.cs

@@ -87,7 +87,7 @@ public async Task DeleteReservedNamespaceAsync(string existingNamespace)
                 throw new ArgumentException(ServicesStrings.ReservedNamespace_InvalidNamespace);
             }
 
-            using (var strategy = new SuspendDbExecutionStrategy())
+            using (new SuspendDbExecutionStrategy())
             using (var transaction = EntitiesContext.GetDatabase().BeginTransaction())
             {
                 var namespaceToDelete = FindReservedNamespaceForPrefix(existingNamespace)
@@ -199,7 +199,7 @@ public async Task DeleteOwnerFromReservedNamespaceAsync(string prefix, string us
             List<PackageRegistration> packageRegistrationsToMarkUnverified;
             if (commitChanges)
             {
-                using (var strategy = new SuspendDbExecutionStrategy())
+                using (new SuspendDbExecutionStrategy())
                 using (var transaction = EntitiesContext.GetDatabase().BeginTransaction())
                 {
                     packageRegistrationsToMarkUnverified = await DeleteOwnerFromReservedNamespaceImplAsync(prefix, username, namespaceToModify);

src/NuGetGallery/App_Code/ViewHelpers.cshtml

@@ -162,6 +162,11 @@
     <text>onerror="this.src='@url'; this.onerror = null;"</text>
 }
 
+@helper PackageImageFallback()
+{
+    <text>onerror="this.className='package-icon img-responsive package-default-icon'; this.onerror = null;"</text>
+}
+
 @helper Option(string value, string label, string currentValue)
 {
     <option value="@value" @if (value == currentValue)

src/NuGetGallery/App_Start/DefaultDependenciesModule.cs

@@ -237,9 +237,9 @@ protected override void Load(ContainerBuilder builder)
                 .InstancePerLifetimeScope();
 
             builder.RegisterType<EntityRepository<AccountDelete>>()
-               .AsSelf()
-               .As<IEntityRepository<AccountDelete>>()
-               .InstancePerLifetimeScope();
+                .AsSelf()
+                .As<IEntityRepository<AccountDelete>>()
+                .InstancePerLifetimeScope();
 
             builder.RegisterType<EntityRepository<Credential>>()
                 .AsSelf()
@@ -1432,18 +1432,45 @@ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryC
             {
                 if (completedBindingKeys.Add(dependent.BindingKey))
                 {
-                    builder.RegisterInstance(new CloudBlobClientWrapper(dependent.AzureStorageConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant))
-                       .AsSelf()
-                       .As<ICloudBlobClient>()
-                       .SingleInstance()
-                       .Keyed<ICloudBlobClient>(dependent.BindingKey);
+                    CloudBlobClientWrapper blobClient;
+                    if (!configuration.Current.AzureStorageUseMsi)
+                    {
+                        blobClient = new CloudBlobClientWrapper(dependent.AzureStorageConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant);
+                    }
+                    else
+                    {
+                        if (string.IsNullOrWhiteSpace(configuration.Current.AzureStorageMsiClientId))
+                        {
+#if DEBUG
+                            blobClient = CloudBlobClientWrapper.UsingDefaultAzureCredential(
+                                dependent.AzureStorageConnectionString,
+                                readAccessGeoRedundant: configuration.Current.AzureStorageReadAccessGeoRedundant);
+#else
+                            blobClient = CloudBlobClientWrapper.UsingMsi(
+                                dependent.AzureStorageConnectionString,
+                                readAccessGeoRedundant: configuration.Current.AzureStorageReadAccessGeoRedundant);
+#endif
+                        }
+                        else
+                        {
+                            blobClient = CloudBlobClientWrapper.UsingMsi(
+                                dependent.AzureStorageConnectionString,
+                                configuration.Current.AzureStorageMsiClientId,
+                                configuration.Current.AzureStorageReadAccessGeoRedundant);
+                        }
+                    }
+                    builder.RegisterInstance(blobClient)
+                        .AsSelf()
+                        .As<ICloudBlobClient>()
+                        .SingleInstance()
+                        .Keyed<ICloudBlobClient>(dependent.BindingKey);
 
                     // Do not register the service as ICloudStorageStatusDependency because
                     // the CloudAuditingService registers it and the gallery uses the same storage account for all the containers.
                     builder.RegisterType<CloudBlobFileStorageService>()
                         .WithParameter(new ResolvedParameter(
-                           (pi, ctx) => pi.ParameterType == typeof(ICloudBlobClient),
-                           (pi, ctx) => ctx.ResolveKeyed<ICloudBlobClient>(dependent.BindingKey)))
+                            (pi, ctx) => pi.ParameterType == typeof(ICloudBlobClient),
+                            (pi, ctx) => ctx.ResolveKeyed<ICloudBlobClient>(dependent.BindingKey)))
                         .AsSelf()
                         .As<IFileStorageService>()
                         .As<ICoreFileStorageService>()

src/NuGetGallery/Controllers/AccountsController.cs

@@ -496,7 +496,7 @@ public virtual async Task<JsonResult> AddCertificate(string accountName, HttpPos
 
             try
             {
-                using (var uploadStream = uploadFile.InputStream)
+                using (uploadFile.InputStream)
                 {
                     certificate = await CertificateService.AddCertificateAsync(uploadFile);
                 }

src/NuGetGallery/Services/PackageDeleteService.cs

@@ -252,7 +252,7 @@ private async Task<bool> AreStatisticsStaleAsync()
 
         public async Task SoftDeletePackagesAsync(IEnumerable<Package> packages, User deletedBy, string reason, string signature)
         {
-            using (var strategy = new SuspendDbExecutionStrategy())
+            using (new SuspendDbExecutionStrategy())
             using (var transaction = _entitiesContext.GetDatabase().BeginTransaction())
             {
                 // Increase command timeout
@@ -322,7 +322,7 @@ await _symbolPackageService.UpdateStatusAsync(
 
         public async Task HardDeletePackagesAsync(IEnumerable<Package> packages, User deletedBy, string reason, string signature, bool deleteEmptyPackageRegistration)
         {
-            using (var strategy = new SuspendDbExecutionStrategy())
+            using (new SuspendDbExecutionStrategy())
             using (var transaction = _entitiesContext.GetDatabase().BeginTransaction())
             {
                 // Increase command timeout

src/NuGetGallery/Services/PackageDeprecationService.cs

@@ -153,7 +153,7 @@ public async Task UpdateDeprecation(
 
             if (_entitiesContext.HasChanges)
             {
-                using (var strategy = new SuspendDbExecutionStrategy())
+                using (new SuspendDbExecutionStrategy())
                 using (var transaction = _entitiesContext.GetDatabase().BeginTransaction())
                 {
                     await _entitiesContext.SaveChangesAsync();

src/NuGetGallery/Views/Packages/DisplayPackage.cshtml

@@ -269,7 +269,7 @@
                         <h1>
                             <span class="pull-left">
                                 <img class="package-icon img-responsive @(PackageHelper.ShouldRenderUrl(Model.IconUrl) && Model.ShowDetailsAndLinks ? null : "package-default-icon")" aria-hidden="true" alt=""
-                                     src="@(PackageHelper.ShouldRenderUrl(Model.IconUrl) && Model.ShowDetailsAndLinks ? Model.IconUrl : null)" />
+                                     src="@(PackageHelper.ShouldRenderUrl(Model.IconUrl) && Model.ShowDetailsAndLinks ? Model.IconUrl : null)" @ViewHelpers.ImageFallback(Url.Absolute("~/Content/gallery/img/default-package-icon-256x256.png")) />
                             </span>
                             <span class="title">
                                 @Html.BreakWord(Model.Id)

src/NuGetGallery/Views/Shared/_ListPackage.cshtml

@@ -31,7 +31,7 @@
     <div class="row">
         <div class="col-sm-1 hidden-xs hidden-sm col-package-icon">
             <img class="package-icon img-responsive @(!PackageHelper.ShouldRenderUrl(Model.IconUrl) ? "package-default-icon" : null)" aria-hidden="true" alt=""
-                 src="@(PackageHelper.ShouldRenderUrl(Model.IconUrl) ? Model.IconUrl : null)" />
+                 src="@(PackageHelper.ShouldRenderUrl(Model.IconUrl) ? Model.IconUrl : null)" @ViewHelpers.PackageImageFallback()/>
         </div>
         <div class="col-sm-11">
             <div class="package-header">

src/NuGetGallery/Views/Users/_UserPackagesListForDeletedAccount.cshtml

@@ -44,7 +44,7 @@
                             </td>
                             <td class="align-middle hidden-xs">
                                 <img class="package-icon img-responsive @(!PackageHelper.ShouldRenderUrl(package.IconUrl) ? "package-default-icon" : null)" aria-hidden="true" alt="Package Icon"
-                                     src="@(PackageHelper.ShouldRenderUrl(package.IconUrl) ? package.IconUrl : null)" />
+                                     src="@(PackageHelper.ShouldRenderUrl(package.IconUrl) ? package.IconUrl : null)" @ViewHelpers.PackageImageFallback()/>
                             </td>
                             <td class="align-middle package-id"><a href="@Url.Package(package.Id)">@Html.BreakWord(package.Id.Abbreviate(40))</a></td>
                             <td class="align-middle">

tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj

@@ -108,7 +108,6 @@
     <Compile Include="Services\CoreReadmeFileServiceFacts.cs" />
     <Compile Include="Services\CoreLicenseFileServiceFacts.cs" />
     <Compile Include="Services\CoreSymbolPackageServiceFacts.cs" />
-    <Compile Include="Services\FileUriPermissionsFacts.cs" />
     <Compile Include="Services\FolderNamesDataAttribute.cs" />
     <Compile Include="Services\FolderNamesDataAttributeFacts.cs" />
     <Compile Include="Services\GalleryCloudBlobContainerInformationProviderFacts.cs" />