Merge pull request #6802 from NuGet/dev

[ReleasePrep][2018.01.07]RI of dev into master

Author: shishirx34

src/NuGetGallery.Core/Services/AccessConditionWrapper.cs

@@ -31,6 +31,13 @@ public static IAccessCondition GenerateIfMatchCondition(string etag)
                 ifMatchETag: AccessCondition.GenerateIfMatchCondition(etag).IfMatchETag);
         }
 
+        public static IAccessCondition GenerateIfNoneMatchCondition(string etag)
+        {
+            return new AccessConditionWrapper(
+                ifNoneMatchETag: AccessCondition.GenerateIfNoneMatchCondition(etag).IfNoneMatchETag,
+                ifMatchETag: null);
+        }
+
         public static IAccessCondition GenerateIfNotExistsCondition()
         {
             return new AccessConditionWrapper(

src/NuGetGallery.Core/Services/CloudBlobWrapper.cs

@@ -29,6 +29,14 @@ public CloudBlobWrapper(CloudBlockBlob blob)
             _blob = blob;
         }
 
+        public async Task<Stream> OpenReadAsync(AccessCondition accessCondition)
+        {
+            return await _blob.OpenReadAsync(
+                accessCondition: accessCondition,
+                options: null,
+                operationContext: null);
+        }
+
         public async Task DeleteIfExistsAsync()
         {
             await _blob.DeleteIfExistsAsync(

src/NuGetGallery.Core/Services/CoreLicenseFileService.cs

@@ -42,13 +42,7 @@ public Task SaveLicenseFileAsync(Package package, Stream licenseFile)
 
             var fileName = BuildLicenseFileName(package);
 
-            // Gallery will generally ignore the content type on license files and will use the value from the DB,
-            // but we'll be nice and try to specify correct content type for them.
-            var contentType = package.EmbeddedLicenseType == EmbeddedLicenseFileType.Markdown
-                ? CoreConstants.MarkdownContentType
-                : CoreConstants.TextContentType;
-
-            return _fileStorageService.SaveFileAsync(_metadata.PackageContentFolderName, fileName, contentType, licenseFile, overwrite: true);
+            return _fileStorageService.SaveFileAsync(_metadata.PackageContentFolderName, fileName, CoreConstants.TextContentType, licenseFile, overwrite: true);
         }
 
         public async Task ExtractAndSaveLicenseFileAsync(Package package, Stream packageStream)

src/NuGetGallery.Core/Services/ISimpleCloudBlob.cs

@@ -20,6 +20,8 @@ public interface ISimpleCloudBlob
         DateTime LastModifiedUtc { get; }
         string ETag { get; }
 
+        Task<Stream> OpenReadAsync(AccessCondition accessCondition);
+
         Task DeleteIfExistsAsync();
         Task DownloadToStreamAsync(Stream target);
         Task DownloadToStreamAsync(Stream target, AccessCondition accessCondition);

src/NuGetGallery/Areas/Admin/Services/ISupportRequestService.cs

@@ -57,7 +57,7 @@ Task<Issue> AddNewSupportRequestAsync(
 
         Task AddAdminAsync(string galleryUsername);
 
-        Task DeleteSupportRequestsAsync(string createdBy);
+        Task DeleteSupportRequestsAsync(User user);
 
         Task<bool> TryAddDeleteSupportRequestAsync(User user);
     }

src/NuGetGallery/Areas/Admin/Services/SupportRequestService.cs

@@ -286,26 +286,27 @@ public string GetIssueStatusNameById(int id)
             return issue?.Name;
         }
 
-        public async Task DeleteSupportRequestsAsync(string createdBy)
+        public async Task DeleteSupportRequestsAsync(User user)
         {
-            if (createdBy == null)
+            if (user == null)
             {
-                throw new ArgumentNullException(nameof(createdBy));
+                throw new ArgumentNullException(nameof(user));
             }
-            var userCreatedIssues = GetIssues().Where(i => string.Equals(i.CreatedBy, createdBy, StringComparison.InvariantCultureIgnoreCase)).ToList();
+            var userIssues = GetIssues().Where(i => i.UserKey.HasValue && i.UserKey.Value == user.Key).ToList();
             // Delete all the support requests with exception of the delete account request.
             // For the DeleteAccount support request clean the user data.
-            foreach (var issue in userCreatedIssues.Where(i => !string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))
+            foreach (var issue in userIssues.Where(i => !string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))
             {
                 _supportRequestDbContext.Issues.Remove(issue);
             }
-            foreach (var accountDeletedIssue in userCreatedIssues.Where(i => string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))
+            foreach (var accountDeletedIssue in userIssues.Where(i => string.Equals(i.IssueTitle, Strings.AccountDelete_SupportRequestTitle)))
             {
                 accountDeletedIssue.OwnerEmail = "deletedaccount";
                 accountDeletedIssue.CreatedBy = null;
+                accountDeletedIssue.Details = "This support request has been redacted as the customer's account has been deleted.";
                 foreach (var historyEntry in accountDeletedIssue.HistoryEntries)
                 {
-                    if (string.Equals(historyEntry.EditedBy, createdBy, StringComparison.InvariantCultureIgnoreCase))
+                    if (string.Equals(historyEntry.EditedBy, user.Username, StringComparison.InvariantCultureIgnoreCase))
                     {
                         historyEntry.EditedBy = null;
                     }

src/NuGetGallery/GalleryConstants.cs

@@ -17,7 +17,7 @@ public static class GalleryConstants
         public const int ColumnsAuthenticationMd = 4;
         public const int ColumnsWideAuthenticationSm = 8;
         public const int ColumnsWideAuthenticationMd = 6;
-        public const int ColumnsFormMd = 10;
+        public const int ColumnsFormMd = 12;
 
         public const int VisibleVersions = 5;
 

src/NuGetGallery/Services/DeleteAccountService.cs

@@ -282,7 +282,7 @@ private async Task RemoveUserDataInUserTable(User user)
 
         private async Task RemoveSupportRequests(User user)
         {
-            await _supportRequestService.DeleteSupportRequestsAsync(user.Username);
+            await _supportRequestService.DeleteSupportRequestsAsync(user);
         }
 
         private async Task RemoveUser(User user)

src/NuGetGallery/Services/PackageService.cs

@@ -56,6 +56,11 @@ public async Task EnsureValid(PackageArchiveReader packageArchiveReader)
                     packageArchiveReader.GetNuspecReader(),
                     strict: true);
 
+                if (packageMetadata.IsSymbolsPackage())
+                {
+                    throw new InvalidPackageException(Strings.UploadPackage_SymbolsPackageNotAllowed);
+                }
+
                 PackageHelper.ValidateNuGetPackageMetadata(packageMetadata);
 
                 var supportedFrameworks = GetSupportedFrameworks(packageArchiveReader).Select(fn => fn.ToShortNameOrNull()).ToArray();

src/NuGetGallery/Services/ReservedNamespaceService.cs

@@ -15,7 +15,7 @@ namespace NuGetGallery
 {
     public class ReservedNamespaceService : IReservedNamespaceService
     {
-        private static readonly Regex NamespaceRegex = new Regex(@"^\w+([_.-]\w+)*[.]?$", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+        private static readonly Regex NamespaceRegex = new Regex(@"^\w+([_.-]\w+)*[.-]?$", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
 
         public IEntitiesContext EntitiesContext { get; protected set; }
         public IEntityRepository<ReservedNamespace> ReservedNamespaceRepository { get; protected set; }
@@ -47,7 +47,14 @@ public async Task AddReservedNamespaceAsync(ReservedNamespace newNamespace)
                 throw new ArgumentNullException(nameof(newNamespace));
             }
 
-            ValidateNamespace(newNamespace.Value);
+            try
+            {
+                ValidateNamespace(newNamespace.Value);
+            }
+            catch (ArgumentException ex)
+            {
+                throw new InvalidOperationException(ex.Message, ex);
+            }
 
             var matchingReservedNamespaces = FindAllReservedNamespacesForPrefix(prefix: newNamespace.Value, getExactMatches: !newNamespace.IsPrefix);
             if (matchingReservedNamespaces.Any())
@@ -348,12 +355,12 @@ public static void ValidateNamespace(string value)
                 throw new ArgumentException(Strings.ReservedNamespace_InvalidNamespace);
             }
 
-            if (value.Length > NuGet.Services.Entities.Constants.MaxPackageIdLength)
+            if (value.Length > Constants.MaxPackageIdLength)
             {
                 throw new ArgumentException(string.Format(
                     CultureInfo.CurrentCulture,
                     Strings.ReservedNamespace_NamespaceExceedsLength,
-                    NuGet.Services.Entities.Constants.MaxPackageIdLength));
+                    Constants.MaxPackageIdLength));
             }
 
             if (!NamespaceRegex.IsMatch(value))