HD Moore
5a2444eb24
Clean up web_vuln import, use additional fields
...
git-svn-id: file:///home/svn/framework3/trunk@10635 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 02:57:07 +00:00
HD Moore
e7fe407106
Update to the report_web_vuln method to take into account the schema update
...
git-svn-id: file:///home/svn/framework3/trunk@10632 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-10 19:36:31 +00:00
HD Moore
39be54970b
Fix a typo in the exception handler
...
git-svn-id: file:///home/svn/framework3/trunk@10625 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 22:09:35 +00:00
HD Moore
b99be2dae6
Unbreak this
...
git-svn-id: file:///home/svn/framework3/trunk@10621 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 18:27:09 +00:00
HD Moore
f19be2ca3f
Try harder to figure out who ran the module
...
git-svn-id: file:///home/svn/framework3/trunk@10620 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 18:11:11 +00:00
James Lee
abf19e002d
tweak the models
...
git-svn-id: file:///home/svn/framework3/trunk@10618 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 08:35:41 +00:00
James Lee
8aa73c2951
add a filename
...
git-svn-id: file:///home/svn/framework3/trunk@10616 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 03:50:04 +00:00
James Lee
014ed847b2
actually save the campaign
...
git-svn-id: file:///home/svn/framework3/trunk@10609 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 20:32:32 +00:00
James Lee
dbcd8619e1
break report_user_agent into a fingerprint method and a report method, pass extra arguments on to report_client
...
git-svn-id: file:///home/svn/framework3/trunk@10608 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 20:28:14 +00:00
James Lee
988bbd13f1
associate clients with a campaign
...
git-svn-id: file:///home/svn/framework3/trunk@10601 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 17:20:57 +00:00
HD Moore
d8b9cf5cac
Slight speed improvement to request processing
...
git-svn-id: file:///home/svn/framework3/trunk@10599 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 06:14:44 +00:00
HD Moore
9e01b0f4e5
Fix a race condition in concurrent session handling
...
git-svn-id: file:///home/svn/framework3/trunk@10596 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:46:53 +00:00
HD Moore
2e9138ebbc
This commit overhauls much of the meterpreter timeouts and staging processes. This fixes a bug with concurrent session handling, reduces CPU load by caching a single SSL certificate for all sessions, increases all of the critical timeouts, and generally makes mass ownage work better. We still need to limit the maximum number of concurrent on_session() threads to something sane to prevent sesssion spikes from dragging out the process even longer. The C-side meterpreter change is minimal and will only help with future compatibility if we move to non-blocking fd's for the SSL socket.
...
git-svn-id: file:///home/svn/framework3/trunk@10595 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:11:47 +00:00
HD Moore
6a47af814a
Basic, still buggy support for NetSparker XML
...
git-svn-id: file:///home/svn/framework3/trunk@10585 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 06:24:26 +00:00
HD Moore
2e25245e9b
Remove threading, caused slowdowns
...
git-svn-id: file:///home/svn/framework3/trunk@10583 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 03:57:51 +00:00
HD Moore
3250ab13e0
Add a parser for Retina XML
...
git-svn-id: file:///home/svn/framework3/trunk@10582 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 02:33:57 +00:00
HD Moore
352b4cf1c8
Dispatch incoming requests as threads
...
git-svn-id: file:///home/svn/framework3/trunk@10579 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 23:20:13 +00:00
HD Moore
b98732ae0a
This change allows the auth modules to automatically remove their input files when requested. This makes scripting with temporary files much easier
...
git-svn-id: file:///home/svn/framework3/trunk@10576 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 21:04:16 +00:00
HD Moore
cbcebc0cc8
Bug fixes to the importer
...
git-svn-id: file:///home/svn/framework3/trunk@10575 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 20:24:26 +00:00
HD Moore
af28507c36
Cleaner regex
...
git-svn-id: file:///home/svn/framework3/trunk@10571 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:10:39 +00:00
HD Moore
222c418fee
Accept MetasploitV4 as well as a base tag, preparing for 3.5.0
...
git-svn-id: file:///home/svn/framework3/trunk@10570 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:09:06 +00:00
HD Moore
0127137151
Reorganize methods and add recognition of v4
...
git-svn-id: file:///home/svn/framework3/trunk@10569 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:00:21 +00:00
HD Moore
683a82bfee
Switch out msfx/msfe terminology for just msf
...
git-svn-id: file:///home/svn/framework3/trunk@10565 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 15:55:28 +00:00
Tod Beardsley
e492136567
Handle slightly malformed MSFX zip imports. This introduces the nils_for_nulls function that basically takes any instance of NULL in the XML of an MSFX import and turns it into a proper Ruby nil. This helps avoid a lot of problems for reports that were created with NULLs accidentally included.
...
git-svn-id: file:///home/svn/framework3/trunk@10563 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 05:10:16 +00:00
Tod Beardsley
7041102df7
Fixes #2848 , uses the half-guessing method of figuring out the "right" protocol.
...
git-svn-id: file:///home/svn/framework3/trunk@10562 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 04:18:01 +00:00
Joshua Drake
8fe655fce7
add unknown command override, see #2793
...
git-svn-id: file:///home/svn/framework3/trunk@10542 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 08:05:09 +00:00
HD Moore
3b99c58cb1
Drop this to 75 to take into account other processes accessing the same db. Theoretically the AR pool manager will kick in when this is hit anyways
...
git-svn-id: file:///home/svn/framework3/trunk@10541 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 07:11:07 +00:00
HD Moore
31b8fcf7f2
Reduce the default pool size to match reasonable database limits
...
git-svn-id: file:///home/svn/framework3/trunk@10540 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 06:55:34 +00:00
HD Moore
f69a1190a4
Commit the EICAR Canary check for meddling AVs
...
git-svn-id: file:///home/svn/framework3/trunk@10536 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 03:07:58 +00:00
HD Moore
adeae9fdec
Expose ReverseListenerComm to the reverse_https and passivex handlers as well
...
git-svn-id: file:///home/svn/framework3/trunk@10535 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 02:17:09 +00:00
HD Moore
1b4190df38
This commit brings configurability to TCP Servers as to which Comm they use. The ReverseListenerComm and ListenerComm advanced options can be used to prevent a given listener from trying to bind a listener over the pivoted routed. This is useful for a number of situations and not possible to configure explicitly before.
...
git-svn-id: file:///home/svn/framework3/trunk@10534 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 02:11:22 +00:00
HD Moore
6a06a95f2f
Faster unique form sort
...
git-svn-id: file:///home/svn/framework3/trunk@10532 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 03:34:58 +00:00
HD Moore
555f6840fa
Remove the port when its the default for the protocol
...
git-svn-id: file:///home/svn/framework3/trunk@10531 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 01:57:07 +00:00
HD Moore
02b1979c27
Tweaks for vuln reporting
...
git-svn-id: file:///home/svn/framework3/trunk@10530 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 01:04:33 +00:00
HD Moore
6319d95456
Actually store the additional fields
...
git-svn-id: file:///home/svn/framework3/trunk@10529 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 00:45:44 +00:00
HD Moore
ddcb07bf97
Typos
...
git-svn-id: file:///home/svn/framework3/trunk@10528 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 00:23:18 +00:00
HD Moore
8a567dd3a8
Add query to web_form/web_path
...
git-svn-id: file:///home/svn/framework3/trunk@10526 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 22:55:54 +00:00
HD Moore
8a0fdf7e14
Add some helper methods to the workspace
...
git-svn-id: file:///home/svn/framework3/trunk@10524 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 19:52:50 +00:00
HD Moore
5b7296931d
This patch merges in support for four new database tables focused on tracking web application information along with a tweak to the task manager code to allow tasks to be run from within tasks without fear of deadlock.
...
git-svn-id: file:///home/svn/framework3/trunk@10523 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 18:48:29 +00:00
James Lee
86f6ecdadd
add bools
...
git-svn-id: file:///home/svn/framework3/trunk@10517 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-01 13:36:32 +00:00
Tod Beardsley
6743dbfc62
Actually respect the allow_yaml status for imports on everything that might be serialized, and also streamlines unserialized_object a little.
...
git-svn-id: file:///home/svn/framework3/trunk@10505 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 17:52:48 +00:00
HD Moore
7409e34738
See #2717 . Fixes session reaping (VNC, specifically)
...
git-svn-id: file:///home/svn/framework3/trunk@10502 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 15:06:09 +00:00
Tod Beardsley
ddb2f71674
Ensuring binary file reads, always.
...
git-svn-id: file:///home/svn/framework3/trunk@10501 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 03:13:10 +00:00
Tod Beardsley
dc79d360ac
Quick fix to avoid dying on badly formatted imported data (looks like a Nessus import problem, actually)
...
git-svn-id: file:///home/svn/framework3/trunk@10499 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 23:06:13 +00:00
Tod Beardsley
331f7a7b26
Handles REXML::ParseErrors without making a terrible mess.
...
git-svn-id: file:///home/svn/framework3/trunk@10497 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 15:40:33 +00:00
James Lee
337a0be8fc
adjust templates, move SerializedPrefs into its own file
...
git-svn-id: file:///home/svn/framework3/trunk@10494 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 04:12:04 +00:00
James Lee
7b2a29365f
fix report_note taking a Service obj in opts[:service]
...
git-svn-id: file:///home/svn/framework3/trunk@10493 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 03:52:39 +00:00
Joshua Drake
f07f354472
tidy pass on exploit mixins
...
git-svn-id: file:///home/svn/framework3/trunk@10487 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 21:02:00 +00:00
Joshua Drake
e4bef2ce51
turn off payload handler by default for fileformat modules
...
git-svn-id: file:///home/svn/framework3/trunk@10486 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 18:28:58 +00:00
HD Moore
cdc97316b5
Automatically close dead sessions (finally), also, automatically mark meterpreter sessions as dead when writes start to trigger exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@10475 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:57:30 +00:00
HD Moore
faf58c2b62
Allows 0.0.0.0/::0 to be used in place of the real "any" address regardless of socket type when the bind address is specified
...
git-svn-id: file:///home/svn/framework3/trunk@10473 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:28:19 +00:00
HD Moore
3b31f56894
This commit adds a new option to all reverse handlers: ReverseListenerBindAddress. This setting determines exactly what address is bound on the local system
...
git-svn-id: file:///home/svn/framework3/trunk@10472 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:25:09 +00:00
James Lee
478a15f827
doc the use of :name for services
...
git-svn-id: file:///home/svn/framework3/trunk@10465 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 21:25:18 +00:00
James Lee
7878273131
try to preserve the service name in the case of incorrect report_note usage
...
git-svn-id: file:///home/svn/framework3/trunk@10464 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 21:11:36 +00:00
Tod Beardsley
c00d56d560
Deal with services a little more intelligently if they're not already there when you report a note.
...
git-svn-id: file:///home/svn/framework3/trunk@10463 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 20:51:38 +00:00
Tod Beardsley
09cab24dbf
Report_note no longer tries to re-report a service name; it just re-reports port numbers and protocols. This is to avoid unidentifying identified services.
...
git-svn-id: file:///home/svn/framework3/trunk@10458 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 17:52:25 +00:00
James Lee
84c031d620
document smtp_deliver a little better
...
git-svn-id: file:///home/svn/framework3/trunk@10456 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 16:54:09 +00:00
Joshua Drake
224891387a
add exploit number to prefix
...
git-svn-id: file:///home/svn/framework3/trunk@10443 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 02:16:29 +00:00
Joshua Drake
87b8b9ae8f
tighten up response code check
...
git-svn-id: file:///home/svn/framework3/trunk@10441 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 01:55:19 +00:00
Joshua Drake
cabbe1a84a
oops, hehehe -- fixes exe generation
...
git-svn-id: file:///home/svn/framework3/trunk@10440 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 01:43:42 +00:00
James Lee
5800274b8f
avoid sending email data when the server says it doesn't like our DATA, don't send creds if the server doesn't ask, fix the slowness in TLS
...
git-svn-id: file:///home/svn/framework3/trunk@10438 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 22:34:37 +00:00
Joshua Drake
000c05ff86
allow external control of the arch/platform, fix for aux modules
...
git-svn-id: file:///home/svn/framework3/trunk@10435 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 20:55:26 +00:00
James Lee
2a58f7433e
revamp report_note to compare data in ruby instead of SQL which was causing headaches with serialization
...
git-svn-id: file:///home/svn/framework3/trunk@10432 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 05:37:21 +00:00
James Lee
7a58e611e6
don't log plaintext passwords
...
git-svn-id: file:///home/svn/framework3/trunk@10422 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 07:00:50 +00:00
HD Moore
b8bcc2fedb
Continue processing even if the exploit's on_new_session override triggers an exception
...
git-svn-id: file:///home/svn/framework3/trunk@10413 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 03:05:55 +00:00
Joshua Drake
001a6ffbdb
really use simple substitution method, oops
...
git-svn-id: file:///home/svn/framework3/trunk@10412 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:59:42 +00:00
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
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
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
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
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
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
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
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
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
Tod Beardsley
99e2218d13
Be a little more careful with credential sources and update new services in the current workspace.
...
git-svn-id: file:///home/svn/framework3/trunk@10339 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 19:45:51 +00:00
James Lee
ab1ac7ab22
make sure attachments are included
...
git-svn-id: file:///home/svn/framework3/trunk@10329 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 08:43:08 +00:00
Tod Beardsley
fa38a19ada
Adding the missing report_template.rb.
...
git-svn-id: file:///home/svn/framework3/trunk@10304 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 13:20:49 +00:00
Tod Beardsley
088e862e16
Adds a migration for report template tracking.
...
git-svn-id: file:///home/svn/framework3/trunk@10303 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 12:17:57 +00:00
James Lee
cd7dd926e2
use the models from the last commit. i suck at getting all the files in a single commit. =/
...
git-svn-id: file:///home/svn/framework3/trunk@10302 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 08:26:48 +00:00
James Lee
c8bd48dbb0
add models for campaigns and stuff.
...
git-svn-id: file:///home/svn/framework3/trunk@10301 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 08:25:27 +00:00
James Lee
eddd6d481d
add some documentation for request_cgi
...
git-svn-id: file:///home/svn/framework3/trunk@10293 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 17:31:26 +00:00
Matt Weeks
cb41474f49
fix typo and import errors.
...
git-svn-id: file:///home/svn/framework3/trunk@10291 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 16:17:12 +00:00
Matt Weeks
995b289635
Add session upgrade capability to command shells.
...
git-svn-id: file:///home/svn/framework3/trunk@10289 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 15:59:19 +00:00
Matt Weeks
7f3cc47da9
Only add platform for meterpreter sessions. Unbreaks shell sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@10286 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-10 23:33:33 +00:00
James Lee
8716609aaf
add the platform to the session attributes returned by rpc
...
git-svn-id: file:///home/svn/framework3/trunk@10285 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-10 20:56:21 +00:00
James Lee
6422d8c2de
unbreak payloads over rpc
...
git-svn-id: file:///home/svn/framework3/trunk@10271 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 05:19:04 +00:00
James Lee
85cdc7ad78
ugh, i'm bouncing between too many languages, this syntax doesn't even work in php. fixes #2495
...
git-svn-id: file:///home/svn/framework3/trunk@10240 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-05 16:13:17 +00:00
James Lee
e42d2c1ef4
make sure we read the whole file
...
git-svn-id: file:///home/svn/framework3/trunk@10234 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 23:00:28 +00:00
Matt Weeks
b24a7db785
Add workspace support throughout GUI; add/select/remove db workspace and set default workspace when running modules.
...
git-svn-id: file:///home/svn/framework3/trunk@10233 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 17:13:53 +00:00
Matt Weeks
f5bc508370
Fix db.vulns typos
...
git-svn-id: file:///home/svn/framework3/trunk@10232 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 16:09:10 +00:00
Joshua Drake
57dac0dbf8
remove newlines when importing from an ip list
...
git-svn-id: file:///home/svn/framework3/trunk@10230 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 15:04:09 +00:00
Tod Beardsley
b65be82387
Handle updating the updated_at time for just-checked credentials better.
...
git-svn-id: file:///home/svn/framework3/trunk@10213 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 22:06:52 +00:00
Tod Beardsley
21540e22ed
Checking in missing reporting stuff for bruteforce. Namely, report_exploit, also changes ftp's pw type to just "password" and re-opens newly verified sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@10205 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-31 20:33:16 +00:00
Matt Weeks
9253085d13
Add plugin support to rpc. Fixes #2292
...
git-svn-id: file:///home/svn/framework3/trunk@10177 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 18:21:17 +00:00
Matt Weeks
1d508a7acd
Fixes #2464
...
git-svn-id: file:///home/svn/framework3/trunk@10175 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 17:37:27 +00:00
Joshua Drake
8dd489ad3b
expose the payload exe filename, remove the concat operator
...
git-svn-id: file:///home/svn/framework3/trunk@10169 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 17:23:47 +00:00
Joshua Drake
330281eadd
see #684 , adds checksum support, updates modules to use it, fixes some wfs_delay/WfsDelay issues
...
git-svn-id: file:///home/svn/framework3/trunk@10150 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:55:37 +00:00
Joshua Drake
c473d20927
default badchars to payload_badchars
...
git-svn-id: file:///home/svn/framework3/trunk@10149 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:54:20 +00:00
James Lee
34eb75af73
overhaul smtp to add support for authentication and STARTTLS. can now send email through a gmail account
...
git-svn-id: file:///home/svn/framework3/trunk@10148 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:31:46 +00:00
Joshua Drake
623e4ef3ac
add forward search, reset between eggs, move options into a hash
...
git-svn-id: file:///home/svn/framework3/trunk@10132 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 01:21:12 +00:00
Tod Beardsley
1db9d8eb01
Fixes #2444 . Adds an ExploitedHost table, adds the db_exploited command, adds the report_exploit() function.
...
Tested with meterpreter, shell, and clientside exploit sessions.
git-svn-id: file:///home/svn/framework3/trunk@10130 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-24 21:57:04 +00:00
Joshua Drake
b6577681c6
another omelet update from Peter, this time with in-line assembly
...
git-svn-id: file:///home/svn/framework3/trunk@10118 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 21:03:00 +00:00
Joshua Drake
6e66831517
couple minor fixes to omelet mixin/class
...
git-svn-id: file:///home/svn/framework3/trunk@10116 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 19:53:15 +00:00
Joshua Drake
2b11577ae1
fix broken free, type in require
...
git-svn-id: file:///home/svn/framework3/trunk@10112 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 18:05:37 +00:00
Tod Beardsley
acef967d5a
Updating importing to deal with importing credentials from Metasploit Express XML.
...
git-svn-id: file:///home/svn/framework3/trunk@10111 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:45:36 +00:00
Joshua Drake
08fc366d0b
add omlet mixin from Peter Van Eeckhoutte
...
git-svn-id: file:///home/svn/framework3/trunk@10108 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:35:41 +00:00
Joshua Drake
8c9d08b1e8
add egg override param for egghunter
...
git-svn-id: file:///home/svn/framework3/trunk@10098 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-22 20:19:19 +00:00
Joshua Drake
09af63c1fb
generate returning nil in payload.size
...
git-svn-id: file:///home/svn/framework3/trunk@10087 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 20:35:48 +00:00
James Lee
0e896261cb
1.8.6 compatibility fix
...
git-svn-id: file:///home/svn/framework3/trunk@10086 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 20:31:39 +00:00
Joshua Drake
198cc37f8a
load java payload mixin, fixes #2432
...
git-svn-id: file:///home/svn/framework3/trunk@10081 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 18:04:48 +00:00
James Lee
5b38990e70
missed this
...
git-svn-id: file:///home/svn/framework3/trunk@10076 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 07:13:35 +00:00
James Lee
5d95f48848
add preliminary support for the new java payloads. Working meterpreter and shell stages with tcp bind and reverse stagers, see #406
...
git-svn-id: file:///home/svn/framework3/trunk@10073 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 07:01:23 +00:00
Tod Beardsley
d0ea2737c5
Don't overwrite source_id just because we don't have one.
...
git-svn-id: file:///home/svn/framework3/trunk@10067 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 23:19:34 +00:00
Joshua Drake
7d560e9c18
rescue NoCompatiblePayloadError inside size method, fixes #1604
...
git-svn-id: file:///home/svn/framework3/trunk@10051 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 00:10:06 +00:00
James Lee
ad2b69dced
add database access to rpc. thanks Ryan Linn for the patch\!
...
git-svn-id: file:///home/svn/framework3/trunk@10043 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 21:26:26 +00:00
Tod Beardsley
6d6a547b34
Fixes #2412 . Adds a creds table, modifies the db_report_auth API, adds the db_creds and db_add_cred commands.
...
git-svn-id: file:///home/svn/framework3/trunk@10034 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 00:58:20 +00:00
Joshua Drake
cb445588e0
fix problem with unclosed sockets
...
git-svn-id: file:///home/svn/framework3/trunk@10012 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 04:58:27 +00:00
James Lee
c94663c1fd
check the os before adding output redirection to commands
...
git-svn-id: file:///home/svn/framework3/trunk@10007 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 19:46:04 +00:00
James Lee
7b521b8ef2
change the timeout to something sane
...
git-svn-id: file:///home/svn/framework3/trunk@10006 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 17:24:59 +00:00
Joshua Drake
bcbd691ea7
add a list chunk function
...
git-svn-id: file:///home/svn/framework3/trunk@9997 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 16:09:31 +00:00
Joshua Drake
1b31a44b57
move riff support from ani_loadimage browser sploit to mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9984 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-12 16:56:41 +00:00
HD Moore
040a292181
Create a new mixin that changes SMBUser/SMBPass to normal options, include this mixin within SMB modules that more often than not require authentication
...
git-svn-id: file:///home/svn/framework3/trunk@9981 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-12 15:00:58 +00:00
Joshua Drake
d540818f01
split http exploit mixin into http/server and http/client
...
git-svn-id: file:///home/svn/framework3/trunk@9971 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 06:59:16 +00:00
Joshua Drake
9dacf8116e
remove rails dependency from module.replicant
...
git-svn-id: file:///home/svn/framework3/trunk@9969 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 05:57:58 +00:00
Joshua Drake
7f8bbbc535
add dhcp/pxe stuff from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9963 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 17:37:28 +00:00
Joshua Drake
53e2a010cd
add -n (disable database) option for msfconsole, gives 33% startup time reduction
...
git-svn-id: file:///home/svn/framework3/trunk@9959 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-05 02:24:40 +00:00
Joshua Drake
d7a4cd2096
fix next/break handling inside new loop -- fixes #2310
...
git-svn-id: file:///home/svn/framework3/trunk@9951 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-03 16:00:45 +00:00
Joshua Drake
2f384cde82
add alias for calling Msf::Exploit regenerate_payload explicitly -- fixes #2312
...
git-svn-id: file:///home/svn/framework3/trunk@9950 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-03 15:14:34 +00:00
HD Moore
e26d4ded08
Import the scanner and utility modules for the VxWorks WDB Agent service
...
git-svn-id: file:///home/svn/framework3/trunk@9945 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-02 05:56:26 +00:00
James Lee
9a583b9e09
fix encoding. =/
...
git-svn-id: file:///home/svn/framework3/trunk@9918 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-24 01:04:58 +00:00
James Lee
e957a7a90e
add support for doing everything msfpayload does into msfconsole and xmlrpc, fixes #589 . Thanks, Ryan Linn for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@9914 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-23 20:22:36 +00:00
Joshua Drake
6e34bc5420
further clean up exception handling / session waiting for exploits
...
git-svn-id: file:///home/svn/framework3/trunk@9910 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 23:25:20 +00:00
James Lee
fed1e88b7d
missed a file
...
git-svn-id: file:///home/svn/framework3/trunk@9908 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 22:37:49 +00:00
James Lee
671d243aaa
put the stop command in core instead of base and default the extra argument to nil. this should allow a cleaner exit without breaking existing code (i hope). see #2247 (again) and also fixes #1010
...
git-svn-id: file:///home/svn/framework3/trunk@9907 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 22:37:26 +00:00
James Lee
b8b5d0586d
generate job info from available properties in rpc. fixes #2236
...
git-svn-id: file:///home/svn/framework3/trunk@9902 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 08:57:11 +00:00
Joshua Drake
8c5f10006f
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9899 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 06:03:42 +00:00
Joshua Drake
276a83d7b4
allow specifing which code to use for the exe
...
git-svn-id: file:///home/svn/framework3/trunk@9895 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 00:01:45 +00:00
James Lee
45c869d015
revert the rpc.stop patch as it breaks other rpc stuff. i'll have a better fix for this later today.
...
git-svn-id: file:///home/svn/framework3/trunk@9890 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 20:36:09 +00:00
James Lee
88c6bf13dd
apply patch from scriptjunkie to stop the xmlrpc daemon. fixes #2247
...
git-svn-id: file:///home/svn/framework3/trunk@9887 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 19:12:09 +00:00
Joshua Drake
33b479e696
adjust https handler status message
...
git-svn-id: file:///home/svn/framework3/trunk@9872 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 00:17:58 +00:00
James Lee
bcb62247dd
explicitly clear a module's job_id in case it was set in a previous run. Fixes #2267
...
git-svn-id: file:///home/svn/framework3/trunk@9847 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 21:47:00 +00:00
Joshua Drake
63595d1ce2
update exception handling to bail on RuntimeError or Interrupt, but wait otherwise.
...
git-svn-id: file:///home/svn/framework3/trunk@9845 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 19:58:41 +00:00
HD Moore
d9402edde3
Handle cases where the exploit succeeds but then throws an exception, printing the "exploit failed" message. Closes #2260
...
git-svn-id: file:///home/svn/framework3/trunk@9840 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-15 21:28:21 +00:00
Tod Beardsley
3c199b0364
Fixes #824 . PcapLog now works, and doesn't use racket nor packetfu -- just straight pcaprub, since I'm not doing anything exciting with them aside from saving to a file.
...
Also, it's a proper plugin now, not just a singleton, with a command dispather and everything.
Pretty much totoally rewritten. Since it hasn't worked for at least 5 months, I doubt anyone will be shocked by the API change.
git-svn-id: file:///home/svn/framework3/trunk@9834 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:38:19 +00:00
HD Moore
ac69cf72bb
Clone the module_store while we are at it
...
git-svn-id: file:///home/svn/framework3/trunk@9832 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:18:39 +00:00
HD Moore
97d3c9da8b
This may solve both of the scanner/bap cases for module cloning
...
git-svn-id: file:///home/svn/framework3/trunk@9831 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:16:22 +00:00