Changeset 1335

Show
Ignore:
Timestamp:
03/06/08 16:48:02 (6 months ago)
Author:
kindlund
Message:

Added programmatic organizational support.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • honeyclient/trunk/etc/honeyclient.xml

    r1334 r1335  
    4747<HoneyClient> 
    4848    <!-- Global Options --> 
     49    <organization description="The name of the organization that owns the host system."> 
     50        MITRE 
     51    </organization> 
    4952    <!-- 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"> 
     53    <timeout description="Default timeout used for all communications between each module (in seconds)." default="3600"> 
    5154        3600 
    5255    </timeout> 

  • honeyclient/trunk/lib/HoneyClient/Manager.pm

    r1322 r1335  
    834834                            $LOG->info("All URLs exhausted.  Shutting down Manager."); 
    835835                            $vm = undef; 
    836                             print "Done!\n"; 
    837836                            _cleanup(); 
    838837                        } 
    …… 
    939938        cid => $vm->name, 
    940939        status => 'running', 
    941         # TODO: Collect host, application, and config through automation/config files 
    942940        host => { 
    943             org => 'MITRE', 
     941            org => getVar(name => "organization"), 
    944942            hostname => Sys::Hostname::Long::hostname_long, 
    945943            ip => Sys::HostIP->ip,