diff --git a/.gitignore b/.gitignore index 36c6f7f..830f04a 100644 --- a/.gitignore +++ b/.gitignore @@ -263,3 +263,4 @@ __pycache__/ *.bin /src/enc_temp_folder/* *.cab +/*/*-cache diff --git a/src/Installer/Installer.wixproj b/src/Installer/Installer.wixproj index 5300bce..a320143 100644 --- a/src/Installer/Installer.wixproj +++ b/src/Installer/Installer.wixproj @@ -29,7 +29,7 @@ obj\$(Platform)\$(Configuration)\ - bin\$(Platform)\$(Configuration)\ + D:\dev\installers\lpp\ obj\$(Platform)\$(Configuration)\ @@ -92,12 +92,12 @@ if $(ConfigurationName) == EVSignedRelease ( - "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)" + %25BuildToolsPath%25\sign-ev.bat "$(TargetFileName)" ) else ( - if $(ConfigurationName) == MicrosoftSignedRelease ( - "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)" + if $(ConfigurationName) == MicrosoftSignedRelease ( + %25BuildToolsPath%25\sign-ev.bat "$(TargetFileName)" ) else ( - "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)" + %25BuildToolsPath%25\sign.bat "$(TargetFileName)" ) ) diff --git a/src/Installer/Product.wxs b/src/Installer/Product.wxs index 8738a2f..b945d6d 100644 --- a/src/Installer/Product.wxs +++ b/src/Installer/Product.wxs @@ -1,238 +1,239 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - 1 - 1 - 1 - 1 - 1 - - - - - + UpgradeCode="0b7695f2-5eeb-4331-923a-ca56af5f1eb1"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 1 + + 1 + 1 + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Lithnet Password Protection for Active Directory.aip b/src/Lithnet Password Protection for Active Directory.aip new file mode 100644 index 0000000..c850cde --- /dev/null +++ b/src/Lithnet Password Protection for Active Directory.aip @@ -0,0 +1,330 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Lithnet.ActiveDirectory.PasswordProtection.sln b/src/Lithnet.ActiveDirectory.PasswordProtection.sln index 7008dd8..9a2c0a3 100644 --- a/src/Lithnet.ActiveDirectory.PasswordProtection.sln +++ b/src/Lithnet.ActiveDirectory.PasswordProtection.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.15 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32630.192 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PasswordFilter", "PasswordFilter\PasswordFilter.vcxproj", "{850894DF-B439-4DAA-A574-F7CFEA422A2F}" EndProject @@ -17,145 +17,41 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lithnet.ActiveDirectory.Pas EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - EVSignedRelease|Any CPU = EVSignedRelease|Any CPU EVSignedRelease|x64 = EVSignedRelease|x64 - EVSignedRelease|x86 = EVSignedRelease|x86 - MicrosoftSignedRelease|Any CPU = MicrosoftSignedRelease|Any CPU MicrosoftSignedRelease|x64 = MicrosoftSignedRelease|x64 - MicrosoftSignedRelease|x86 = MicrosoftSignedRelease|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.Debug|Any CPU.ActiveCfg = Debug|Win32 {850894DF-B439-4DAA-A574-F7CFEA422A2F}.Debug|x64.ActiveCfg = Debug|x64 {850894DF-B439-4DAA-A574-F7CFEA422A2F}.Debug|x64.Build.0 = Debug|x64 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.Debug|x86.ActiveCfg = Debug|Win32 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.Debug|x86.Build.0 = Debug|Win32 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.EVSignedRelease|Any CPU.ActiveCfg = Release|Win32 {850894DF-B439-4DAA-A574-F7CFEA422A2F}.EVSignedRelease|x64.ActiveCfg = EVSignedRelease|x64 {850894DF-B439-4DAA-A574-F7CFEA422A2F}.EVSignedRelease|x64.Build.0 = EVSignedRelease|x64 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.EVSignedRelease|x86.ActiveCfg = Release|Win32 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.EVSignedRelease|x86.Build.0 = Release|Win32 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.MicrosoftSignedRelease|Any CPU.ActiveCfg = MicrosoftSignedRelease|Win32 {850894DF-B439-4DAA-A574-F7CFEA422A2F}.MicrosoftSignedRelease|x64.ActiveCfg = MicrosoftSignedRelease|x64 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.MicrosoftSignedRelease|x86.ActiveCfg = MicrosoftSignedRelease|Win32 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.MicrosoftSignedRelease|x86.Build.0 = MicrosoftSignedRelease|Win32 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.Release|Any CPU.ActiveCfg = Release|Win32 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.Release|x64.ActiveCfg = Release|x64 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.Release|x64.Build.0 = Release|x64 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.Release|x86.ActiveCfg = Release|Win32 - {850894DF-B439-4DAA-A574-F7CFEA422A2F}.Release|x86.Build.0 = Release|Win32 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Debug|Any CPU.ActiveCfg = Debug|x86 {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Debug|x64.ActiveCfg = Debug|x64 {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Debug|x64.Build.0 = Debug|x64 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Debug|x86.ActiveCfg = Debug|x86 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Debug|x86.Build.0 = Debug|x86 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.EVSignedRelease|Any CPU.ActiveCfg = Release|x86 {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.EVSignedRelease|x64.ActiveCfg = EVSignedRelease|x64 {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.EVSignedRelease|x64.Build.0 = EVSignedRelease|x64 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.EVSignedRelease|x86.ActiveCfg = Release|x86 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.EVSignedRelease|x86.Build.0 = Release|x86 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|Any CPU.ActiveCfg = Release|x64 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|Any CPU.Build.0 = Release|x64 {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x64.ActiveCfg = MicrosoftSignedRelease|x64 {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x64.Build.0 = MicrosoftSignedRelease|x64 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x86.ActiveCfg = Release|x86 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x86.Build.0 = Release|x86 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Release|Any CPU.ActiveCfg = Release|x86 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Release|x64.ActiveCfg = Release|x64 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Release|x64.Build.0 = Release|x64 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Release|x86.ActiveCfg = Release|x86 - {F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Release|x86.Build.0 = Release|x86 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Debug|Any CPU.ActiveCfg = Debug|Win32 {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Debug|x64.ActiveCfg = Debug|x64 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Debug|x86.ActiveCfg = Debug|Win32 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Debug|x86.Build.0 = Debug|Win32 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.EVSignedRelease|Any CPU.ActiveCfg = Release|Win32 {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.EVSignedRelease|x64.ActiveCfg = Release|x64 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.EVSignedRelease|x86.ActiveCfg = Release|Win32 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.EVSignedRelease|x86.Build.0 = Release|Win32 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.MicrosoftSignedRelease|Any CPU.ActiveCfg = MicrosoftSignedRelease|Win32 {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.MicrosoftSignedRelease|x64.ActiveCfg = MicrosoftSignedRelease|x64 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.MicrosoftSignedRelease|x86.ActiveCfg = MicrosoftSignedRelease|Win32 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.MicrosoftSignedRelease|x86.Build.0 = MicrosoftSignedRelease|Win32 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Release|Any CPU.ActiveCfg = Release|Win32 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Release|x64.ActiveCfg = Release|x64 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Release|x86.ActiveCfg = Release|Win32 - {4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Release|x86.Build.0 = Release|Win32 - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|x64.ActiveCfg = Debug|x64 {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|x64.Build.0 = Debug|x64 - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|x86.ActiveCfg = Debug|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|x86.Build.0 = Debug|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.EVSignedRelease|Any CPU.ActiveCfg = Release|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.EVSignedRelease|Any CPU.Build.0 = Release|Any CPU {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.EVSignedRelease|x64.ActiveCfg = Release|x64 - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.EVSignedRelease|x86.ActiveCfg = Release|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.EVSignedRelease|x86.Build.0 = Release|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.MicrosoftSignedRelease|Any CPU.ActiveCfg = MicrosoftSignedRelease|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.MicrosoftSignedRelease|Any CPU.Build.0 = MicrosoftSignedRelease|Any CPU {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.MicrosoftSignedRelease|x64.ActiveCfg = MicrosoftSignedRelease|x64 - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.MicrosoftSignedRelease|x86.ActiveCfg = MicrosoftSignedRelease|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.MicrosoftSignedRelease|x86.Build.0 = MicrosoftSignedRelease|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Release|Any CPU.Build.0 = Release|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Release|x64.ActiveCfg = Release|x64 - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Release|x86.ActiveCfg = Release|Any CPU - {B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Release|x86.Build.0 = Release|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|Any CPU.Build.0 = Debug|Any CPU {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|x64.ActiveCfg = Debug|x64 {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|x64.Build.0 = Debug|x64 - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|x86.ActiveCfg = Debug|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|x86.Build.0 = Debug|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|Any CPU.ActiveCfg = Release|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|Any CPU.Build.0 = Release|Any CPU {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|x64.ActiveCfg = EVSignedRelease|x64 {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|x64.Build.0 = EVSignedRelease|x64 - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|x86.ActiveCfg = Release|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|x86.Build.0 = Release|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|Any CPU.ActiveCfg = MicrosoftSignedRelease|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|Any CPU.Build.0 = MicrosoftSignedRelease|Any CPU {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|x64.ActiveCfg = EVSignedRelease|x64 {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|x64.Build.0 = EVSignedRelease|x64 - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|x86.ActiveCfg = MicrosoftSignedRelease|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|x86.Build.0 = MicrosoftSignedRelease|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|Any CPU.Build.0 = Release|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|x64.ActiveCfg = Release|x64 - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|x64.Build.0 = Release|x64 - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|x86.ActiveCfg = Release|Any CPU - {61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|x86.Build.0 = Release|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|x64.ActiveCfg = Debug|x64 {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|x64.Build.0 = Debug|x64 - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|x86.ActiveCfg = Debug|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|x86.Build.0 = Debug|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|Any CPU.ActiveCfg = Release|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|Any CPU.Build.0 = Release|Any CPU {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|x64.ActiveCfg = EVSignedRelease|x64 {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|x64.Build.0 = EVSignedRelease|x64 - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|x86.ActiveCfg = Release|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|x86.Build.0 = Release|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|Any CPU.ActiveCfg = MicrosoftSignedRelease|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|Any CPU.Build.0 = MicrosoftSignedRelease|Any CPU {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|x64.ActiveCfg = EVSignedRelease|x64 {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|x64.Build.0 = EVSignedRelease|x64 - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|x86.ActiveCfg = MicrosoftSignedRelease|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|x86.Build.0 = MicrosoftSignedRelease|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|Any CPU.Build.0 = Release|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|x64.ActiveCfg = Release|x64 - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|x64.Build.0 = Release|x64 - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|x86.ActiveCfg = Release|Any CPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/ManagedUnitTests/ManagedUnitTests.csproj b/src/ManagedUnitTests/ManagedUnitTests.csproj index 9977af6..b4cd346 100644 --- a/src/ManagedUnitTests/ManagedUnitTests.csproj +++ b/src/ManagedUnitTests/ManagedUnitTests.csproj @@ -21,24 +21,6 @@ - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x64 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true bin\x64\Debug\ @@ -57,15 +39,6 @@ prompt MinimumRecommendedRules.ruleset - - bin\LsaProtectedModeRelease\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - bin\x64\MicrosoftSignedRelease\ TRACE @@ -105,6 +78,20 @@ Lithnet.ActiveDirectory.PasswordProtection + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + diff --git a/src/ManagedUnitTests/Properties/AssemblyInfo.cs b/src/ManagedUnitTests/Properties/AssemblyInfo.cs index b07c212..7e37049 100644 --- a/src/ManagedUnitTests/Properties/AssemblyInfo.cs +++ b/src/ManagedUnitTests/Properties/AssemblyInfo.cs @@ -16,5 +16,5 @@ [assembly: Guid("b94ae2c5-72f3-40fc-bb70-c18b33d19a2b")] // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.7239.0")] -[assembly: AssemblyFileVersion("1.0.7239.0")] +[assembly: AssemblyVersion("1.0.7240.0")] +[assembly: AssemblyFileVersion("1.0.7240.0")] diff --git a/src/ManagedUnitTests/TestData/english.txt b/src/ManagedUnitTests/TestData/english.txt new file mode 100644 index 0000000..00854ce --- /dev/null +++ b/src/ManagedUnitTests/TestData/english.txt @@ -0,0 +1 @@ +abacus \ No newline at end of file diff --git a/src/ManagedUnitTests/TestData/test-good-hash.txt b/src/ManagedUnitTests/TestData/test-good-hash.txt new file mode 100644 index 0000000..82d10ef --- /dev/null +++ b/src/ManagedUnitTests/TestData/test-good-hash.txt @@ -0,0 +1 @@ +0CB6948805F797BF2A82807973B89537 \ No newline at end of file diff --git a/src/ManagedUnitTests/TestData/test-hash-too-long.txt b/src/ManagedUnitTests/TestData/test-hash-too-long.txt new file mode 100644 index 0000000..631dce6 --- /dev/null +++ b/src/ManagedUnitTests/TestData/test-hash-too-long.txt @@ -0,0 +1 @@ +0CB6948805F797BF2A82807973B895371 \ No newline at end of file diff --git a/src/ManagedUnitTests/TestData/test-hash-too-short.txt b/src/ManagedUnitTests/TestData/test-hash-too-short.txt new file mode 100644 index 0000000..d9cd2aa --- /dev/null +++ b/src/ManagedUnitTests/TestData/test-hash-too-short.txt @@ -0,0 +1 @@ +0CB6948805F797BF2A82807973B8953 \ No newline at end of file diff --git a/src/ManagedUnitTests/TestHelpers.cs b/src/ManagedUnitTests/TestHelpers.cs index 9ab117a..52e711f 100644 --- a/src/ManagedUnitTests/TestHelpers.cs +++ b/src/ManagedUnitTests/TestHelpers.cs @@ -10,7 +10,7 @@ namespace ManagedUnitTests { public static class TestHelpers { - public static string TestStorePath = "D:\\pwnedpwds\\test"; + public static string TestStorePath = @"D:\dev\lppstore"; public static void AssertFileIsExpectedSize(string rawFile, int size) { diff --git a/src/ManagedUnitTests/V3StoreTests.cs b/src/ManagedUnitTests/V3StoreTests.cs index aa5f756..fa6d3fa 100644 --- a/src/ManagedUnitTests/V3StoreTests.cs +++ b/src/ManagedUnitTests/V3StoreTests.cs @@ -35,7 +35,7 @@ protected override string GetPrefixFromHash(string hash) [TestMethod] public void TestGoodHashTypes() { - Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"D:\pwnedpwds\raw\test-good-hash.txt", new CancellationToken()); + Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"TestData\test-good-hash.txt", new CancellationToken()); } [TestMethod] @@ -43,7 +43,7 @@ public void TestHashTooLong() { try { - Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"D:\pwnedpwds\raw\test-hash-too-long.txt", new CancellationToken()); + Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"TestData\test-hash-too-long.txt", new CancellationToken()); Assert.Fail("Did not throw the expected exception"); } catch (InvalidDataException) @@ -56,7 +56,7 @@ public void TestHashTooShort() { try { - Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"D:\pwnedpwds\raw\test-hash-too-short.txt", new CancellationToken()); + Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"TestData\test-hash-too-short.txt", new CancellationToken()); Assert.Fail("Did not throw the expected exception"); } catch (InvalidDataException) @@ -85,7 +85,7 @@ public void TestAddNormalizedWordToStore() [TestMethod] public void AddEnglishDictionaryToNewStoreAndValidate() { - string file = @"D:\pwnedpwds\raw\english.txt"; + string file = @"TestData\english.txt"; string path = Path.Combine(TestHelpers.TestStorePath, Guid.NewGuid().ToString()); Directory.CreateDirectory(path); CancellationToken ct = new CancellationToken(); diff --git a/src/NativeUnitTests/FilterTests.cpp b/src/NativeUnitTests/FilterTests.cpp index 7edfe68..b3f564e 100644 --- a/src/NativeUnitTests/FilterTests.cpp +++ b/src/NativeUnitTests/FilterTests.cpp @@ -65,7 +65,6 @@ namespace NativeUnitTests TEST_METHOD(TestBadPasswordv3Store) { - TestBannedPassword(); } }; } \ No newline at end of file diff --git a/src/PasswordFilter/PasswordFilter.rc b/src/PasswordFilter/PasswordFilter.rc index afea2c4..d7ed09b 100644 Binary files a/src/PasswordFilter/PasswordFilter.rc and b/src/PasswordFilter/PasswordFilter.rc differ diff --git a/src/PasswordFilter/PasswordFilter.vcxproj b/src/PasswordFilter/PasswordFilter.vcxproj index c98d590..e8fc1c0 100644 --- a/src/PasswordFilter/PasswordFilter.vcxproj +++ b/src/PasswordFilter/PasswordFilter.vcxproj @@ -129,30 +129,38 @@ true lithnetpwdf + D:\build\lpp\filter true + D:\build\lpp\filter false + D:\build\lpp\filter false + D:\build\lpp\filter false + D:\build\lpp\filter false lithnetpwdf + D:\build\lpp\filter false lithnetpwdf + D:\build\lpp\filter false lithnetpwdf + D:\build\lpp\filter @@ -180,7 +188,8 @@ rc $(ProjectDir)messages.rc link -dll -noentry $(ProjectDir)messages.res - if $(ConfigurationName) == EVSignedRelease ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetPath)") else ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetPath)") + + @@ -265,7 +274,8 @@ rc $(ProjectDir)messages.rc link -dll -noentry $(ProjectDir)messages.res - if $(ConfigurationName) == EVSignedRelease ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetPath)") else ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetPath)") + + @@ -276,7 +286,7 @@ link -dll -noentry $(ProjectDir)messages.res true true NDEBUG;_WINDOWS;_USRDLL;LITHNETACTIVEDIRECTORYPASSWORDFILTERNATIVE_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL + MultiThreaded stdcpp17 StdCall CompileAsCpp @@ -294,9 +304,12 @@ rc $(ProjectDir)messages.rc link -dll -noentry $(ProjectDir)messages.res - "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetPath)" + call %BuildToolsPath%\sign-ev.bat $(TargetPath) + makecab $(TargetPath) $(TargetDir)$(TargetName).cab -"C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetDir)$(TargetName).cab" + +call %BuildToolsPath%\sign-ev.bat "$(TargetDir)$(TargetName).cab" + @@ -307,7 +320,7 @@ makecab $(TargetPath) $(TargetDir)$(TargetName).cab true true NDEBUG;_WINDOWS;_USRDLL;LITHNETACTIVEDIRECTORYPASSWORDFILTERNATIVE_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL + MultiThreaded stdcpp17 StdCall CompileAsCpp @@ -325,7 +338,8 @@ rc $(ProjectDir)messages.rc link -dll -noentry $(ProjectDir)messages.res - if $(ConfigurationName) == EVSignedRelease ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetPath)") else ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetPath)") + + diff --git a/src/PasswordFilter/binarystore.cpp b/src/PasswordFilter/binarystore.cpp index da3f8ec..04e29f4 100644 --- a/src/PasswordFilter/binarystore.cpp +++ b/src/PasswordFilter/binarystore.cpp @@ -5,7 +5,6 @@ #include #include #include "utils.h" -#include #include "SecureArrayT.h" #include "eventlog.h" #include "messages.h" diff --git a/src/PasswordProtection/Lithnet.ActiveDirectory.PasswordProtection.csproj b/src/PasswordProtection/Lithnet.ActiveDirectory.PasswordProtection.csproj index 80d1263..2d42dd3 100644 --- a/src/PasswordProtection/Lithnet.ActiveDirectory.PasswordProtection.csproj +++ b/src/PasswordProtection/Lithnet.ActiveDirectory.PasswordProtection.csproj @@ -13,23 +13,6 @@ 512 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true bin\x64\Debug\ @@ -57,15 +40,6 @@ password-protection.ico - - bin\LsaProtectedModeRelease\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - bin\x64\MicrosoftSignedRelease\ TRACE @@ -75,15 +49,6 @@ prompt MinimumRecommendedRules.ruleset - - bin\EVSignedRelease\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - bin\x64\EVSignedRelease\ TRACE @@ -141,7 +106,7 @@ - if $(ConfigurationName) == EVSignedRelease ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)") else ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)") -"C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore" add /f "$(TargetDir)*.pdb" /s \\localhost\symbols /t "$(ProjectName)" /v "@(VersionNumber)" + if $(ConfigurationName) == EVSignedRelease (%25BuildToolsPath%25\sign-ev-and-save-symbols.bat $(TargetPath) $(TargetDir) $(ProjectName)) else (%25BuildToolsPath%25\sign-and-save-symbols.bat $(TargetPath) $(TargetDir) $(ProjectName)) + \ No newline at end of file diff --git a/src/PasswordProtection/Properties/AssemblyInfo.cs b/src/PasswordProtection/Properties/AssemblyInfo.cs index 14cdac6..7ef895c 100644 --- a/src/PasswordProtection/Properties/AssemblyInfo.cs +++ b/src/PasswordProtection/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.7239.0")] -[assembly: AssemblyVersion("1.0.7239.0")] -[assembly: AssemblyFileVersion("1.0.7239.0")] +[assembly: AssemblyVersion("1.0.7242.0")] +[assembly: AssemblyFileVersion("1.0.7242.0")] diff --git a/src/PasswordProtectionPS/Lithnet.ActiveDirectory.PasswordProtection.PowerShell.csproj b/src/PasswordProtectionPS/Lithnet.ActiveDirectory.PasswordProtection.PowerShell.csproj index 4789c1e..2302deb 100644 --- a/src/PasswordProtectionPS/Lithnet.ActiveDirectory.PasswordProtection.PowerShell.csproj +++ b/src/PasswordProtectionPS/Lithnet.ActiveDirectory.PasswordProtection.PowerShell.csproj @@ -1,203 +1,172 @@  - - - Debug - AnyCPU - {5F3D1518-5EDC-4552-8A65-19C20037EF3E} - Library - Properties - Lithnet.ActiveDirectory.PasswordProtection.PowerShell - LithnetPasswordProtection - v4.7.2 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - - password-protection.ico - - - bin\LsaProtectedModeRelease\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - bin\x64\MicrosoftSignedRelease\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - - bin\EVSignedRelease\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - bin\x64\EVSignedRelease\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - - - - - - - - - - - - - + + Debug + AnyCPU + {5F3D1518-5EDC-4552-8A65-19C20037EF3E} + Library + Properties + Lithnet.ActiveDirectory.PasswordProtection.PowerShell + LithnetPasswordProtection + v4.7.2 + 512 + + + + .nothing + + + + true + d:\build\lpp\ps\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + d:\build\lpp\ps\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + password-protection.ico + + + d:\build\lpp\ps\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + d:\build\lpp\ps\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + + + + + + + + + + + + + - - - - - ..\packages\PeterO.Cbor.4.1.0\lib\net40\CBOR.dll - - - ..\packages\DSInternals.Common.4.7.0\lib\net472\DSInternals.Common.dll - - - ..\packages\DSInternals.Replication.4.7.0\lib\net472\DSInternals.Replication.dll - - - ..\packages\DSInternals.Replication.4.7.0\lib\net472\DSInternals.Replication.Model.dll - - - ..\packages\NDceRpc.0.2.1.0\lib\NET40\NDceRpc.Microsoft.dll - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\PeterO.Numbers.1.5.1\lib\net40\Numbers.dll - - - - - - - False - ..\packages\System.Management.Automation.6.0.4\ref\netstandard2.0\System.Management.Automation.dll - - - - - ..\packages\PeterO.URIUtility.1.0.0\lib\net40\URIUtility.dll - - - - - - - - - - - - - - - - - - - - - - - - {61df881d-34fe-462b-aaa8-a56cd4dff287} - Lithnet.ActiveDirectory.PasswordProtection - - - - - - PreserveNewest - - - - - - - - - $(PostBuildEventDependsOn); - PostBuildMacros; - - if $(ConfigurationName) == EVSignedRelease ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)") else ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)") - -"C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore" add /f "$(TargetDir)*.pdb" /s \\localhost\symbols /t "$(ProjectName)" /v "@(VersionNumber)" - - - - - + ]]> + + + + + + ..\packages\PeterO.Cbor.4.1.0\lib\net40\CBOR.dll + + + ..\packages\DSInternals.Common.4.7.0\lib\net472\DSInternals.Common.dll + + + ..\packages\DSInternals.Replication.4.7.0\lib\net472\DSInternals.Replication.dll + + + ..\packages\DSInternals.Replication.4.7.0\lib\net472\DSInternals.Replication.Model.dll + + + ..\packages\NDceRpc.0.2.1.0\lib\NET40\NDceRpc.Microsoft.dll + + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\PeterO.Numbers.1.5.1\lib\net40\Numbers.dll + + + + + + + False + ..\packages\System.Management.Automation.6.0.4\ref\netstandard2.0\System.Management.Automation.dll + + + + + ..\packages\PeterO.URIUtility.1.0.0\lib\net40\URIUtility.dll + + + + + + + + + + + + + + + + + + + + + + + + {61df881d-34fe-462b-aaa8-a56cd4dff287} + Lithnet.ActiveDirectory.PasswordProtection + + + + + + PreserveNewest + + - + - - - - + + + + $(PostBuildEventDependsOn); + PostBuildMacros; + + + if $(ConfigurationName) == EVSignedRelease (%25BuildToolsPath%25\sign-ev-and-save-symbols.bat $(TargetPath) $(TargetDir) $(ProjectName)) else (%25BuildToolsPath%25\sign-and-save-symbols.bat $(TargetPath) $(TargetDir) $(ProjectName)) + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/PasswordProtectionPS/Properties/AssemblyInfo.cs b/src/PasswordProtectionPS/Properties/AssemblyInfo.cs index fad7f2f..e792338 100644 --- a/src/PasswordProtectionPS/Properties/AssemblyInfo.cs +++ b/src/PasswordProtectionPS/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.7239.0")] -[assembly: AssemblyVersion("1.0.7239.0")] -[assembly: AssemblyFileVersion("1.0.7239.0")] +[assembly: AssemblyVersion("1.0.7242.0")] +[assembly: AssemblyFileVersion("1.0.7242.0")]