diff --git a/.gitignore b/.gitignore index f26a0b0..1ba71f3 100644 --- a/.gitignore +++ b/.gitignore @@ -214,3 +214,4 @@ Thumbs.db Desktop.ini Website/Install/Temp/ +install/ diff --git a/BuildScripts/MSBuild.Community.Tasks.Targets b/BuildScripts/MSBuild.Community.Tasks.Targets index 3463086..bd99093 100644 --- a/BuildScripts/MSBuild.Community.Tasks.Targets +++ b/BuildScripts/MSBuild.Community.Tasks.Targets @@ -2,7 +2,7 @@ $(MSBuildProjectDirectory)\BuildScripts - $(MSBuildProjectDirectory)\..\..\bin + $(MSBuildProjectDirectory)\..\..\..\bin $(SolutionDir)\packages\MSBuildTasks.1.4.0.61\tools\MSBuild.Community.Tasks.dll diff --git a/Components/Checks/CheckUnexpectedExtensions.cs b/Components/Checks/CheckUnexpectedExtensions.cs index 4901c27..7b90a08 100644 --- a/Components/Checks/CheckUnexpectedExtensions.cs +++ b/Components/Checks/CheckUnexpectedExtensions.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; namespace DNN.Modules.SecurityAnalyzer.Components.Checks { @@ -9,8 +10,8 @@ public CheckResult Execute() var result = new CheckResult(SeverityEnum.Unverified, "CheckUnexpectedExtensions"); try { - var investigatefiles = Utility.FindFiles("*.asp;*.php"); - if (investigatefiles.Length > 0) + var investigatefiles = Utility.FindUnexpectedExtensions(); + if (investigatefiles.Count() > 0) { result.Severity = SeverityEnum.Failure; foreach (var filename in investigatefiles) diff --git a/Components/FeatureController.cs b/Components/FeatureController.cs index 3218e40..60ab721 100644 --- a/Components/FeatureController.cs +++ b/Components/FeatureController.cs @@ -18,10 +18,10 @@ public string UpgradeModule(string version) //Add Extensions Host Page var moduleDefId = GetModuleDefinition("SecurityAnalyzer", "SecurityAnalyzer"); var auditPage = AddHostPage("Security Analyzer", "Audit site security for best practices.", - "~/images/icon_extensions_16px.gif", "~/images/icon_extensions_32px.gif", true); + "~/Icons/Sigma/Extensions_16x16_Standard.png", "~/Icons/Sigma/Extensions_32x32_Standard.png", true); var moduleid = AddModuleToPage(auditPage, moduleDefId, "Security Analyzer", - "~/images/icon_extensions_32px.gif"); + "~/Icons/Sigma/Extensions_32x32_Standard.png"); break; } diff --git a/DNN.Modules.SecurityAnalyzer.csproj b/DNN.Modules.SecurityAnalyzer.csproj index 8d49a51..939baf1 100644 --- a/DNN.Modules.SecurityAnalyzer.csproj +++ b/DNN.Modules.SecurityAnalyzer.csproj @@ -14,12 +14,13 @@ DNN.Modules.SecurityAnalyzer DNN.Modules.SecurityAnalyzer v3.5 - false + true + true @@ -147,7 +148,7 @@ False 0 / - http://dnndev.me/desktopmodules/SecurityAnalyzer + http://localhost:30900/ True http://dnndev.me False diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 18021bc..33d3b20 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("01.00.00.00")] -[assembly: AssemblyFileVersion("01.00.00.00")] \ No newline at end of file +[assembly: AssemblyVersion("01.00.01.00")] +[assembly: AssemblyFileVersion("01.00.01.00")] \ No newline at end of file diff --git a/SecurityAnalyzer.dnn b/SecurityAnalyzer.dnn index 6011291..ca53ca9 100644 --- a/SecurityAnalyzer.dnn +++ b/SecurityAnalyzer.dnn @@ -1,9 +1,9 @@ - + SecurityAnalyzer SecurityAnalyzer module - Images/icon_extensions.gif + ~/Icons/Sigma/Extensions_32x32_standard.png DNN Software DNN Software @@ -12,11 +12,11 @@ - true + true 06.02.00 - + @@ -42,8 +42,8 @@ DNN.Modules.SecurityAnalyzer.Components.FeatureController - - + + SecurityAnalyzer @@ -63,41 +63,30 @@ - - DotNetNuke.Entities.Modules.EventMessageProcessor, DotNetNuke - UpgradeModule - - DNN.Modules.SecurityAnalyzer.Components.FeatureController - [DESKTOPMODULEID] - 01.00.00 - - + + DotNetNuke.Entities.Modules.EventMessageProcessor, DotNetNuke + UpgradeModule + + DNN.Modules.SecurityAnalyzer.Components.FeatureController + [DESKTOPMODULEID] + 01.00.00 + + - - DesktopModules\DNNCorp\SecurityAnalyzer - - License.txt - - - module.css - - - ReleaseNotes.txt - - - View.ascx - - - App_LocalResources - View.ascx.resx - - - - SecurityAnalyzer.dnn - - - + + DesktopModules\DNNCorp\SecurityAnalyzer + + License.txt + + + ReleaseNotes.txt + + + SecurityAnalyzer.dnn + + + @@ -106,6 +95,14 @@ + + + DesktopModules/DNNCorp/SecurityAnalyzer + + Resources.zip + + +