Commit Graph

40 Commits (d02f0dc4b9776ca0b7e175d5af969e3759782b5d)

Author SHA1 Message Date
OJ 9fb081cb2d Add getenvs, update getenv, change extract_path use
Stacks of modules were using `extract_path` where it wasn't really semantically correct
because this was the only way to expand environment variables. This commit fixes that
up a bit.

Also, I changed the existing `getenv` function in `stdapi` to `getenvs`, and had it
support the splat operator. I added a `getenv` function which is used just for a
single variable and uses `getenvs` behind the scenes.

The meterpreter console `getenv` command now uses `getenvs`
2013-12-19 11:54:34 +10:00
Tab Assassin 2e8d19edcf Retab all the things (except external/) 2013-09-30 13:47:53 -05:00
g0tmi1k 99796bb10a WinEnum - Fix typo 2013-07-03 15:05:50 +01:00
James Lee 624e19fd8b Merge session-host-rework branch back to master
Squashed commit of the following:

commit 2f4e8df33c5b4baa8d6fd67b400778a3f93482aa
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:31:03 2012 -0700

    Clean up some rdoc comments

    This adds categories for the various interfaces that meterpreter and
    shell sessions implement so they are grouped logically in the docs.

commit 9d31bc1b35845f7279148412f49bda56a39c9d9d
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 13:00:25 2012 -0700

    Combine the docs into one output dir

    There's really no need to separate the API sections into their own
    directory.  Combining them makes it much easier to read.

commit eadd7fc136a9e7e4d9652d55dfb86e6f318332e0
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 08:27:22 2012 -0700

    Keep the order of iface attributes the same accross rubies

    1.8 doesn't maintain insertion order for Hash keys like 1.9 does so we
    end up with ~random order for the display with the previous technique.
    Switch to an Array instead of a Hash so it's always the same.

commit 6f66dd40f39959711f9bacbda99717253a375d21
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 08:23:35 2012 -0700

    Fix a few more compiler warnings

commit f39cb536a80c5000a5b9ca1fec5902300ae4b440
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 08:17:39 2012 -0700

    Fix a type-safety warning

commit 1e52785f38146515409da3724f858b9603d19454
Author: James Lee <egypt@metasploit.com>
Date:   Mon Feb 27 15:21:36 2012 -0700

    LHOST should be OptAddress, not OptAddressRange

commit acef978aa4233c7bd0b00ef63646eb4da5457f67
Author: James Lee <egypt@metasploit.com>
Date:   Sun Feb 26 17:45:59 2012 -0700

    Fix a couple of warnings and a typo

commit 29d87f88790aa1b3e5db6df650ecfb3fb93c675b
Author: HD Moore <hdm@digitaloffense.net>
Date:   Mon Feb 27 11:54:29 2012 -0600

    Fix ctype vs content_type typo

commit 83b5400356c47dd1973e6be3aa343084dfd09c73
Author: Gregory Man <man.gregory@gmail.com>
Date:   Sun Feb 26 15:38:33 2012 +0200

    Fixed scripts/meterpreter/enum_firefox to work with firefox > 3.6.x

commit 49c2c80b347820d02348d694cc71f1b3028b4365
Author: Steve Tornio <swtornio@gmail.com>
Date:   Sun Feb 26 07:13:13 2012 -0600

    add osvdb ref

commit e18e1fe97b89c3a2b8c22bc6c18726853d2c2bee
Author: Matt Andreko <mandreko@gmail.com>
Date:   Sat Feb 25 18:02:56 2012 -0500

    Added aspx target to msfvenom.  This in turn added it to msfencode as well.
    Ref: https://github.com/rapid7/metasploit-framework/pull/188
    Tested on winxp with IIS in .net 1.1 and 2.0 modes

commit e6aa5072112d79bbf8a4d2289cf8d301db3932f5
Author: Joshua J. Drake <github.jdrake@qoop.org>
Date:   Sat Feb 25 13:00:48 2012 -0600

    Fixes #6308: Fall back to 127.0.0.1 when SocketError is raised from the resolver

commit b3371e8bfeea4d84f9d0cba100352b57d7e9e78b
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 17:07:42 2012 -0700

    Simplify logic for whether an inner iface has the same address

commit 5417419f35a40d1c08ca11ca40744722692d3b0d
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:58:16 2012 -0700

    Whitespace

commit 9036875c2918439ae23e11ee7b958e30ccc29545
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:53:45 2012 -0700

    Set session info before worrying about address

    get_interfaces can take a while on Linux, grab uid and hostname earlier
    so we can give the user an idea of what they popped as soon as possible.

commit f34b51c6291031ab25b5bfb1ac6307a516ab0ee9
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:48:42 2012 -0700

    Clean up rdoc

commit e61a0663454400ec66f59a80d18b0baff4cb8cd9
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 04:54:45 2012 -0600

    Ensure the architecture is only the first word (not the full WOW64
    message in some cases)

commit 4c701610976a92298c1182eecc9291a1b301e43b
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 04:49:17 2012 -0600

    More paranoia code, just in case RHOST is set to whitespace

commit c5ff89fe3dc9061e0fa9f761e6530f6571989d28
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 04:47:01 2012 -0600

    A few more small bug fixes to handle cases with an empty string target
    host resulting in a bad address

commit 462d0188a1298f29ac83b10349aec6737efc5b19
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 03:55:10 2012 -0600

    Fix up the logic (reversed by accident)

commit 2b2b0adaec2448423dbd3ec54d90a5721965e2df
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 23:29:52 2012 -0600

    Automatically parse system information and populate the db, identify and
    report NAT when detected, show the real session_host in the sessions -l
    listing

commit 547a4ab4c62dc3248f847dd5d305ad3b74157348
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:16:03 2012 -0600

    Fix typo introduced

commit 27a7b7961e61894bdecd55310a8f45d0917c5a5c
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:11:38 2012 -0600

    More session.session_host tweaks

commit e447302a1a9915795e89b5e29c89ff2ab9b6209b
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:08:20 2012 -0600

    Additional tunnel_peer changes

commit 93369fcffaf8c6b00d992526b4083acfce036bb3
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:06:21 2012 -0600

    Additional changes to session.session_host

commit c3552f66d158685909e2c8b51dfead7c240c4f40
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:00:19 2012 -0600

    Merge changes into the new branch
2012-02-28 18:29:39 -07:00
Carlos Perez 68e3691411 Change Post Mixin for Windows platform in its own separate class and minor fixes on modules and scripts
git-svn-id: file:///home/svn/framework3/trunk@12990 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-21 00:38:04 +00:00
Carlos Perez 89795f1784 Update Meterpreter scripts to use is_system? and make getgui script language independent thru the use of SID for group identification
git-svn-id: file:///home/svn/framework3/trunk@11998 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 22:48:43 +00:00
HD Moore 3794ed35cc Apply patches from Matthew Weeks (scriptjunkie) to fix traversal flaws outlined in his Black Hat DC talk:
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-wp.pdf
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-Slides.pdf



git-svn-id: file:///home/svn/framework3/trunk@11636 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 02:24:37 +00:00
Jonathan Cran e8bf4118b1 awww, platfom =/= platform
git-svn-id: file:///home/svn/framework3/trunk@11583 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-16 05:23:57 +00:00
Carlos Perez 1ebdc631b1 fixed problem with platform check on scripts
git-svn-id: file:///home/svn/framework3/trunk@11527 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 00:35:45 +00:00
Carlos Perez c546cac029 give priv extension enough time to load
git-svn-id: file:///home/svn/framework3/trunk@11232 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-06 13:28:07 +00:00
Carlos Perez aa02905564 Speeded up application list enumeration in winenum
git-svn-id: file:///home/svn/framework3/trunk@10879 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 04:39:43 +00:00
Joshua Drake 291027ee1f swap each_line for each
git-svn-id: file:///home/svn/framework3/trunk@10437 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 22:23:23 +00:00
Carlos Perez 7d665e8a8d All scripts that are not platform dependednt will check for version, windows specific will only run on win32, win64 and some on PHP
git-svn-id: file:///home/svn/framework3/trunk@10277 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 16:09:27 +00:00
Carlos Perez 7019dd8bdb Print the right path for the saved data, false report on UAC and fixed program list extraction
git-svn-id: file:///home/svn/framework3/trunk@10268 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 00:36:44 +00:00
Carlos Perez ae5a3d388f Print the right path for the saved data
git-svn-id: file:///home/svn/framework3/trunk@10267 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 00:25:54 +00:00
Joshua Drake fce9a6404c correct regex again, see #2427
git-svn-id: file:///home/svn/framework3/trunk@10080 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 17:55:44 +00:00
Carlos Perez b7ec92ae1f Ticket #2427 Fixed regex in main part of the code and changed the UAC check to the one in the Meterpreter Mixin
git-svn-id: file:///home/svn/framework3/trunk@10079 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 13:07:41 +00:00
Joshua Drake 321f0ce8c3 fix regex and remove extra call to sysinfo, see #2354
git-svn-id: file:///home/svn/framework3/trunk@10046 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 23:05:55 +00:00
Carlos Perez 85ff4e22b9 refactor several calls to use now Meterpreter mixin
git-svn-id: file:///home/svn/framework3/trunk@9768 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-10 16:55:50 +00:00
Carlos Perez ec0e8aba30 Cosmetic changes, renamed mixin function and now all scripts that generate logs they are saved to .msf3/logs/scripts
git-svn-id: file:///home/svn/framework3/trunk@9588 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-23 00:50:14 +00:00
Joshua Drake 0e72894e58 more cleanups
git-svn-id: file:///home/svn/framework3/trunk@9212 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 17:13:09 +00:00
Carlos Perez 469e1deeb7 Removed useless wireless interface registry key dump
git-svn-id: file:///home/svn/framework3/trunk@8175 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:41:21 +00:00
Carlos Perez 4e5c0f55bf Bug fix for when running against WindowsXP RTM, and now dumps wireless registry key for 7
git-svn-id: file:///home/svn/framework3/trunk@8172 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:00:05 +00:00
Carlos Perez f2e61b9cda All output from enumeration that could be saved in a CSV is now saved in one for easier parsing
git-svn-id: file:///home/svn/framework3/trunk@8143 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 01:17:54 +00:00
Carlos Perez f054310e0c Bug fixes, and now all commands output is saved to individual files for easier parsing
git-svn-id: file:///home/svn/framework3/trunk@8142 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-17 19:11:40 +00:00
Carlos Perez 2af04a5a47 Fixed issues while running against Windows 7 with UAC enabled
git-svn-id: file:///home/svn/framework3/trunk@7967 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-25 05:04:42 +00:00
Carlos Perez ff0c6456cf Multi-threaded execution of shell commands and wmic. Uses hostname instead of IP for when doing client side and targets are behind a NAT device.
git-svn-id: file:///home/svn/framework3/trunk@7909 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 18:49:08 +00:00
James Lee 50aa304692 add usage and option parsing
git-svn-id: file:///home/svn/framework3/trunk@7362 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 00:40:19 +00:00
James Lee 0a6bb91cb9 keywords
git-svn-id: file:///home/svn/framework3/trunk@7276 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 15:14:28 +00:00
James Lee e836e6373a add Id to scripts; remove shebang since they should never run from commandline
git-svn-id: file:///home/svn/framework3/trunk@7252 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 18:04:39 +00:00
Carlos Perez 263998e27d Added UAC detection for Windows Vista and Windows 7 and checking so as to be able to perform certain accions
git-svn-id: file:///home/svn/framework3/trunk@6904 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-26 17:31:32 +00:00
Carlos Perez 9e28205d16 Updated for Ruby 1.9.1
git-svn-id: file:///home/svn/framework3/trunk@6680 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 16:15:46 +00:00
HD Moore 7ef884eba7 Updated winenum frmo Carlos Perez
git-svn-id: file:///home/svn/framework3/trunk@6574 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-22 02:33:33 +00:00
HD Moore 9a831f452c Fixed winenum from Carlos
git-svn-id: file:///home/svn/framework3/trunk@6557 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-16 21:24:33 +00:00
HD Moore 37eadc98f5 More scripts from Carlos Perez along with improvements to the existing scripts
git-svn-id: file:///home/svn/framework3/trunk@6556 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-15 04:24:20 +00:00
natron aae66a4cb3 Per Carlos Perez, WMIC misspells Windows Serverr. Reversing typo corrections.
git-svn-id: file:///home/svn/framework3/trunk@6392 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 22:00:36 +00:00
natron 970d30cd45 Typos in meterpreter scripts (thanks Rhys Kidd)
git-svn-id: file:///home/svn/framework3/trunk@6389 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 15:15:56 +00:00
natron 02ab203dfd Updated meterpreter scripts from Carlos Perez
git-svn-id: file:///home/svn/framework3/trunk@6386 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 03:13:54 +00:00
HD Moore e6ef0ab495 New scripts and updated scripts from Carlos Perez
git-svn-id: file:///home/svn/framework3/trunk@6202 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-30 06:18:02 +00:00
HD Moore 51f01d05a4 Committ a pile of scripts from Carlos Perez, along with the original version of scraper.rb
git-svn-id: file:///home/svn/framework3/trunk@6091 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-08 18:14:03 +00:00