Commit Graph

27 Commits (545025dbea2fd93087326c00f094e68c80432aa6)

Author SHA1 Message Date
Jonathan Cran d45b2aaa20 bugfix & cleanup of the vm loading and a speedup / bugfix for the regex lib
git-svn-id: file:///home/svn/framework3/trunk@12032 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 02:33:39 +00:00
Jonathan Cran bbbb86d571 patch by Hauke of the Fidus Project to fixup my bugs in the virtualbox controller :) -- thanks!
git-svn-id: file:///home/svn/framework3/trunk@11775 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 17:03:19 +00:00
Jonathan Cran 38e7beda4f minor typo
git-svn-id: file:///home/svn/framework3/trunk@11755 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 02:20:12 +00:00
Jonathan Cran 5172768cb9 Merging in VirtualBox control functionality from Hauke / Fidius Project
git-svn-id: file:///home/svn/framework3/trunk@11753 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 02:15:24 +00:00
Jonathan Cran f8d03ea257 make the _snapshot / running_list methods a little more sane
git-svn-id: file:///home/svn/framework3/trunk@11742 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-11 15:04:33 +00:00
Jonathan Cran 224bd1c6a2 make vm type available
git-svn-id: file:///home/svn/framework3/trunk@11738 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-10 10:56:36 +00:00
Jonathan Cran 81f659f8b1 ugh, replace this with vixr soon.
git-svn-id: file:///home/svn/framework3/trunk@11722 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 07:37:06 +00:00
Jonathan Cran 3c86009e54 updates to do basic input filtering, and stubbing out a few other controllers
git-svn-id: file:///home/svn/framework3/trunk@11721 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 07:26:18 +00:00
Jonathan Cran 02e11ec338 allow usage: $ controller["machine1].start
git-svn-id: file:///home/svn/framework3/trunk@11718 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-07 23:42:20 +00:00
Jonathan Cran 670b28c65b updates for the lab plugin
git-svn-id: file:///home/svn/framework3/trunk@11715 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 21:29:24 +00:00
Jonathan Cran 7a606033ea somewhat less breaky. -- need to apply todb's patches yet, and make sure this is working with the lab plugin
git-svn-id: file:///home/svn/framework3/trunk@11711 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 09:17:11 +00:00
Jonathan Cran 19d9185ca3 updated for remote workstation control
git-svn-id: file:///home/svn/framework3/trunk@11647 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 07:33:59 +00:00
Jonathan Cran d8fddbfcd4 missing file
git-svn-id: file:///home/svn/framework3/trunk@11603 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 21:23:29 +00:00
Jonathan Cran 4384618950 add workstation-over-ssh control into the lab vm-control plugin
git-svn-id: file:///home/svn/framework3/trunk@11584 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 05:58:16 +00:00
Jonathan Cran f164059d60 backend changes for lab functionality. architecture now allows storage of more info about VMs, and Labs made up of different-technology vms (ie, 1 vmware, 1 vbox, 1 amazon). drivers still need to be written
git-svn-id: file:///home/svn/framework3/trunk@11433 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 19:47:33 +00:00
Jonathan Cran 8ffe70c2a8 include the local path so you can just require lab_controller in irb
git-svn-id: file:///home/svn/framework3/trunk@10630 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-10 02:22:50 +00:00
Jonathan Cran c76f88245d Cleaned up the gidance on the labs, and fixed the lab.rb require
git-svn-id: file:///home/svn/framework3/trunk@10629 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-10 02:18:41 +00:00
Jonathan Cran 04ee50d10c fixed bug w/ revert
git-svn-id: file:///home/svn/framework3/trunk@10224 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-02 20:34:31 +00:00
Jonathan Cran 8741179e8a bugfix for the revert command
git-svn-id: file:///home/svn/framework3/trunk@10129 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-24 19:29:43 +00:00
Jonathan Cran c1a2f51487 tagging id / rev
git-svn-id: file:///home/svn/framework3/trunk@10004 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 16:54:40 +00:00
Jonathan Cran e81fd4a5fe updated lab controller
git-svn-id: file:///home/svn/framework3/trunk@9941 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-29 03:50:31 +00:00
Jonathan Cran 5fd9b689e7 updated lab backend
git-svn-id: file:///home/svn/framework3/trunk@9931 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-26 15:24:05 +00:00
Jonathan Cran d363efd883 slight changes to the vmware controller
git-svn-id: file:///home/svn/framework3/trunk@9850 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 22:19:38 +00:00
Jonathan Cran e5d6214bf5 refactored lab libraries - now with more object orientation.
git-svn-id: file:///home/svn/framework3/trunk@9793 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 15:00:45 +00:00
Jonathan Cran 978c0f30e3 updated get_vmx to handle the structure passed by the control shells. For instance: @lab['metasploitable'] = {"vmx" => "msf_lab/user/Metasploitable/Metasploitable.vmx", "user" => "user", "pass" => "user", "os" => "linux" }
git-svn-id: file:///home/svn/framework3/trunk@9737 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 19:13:20 +00:00
Jonathan Cran 2d0e49ca6f adding in tod's patch (http://www.0x0e.org/x/msf/vmware_lab_diff.tod.20100707) - adds neat functionality like being able to create a lab on the fly or from a set of files on disk.
git-svn-id: file:///home/svn/framework3/trunk@9730 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 22:56:26 +00:00
Jonathan Cran 2786427113 adding initial version of the lab controller - note that this will be updated to use vixr soon
git-svn-id: file:///home/svn/framework3/trunk@9687 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:18:06 +00:00