scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed May 6 23:59:35 CEST 2009

Author: doj
Date: 2009-05-06 23:59:34 +0200 (Wed, 06 May 2009)
New Revision: 3268

Modified:
Log:

===================================================================
--- trunk/winslad/INSTALL.txt	2009-05-06 21:58:54 UTC (rev 3267)
+++ trunk/winslad/INSTALL.txt	2009-05-06 21:59:34 UTC (rev 3268)
@@ -1,19 +1,21 @@
-Prerequesities
----------------
+How to compile WinSLAD and create the installer
+------------------------------------------------

http://sourceforge.net/project/showfiles.php?group_id=2435&package_id=240780
http://www.mingw.org
-
- + use the installer to install the "MinGW base tools", "g++ compiler", "MinGW Make"
+  (this release tested with MinGW 5.1.4)
+ + select the "Current" package
+ + install the "MinGW base tools", "g++ compiler", "MinGW Make"
+ + install into c:\mingw
- + copy "c:\MinGW\bin\mingw32-make.exe" c:\MinGW\bin\make.exe
+ + "copy c:\MinGW\bin\mingw32-make.exe c:\MinGW\bin\make.exe"

-  tested with NSIS 2.44) and install "Full".
+  tested with NSIS 2.44).
+ + install "Full"
+ + install into c:\Program Files\NSIS

-The installer uses CopSSH from http://www.itefix.no/i2/taxonomy/term/33
+- If you did not choose those default paths, you may have to edit CXX and MAKENSIS in config.mk

-- You can then either use ssh to log into a restricted shell, or use
+- compile the sladd.exe and create the installer with "make".

___________________________________________________________________
Name: svn:eol-style
+ CRLF

===================================================================
--- trunk/winslad/TODO.txt	2009-05-06 21:58:54 UTC (rev 3267)
+++ trunk/winslad/TODO.txt	2009-05-06 21:59:34 UTC (rev 3268)
@@ -1,21 +1,33 @@
-# -*- mode: org; -*-
-#+STARTUP: showall
-
-- test on 32bit XP
-- test on 32bit Vista
-- test on 32bit Server 2003
-- test on 32bit Server 2008
-- test on 64bit Vista
-- test on 64bit Server 2003
-- test on 64bit Server 2008
-
-- installer
- + hide slad account from Windows Login Screen, maybe also SvcCOPSSH
-  * does this work with the SeServiceLogonRight privilege?
- + supply a special slad user picture
-
-- cross compile
- + http://www.profv.de/mingw_cross_env/
- + http://wiki.njh.eu/Cross_Compiling_for_Win32
+# -*- mode: org; -*-
+#+STARTUP: showall
+
+- test on 32bit XP: ok
+- test on 32bit Vista: silent install my fail if cygwin detected
+- test on 32bit Server 2003
+- test on 32bit Server 2008
+- test on 64bit Vista
+- test on 64bit Server 2003
+- test on 64bit Server 2008
+
+- installer
+ + hide slad account from Windows Login Screen, maybe also SvcCOPSSH
+  * does this work with the SeServiceLogonRight privilege?
+ + supply a special slad user picture
+ + installer/publisher certification
+ + how to do mass-deployment?
+  * create ssh-keys for every computer and copy them to scan console?
+  * use authorized_key from scan console?
+ + second installer which only contains plugins and sladd.exe for updates?
+
+- CopSSH
+ + how to restrict direct execution of commands to sladd.exe?
+ + as CopSSH uses cygwin it may interfere with other cygwin based programs on the Windows computer
+
+
+- cross compile
+ + http://www.profv.de/mingw_cross_env/
+ + http://wiki.njh.eu/Cross_Compiling_for_Win32

___________________________________________________________________
Name: svn:eol-style
+ CRLF

===================================================================
--- trunk/winslad/gpl-2.0.txt	2009-05-06 21:58:54 UTC (rev 3267)
+++ trunk/winslad/gpl-2.0.txt	2009-05-06 21:59:34 UTC (rev 3268)
@@ -0,0 +1,339 @@
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type show c' for details.
+
+The hypothetical commands show w' and show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than show w' and show c'; they could even be
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General

___________________________________________________________________
Name: svn:eol-style
+ CRLF

===================================================================
@@ -1,77 +1,93 @@
-The sladd is a program to run plugin programs and capture their output for
-further processing. The main options are:
-
--r <plugin>: Run a plugin by id in background.
--s: show various things. These are
-  -s plugins: Show the list of plugins known to the server, or, if the
-              server is not running,  that can be read from the
-              plugin's XML files.
-  -s jobs   : Show the list of finished or currently running jobs.
-  -s <jobid>: Show the output of the finished job <jobid>.
-
-Optional parameters are given for the location of plugins and results.
-
-After launch, the program reads its plugin configuration from
-configuration files in XML format. These files are searched for in
-subdirectories in the first level of the plugin path, where they have
-to be named "plugin.xml".
-
-The configuration with these XML documents with regards to
-selectability from the user happens in three levels: Plugins, sets,
-and entries.
-
-A "plugin" is a container for grouping sets. Sets are mutually
-exclusive containers for entries that may or may be not run, and is
-intended for user selection of the plugins to run. Each plugin may
-contain up to one default set, while each entry in a set may be
-enabled as default inside the set.
-
-The XML entries are located in the namespace "slad".
-
-The declaration of a plugin start is <slad:plugin id="ID">, where id
-is a mandatory attribute that is used for selection purpose.
-
-Inside this tag two optional tags can be given. The first one is
-<slad:pluginDescription>, which declares a description of the whole
-plugin. The second is <slad:pluginPath>, which declares a path
-relative to the plugin's directory under /opt/slad/plugins.
-
-A set is declared with the plugin with <slad:pluginSet id="ID">,
-where id uniquely identifies the set within the plugin. Up to one set
-within a plugin may contain a <slad:pluginSetDefault> tag with a value
-of "1" to declare the default set within the plugin. As with the
-plugins, each set may have a description with the
-
-An entry within a set is given by the <slad:pluginSetEntry id="ID">
-tag, where id is the unique identifier of that entry within a
-set. Each entry may contain the following tags for data:
-
-<slad:pluginSetEntryDescription> like sets and plugin, each entry may
-contain a short description for the user.
-
-<slad:pluginSetEntryDefault> if set to "1" the entry is by default
-selected within the set.
-
-<slad:pluginSetEntryBinary> contains the name of the binary. The
-binary is called with slad's plugin path (as given by the -p command
-line option) plus <slad:pluginPath> if set, plus
-
-<slad:pluginSetEntryCommandline> this contains optional command line
-parameters for the command.
-
-Change the uid and gid before running the plugin.
-
-Not yet evaluated but recognized are these additional tags:
-
-<slad:pluginSetEntryMaxRuntime> Supposed to limit a process's runtime.
-
-<slad:pluginSetEntryMaxLoglines> Supposed to limit the number of
-output lines recorded from the process.
-
-For the purpose of identifying a command to the daemon all three IDs
-are used in the notation <plugin id>:<set id>:<entry id>. It's finally
-up to the calling program to evaluate plugins and sets and offer the
-user the selections, then call all selected entries.
+WinSLAD - Windows Security Local Audit Daemon
+----------------------------------------------
+
+The WinSLAD installer installs CopSSH from http://www.itefix.no/i2/taxonomy/term/33 for remote access.
+
+You can then either use ssh to log into a restricted shell, or use
+
+During installation or when executing the john plugin your antivirus/security software may warn you about executing/installing the john-mmx.exe program.
+
+After the installation you might have to configure your firewall to allow access from the network to the SSH port 22.
+
+-----------------------------------------------
+
+The sladd is a program to run plugin programs and capture their output for
+further processing. The main options are:
+
+-r <plugin>: Run a plugin by id in background.
+-s: show various things. These are
+  -s plugins: Show the list of plugins known to the server, or, if the
+              server is not running,  that can be read from the
+              plugin's XML files.
+  -s jobs   : Show the list of finished or currently running jobs.
+  -s <jobid>: Show the output of the finished job <jobid>.
+
+Optional parameters are given for the location of plugins and results.
+
+After launch, the program reads its plugin configuration from
+configuration files in XML format. These files are searched for in
+subdirectories in the first level of the plugin path, where they have
+to be named "plugin.xml".
+
+The configuration with these XML documents with regards to
+selectability from the user happens in three levels: Plugins, sets,
+and entries.
+
+A "plugin" is a container for grouping sets. Sets are mutually
+exclusive containers for entries that may or may be not run, and is
+intended for user selection of the plugins to run. Each plugin may
+contain up to one default set, while each entry in a set may be
+enabled as default inside the set.
+
+The XML entries are located in the namespace "slad".
+
+The declaration of a plugin start is <slad:plugin id="ID">, where id
+is a mandatory attribute that is used for selection purpose.
+
+Inside this tag two optional tags can be given. The first one is
+<slad:pluginDescription>, which declares a description of the whole
+plugin. The second is <slad:pluginPath>, which declares a path
+relative to the plugin's directory under /opt/slad/plugins.
+
+A set is declared with the plugin with <slad:pluginSet id="ID">,
+where id uniquely identifies the set within the plugin. Up to one set
+within a plugin may contain a <slad:pluginSetDefault> tag with a value
+of "1" to declare the default set within the plugin. As with the
+plugins, each set may have a description with the
+
+An entry within a set is given by the <slad:pluginSetEntry id="ID">
+tag, where id is the unique identifier of that entry within a
+set. Each entry may contain the following tags for data:
+
+<slad:pluginSetEntryDescription> like sets and plugin, each entry may
+contain a short description for the user.
+
+<slad:pluginSetEntryDefault> if set to "1" the entry is by default
+selected within the set.
+
+<slad:pluginSetEntryBinary> contains the name of the binary. The
+binary is called with slad's plugin path (as given by the -p command
+line option) plus <slad:pluginPath> if set, plus
+
+<slad:pluginSetEntryCommandline> this contains optional command line
+parameters for the command.
+
+Change the uid and gid before running the plugin.
+
+Not yet evaluated but recognized are these additional tags:
+
+<slad:pluginSetEntryMaxRuntime> Supposed to limit a process's runtime.
+
+<slad:pluginSetEntryMaxLoglines> Supposed to limit the number of
+output lines recorded from the process.
+
+For the purpose of identifying a command to the daemon all three IDs
+are used in the notation <plugin id>:<set id>:<entry id>. It's finally
+up to the calling program to evaluate plugins and sets and offer the
+user the selections, then call all selected entries.

___________________________________________________________________
Name: svn:eol-style
+ CRLF

===================================================================
@@ -1,123 +1,136 @@
-# set compressor
-SetCompressor lzma
-SetCompress auto
-
-# define name of installer
-
-# define installation directory
-
-
-
-BrandingText "WinSLAD - Windows Security Local Audit Daemon"
-XPStyle on
-
-# request application privileges for Windows Vista
-
-# start default section
-section
-
-    # set the installation directory as the destination for the following actions
-    setOutPath $INSTDIR - - # create the uninstaller - writeUninstaller "$INSTDIR\uninstall.exe"
-
-    # files which need to be copied
-    File /oname=.profile nsis\profile
-
-    # John the Ripper plugin
-    SetOutPath $INSTDIR\plugins\john - file /r /x Makefile /x .svn john\*.* - - # ovaldi plugin - SetOutPath$INSTDIR\plugins\oval
-    file /r /x Makefile /x .svn oval\*.*
-
-    # after all plugins are installed, reset outpath again
-    setOutPath $INSTDIR - - # create a shortcut named "new shortcut" in the start menu programs directory - # point the new shortcut at the program uninstaller - #createShortCut "$SMPROGRAMS\new shortcut.lnk" "$INSTDIR\uninstall.exe" - - # Add Uninstall RegKey http://nsis.sourceforge.net/Add_uninstall_information_to_Add/Remove_Programs - DetailPrint "register uninstall information" - WriteRegStr HKLM "${uninstkey}" "DisplayName" "WinSLAD ${SLADD_VERSION} (remove only)" - WriteRegStr HKLM "${uninstkey}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\"" - WriteRegStr HKLM "${uninstkey}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S" - WriteRegStr HKLM "${uninstkey}" "InstallLocation" "$\"$INSTDIR$\"" - WriteRegStr HKLM "${uninstkey}" "Publisher" "Greenbone Networks GmbH"
-    WriteRegStr HKLM "${uninstkey}" "HelpLink" "http://greenbone.net/" - WriteRegStr HKLM "${uninstkey}" "HelpTelephone" "+49-541-335084-0"
-    WriteRegStr HKLM "${uninstkey}" "DisplayVersion" "${SLADD_VERSION}"
-    WriteRegStr HKLM "${uninstkey}" "NoModify" "1" - WriteRegStr HKLM "${uninstkey}" "NoRepair" "1"
-
-    # Create slad user http://nsis.sourceforge.net/UserMgr_plug-in
-    DetailPrint "create ${sladuser} account" - UserMgr::CreateAccountEx "${sladuser}" "slad" "WinSLAD service user" "WinSLAD service user" "WinSLAD service user" "UF_DONT_EXPIRE_PASSWD"
-    UserMgr::AddToGroup "${sladuser}" "Administrators" - UserMgr::SetUserInfo "${sladuser}" "HOMEDIR" "$\"$INSTDIR$\"" - - # install SSH - IfSilent +3 - MessageBox MB_YESNO "Would you like to install the SSH Service now?" IDYES true IDNO false - true: - DetailPrint "installing CopSSH" - # copy, execute and delete CopSSH installer - File /oname=s-i.exe nsis\Copssh_2.1.0_Installer.exe - ExecWait "$INSTDIR\s-i.exe /S"
-        Delete "$INSTDIR\s-i.exe" - ExecWait "$\"$PROGRAMFILES\ICW\Bin\copsshadm.exe$\" -c activateuser -u ${sladuser}" - # /home/slad -> c:\winslad - ExecWait "$\"$PROGRAMFILES\ICW\Bin\rm.exe$\" -rf /home/${sladuser}" - ExecWait "$\"$PROGRAMFILES\ICW\Bin\ln.exe$\" -s /cygdrive/c/winslad /home/${sladuser}" - # /opt/slad/bin/sladd -> c:\winslad\sladd.exe - ExecWait "$\"$PROGRAMFILES\ICW\Bin\mkdir.exe$\" -p /opt/slad/bin/"
-        ExecWait "$\"$PROGRAMFILES\ICW\Bin\ln.exe$\" -s /home/${sladuser}/sladd.exe /opt/slad/bin/sladd"
-        # copy CopSSH configuration
-        SetOutPath "$PROGRAMFILES\ICW\etc" - File /oname=sshd_config nsis\sshd_config - #File /oname=banner.txt nsis\banner.txt - setOutPath$INSTDIR
-        false:
-
-sectionEnd
-
-section "uninstall"
-
-    # uninstall SSH
-    IfSilent +3
-    MessageBox MB_YESNO "Would you like to uninstall the SSH Service now?" IDYES true IDNO false
-    true:
-        DetailPrint "uninstalling CopSSH"
-        ExecWait "$\"$PROGRAMFILES\ICW\uninstall_Copssh.exe$\" /S" - UserMgr::DeleteAccount SvcCOPSSH - RMDir /r /REBOOTOK "$PROGRAMFILES\ICW"
-        false:
-
-    # delete the slad user
-    DetailPrint "delete ${sladuser} account" - UserMgr::DeleteAccount "${sladuser}"
-
-    # Remove the Uninstall RegKey
-    DeleteRegKey HKLM "${uninstkey}" - - # delete the uninstaller - DetailPrint "delete WinSLAD files in$INSTDIR"
-    delete "$INSTDIR\uninstall.exe" - - # then delete the installation directory - RMDir /r /REBOOTOK$INSTDIR
-
-    #delete "$SMPROGRAMS\new shortcut.lnk" - -sectionEnd +# set compressor +SetCompressor lzma +SetCompress auto + +# define name of installer +outFile "winslad-installer.exe" + +# define installation directory +installDir C:\winslad + +!define uninstkey "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinSLAD" +!define sladuser "slad" + +!addplugindir nsis + +BrandingText "WinSLAD - Windows Security Local Audit Daemon" +XPStyle on + +# request application privileges for Windows Vista +RequestExecutionLevel admin + +# start default section +section + + # set the installation directory as the destination for the following actions + setOutPath$INSTDIR
+
+    # create the uninstaller
+    writeUninstaller "$INSTDIR\uninstall.exe" + + # files which need to be copied + File sladd.exe + File INSTALL.txt + File README.txt + File gpl-2.0.txt + File /oname=.profile nsis\profile + + # John the Ripper plugin + SetOutPath$INSTDIR\plugins\john
+    file /r /x Makefile /x .svn john\*.*
+
+    # ovaldi plugin
+    SetOutPath $INSTDIR\plugins\oval + file /r /x Makefile /x .svn oval\*.* + + # after all plugins are installed, reset outpath again + setOutPath$INSTDIR
+
+    # create a shortcut named "new shortcut" in the start menu programs directory
+    # point the new shortcut at the program uninstaller
+    #createShortCut "$SMPROGRAMS\new shortcut.lnk" "$INSTDIR\uninstall.exe"
+
+    DetailPrint "register uninstall information"
+    WriteRegStr HKLM "${uninstkey}" "DisplayName" "WinSLAD${SLADD_VERSION} (remove only)"
+    WriteRegStr HKLM "${uninstkey}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+    WriteRegStr HKLM "${uninstkey}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
+    WriteRegStr HKLM "${uninstkey}" "InstallLocation" "$\"$INSTDIR$\""
+    WriteRegStr HKLM "${uninstkey}" "Publisher" "Greenbone Networks GmbH" + WriteRegStr HKLM "${uninstkey}" "HelpLink" "http://greenbone.net/"
+    WriteRegStr HKLM "${uninstkey}" "HelpTelephone" "+49-541-335084-0" + WriteRegStr HKLM "${uninstkey}" "DisplayVersion" "${SLADD_VERSION}" + WriteRegStr HKLM "${uninstkey}" "NoModify" "1"
+    WriteRegStr HKLM "${uninstkey}" "NoRepair" "1" + + # Create slad user http://nsis.sourceforge.net/UserMgr_plug-in + DetailPrint "create${sladuser} account"
+    UserMgr::CreateAccountEx "${sladuser}" "slad" "WinSLAD service user" "WinSLAD service user" "WinSLAD service user" "UF_DONT_EXPIRE_PASSWD" + UserMgr::AddToGroup "${sladuser}" "Administrators"
+    UserMgr::SetUserInfo "${sladuser}" "HOMEDIR" "$\"$INSTDIR$\""
+
+    # install SSH
+    IfSilent inst_ssh_true
+    MessageBox MB_YESNO "Would you like to install the SSH Service now?" IDYES inst_ssh_true IDNO inst_ssh_false
+    inst_ssh_true:
+        DetailPrint "installing CopSSH"
+        # copy, execute and delete CopSSH installer
+        File /oname=s-i.exe nsis\Copssh_2.1.0_Installer.exe
+
+        IfSilent inst_ssh_silent inst_ssh_verbose
+        inst_ssh_silent:
+            ExecWait "$INSTDIR\s-i.exe /S" + Goto inst_ssh_done + inst_ssh_verbose: + ExecWait "$INSTDIR\s-i.exe"
+        inst_ssh_done:
+
+        Delete "$INSTDIR\s-i.exe" + + # active sladuser + ExecWait "$\"$PROGRAMFILES\ICW\Bin\copsshadm.exe$\" -c activateuser -u ${sladuser}" + # /home/slad -> c:\winslad + ExecWait "$\"$PROGRAMFILES\ICW\Bin\rm.exe$\" -rf /home/${sladuser}" + ExecWait "$\"$PROGRAMFILES\ICW\Bin\ln.exe$\" -s /cygdrive/c/winslad /home/${sladuser}" + # /opt/slad/bin/sladd -> c:\winslad\sladd.exe + ExecWait "$\"$PROGRAMFILES\ICW\Bin\mkdir.exe$\" -p /opt/slad/bin/"
+        ExecWait "$\"$PROGRAMFILES\ICW\Bin\ln.exe$\" -s /home/${sladuser}/sladd.exe /opt/slad/bin/sladd"
+        # copy CopSSH configuration
+        SetOutPath "$PROGRAMFILES\ICW\etc" + File /oname=sshd_config nsis\sshd_config + #File /oname=banner.txt nsis\banner.txt + setOutPath$INSTDIR
+    inst_ssh_false:
+
+sectionEnd
+
+section "uninstall"
+
+    # uninstall SSH
+    IfSilent +3
+    MessageBox MB_YESNO "Would you like to uninstall the SSH Service now?" IDYES un_ssh_true IDNO un_ssh_false
+    un_ssh_true:
+        DetailPrint "uninstalling CopSSH"
+        ExecWait "$\"$PROGRAMFILES\ICW\uninstall_Copssh.exe$\" /S" + UserMgr::DeleteAccount SvcCOPSSH + RMDir /r /REBOOTOK "$PROGRAMFILES\ICW"
+    un_ssh_false:
+
+    # delete the slad user
+    DetailPrint "delete ${sladuser} account" + UserMgr::DeleteAccount "${sladuser}"
+
+    # Remove the Uninstall RegKey
+    DeleteRegKey HKLM "${uninstkey}" + + # delete the uninstaller + DetailPrint "delete WinSLAD files in$INSTDIR"
+    delete "$INSTDIR\uninstall.exe" + + # then delete the installation directory + RMDir /r /REBOOTOK$INSTDIR
+
+    #delete "\$SMPROGRAMS\new shortcut.lnk"
+
+sectionEnd

`