From f4b12bc550587e897f163295f6298f6db5365733 Mon Sep 17 00:00:00 2001 From: Evan Anderson Date: Wed, 30 May 2012 16:46:42 -0400 Subject: 20120530 release --- MSI/make-msi.bat | 30 ++++++++++++++++++++++++++ MSI/third-party/nssm.exe | Bin 0 -> 75776 bytes MSI/ts_block.wxs | 54 +++++++++++++++++++++++++++++++++++++++++++++++ README.txt | 15 +++++++------ RELEASE.txt | 1 + make-msi.bat | 5 ----- nssm.exe | Bin 75776 -> 0 bytes ts_block.vbs | 1 + ts_block.wxs | 50 ------------------------------------------- ts_block_20120530.msi | Bin 0 -> 68608 bytes 10 files changed, 95 insertions(+), 61 deletions(-) create mode 100644 MSI/make-msi.bat create mode 100644 MSI/third-party/nssm.exe create mode 100644 MSI/ts_block.wxs create mode 100644 RELEASE.txt delete mode 100644 make-msi.bat delete mode 100644 nssm.exe delete mode 100644 ts_block.wxs create mode 100644 ts_block_20120530.msi diff --git a/MSI/make-msi.bat b/MSI/make-msi.bat new file mode 100644 index 0000000..56a3024 --- /dev/null +++ b/MSI/make-msi.bat @@ -0,0 +1,30 @@ +@echo off +SET RELEASE= +for /f %%i in (..\RELEASE.txt) do set RELEASE=%%i +if "%RELEASE%"=="" goto _err_no_release + +del *.msi +del *.wixobj + +candle -out ts_block.wixobj ts_block.wxs +if errorlevel 1 goto _err_candle + +light -out ..\ts_block_%RELEASE%.msi ts_block.wixobj +if errorlevel 1 goto _err_light + +del ts_block.wixobj +goto :EOF + +:_err_candle +echo Fatal Error - CANDLE returned error. +echo. +goto :EOF + +:_err_light +echo Fatal Error - LIGHT returned error. +echo. +goto :EOF + +:_err_no_release +echo Fatal Error - No ..\RELEASE.txt found. +echo. diff --git a/MSI/third-party/nssm.exe b/MSI/third-party/nssm.exe new file mode 100644 index 0000000..54e8e31 Binary files /dev/null and b/MSI/third-party/nssm.exe differ diff --git a/MSI/ts_block.wxs b/MSI/ts_block.wxs new file mode 100644 index 0000000..b9e09d7 --- /dev/null +++ b/MSI/ts_block.wxs @@ -0,0 +1,54 @@ + + + + + + + 2 + http://opensource.wellbury.com/projects/ts_block + 1 + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + NOT (REMOVE="ALL") + REMOVE="ALL" + + + + WindowsBuild > 2600 + + + + + + + diff --git a/README.txt b/README.txt index 1599c26..d6926a4 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,8 @@ -ts_block.vbs - Blocks IP addresses generating invalid Terminal Services logons +ts_block.vbs - Blocks brute force Terminal Services login attempts Copyright 2011 Wellbury LLC - See LICENSE for license information Release 20110901 - Adapted from sshd_block release 20100120 +Release 20120530 - Added MSI to distribution For support, please contact Evan Anderson at Wellbury LLC EAnderson@wellbury.com, (866) 569-9799, ext 801 @@ -127,7 +128,7 @@ BlackholeIP value specified (as this will vary based on the subnets where the server computers are located, and is only necessary for Windows Server 2003 machines) is recommended. - + Script Testing ============== It is recommended that you copy the ts_block.vbs script to your desired @@ -144,9 +145,9 @@ Test the functionality of the script by performing both invalid logons using both a "block immediately" account and attempting repeated logons with a valid or invalid account that is not in the "block immediately" list. Blocking and unblocking events will be logged in the Application -event log. (It is recommended that you perform your tests via a remote -control mechanism such that you do not lose communication with the -server computer during testing.) +event log. (It is recommended that you perform your tests via a protocol +that won't cause you to lose communication with the server computer +during testing or from an IP address that isn't going to be blocked.) Windows Service Installation @@ -216,7 +217,9 @@ A Windows Installer package (MSI) version of ts_block is included with this distribution (along with the WiX source file used to create the MSI). The MSI is self-contained (all necessary files are compressed and embedded within it) and can be used for automated deployment of ts_block -as a service under NSSM. +as a service under NSSM. It has been tested using Group Policy Software +Installation Policy under Windows Server 2003, Windows Server 2008 R2, +and Windows 7. Uninstallation via Group Policy has also been tested. Future Roadmap diff --git a/RELEASE.txt b/RELEASE.txt new file mode 100644 index 0000000..cb2560d --- /dev/null +++ b/RELEASE.txt @@ -0,0 +1 @@ +20120530 diff --git a/make-msi.bat b/make-msi.bat deleted file mode 100644 index 3ce66ff..0000000 --- a/make-msi.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -del *.msi -del *.wixobj -candle -out ts_block.wixobj ts_block.wxs -light -out ts_block.MSI ts_block.wixobj diff --git a/nssm.exe b/nssm.exe deleted file mode 100644 index 54e8e31..0000000 Binary files a/nssm.exe and /dev/null differ diff --git a/ts_block.vbs b/ts_block.vbs index 2a772ba..3f9b6cc 100644 --- a/ts_block.vbs +++ b/ts_block.vbs @@ -4,6 +4,7 @@ Option Explicit ' Copyright 2011 Wellbury LLC - See LICENSE for license information ' ' Release 20110831 - Adapted from sshd_block release 20100120 +' Release 20120530 - No change from 20110831 code for ts_block script ' External executables required to be accessible from PATH: ' diff --git a/ts_block.wxs b/ts_block.wxs deleted file mode 100644 index c64f4eb..0000000 --- a/ts_block.wxs +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - 2 - http://opensource.wellbury.com/projects/ts_block - 1 - 1 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - NOT (REMOVE="ALL") - REMOVE="ALL" - - - - - - - diff --git a/ts_block_20120530.msi b/ts_block_20120530.msi new file mode 100644 index 0000000..6405373 Binary files /dev/null and b/ts_block_20120530.msi differ -- cgit v1.2.3