From c67f0baf74205bd855f6e8bda3b83715cb8f99f6 Mon Sep 17 00:00:00 2001
From: jakobdyrby <jad@netmester.dk>
Date: Thu, 5 Jun 2014 11:07:17 +0200
Subject: [PATCH] Method renaming and zip allowed

---
 build/NuSpecs/build/UmbracoCms.targets        |  92 +++++++--------
 src/Umbraco.Core/Constants-Packaging.cs       | 107 +++++++++---------
 src/Umbraco.Core/Packaging/UnpackHelper.cs    |   9 +-
 .../Netmester.BestPractice.Base_0.0.0.1.umb   | Bin 0 -> 6634 bytes
 .../Services/PackageInstallerServiceTest.cs   |  18 ++-
 5 files changed, 121 insertions(+), 105 deletions(-)
 create mode 100644 src/Umbraco.Tests/Packages/Netmester.BestPractice.Base_0.0.0.1.umb

diff --git a/build/NuSpecs/build/UmbracoCms.targets b/build/NuSpecs/build/UmbracoCms.targets
index 024d8af7ad..b057ce5202 100644
--- a/build/NuSpecs/build/UmbracoCms.targets
+++ b/build/NuSpecs/build/UmbracoCms.targets
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
-    <PropertyGroup>
-      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-  <Target Name="AddUmbracoFilesToOutput">
-    <!-- With help from: http://blog.samstephens.co.nz/2010-10-18/msbuild-including-extra-files-multiple-builds/ -->
-    <ItemGroup>
-      <CustomFilesToInclude Include=".\App_Browsers\**\*">
-        <Dir>App_Browsers</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\App_Code\**\*">
-        <Dir>App_Code</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\App_Plugins\**\*">
-        <Dir>App_Plugins</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\bin\amd64\**\*">
-        <Dir>bin\amd64</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\bin\x86\**\*">
-        <Dir>bin\x86</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\Config\Splashes\**\*">
-        <Dir>Config\Splashes</Dir>
-      </CustomFilesToInclude>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
+    <PropertyGroup>
+      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
+    </PropertyGroup>
+    <ItemGroup>
+      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
+    </ItemGroup>
+    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+  <Target Name="AddUmbracoFilesToOutput">
+    <!-- With help from: http://blog.samstephens.co.nz/2010-10-18/msbuild-including-extra-files-multiple-builds/ -->
+    <ItemGroup>
+      <CustomFilesToInclude Include=".\App_Browsers\**\*">
+        <Dir>App_Browsers</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\App_Code\**\*">
+        <Dir>App_Code</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\App_Plugins\**\*">
+        <Dir>App_Plugins</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\bin\amd64\**\*">
+        <Dir>bin\amd64</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\bin\x86\**\*">
+        <Dir>bin\x86</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\Config\Splashes\**\*">
+        <Dir>Config\Splashes</Dir>
+      </CustomFilesToInclude>
       <CustomFilesToInclude Include=".\data\**\*">
         <Dir>data</Dir>
       </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\umbraco\**\*">
-        <Dir>umbraco</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\umbraco_client\**\*">
-        <Dir>umbraco_client</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\Global.asax">
-        <Dir>.</Dir>
-      </CustomFilesToInclude>
-      <FilesForPackagingFromProject Include="@(CustomFilesToInclude)">
-        <DestinationRelativePath>%(CustomFilesToInclude.Dir)\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
+      <CustomFilesToInclude Include=".\umbraco\**\*">
+        <Dir>umbraco</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\umbraco_client\**\*">
+        <Dir>umbraco_client</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\Global.asax">
+        <Dir>.</Dir>
+      </CustomFilesToInclude>
+      <FilesForPackagingFromProject Include="@(CustomFilesToInclude)">
+        <DestinationRelativePath>%(CustomFilesToInclude.Dir)\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Core/Constants-Packaging.cs b/src/Umbraco.Core/Constants-Packaging.cs
index ef68b2a656..0beb034508 100644
--- a/src/Umbraco.Core/Constants-Packaging.cs
+++ b/src/Umbraco.Core/Constants-Packaging.cs
@@ -1,56 +1,53 @@
-using System.Xml.Linq;
-
-namespace Umbraco.Core
-{
-    public static partial class Constants
-	{
-        /// <summary>
-        /// Defines the constants used for Umbraco packages in the package.config xml
-        /// </summary>
-        public static class Packaging
-        {
-            public const string UmbPackageNodeName = "umbPackage";
-            public const string DataTypesNodeName = "DataTypes";
-            public const string PackageXmlFileName = "package.xml";
-            public const string UmbracoPackageExtention = ".umb";
-            public const string DataTypeNodeName = "DataType";
-            public const string LanguagesNodeName = "Languages";
-            public const string FilesNodeName = "files";
-            public const string StylesheetsNodeName = "Stylesheets";
-            public const string TemplatesNodeName = "Templates";
-            public const string NameNodeName = "Name";
-            public const string TemplateNodeName = "Template";
-            public const string AliasNodeNameSmall = "alias";
-            public const string AliasNodeNameCapital = "Alias";
-            public const string DictionaryItemsNodeName = "DictionaryItems";
-            public const string DictionaryItemNodeName = "DictionaryItem";
-            public const string MacrosNodeName = "Macros";
-            public const string DocumentSetNodeName = "DocumentSet";
-            public const string DocumentTypesNodeName = "DocumentTypes";
-            public const string DocumentTypeNodeName = "DocumentType";
-            public const string FileNodeName = "file";
-            public const string OrgNameNodeName = "orgName";
-            public const string OrgPathNodeName = "orgPath";
-            public const string GuidNodeName = "guid";
-            public const string StylesheetNodeName = "styleSheet";
-            public const string MacroNodeName = "macro";
-            public const string InfoNodeName = "info";
-            public const string PackageRequirementsMajorXpath = "./package/requirements/major";
-            public const string PackageRequirementsMinorXpath = "./package/requirements/minor";
-            public const string PackageRequirementsPatchXpath = "./package/requirements/patch";
-            public const string PackageNameXpath = "./package/name";
-            public const string PackageVersionXpath = "./package/version";
-            public const string PackageUrlXpath = "./package/url";
-            public const string PackageLicenseXpath = "./package/license";
-            public const string AuthorNameXpath = "./author/name";
-            public const string AuthorWebsiteXpath = "./author/website";
-            public const string ReadmeXpath = "./readme";
-            public const string ControlNodeName = "control";
-            public const string ActionNodeName = "Action";
-            public const string ActionsNodeName = "Actions";
-            public const string UndoNodeAttribute = "undo";
-            public const string RunatNodeAttribute = "runat";
-           
-        }
-	}
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        /// <summary>
+        ///     Defines the constants used for Umbraco packages in the package.config xml
+        /// </summary>
+        public static class Packaging
+        {
+            public static readonly string UmbPackageNodeName = "umbPackage";
+            public static readonly string DataTypesNodeName = "DataTypes";
+            public static readonly string PackageXmlFileName = "package.xml";
+            public static readonly string UmbracoPackageExtention = ".umb";
+            public static readonly string DataTypeNodeName = "DataType";
+            public static readonly string LanguagesNodeName = "Languages";
+            public static readonly string FilesNodeName = "files";
+            public static readonly string StylesheetsNodeName = "Stylesheets";
+            public static readonly string TemplatesNodeName = "Templates";
+            public static readonly string NameNodeName = "Name";
+            public static readonly string TemplateNodeName = "Template";
+            public static readonly string AliasNodeNameSmall = "alias";
+            public static readonly string AliasNodeNameCapital = "Alias";
+            public static readonly string DictionaryItemsNodeName = "DictionaryItems";
+            public static readonly string DictionaryItemNodeName = "DictionaryItem";
+            public static readonly string MacrosNodeName = "Macros";
+            public static readonly string DocumentSetNodeName = "DocumentSet";
+            public static readonly string DocumentTypesNodeName = "DocumentTypes";
+            public static readonly string DocumentTypeNodeName = "DocumentType";
+            public static readonly string FileNodeName = "file";
+            public static readonly string OrgNameNodeName = "orgName";
+            public static readonly string OrgPathNodeName = "orgPath";
+            public static readonly string GuidNodeName = "guid";
+            public static readonly string StylesheetNodeName = "styleSheet";
+            public static readonly string MacroNodeName = "macro";
+            public static readonly string InfoNodeName = "info";
+            public static readonly string PackageRequirementsMajorXpath = "./package/requirements/major";
+            public static readonly string PackageRequirementsMinorXpath = "./package/requirements/minor";
+            public static readonly string PackageRequirementsPatchXpath = "./package/requirements/patch";
+            public static readonly string PackageNameXpath = "./package/name";
+            public static readonly string PackageVersionXpath = "./package/version";
+            public static readonly string PackageUrlXpath = "./package/url";
+            public static readonly string PackageLicenseXpath = "./package/license";
+            public static readonly string AuthorNameXpath = "./author/name";
+            public static readonly string AuthorWebsiteXpath = "./author/website";
+            public static readonly string ReadmeXpath = "./readme";
+            public static readonly string ControlNodeName = "control";
+            public static readonly string ActionNodeName = "Action";
+            public static readonly string ActionsNodeName = "Actions";
+            public static readonly string UndoNodeAttribute = "undo";
+            public static readonly string RunatNodeAttribute = "runat";
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Packaging/UnpackHelper.cs b/src/Umbraco.Core/Packaging/UnpackHelper.cs
index 0ad5397d32..970e0c85a0 100644
--- a/src/Umbraco.Core/Packaging/UnpackHelper.cs
+++ b/src/Umbraco.Core/Packaging/UnpackHelper.cs
@@ -10,7 +10,6 @@ namespace Umbraco.Core.Packaging
     {
         public string ReadTextFileFromArchive(string packageFilePath, string fileToRead, out string directoryInPackage)
         {
-
             string retVal = null;
             bool fileFound = false;
             string foundDir = null;
@@ -56,11 +55,15 @@ namespace Umbraco.Core.Packaging
                     throw new ArgumentException(string.Format("Package file: {0} could not be found", packageFilePath));
             }
 
+            string extension = Path.GetExtension(packageFilePath).ToLower();
+
+            var alowedExtension = new[] {".umb", ".zip"};
+
             // Check if the file is a valid package
-            if (Path.GetExtension(packageFilePath).Equals(".umb", StringComparison.InvariantCultureIgnoreCase) == false)
+            if (alowedExtension.All(ae => ae.Equals(extension) == false))
             {
                 throw new ArgumentException(
-                    "Error - file isn't a package (doesn't have a .umb extension). Check if the file automatically got named '.zip' upon download.");
+                    string.Format("Error - file isn't a package. only extentions: \"{0}\" is allowed", string.Join(", ", alowedExtension)));
             }
         }
 
diff --git a/src/Umbraco.Tests/Packages/Netmester.BestPractice.Base_0.0.0.1.umb b/src/Umbraco.Tests/Packages/Netmester.BestPractice.Base_0.0.0.1.umb
new file mode 100644
index 0000000000000000000000000000000000000000..11610beb1e6957ee18c4121974ecd482d42d3ee7
GIT binary patch
literal 6634
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
aPf7lkMq3RP?HL{c`FY1b_fRGKtNIVmeE!t{

literal 0
HcmV?d00001

diff --git a/src/Umbraco.Tests/Services/PackageInstallerServiceTest.cs b/src/Umbraco.Tests/Services/PackageInstallerServiceTest.cs
index f46e243d95..6067ff0909 100644
--- a/src/Umbraco.Tests/Services/PackageInstallerServiceTest.cs
+++ b/src/Umbraco.Tests/Services/PackageInstallerServiceTest.cs
@@ -11,6 +11,7 @@ namespace Umbraco.Tests.Services
     public class PackageInstallerServiceTest : BaseServiceTest
     {
         private const string DOCUMENT_TYPE_PICKER_UMB = "Document_Type_Picker_1.1.umb";
+        private const string NETMESTER_BEST_PRACTICE_BASE_UMB = "Netmester.BestPractice.Base_0.0.0.1.umb";
         private const string TEST_PACKAGES_DIR_NAME = "Packages";
 
         [SetUp]
@@ -45,13 +46,28 @@ namespace Umbraco.Tests.Services
             var path = GetTestPackagePath(DOCUMENT_TYPE_PICKER_UMB);
             
             // Act
-            var importIssues = ServiceContext.PackageInstallerService.FindPackageImportIssues(path);
+            var importIssues = ServiceContext.PackageInstallerService.GetPreInstallWarnings(path);
 
             // Assert
             Assert.IsNotNull(importIssues);
         }
 
 
+        [Test]
+        public void PackageInstallerService_TestSomethingnew()
+        {
+            // Arrange
+            var path = GetTestPackagePath(NETMESTER_BEST_PRACTICE_BASE_UMB);
+
+            // Act
+            var importIssues = ServiceContext.PackageInstallerService.GetPreInstallWarnings(path);
+
+            // Assert
+            Assert.IsNotNull(importIssues);
+        }
+
+
+        
         [Test]
         public void PackageInstallerService_TestSomethingthered()
         {