Show
Ignore:
Timestamp:
12/20/06 11:09:07 (2 years ago)
Author:
kindlund
Message:

sc: merging branch using tags svn+ssh://kindlund@www.honeyclient.org/home/svn/honeyclient/honeyclient/tags/bug/PRE-42 and svn+ssh://kindlund@www.honeyclient.org/home/svn/honeyclient/honeyclient/tags/bug/POST-42

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • honeyclient/branches/rel/0.9

    • Property sc:bug-fix-release-branch set to 0.9
  • honeyclient/branches/rel/0.9/etc/honeyclient.xml

    • Property svn:keywords set to Id "$file"
    r13 r130  
    99For information about the syntax of this file format, please type 
    1010"perldoc XML::Simple". 
     11 
     12CVS: $Id$ 
    1113 
    1214####################################################################### 
     
    4547<HoneyClient> 
    4648    <!-- Global Options --> 
    47     <timeout description="Default timeout used for all communications between each module (in seconds)." default="600"> 
    48         600 
     49    <!-- Note: This timeout should be long enough so that the Agent watchdog code will properly let the integrity checking code finish, before detecting a faulty timeout in processing. --> 
     50    <timeout description="Default timeout used for all communications between each module (in seconds)." default="900"> 
     51        1800 
    4952    </timeout> 
    5053    <log_config description="The global Log4perl configuration file, used throughout all modules.  This setting should not need to be changed." default="etc/honeyclient_log.conf"> 
     
    6972            </timeout> 
    7073            <Browser> 
    71                    <!-- HoneyClient::Agent::Driver::IE Options --> 
    72                <!-- TODO: Update this. --> 
    73                <ignore_links_timed_out description="If this parameter is 1, then the browser will never attempt to revisit any links that caused the browser to initially time out." default="0"> 
     74                <!-- HoneyClient::Agent::Driver::IE Options --> 
     75                <!-- TODO: Update this. --> 
     76                <ignore_links_timed_out description="If this parameter is 1, then the browser will never attempt to revisit any links that caused the browser to initially time out." default="0"> 
    7477                    1 
    7578                </ignore_links_timed_out> 
    76                <!-- TODO: Update this. --> 
    77                <process_name description="The name of the Internet Explorer application process, as it appears in the Task Manager." default="iexplore.exe"> 
     79                <!-- TODO: Update this. --> 
     80                <process_name description="The name of the Internet Explorer application process, as it appears in the Task Manager." default="iexplore.exe"> 
    7881                    iexplore.exe 
    7982                </process_name> 
    80                <max_relative_links_to_visit description="An integer, representing the maximum number of relative links that the browser should visit, before moving onto another website.  If negative, then the browser will exhaust all possible relative links found, before moving on.  This functionality is best effort; it's possible for the browser to visit new links on previously visited websites." default="-1"> 
     83                <max_relative_links_to_visit description="An integer, representing the maximum number of relative links that the browser should visit, before moving onto another website.  If negative, then the browser will exhaust all possible relative links found, before moving on.  This functionality is best effort; it's possible for the browser to visit new links on previously visited websites." default="-1"> 
    8184                    -1 
    8285                </max_relative_links_to_visit> 
    83                <IE> 
    84                        <!-- HoneyClient::Agent::Driver::IE Options --> 
    85                    <!-- TODO: Update this. --> 
    86                    <ignore_links_timed_out description="If this parameter is 1, then the browser will never attempt to revisit any links that caused the browser to initially time out." default="0"> 
     86                <IE> 
     87                    <!-- HoneyClient::Agent::Driver::IE Options --> 
     88                    <!-- TODO: Update this. --> 
     89                    <ignore_links_timed_out description="If this parameter is 1, then the browser will never attempt to revisit any links that caused the browser to initially time out." default="0"> 
    8790                        1 
    8891                    </ignore_links_timed_out> 
    89                    <!-- TODO: Update this. --> 
    90                    <process_name description="The name of the Internet Explorer application process, as it appears in the Task Manager." default="iexplore.exe"> 
     92                    <!-- TODO: Update this. --> 
     93                    <process_name description="The name of the Internet Explorer application process, as it appears in the Task Manager." default="iexplore.exe"> 
    9194                        iexplore.exe 
    9295                    </process_name> 
    93                    <max_relative_links_to_visit description="An integer, representing the maximum number of relative links that the browser should visit, before moving onto another website.  If negative, then the browser will exhaust all possible relative links found, before moving on.  This functionality is best effort; it's possible for the browser to visit new links on previously visited websites." default="-1"> 
     96                    <max_relative_links_to_visit description="An integer, representing the maximum number of relative links that the browser should visit, before moving onto another website.  If negative, then the browser will exhaust all possible relative links found, before moving on.  This functionality is best effort; it's possible for the browser to visit new links on previously visited websites." default="-1"> 
    9497                        -1 
    9598                    </max_relative_links_to_visit> 
    96                    </IE> 
     99                </IE> 
    97100                <FF> 
    98                    <max_relative_links_to_visit description="An integer, representing the maximum number of relative links that the browser should visit, before moving onto another website.  If negative, then the browser will exhaust all possible relative links found, before moving on.  This functionality is best effort; it's possible for the browser to visit new links on previously visited websites." default="-1"> 
     101                    <max_relative_links_to_visit description="An integer, representing the maximum number of relative links that the browser should visit, before moving onto another website.  If negative, then the browser will exhaust all possible relative links found, before moving on.  This functionality is best effort; it's possible for the browser to visit new links on previously visited websites." default="-1"> 
    99102                        5 
    100103                    </max_relative_links_to_visit> 
    101                    <!-- http://gatekeeper-w.mitre.org:80 --> 
    102                    <http_proxy description="Set to your HTTP Proxy if you have one, otherwise set to 'none'"> 
     104                    <!-- http://gatekeeper-w.mitre.org:80 --> 
     105                    <http_proxy description="Set to your HTTP Proxy if you have one, otherwise set to 'none'"> 
    103106                        none 
    104107                    </http_proxy> 
    105                    <ff_exec description="path to the firefox executable (default install path is C:\Program Files\Mozilla Firefox\firefox.exe)"> 
     108                    <ff_exec description="path to the firefox executable (default install path is C:\Program Files\Mozilla Firefox\firefox.exe)"> 
    106109                        C:\Program Files\Mozilla Firefox\firefox.exe 
    107110                    </ff_exec> 
    108                </FF> 
     111                </FF> 
    109112            </Browser> 
    110113            <EmailClient> 
     
    112115        </Driver> 
    113116        <perform_integrity_checks description="An integer, representing whether the Agent should perform any integrity checks. 1 enables, 0 disables." default="1"> 
    114             0 
     117            1  
    115118        </perform_integrity_checks> 
    116119        <!-- HoneyClient::Agent::Integrity Options --> 
     
    118121            <!-- Files which are read in only. --> 
    119122            <!-- TODO: Update this. --> 
    120             <file_checklist description="The file containing the list of files and directories to check during filesystem checking."
    121                 none 
     123            <file_checklist description="The file containing the list of files and directories to check during filesystem checking." default="none"
     124                etc/file_checklist.txt 
    122125            </file_checklist> 
    123126            <!-- TODO: Update this. --> 
    124             <file_exclude description="The file containing the list of files or directories to exclude if found in subdirectories during filesystem checking."
    125                 /tmp/file_exclude.txt 
     127            <file_exclude description="The file containing the list of files or directories to exclude if found in subdirectories during filesystem checking." default="none"
     128                ../../../etc/file_exclude.txt 
    126129            </file_exclude> 
    127             <!-- TODO: Update this. --> 
    128             <reg_list_to_check description="The file containing the list of registry keys to check."> 
    129                 /tmp/reg_list_to_check.txt 
    130             </reg_list_to_check> 
    131130            <!-- Files which are written out only. --> 
    132131            <!-- TODO: Update this. --> 
     
    140139            <!-- Files to read and write. --> 
    141140            <!-- TODO: Update this. --> 
    142             <clean_reg description="Stores baseline for the registry.  Always appended with a number."> 
    143                 clean.reg 
    144             </clean_reg> 
    145             <!-- TODO: Update this. --> 
    146             <current_reg description="Stores the current state of the register to check against the clean state."> 
    147                 current.reg 
    148             </current_reg> 
    149             <!-- TODO: Update this. --> 
    150             <diffs description="The file for the diff command to redirect its output to.  Always appended with a number."> 
    151                 differences.out 
    152             </diffs> 
    153             <!-- TODO: Update this. --> 
    154141            <test_dir description="If you're testing integrity checks, this is the directory that you can specify to minimize testing time. Only the files in this directory will be part of the integrity check."> 
    155142                ../t/testintegrity 
    156143            </test_dir> 
     144            <Registry> 
     145                <!-- HoneyClient::Agent::Integrity::Registry::Test Options --> 
     146                <Test> 
     147                    <!-- 
     148                        Note: you should *never* need to change *any* values 
     149                        within this section of the configuration.  All contents 
     150                        are *only* used for unit testing. 
     151                    --> 
     152                    <before_registry_file description="The relative path to a (before) sample registry dump, that's used during unit testing." default="t/test_registry/before.reg"> 
     153                        t/test_registry/before.reg 
     154                    </before_registry_file> 
     155                    <after_registry_file description="The relative path to an (after) sample registry dump, that's used during unit testing." default="t/test_registry/after.reg"> 
     156                        t/test_registry/after.reg 
     157                    </after_registry_file> 
     158                </Test> 
     159                <Parser> 
     160                    <!-- HoneyClient::Agent::Integrity::Registry::Parser::Test Options --> 
     161                    <Test> 
     162                        <!-- 
     163                            Note: you should *never* need to change *any* values 
     164                            within this section of the configuration.  All contents 
     165                            are *only* used for unit testing. 
     166                        --> 
     167                        <registry_file description="The relative path to a sample registry dump, that's used during unit testing." default="t/test_registry/dump.reg"> 
     168                            t/test_registry/dump.reg 
     169                        </registry_file> 
     170                    </Test> 
     171                </Parser> 
     172            </Registry> 
    157173        </Integrity> 
    158174    </Agent> 
     
    314330                    are *only* used for unit testing. 
    315331                --> 
    316                 <!-- TODO: Update this. --> 
    317332                <test_vm_config description="The relative path to the (empty) test VM, that's used during unit testing." default="t/testVM/winXPPro.vmx"> 
    318333                    t/testVM/winXPPro.vmx 
  • honeyclient/branches/rel/0.9/etc/honeyclient_log.conf

    • Property svn:keywords set to Id "$file"
    r13 r130  
    77#              modules. 
    88# 
    9 # CVS: $Id: honeylog.conf 1099 2006-06-29 22:38:16Z jdurick
     9# CVS: $Id
    1010# 
    1111# @author jdurick, kindlund 
     
    6060 
    6161log4perl.rootLogger=INFO, Screen 
     62# Suppress Parser Debugging Messages 
     63#log4perl.logger.HoneyClient.Agent.Integrity.Registry.Parser=INFO, Screen 
    6264log4perl.appender.Screen=Log::Log4perl::Appender::Screen 
    6365# If you want colorized logging to the screen, enable this line, instead. 
    6466#log4perl.appender.Screen=Log::Log4perl::Appender::ScreenColoredLevels 
    6567log4perl.appender.Screen.stderr=0 
    66 log4perl.appender.Screen.Threshold=INFO 
     68log4perl.appender.Screen.Threshold=DEBUG 
    6769log4perl.appender.Screen.layout=Log::Log4perl::Layout::PatternLayout 
    6870log4perl.appender.Screen.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p [%M] (%F:%L) - %m%n 
  • honeyclient/branches/rel/0.9/etc/inline2test.conf

    • Property svn:keywords set to Id "$file"