1
mirror of https://github.com/rapid7/metasploit-framework synced 2024-11-12 11:52:01 +01:00
Commit Graph

7527 Commits

Author SHA1 Message Date
HD Moore
048b21e3b9 Ensure that errors in the PHPInclude mixin lead to the service being stopped. Handle unreachable services in the php_include module better. Fix database-enabled tab completion to be workspace friendly
git-svn-id: file:///home/svn/framework3/trunk@10410 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:52:49 +00:00
Joshua Drake
e3e57d4d61 add verbosity flag, disable stack traces w/o it
git-svn-id: file:///home/svn/framework3/trunk@10409 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:38:09 +00:00
Joshua Drake
9f02523ab9 allow forcing use of substitution method
git-svn-id: file:///home/svn/framework3/trunk@10408 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:34:43 +00:00
Joshua Drake
eab9c22657 add support for more dll template types
git-svn-id: file:///home/svn/framework3/trunk@10407 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:32:12 +00:00
Joshua Drake
837e6e5075 fix inject support
git-svn-id: file:///home/svn/framework3/trunk@10406 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:19:33 +00:00
Joshua Drake
a0b193f9d3 note psexec release date
git-svn-id: file:///home/svn/framework3/trunk@10405 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 01:50:50 +00:00
Joshua Drake
8e5cf31e9a big exe/dll update, see #2017
NOTE: These changes specifically affect payload encoding via RPC, "use
payload", and msfencode

1. consolidate user-specified exe generation routine (now
Msf::Util::EXE.to_executable_fmt)
2. supported format types are now queried/checked using arrays
3. cleaned up and standardized exe option passing
4. rename data store options for EXE mixin
5. add generate_payload_exe_service for psexec/smb_relay
6. reworked default template handling in Msf::Util::EXE
  a. added template search path option (not used if template includes
a path separator)
  b. "fallback" flag to enable using default if specified file doesn't
exist
7. added Msf::Util::EXE.to_win64pe_dll
8. improved error messages from exe generation



git-svn-id: file:///home/svn/framework3/trunk@10404 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 00:13:30 +00:00
HD Moore
76b14e5db7 Invert logic for consistency
git-svn-id: file:///home/svn/framework3/trunk@10403 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 00:06:18 +00:00
HD Moore
74e5c38fe8 Make the challenge configurable via patch from troulouliou
git-svn-id: file:///home/svn/framework3/trunk@10402 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 00:05:08 +00:00
Matt Weeks
6623a54285 Follow symlinks when running msfgui.
git-svn-id: file:///home/svn/framework3/trunk@10400 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 22:50:21 +00:00
James Lee
771fc82c8c add a unique cid to attachments
git-svn-id: file:///home/svn/framework3/trunk@10399 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 21:41:50 +00:00
Joshua Drake
bd1eeb3722 rework to_jsp_war a bit, fix uses, default msfencode -t war to x86/win32
git-svn-id: file:///home/svn/framework3/trunk@10397 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 15:59:46 +00:00
HD Moore
2cd8b7d5e2 Update from Zate
git-svn-id: file:///home/svn/framework3/trunk@10396 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 14:27:34 +00:00
Joshua Drake
4590844871 tons of indentation fixes, some other style tweaks
git-svn-id: file:///home/svn/framework3/trunk@10394 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 08:06:27 +00:00
Joshua Drake
78188beb6b change from capture to service
git-svn-id: file:///home/svn/framework3/trunk@10393 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 08:05:50 +00:00
James Lee
5ae74d8913 mar my nice migration with a new one.
git-svn-id: file:///home/svn/framework3/trunk@10392 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 07:43:49 +00:00
Joshua Drake
0149ec0253 bump exe name to 14 chars to avoid randomly smashing existing bins
git-svn-id: file:///home/svn/framework3/trunk@10391 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 05:06:51 +00:00
HD Moore
69ce7eed1b Wrap the admin check in case the OS doesn't support this API (WinNT, Win2000)
git-svn-id: file:///home/svn/framework3/trunk@10390 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 04:58:25 +00:00
Joshua Drake
19db412383 convert remaining EXE generation to use the mixin, fixes #2017
git-svn-id: file:///home/svn/framework3/trunk@10389 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 04:38:13 +00:00
Joshua Drake
21d88b36c1 rename generate_exe -> generate_payload_exe
git-svn-id: file:///home/svn/framework3/trunk@10388 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 04:37:25 +00:00
HD Moore
e59ec467af Quick SMB upload module for when you need to upload a file via PTH
git-svn-id: file:///home/svn/framework3/trunk@10387 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 04:03:26 +00:00
HD Moore
25315ec3ea Store the module instance itself in an accessor on the session. You have to be careful when using this, as the contents can change if the owner of the module is still working with it.
git-svn-id: file:///home/svn/framework3/trunk@10386 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 03:51:38 +00:00
Joshua Drake
3c505f4c5d remove loop instruction, it was causing problems when the destination was too far away, fixes #2459
git-svn-id: file:///home/svn/framework3/trunk@10385 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 03:26:41 +00:00
HD Moore
3dae16482f Required admin creds == ManualRanking
git-svn-id: file:///home/svn/framework3/trunk@10384 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 02:56:29 +00:00
HD Moore
541c192f12 Updates from Zate, renamed commands to match the existing plugins
git-svn-id: file:///home/svn/framework3/trunk@10383 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 02:18:25 +00:00
James Lee
0b008d6c3c remove some duplicate code and make output more useful when there is a service with no name
git-svn-id: file:///home/svn/framework3/trunk@10382 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 01:54:23 +00:00
James Lee
c0137c7d61 migrations for campaigns
git-svn-id: file:///home/svn/framework3/trunk@10380 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 23:45:40 +00:00
James Lee
711fe18ac2 typo fix
git-svn-id: file:///home/svn/framework3/trunk@10379 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 23:22:32 +00:00
James Lee
940a096769 typo fix
git-svn-id: file:///home/svn/framework3/trunk@10378 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 23:13:02 +00:00
James Lee
5f0cc946b1 document report_note a little better, and modify several modules to use it correctly. fixes #2568
git-svn-id: file:///home/svn/framework3/trunk@10377 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 22:25:56 +00:00
HD Moore
7c540583b5 Latest code from Zate
git-svn-id: file:///home/svn/framework3/trunk@10376 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 22:18:56 +00:00
Joshua Drake
5d3089c135 raise EOFError from SSL connections
git-svn-id: file:///home/svn/framework3/trunk@10375 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 21:20:06 +00:00
Matt Weeks
6736f6d5be Make encoding payloads a million times faster.
git-svn-id: file:///home/svn/framework3/trunk@10374 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 02:45:55 +00:00
Matt Weeks
136ab04a22 Add msfencode capability to rpc.
git-svn-id: file:///home/svn/framework3/trunk@10373 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 02:42:33 +00:00
Mario Ceballos
9975827d22 updated module from Thomas Ring.
git-svn-id: file:///home/svn/framework3/trunk@10371 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 23:59:28 +00:00
HD Moore
ad4bf32a45 Move to the SMB directory
git-svn-id: file:///home/svn/framework3/trunk@10370 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 17:56:22 +00:00
HD Moore
36444591b8 Fix tab indent and make exe name more unique (since its not a fully-qualified path)
git-svn-id: file:///home/svn/framework3/trunk@10369 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 15:08:23 +00:00
Joshua Drake
19d350fe14 prevent loading activerecord for msf{payload,encode}
git-svn-id: file:///home/svn/framework3/trunk@10368 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 06:47:59 +00:00
Joshua Drake
ff22e5212e revert to backward compatible method of using utc+zone
git-svn-id: file:///home/svn/framework3/trunk@10367 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 05:09:47 +00:00
HD Moore
e939379b1b Fix missing end, use explicit Timeout class
git-svn-id: file:///home/svn/framework3/trunk@10366 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 04:15:32 +00:00
Tod Beardsley
b023d89469 Wrap SSH and Telnet version checkers in a timeout, or else they sometimes hang forever.
git-svn-id: file:///home/svn/framework3/trunk@10365 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 03:00:19 +00:00
Joshua Drake
af19a0d924 hrm, i dont think i meant to check these in
git-svn-id: file:///home/svn/framework3/trunk@10364 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 01:41:13 +00:00
Joshua Drake
3cf8dea0c6 add exploit for cve-2010-2729, finally
git-svn-id: file:///home/svn/framework3/trunk@10363 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 01:17:59 +00:00
Joshua Drake
b22c24289d fix up the simple.client.system_time and underlying stuffs
git-svn-id: file:///home/svn/framework3/trunk@10362 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 01:12:44 +00:00
Matt Weeks
16f2e33442 Better support issuing commands to multiple sessions.
git-svn-id: file:///home/svn/framework3/trunk@10360 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 22:18:52 +00:00
Matt Weeks
908976c70a Add ability to refresh console list, and only start polling for input on sessions when the window is opened.
git-svn-id: file:///home/svn/framework3/trunk@10359 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:41:08 +00:00
Carlos Perez
16ae3c84e9 fixes to the script for when multiple accounts are logged on on target and Meterpreter is running as system.
git-svn-id: file:///home/svn/framework3/trunk@10358 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:19:04 +00:00
HD Moore
012654947a Store the time zone as well
git-svn-id: file:///home/svn/framework3/trunk@10357 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:19:04 +00:00
Matt Weeks
9712a99e42 Properly save host connecting to.
git-svn-id: file:///home/svn/framework3/trunk@10356 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:13:42 +00:00
James Lee
73bec8b819 many-to-many switch
git-svn-id: file:///home/svn/framework3/trunk@10355 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:05:11 +00:00