Tod Beardsley
66e258da2d
Adding a framework.db.sync for on_session_open -- otherwise it can be to quick and session.tunnel_peer can be nil.
...
git-svn-id: file:///home/svn/framework3/trunk@9197 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 16:25:52 +00:00
HD Moore
704702729b
Switch from serialize to marshalize, ugly code still, will consolidate before release
...
git-svn-id: file:///home/svn/framework3/trunk@9196 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 06:09:08 +00:00
HD Moore
49932f9ef5
Deprecate db_create, change the suggested postgres driver to 'postgres'
...
git-svn-id: file:///home/svn/framework3/trunk@9195 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 02:07:30 +00:00
HD Moore
7631b193fd
Glue to tie Metasploit mixins into Rex::Script::Meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@9193 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 00:09:01 +00:00
HD Moore
cbd675e369
Add user.prefs
...
git-svn-id: file:///home/svn/framework3/trunk@9191 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-01 22:02:00 +00:00
HD Moore
42da9e899a
Improvements to the cleanup process, close sockets properly for exploits and auxiliary
...
git-svn-id: file:///home/svn/framework3/trunk@9187 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-01 16:26:24 +00:00
Tod Beardsley
af38610728
Allows for an early exit in the event of a guessed credential.
...
git-svn-id: file:///home/svn/framework3/trunk@9180 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-30 21:17:27 +00:00
HD Moore
bd928017de
Use gsub over tr to handle binary strings better
...
git-svn-id: file:///home/svn/framework3/trunk@9157 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 14:46:00 +00:00
HD Moore
45425c32da
Ignore incoming data when the socket has already been closed. This may not be correct for WebRPC, but it causes problems with the default mode
...
git-svn-id: file:///home/svn/framework3/trunk@9156 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 14:39:51 +00:00
HD Moore
8b93465d46
Remove global extend -> include change, identify common cases and change instead
...
git-svn-id: file:///home/svn/framework3/trunk@9152 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 01:00:43 +00:00
Tod Beardsley
111f105117
Handle importing timestamps from Metasploit Express reports.
...
git-svn-id: file:///home/svn/framework3/trunk@9149 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 21:51:29 +00:00
Tod Beardsley
3fa96688f2
Moved the common rexmlifier to its own function for consistency. Ensure that nulls stay null for MSFE import.
...
git-svn-id: file:///home/svn/framework3/trunk@9146 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 20:25:42 +00:00
Tod Beardsley
1b910c1862
Expose a means to import MSFE reports to the user.
...
git-svn-id: file:///home/svn/framework3/trunk@9144 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 19:10:40 +00:00
Tod Beardsley
fab458579e
Implements methods to import reports from Metasploit Express.
...
git-svn-id: file:///home/svn/framework3/trunk@9141 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 18:40:49 +00:00
HD Moore
6511e4fa77
Workaround for a memory leak on some versions of Ruby
...
git-svn-id: file:///home/svn/framework3/trunk@9136 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-25 23:49:20 +00:00
James Lee
30b210a896
make task exception logs a little more readable.
...
git-svn-id: file:///home/svn/framework3/trunk@9127 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-24 18:34:21 +00:00
James Lee
016ec84531
fix auth lookups on mysql ('==' != '=')
...
git-svn-id: file:///home/svn/framework3/trunk@9126 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-24 15:53:20 +00:00
James Lee
928389e8b0
update comments to explain the reason for not running init_ui
...
git-svn-id: file:///home/svn/framework3/trunk@9114 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-20 07:01:46 +00:00
James Lee
4243ce5bf4
preliminary fix for the meterpreter-breaks-tab-completion bug pending some testing, see #1180
...
git-svn-id: file:///home/svn/framework3/trunk@9113 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-20 03:59:27 +00:00
James Lee
dc2b42a8c2
typo fix? actually pass the options instead of always using an empty Hash.
...
git-svn-id: file:///home/svn/framework3/trunk@9107 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-19 23:19:12 +00:00
HD Moore
7e4515cd7e
Handle task processing errors better
...
git-svn-id: file:///home/svn/framework3/trunk@9087 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 19:25:48 +00:00
Tod Beardsley
888e80f92c
Fixes up various usability bugs with AuthBrute, many of which revolved around smb_login tests.
...
git-svn-id: file:///home/svn/framework3/trunk@9086 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 17:29:47 +00:00
HD Moore
dff1132e08
Remove stderr
...
git-svn-id: file:///home/svn/framework3/trunk@9084 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 15:29:28 +00:00
James Lee
086f82630a
don't queue a task from within a task; error out earlier when we don't have a host
...
git-svn-id: file:///home/svn/framework3/trunk@9081 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 09:00:16 +00:00
Joshua Drake
5aea21fcb8
speel more godoer
...
git-svn-id: file:///home/svn/framework3/trunk@9080 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 02:09:08 +00:00
Joshua Drake
6fec79926c
revert service name string insertion
...
git-svn-id: file:///home/svn/framework3/trunk@9079 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-14 22:17:19 +00:00
Joshua Drake
730b27eed1
fixup some of the payload exe generation/templating stuff, add pe/dll template+src
...
git-svn-id: file:///home/svn/framework3/trunk@9073 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-14 21:44:23 +00:00
HD Moore
914a90a714
Fix the print lins
...
git-svn-id: file:///home/svn/framework3/trunk@9068 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-14 02:46:43 +00:00
James Lee
e1639ce853
truncate host and service info to the size of the database field, see #912
...
git-svn-id: file:///home/svn/framework3/trunk@9064 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 21:15:15 +00:00
HD Moore
52d17d73da
Show the URL, print an OK error for unknown requests
...
git-svn-id: file:///home/svn/framework3/trunk@9058 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 16:05:37 +00:00
HD Moore
32b8f366de
Do not try to bind to LHOST
...
git-svn-id: file:///home/svn/framework3/trunk@9057 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 15:38:01 +00:00
HD Moore
197595839a
Add a close method, fix a memory leak
...
git-svn-id: file:///home/svn/framework3/trunk@9056 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-12 19:25:29 +00:00
HD Moore
be7f2fdac8
Handle cases where the session has a target_host by not tunnel_peer
...
git-svn-id: file:///home/svn/framework3/trunk@9052 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-11 22:11:31 +00:00
James Lee
c8a8a6a3fe
log a little more info when a migration fails
...
git-svn-id: file:///home/svn/framework3/trunk@9050 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-11 16:33:21 +00:00
Joshua Drake
df16eec4d7
revert r9038, see r9039, fixes #1531 , fixes #531
...
git-svn-id: file:///home/svn/framework3/trunk@9040 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 23:42:04 +00:00
James Lee
a502c2647d
tell readline that the color escapes shouldn't be counted as part of the line length, thanks to Niklas Baumstark. fixes 1531, fixes 531
...
git-svn-id: file:///home/svn/framework3/trunk@9038 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 23:24:54 +00:00
HD Moore
36836423d9
Add a warning, cosmetic comment to asm
...
git-svn-id: file:///home/svn/framework3/trunk@9037 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 20:51:05 +00:00
Joshua Drake
4e23992588
move to more indirect method for defining syscall sets
...
git-svn-id: file:///home/svn/framework3/trunk@9035 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 16:49:48 +00:00
HD Moore
b2568a33df
Change the gem name
...
git-svn-id: file:///home/svn/framework3/trunk@9034 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 16:21:14 +00:00
Joshua Drake
71426f1af7
fix db_destory help
...
git-svn-id: file:///home/svn/framework3/trunk@9033 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 16:09:01 +00:00
HD Moore
af10ee5e57
Handle timeout errors more gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@9023 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-06 02:05:50 +00:00
HD Moore
724f980842
Make auth reports critical by default
...
git-svn-id: file:///home/svn/framework3/trunk@9022 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-06 00:04:52 +00:00
HD Moore
987757246f
Speed up the queue processing a little
...
git-svn-id: file:///home/svn/framework3/trunk@9019 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-05 20:34:41 +00:00
HD Moore
ca5963fbc7
Check for the host first
...
git-svn-id: file:///home/svn/framework3/trunk@9017 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-05 19:58:18 +00:00
HD Moore
97026edee6
Aggressively update the host.updated_at during report_* calls
...
git-svn-id: file:///home/svn/framework3/trunk@9016 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-05 19:38:51 +00:00
HD Moore
756c981c2b
Add timestamps to print_good() too
...
git-svn-id: file:///home/svn/framework3/trunk@9011 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-04 22:48:35 +00:00
Joshua Drake
8d6f934570
provide better error messages when dealing failing to generate AIX payloads
...
git-svn-id: file:///home/svn/framework3/trunk@9010 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-04 20:57:17 +00:00
HD Moore
c8defe9716
Size tweaks to bring the ssl stager + encoder + target_id to exactly 400 bytes
...
git-svn-id: file:///home/svn/framework3/trunk@8998 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 07:48:53 +00:00
HD Moore
eac38aaa23
Allow alphanumeric targetid's
...
git-svn-id: file:///home/svn/framework3/trunk@8996 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:21:00 +00:00
HD Moore
949874e541
Remove close message
...
git-svn-id: file:///home/svn/framework3/trunk@8995 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:14:58 +00:00
HD Moore
e98af96779
Revert - sort out a bug
...
git-svn-id: file:///home/svn/framework3/trunk@8994 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:14:10 +00:00
HD Moore
84e30cd71e
Switch from int to string, no reason not to
...
git-svn-id: file:///home/svn/framework3/trunk@8993 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:11:45 +00:00
HD Moore
3c4024a0c6
Expose the server client list, set the keepalive
...
git-svn-id: file:///home/svn/framework3/trunk@8992 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:05:06 +00:00
HD Moore
4fe58a8f02
Revert previous exe change
...
git-svn-id: file:///home/svn/framework3/trunk@8989 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 05:44:40 +00:00
HD Moore
32f50fac66
Woops. Add the missing base class:
...
git-svn-id: file:///home/svn/framework3/trunk@8987 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 05:37:40 +00:00
HD Moore
c6c956ab46
Small patch to enable a new stager
...
git-svn-id: file:///home/svn/framework3/trunk@8984 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 05:21:15 +00:00
HD Moore
5f3def5bee
License corrections
...
git-svn-id: file:///home/svn/framework3/trunk@8982 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-02 21:34:15 +00:00
James Lee
7061c782d3
make Session#inspect a little nicer
...
git-svn-id: file:///home/svn/framework3/trunk@8981 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-02 18:00:30 +00:00
HD Moore
bf7b84c7e2
See you next year
...
git-svn-id: file:///home/svn/framework3/trunk@8977 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-02 04:44:02 +00:00
HD Moore
cf1a6bdfb1
Yup, still that time
...
git-svn-id: file:///home/svn/framework3/trunk@8973 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-01 15:12:53 +00:00
HD Moore
48a672ce6a
Its that time again
...
git-svn-id: file:///home/svn/framework3/trunk@8972 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-01 15:02:09 +00:00
natron
c1fa8d60f7
Expose exe :template and :insert via advanced options plus formatting changes. Thanks MarkBagget for the kick in the pants and the example options to to_win32pe\!
...
git-svn-id: file:///home/svn/framework3/trunk@8966 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-31 22:05:32 +00:00
James Lee
d248575c57
comment about the use of .peerhost
...
git-svn-id: file:///home/svn/framework3/trunk@8962 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-31 00:10:34 +00:00
HD Moore
688d40520d
Move ActiveRecord to UTC
...
git-svn-id: file:///home/svn/framework3/trunk@8952 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-29 17:04:40 +00:00
HD Moore
ddc98a65a1
Support importing raw IP lists as well
...
git-svn-id: file:///home/svn/framework3/trunk@8950 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-28 23:07:52 +00:00
HD Moore
09dd8c1fcc
Adds portlist_to_portspec and portspec_to_portlist. Merges in Qualys XML support from Sertan Kolat
...
git-svn-id: file:///home/svn/framework3/trunk@8949 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-28 23:02:28 +00:00
James Lee
deeb00e4ae
display who we're sending the stage to, if possible
...
git-svn-id: file:///home/svn/framework3/trunk@8948 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-28 21:53:58 +00:00
HD Moore
900fb250a2
Fix warning when report_service() contains host_name/host_mac
...
git-svn-id: file:///home/svn/framework3/trunk@8947 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-28 16:53:55 +00:00
HD Moore
ba12ddd280
Allow authbrute modules to use a single username/password in a sane way
...
git-svn-id: file:///home/svn/framework3/trunk@8945 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 23:52:43 +00:00
HD Moore
dfeb7978bf
More authors
...
git-svn-id: file:///home/svn/framework3/trunk@8944 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 23:47:59 +00:00
HD Moore
9cc4cab9ec
Duplicate the datastore and manually set user/pass in the telnet/ssh modules
...
git-svn-id: file:///home/svn/framework3/trunk@8943 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 22:57:29 +00:00
HD Moore
c3eccf2cb5
Change default to 445, its 2010
...
git-svn-id: file:///home/svn/framework3/trunk@8941 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 21:00:28 +00:00
HD Moore
432f1676aa
Increase LocalRelay block size, return exploit_uuid in sessions
...
git-svn-id: file:///home/svn/framework3/trunk@8939 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 15:44:33 +00:00
HD Moore
d0529c325e
Only process autoruns if the session supports it (VNC)
...
git-svn-id: file:///home/svn/framework3/trunk@8938 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 15:03:03 +00:00
HD Moore
9277f060a7
Store a uuid for each module, track this in sessions
...
git-svn-id: file:///home/svn/framework3/trunk@8937 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 02:39:52 +00:00
HD Moore
56e2f73e59
Dont import port 0
...
git-svn-id: file:///home/svn/framework3/trunk@8936 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 02:31:14 +00:00
HD Moore
7e86cd7b35
Try not to break the tree this time
...
git-svn-id: file:///home/svn/framework3/trunk@8928 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-26 01:21:01 +00:00
HD Moore
ee2e796a19
Store the last generated error
...
git-svn-id: file:///home/svn/framework3/trunk@8927 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-26 01:18:10 +00:00
Tod Beardsley
25ec5fa444
Do a little better password management for services that don't ask for usernames -- fingerprint them ahead of time, and resort the credentials list in a usernameless way. Also, this allows telnet RST's to be treated just as busy services, since sometimes telnet servers get persnickety about a lot of login attempts, but they do come back shortly.
...
git-svn-id: file:///home/svn/framework3/trunk@8920 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 21:32:32 +00:00
HD Moore
a560992c7f
If a duplicate note is found, change the updated_at to indicate its fresh.
...
git-svn-id: file:///home/svn/framework3/trunk@8919 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 18:10:37 +00:00
HD Moore
eb0e9fdc73
Always insert auth notes, dupe data doesnt make sense for long-running work
...
git-svn-id: file:///home/svn/framework3/trunk@8918 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 18:07:51 +00:00
Joshua Drake
f7f0f03a4a
handle the user hitting ^D while interacting properly
...
git-svn-id: file:///home/svn/framework3/trunk@8911 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 01:38:47 +00:00
HD Moore
af3ab0a260
Handle situations where any user/pass is allowed
...
git-svn-id: file:///home/svn/framework3/trunk@8904 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 21:11:00 +00:00
Tod Beardsley
dabe51f3c4
Converting credentials_tried and credentials_skipped to class variables so threads can access them and cut down on the repeats.
...
git-svn-id: file:///home/svn/framework3/trunk@8902 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 20:31:43 +00:00
James Lee
1dc7a4a21f
i'm tired of support requests for oci libs not being installed
...
git-svn-id: file:///home/svn/framework3/trunk@8899 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 19:02:38 +00:00
HD Moore
2efa31cfec
Closes #1244 with a caveat. If the template injected calls ExitProcess(), the payload will be killed. This means that -k is not compatible with our default executable
...
git-svn-id: file:///home/svn/framework3/trunk@8896 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 15:55:24 +00:00
HD Moore
4625e9b363
Catch Meterpreter-timeout errors for pivoted scanners
...
git-svn-id: file:///home/svn/framework3/trunk@8893 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 12:09:32 +00:00
HD Moore
2b419a421d
Add default timeouts to autopwn, control with -T
...
git-svn-id: file:///home/svn/framework3/trunk@8892 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 00:11:21 +00:00
James Lee
1265cccde7
override the command shell session interaction to use shell_read and shell_write instead of operating on rstream directly
...
git-svn-id: file:///home/svn/framework3/trunk@8886 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-23 00:33:18 +00:00
HD Moore
38e4a9c8a2
Store the tunnel_peer directly
...
git-svn-id: file:///home/svn/framework3/trunk@8885 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 23:24:08 +00:00
James Lee
e088d9ff68
change order of paths to src, dest in session up/download events
...
git-svn-id: file:///home/svn/framework3/trunk@8882 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 20:56:22 +00:00
Tod Beardsley
4f3c5fd44d
Whoops, left a print_debug in there.
...
git-svn-id: file:///home/svn/framework3/trunk@8880 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 20:14:03 +00:00
Tod Beardsley
83d96d713c
Refactoring Auxiliary::AuthBrute. Now that several modules actually use it, the real use cases have become obvious. So, refactored for simplicity and readability. Also touched up all the authentication modules to behave consistently.
...
git-svn-id: file:///home/svn/framework3/trunk@8879 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 20:07:26 +00:00
HD Moore
05bd6b816d
Fix this for when users dont have msfconsole.rc
...
git-svn-id: file:///home/svn/framework3/trunk@8877 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 15:50:42 +00:00
HD Moore
0bea440dcb
Add the ability to process ruby blocks in resource scripts. Fixes #1288
...
git-svn-id: file:///home/svn/framework3/trunk@8876 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 14:26:02 +00:00
HD Moore
4c8dbafe1d
Only set KCODE on 1.8, prevent warnings on 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@8874 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 12:34:06 +00:00
James Lee
73cd20f8a6
add the skeleton for new session events. now the hard part is going to be triggering them for meterpreter sessions without mixing the Rex and Msf namespaces...
...
git-svn-id: file:///home/svn/framework3/trunk@8873 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 01:13:58 +00:00
HD Moore
6c502a6fd3
Woops, fix reporting os the nmap fingerprint on import
...
git-svn-id: file:///home/svn/framework3/trunk@8872 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 00:36:59 +00:00
HD Moore
869435322e
Move direct OS updates out, fingerprints instead
...
git-svn-id: file:///home/svn/framework3/trunk@8870 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 00:11:43 +00:00
James Lee
25f9458c86
allow Msf::Module::SiteRefence to be reported via report_vuln; report module references when creating vulns from a successful exploit
...
git-svn-id: file:///home/svn/framework3/trunk@8867 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-21 23:12:37 +00:00
HD Moore
480380003c
Make verbose status printing standardized across login modules
...
git-svn-id: file:///home/svn/framework3/trunk@8866 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-21 18:42:47 +00:00
HD Moore
bb0db3cdf6
Closes command and meterpreter sessions in a much more consistent way
...
git-svn-id: file:///home/svn/framework3/trunk@8865 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-21 04:24:27 +00:00
HD Moore
0b996801d0
Some database drivers will reset the status of $KCODE, which then auto-unicodes all of the binary strings. Prevent them
...
git-svn-id: file:///home/svn/framework3/trunk@8860 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-20 21:40:59 +00:00
HD Moore
9d918b3cbc
Make the uuid more hash-like
...
git-svn-id: file:///home/svn/framework3/trunk@8859 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-20 19:04:21 +00:00
HD Moore
56c91e0441
Store the session type as well
...
git-svn-id: file:///home/svn/framework3/trunk@8858 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-20 18:40:41 +00:00
HD Moore
b19e21a3e3
Use the right workspace
...
git-svn-id: file:///home/svn/framework3/trunk@8857 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-20 16:58:19 +00:00
Tod Beardsley
e3355656ee
Don't record 127.0.0.1 in the database as a host.
...
If you really want to record localhost, call it 127.0.0.2 or something.
git-svn-id: file:///home/svn/framework3/trunk@8856 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-20 14:38:50 +00:00
James Lee
1678a0f74a
move\ vuln\ reporting\ out\ of\ the\ console\ so\ it works in all\ UIs
...
git-svn-id: file:///home/svn/framework3/trunk@8855 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-19 22:17:07 +00:00
Joshua Drake
24934444b6
only allow living sessions to be deregistered -- in theory this won't cause any issues
...
git-svn-id: file:///home/svn/framework3/trunk@8854 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-19 03:12:36 +00:00
Joshua Drake
b8b11338b1
add linux x86/x86_64 support for tomcat manger deploy, see #1016
...
git-svn-id: file:///home/svn/framework3/trunk@8853 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-19 02:13:02 +00:00
James Lee
99414acc54
fixes #1120 . only wait for the jobs we spawned
...
git-svn-id: file:///home/svn/framework3/trunk@8850 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-18 18:26:53 +00:00
HD Moore
260b92f65a
Correct decoding
...
git-svn-id: file:///home/svn/framework3/trunk@8847 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-18 15:31:01 +00:00
HD Moore
eb31c8f24b
Fixes up SunRPC to use proper timeouts and track the socket context (needed for pivoting)
...
git-svn-id: file:///home/svn/framework3/trunk@8845 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 23:02:35 +00:00
HD Moore
6383ef6cfd
Typo
...
git-svn-id: file:///home/svn/framework3/trunk@8844 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 18:41:09 +00:00
HD Moore
37d1965b24
allow the configuration directory to be overloaded
...
git-svn-id: file:///home/svn/framework3/trunk@8843 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 18:25:53 +00:00
HD Moore
ae90a52e94
Pass the username back to the rpc client
...
git-svn-id: file:///home/svn/framework3/trunk@8842 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 18:25:36 +00:00
HD Moore
984890a2cd
Merge in the user -> username change
...
git-svn-id: file:///home/svn/framework3/trunk@8840 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 14:07:45 +00:00
HD Moore
cae92bbe7d
Explicitly handle username
...
git-svn-id: file:///home/svn/framework3/trunk@8839 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 14:04:47 +00:00
James Lee
efceaa84cf
add on_module_complete and on_module_error events
...
git-svn-id: file:///home/svn/framework3/trunk@8837 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 19:32:54 +00:00
James Lee
38fe469ce8
deal with via_exploit being fullname instead of refname by creating it through framework.modules instead of framework.exploits. fixes #1165
...
git-svn-id: file:///home/svn/framework3/trunk@8836 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 19:17:21 +00:00
Tod Beardsley
3f69bb8053
Fixes the handling for telnet services when the server is "busy" -- this is common wit HP JetDirect servers, where the server will respond with a busy message up to several seconds after the last connection logged off. While this does mean that credential tests will be skipped, they will at least not be scored incorrectly as false postives.
...
Also, this removes the disconnect() method in favor of self.sock.close(). Disconnect seems to have a tendency to leave sessions half-closed, which will cause a busy state to never clear. self.sock.close doesn't appear to have this effect if you use a slower bruteforce_speed option (3 seems to work all right).
git-svn-id: file:///home/svn/framework3/trunk@8835 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 18:45:50 +00:00
Tod Beardsley
cb640571b0
Fixes #1109 -- ARP is now less picky about ARP replies, but does conform to normal networking standards.
...
git-svn-id: file:///home/svn/framework3/trunk@8832 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 16:04:02 +00:00
Joshua Drake
32fb7653ca
only set .info if its nil or empty
...
git-svn-id: file:///home/svn/framework3/trunk@8831 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 15:20:48 +00:00
HD Moore
18075f9b68
Store session UUID and username
...
git-svn-id: file:///home/svn/framework3/trunk@8830 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 15:11:07 +00:00
Joshua Drake
f9267498e3
save initial command shell session output into session.info
...
git-svn-id: file:///home/svn/framework3/trunk@8829 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 04:50:47 +00:00
Joshua Drake
7cf8b4c43f
distinguish the error message for sessions that die from EOF
...
git-svn-id: file:///home/svn/framework3/trunk@8828 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 03:15:52 +00:00
HD Moore
d03342fa49
Store the full module paths
...
git-svn-id: file:///home/svn/framework3/trunk@8827 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-15 23:40:12 +00:00
HD Moore
2dd91d4f88
Allow API tokens to be used instead of user/pass
...
git-svn-id: file:///home/svn/framework3/trunk@8823 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-15 20:16:37 +00:00
HD Moore
9ae8422c05
Fix info field
...
git-svn-id: file:///home/svn/framework3/trunk@8817 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 16:09:46 +00:00
HD Moore
5e26eb9498
Adds name and info to the loot table:
...
git-svn-id: file:///home/svn/framework3/trunk@8816 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 15:38:52 +00:00
HD Moore
8464a36bf5
Bump pool to 256; may still be driver limited. See #976 .
...
git-svn-id: file:///home/svn/framework3/trunk@8814 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 03:54:54 +00:00
Joshua Drake
ec325f9ab1
adjust help text, see #394
...
git-svn-id: file:///home/svn/framework3/trunk@8809 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 23:06:33 +00:00
Joshua Drake
a811ad0c32
clean up, add comments, and fix bug in command dispatcher, fixes #394
...
git-svn-id: file:///home/svn/framework3/trunk@8808 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 22:59:19 +00:00
Joshua Drake
7b41d08387
remove dupe "-s" option from help, add "-u" option to upgrade command shell session to meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@8807 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 21:51:55 +00:00
Joshua Drake
ac06e2d667
only copy user_input and user_output if they are non-nil
...
git-svn-id: file:///home/svn/framework3/trunk@8806 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 21:47:27 +00:00
Joshua Drake
b6851b8ee4
modify cmd stager to take a raw payload string instead of a payload instance
...
git-svn-id: file:///home/svn/framework3/trunk@8805 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 21:47:01 +00:00
HD Moore
9288f34fbf
Add a results column
...
git-svn-id: file:///home/svn/framework3/trunk@8804 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 15:58:02 +00:00
HD Moore
1b1ec3b5dc
Store the job_id for auxiliary modules running as a background job
...
git-svn-id: file:///home/svn/framework3/trunk@8803 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 02:39:02 +00:00
HD Moore
c5cbacd194
Handle long responses better
...
git-svn-id: file:///home/svn/framework3/trunk@8799 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 22:21:41 +00:00
HD Moore
c3d17ab48b
Add hooks for input/output/error
...
git-svn-id: file:///home/svn/framework3/trunk@8798 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 21:57:04 +00:00
James Lee
646044f631
move session_output events to the session where they belong (instead of in rpc). add a timeout arg to shell_read
...
git-svn-id: file:///home/svn/framework3/trunk@8797 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 20:07:06 +00:00
HD Moore
7f1e5fd475
Base64 encode the console output as well
...
git-svn-id: file:///home/svn/framework3/trunk@8796 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:49:39 +00:00
James Lee
dbe4d05875
typo fix. how did this ever work?
...
git-svn-id: file:///home/svn/framework3/trunk@8795 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:41:59 +00:00
James Lee
a20b74536c
add an events accessor
...
git-svn-id: file:///home/svn/framework3/trunk@8794 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:38:19 +00:00
James Lee
89e378dd4c
break output into 1024-byte chunks so it fits in the database
...
git-svn-id: file:///home/svn/framework3/trunk@8793 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:18:39 +00:00
HD Moore
5957dd5393
Add tasks
...
git-svn-id: file:///home/svn/framework3/trunk@8791 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 18:42:21 +00:00
James Lee
0e537a17bb
fix some pastographical errors
...
git-svn-id: file:///home/svn/framework3/trunk@8790 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 17:48:59 +00:00
James Lee
09c1fdd13d
store full name (which includes module type) instead of just the refname
...
git-svn-id: file:///home/svn/framework3/trunk@8785 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 14:33:48 +00:00
HD Moore
ac0e6515ab
Remove the PID from session.info, it doesn't add much value:
...
git-svn-id: file:///home/svn/framework3/trunk@8784 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 14:21:46 +00:00
HD Moore
4c22afed31
Fix other occurrences of on_session_close not taking a second parameter. See #1075
...
git-svn-id: file:///home/svn/framework3/trunk@8782 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 13:54:10 +00:00
HD Moore
3d601c0be9
Add a new table
...
git-svn-id: file:///home/svn/framework3/trunk@8778 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 03:02:13 +00:00
James Lee
dea0ec37f0
add events accessor to workspace
...
git-svn-id: file:///home/svn/framework3/trunk@8777 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 00:57:23 +00:00
HD Moore
dcfdb95e5f
*Backwards Compatibility Broken* - The session XMLRPC object now requires data for read/write to be encoded using Base64, this solves a number of issues with the builtin XMLRPC library with regards to binary data encoding. The response from read() now contains an 'encoding' element with the value 'base64', in order to differentiate from older versions.
...
git-svn-id: file:///home/svn/framework3/trunk@8776 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 00:55:21 +00:00
HD Moore
286bb09a56
Add a timeout wrapper, remove debug statement
...
git-svn-id: file:///home/svn/framework3/trunk@8773 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 22:06:52 +00:00
HD Moore
bfab49b9e9
Change the sessions -l output to show info and type vs description, automatically grab the user/hostname on startup (disabled with set AutoSystemInfo false)
...
git-svn-id: file:///home/svn/framework3/trunk@8772 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 22:02:27 +00:00
HD Moore
91404f9c8f
Report critical/seen properly
...
git-svn-id: file:///home/svn/framework3/trunk@8768 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 18:00:19 +00:00
HD Moore
aaea62bb92
Report the correct local/peer names for the session information. Fix a return value check
...
git-svn-id: file:///home/svn/framework3/trunk@8765 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 07:13:18 +00:00
HD Moore
6bd2a954cf
Lots of small changes, the big one is moving from sysread -> readpartial in the stream base class
...
git-svn-id: file:///home/svn/framework3/trunk@8764 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 06:43:46 +00:00
HD Moore
e05921b297
Report the workspace object not the name
...
git-svn-id: file:///home/svn/framework3/trunk@8763 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 06:16:57 +00:00
HD Moore
33c60067c0
Sanity check reported host addresses
...
git-svn-id: file:///home/svn/framework3/trunk@8760 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 05:45:40 +00:00
HD Moore
b87f0ac796
Fix the reaper
...
git-svn-id: file:///home/svn/framework3/trunk@8753 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 23:32:57 +00:00
HD Moore
54755d856c
Handle cases where the peer has no : (distcc exploit)
...
git-svn-id: file:///home/svn/framework3/trunk@8751 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 23:03:49 +00:00
HD Moore
69f50eea7c
Kill off any session with eof on the socket
...
git-svn-id: file:///home/svn/framework3/trunk@8750 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 22:58:43 +00:00
HD Moore
1c1fe9c20f
Add a method for syncing the database (waiting on all pending writes)
...
git-svn-id: file:///home/svn/framework3/trunk@8743 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 14:17:34 +00:00
HD Moore
d8c900aabb
Report the workspace based on the session
...
git-svn-id: file:///home/svn/framework3/trunk@8741 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 05:31:21 +00:00
HD Moore
4bfd1a1f1e
Allow run_simple to inherit input/output from itself when opts are nil
...
git-svn-id: file:///home/svn/framework3/trunk@8739 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 04:47:40 +00:00
Joshua Drake
607752f141
dont try to run cmds on meterpreter sessions with a "sys" member, see #803
...
git-svn-id: file:///home/svn/framework3/trunk@8732 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-06 04:58:38 +00:00
Joshua Drake
28f4eb2fd9
handle failed logins - fixes #1014
...
git-svn-id: file:///home/svn/framework3/trunk@8728 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 17:05:12 +00:00
Joshua Drake
2f3b54efe3
use happy color printer functions for cmd_check
...
git-svn-id: file:///home/svn/framework3/trunk@8727 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 17:03:59 +00:00
James Lee
9fbf2c0c6e
add platform aliases for newer versions of windows.
...
git-svn-id: file:///home/svn/framework3/trunk@8724 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 08:26:51 +00:00
Tod Beardsley
3d1f773f18
Reimplementing DB2's auth checker to use the same methods as the other auth_brute modules.
...
git-svn-id: file:///home/svn/framework3/trunk@8722 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 00:44:39 +00:00
Joshua Drake
73da75a931
big update to cmd stager
...
1. returns array of commands instead of big blob of lines
2. combine lines together when possible (to reduce # of commands to execute)
3. add cmd stager usage in mssql_payload
4. remove extraneous stuff here and there
git-svn-id: file:///home/svn/framework3/trunk@8721 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 00:29:44 +00:00
Joshua Drake
d8818fc268
execute xp_cmdshell from master explicitly
...
git-svn-id: file:///home/svn/framework3/trunk@8720 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 23:55:04 +00:00
Tod Beardsley
a5e187bd69
Add the ability to slow down brute force sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@8719 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 23:29:26 +00:00
Joshua Drake
8a2382ed1a
don't wait for shell.run to finish
...
git-svn-id: file:///home/svn/framework3/trunk@8717 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 22:32:46 +00:00
Joshua Drake
1629bf7bf0
move http_send_cmd into cmdweb test exploit
...
git-svn-id: file:///home/svn/framework3/trunk@8716 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 21:00:58 +00:00
James Lee
c2612548c5
fix get_host, was breaking browser_autopwn, see #976
...
git-svn-id: file:///home/svn/framework3/trunk@8710 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 07:58:47 +00:00
James Lee
602395ead0
don't set the language if we don't have one
...
git-svn-id: file:///home/svn/framework3/trunk@8709 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 07:38:52 +00:00
James Lee
37159d6b41
move this up so all database drivers have a bigger pool, see #976
...
git-svn-id: file:///home/svn/framework3/trunk@8706 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 07:10:20 +00:00
James Lee
7392de4d3d
don't use undefined variables.
...
git-svn-id: file:///home/svn/framework3/trunk@8700 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 19:50:22 +00:00
James Lee
7d348c3593
honor the SSL option in HttpServer, fixes #1001
...
git-svn-id: file:///home/svn/framework3/trunk@8699 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 18:47:04 +00:00
Joshua Drake
9148068acc
pass unlink_now flag to close for Tempfile instances
...
git-svn-id: file:///home/svn/framework3/trunk@8697 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 04:58:12 +00:00
James Lee
467a7a5f3e
merge mubix's patch to allow importing a simple list of ip addresses from a file, closes #999
...
git-svn-id: file:///home/svn/framework3/trunk@8695 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 00:34:16 +00:00
Joshua Drake
7a37934a01
process autorun scripts for telnet_login and ssh_login
...
1. create session.process_autoruns in Msf::Sessions::CommandShell
2. call process_autoruns from within the handler on_session code
4. set user_input and user_output in sessions base set_from_exploit method
5. remove on_session from Msf::Sessions::CommandShellOptions
6. include CommandShellOptions into telnet_login and ssh_login
7. call sess.process_autoruns from telnet_login and ssh_login
8. celebrate (while crossing fingers of course)!
git-svn-id: file:///home/svn/framework3/trunk@8692 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 18:07:50 +00:00
James Lee
76745eed81
bump the connection pool up to 30 for sqlite; see #976 . Not closing the bug, since I don't know how this will work in the long term
...
git-svn-id: file:///home/svn/framework3/trunk@8689 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 14:27:36 +00:00
Joshua Drake
e7a9391a76
minor tweaks, no functional changes
...
git-svn-id: file:///home/svn/framework3/trunk@8684 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 02:26:08 +00:00
HD Moore
e4ec13eec2
Store the path in the path
...
git-svn-id: file:///home/svn/framework3/trunk@8673 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 22:13:20 +00:00
James Lee
cded6cc59d
log all output from sessions when reading from rpc
...
git-svn-id: file:///home/svn/framework3/trunk@8672 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 21:55:30 +00:00
HD Moore
df415fd636
Fix workspace.loots
...
git-svn-id: file:///home/svn/framework3/trunk@8671 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 21:48:16 +00:00
HD Moore
1fff5f447f
Add loot content-type
...
git-svn-id: file:///home/svn/framework3/trunk@8667 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:33:49 +00:00
Joshua Drake
5ab32ab792
shell_read_until_token should work for any requested idx now
...
git-svn-id: file:///home/svn/framework3/trunk@8665 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:07:35 +00:00
HD Moore
304a238d3e
Add pop3/imap4 scanners
...
git-svn-id: file:///home/svn/framework3/trunk@8664 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:06:26 +00:00
James Lee
5a89952606
bah, typo
...
git-svn-id: file:///home/svn/framework3/trunk@8663 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 18:52:22 +00:00
HD Moore
2cbf64b85a
Fix up the stored banner for SMTP
...
git-svn-id: file:///home/svn/framework3/trunk@8661 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 18:47:48 +00:00
James Lee
be0fc489b1
clean up
...
git-svn-id: file:///home/svn/framework3/trunk@8660 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 18:45:24 +00:00
James Lee
99f4507405
store workspace in the correct place for module_run events
...
git-svn-id: file:///home/svn/framework3/trunk@8659 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 18:38:05 +00:00
Joshua Drake
eb8e8d22b5
add wanted_idx parameter to shell_read_until_token, fixes #980
...
git-svn-id: file:///home/svn/framework3/trunk@8658 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 18:37:07 +00:00
HD Moore
34489f9a61
Pass the workspace into the importer properly
...
git-svn-id: file:///home/svn/framework3/trunk@8654 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 13:40:32 +00:00
Stephen Fewer
300cede801
Fix for #291 , Meterpreter over PassiveX now working again :)
...
git-svn-id: file:///home/svn/framework3/trunk@8653 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 05:13:58 +00:00
James Lee
832d0bcbfa
add exploit datastore to sessions so we can tell exactly how the session was created
...
git-svn-id: file:///home/svn/framework3/trunk@8651 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 01:09:23 +00:00
HD Moore
8ebc16bb4a
Add the info field to the session object
...
git-svn-id: file:///home/svn/framework3/trunk@8649 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 23:20:33 +00:00
James Lee
585842e34e
blah, missed a line
...
git-svn-id: file:///home/svn/framework3/trunk@8644 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 22:27:18 +00:00
James Lee
76dd732db4
minimize the ghettoness
...
git-svn-id: file:///home/svn/framework3/trunk@8640 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 17:53:27 +00:00
HD Moore
51e5dcfed2
Skip resource file processing when loaded via this interface
...
git-svn-id: file:///home/svn/framework3/trunk@8638 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 16:29:48 +00:00
HD Moore
b2e40216b9
Fix up the RPC calls for the console
...
git-svn-id: file:///home/svn/framework3/trunk@8637 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 14:14:48 +00:00
HD Moore
dfe2dcd9eb
Add console interaction to the RPC interface
...
git-svn-id: file:///home/svn/framework3/trunk@8635 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 06:26:53 +00:00
Joshua Drake
1011d31613
buf only has one f
...
git-svn-id: file:///home/svn/framework3/trunk@8629 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 23:00:05 +00:00
James Lee
ebfaf77374
mark hosts as alive when adding vulns
...
git-svn-id: file:///home/svn/framework3/trunk@8628 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 22:57:38 +00:00
James Lee
27cda778a8
mark hosts as alive when adding notes or services
...
git-svn-id: file:///home/svn/framework3/trunk@8627 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 22:54:16 +00:00
James Lee
f5446b5d4f
add workspace to module run events
...
git-svn-id: file:///home/svn/framework3/trunk@8626 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 21:46:18 +00:00
HD Moore
6e2e7ed55e
Pass the cached input/output into the real payload
...
git-svn-id: file:///home/svn/framework3/trunk@8625 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 21:32:56 +00:00
James Lee
6ab68f5752
save the session's workspace in events
...
git-svn-id: file:///home/svn/framework3/trunk@8624 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 21:31:35 +00:00
HD Moore
7eed9f3fed
Handle user in/out passthrough better
...
git-svn-id: file:///home/svn/framework3/trunk@8623 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 21:25:35 +00:00
HD Moore
1133f8f05c
Pass through user_input/user_output
...
git-svn-id: file:///home/svn/framework3/trunk@8622 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 21:10:32 +00:00
Joshua Drake
3660cae90e
add tokenized shell_command functions for CommandShell sesssions
...
git-svn-id: file:///home/svn/framework3/trunk@8620 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 20:56:31 +00:00
James Lee
999feb879f
setup the input/output handles correctly for meterpreter sessions so we can get the output from scripts
...
git-svn-id: file:///home/svn/framework3/trunk@8618 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 16:46:47 +00:00
James Lee
9f9d97d735
make sure the sys extension is available before using it. this appears to fix #803
...
git-svn-id: file:///home/svn/framework3/trunk@8617 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 06:45:12 +00:00
Joshua Drake
cc4b13a0a0
check for empty args to sessions -c
...
git-svn-id: file:///home/svn/framework3/trunk@8616 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 04:46:59 +00:00
Joshua Drake
b391abd32d
adds scripting for command shell sessions
...
1. InitialAutoRunScript and AutoRunScript vars work
2. scripts/shells was created to hold them
3. *_shell methods were renamed shell_*
4. added "shell_command" method to command shell sessions
5. converted all uses of *_shell to shell_*
6. all payloads that produce command shell sessions include Msf::Sessions::CommandShellOptions
git-svn-id: file:///home/svn/framework3/trunk@8615 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 01:19:59 +00:00
James Lee
f0d27f7f9d
buffer io on meterpreter commands so we can get the output
...
git-svn-id: file:///home/svn/framework3/trunk@8614 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 22:39:34 +00:00
HD Moore
dd9c441546
Set the user input/output drivers on start
...
git-svn-id: file:///home/svn/framework3/trunk@8613 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 20:56:44 +00:00
Joshua Drake
b98868e32f
check for script before trying to run it for all sessions
...
git-svn-id: file:///home/svn/framework3/trunk@8612 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 20:54:18 +00:00
HD Moore
a71e8d2af0
Fix up meterpreter script changes
...
git-svn-id: file:///home/svn/framework3/trunk@8611 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 20:16:45 +00:00
HD Moore
e33c1456f1
Add report_loot to the reporting mixin
...
git-svn-id: file:///home/svn/framework3/trunk@8610 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 20:09:46 +00:00
James Lee
dd915415c3
add initial support for interacting with meterpreter through xmlrpc
...
git-svn-id: file:///home/svn/framework3/trunk@8606 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 18:07:07 +00:00
Tod Beardsley
25de6844b8
Adding OpenSoliaris Postgres fingerprints.
...
git-svn-id: file:///home/svn/framework3/trunk@8599 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 14:09:21 +00:00
HD Moore
d148c95c84
The ssh login code can now create sessions
...
git-svn-id: file:///home/svn/framework3/trunk@8598 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 07:12:54 +00:00
James Lee
4ad6c24a95
look for dead sesions with a reaper thread instead of on other session events, add Session#alive accessor for all session types; still need to figure out when a shell session is dead and set it accordingly. Add a reason argument to on_session_close to distinguish between killed sessions and dead sessions
...
git-svn-id: file:///home/svn/framework3/trunk@8596 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 05:59:30 +00:00
HD Moore
749849751d
Better error message for xmlrpc
...
git-svn-id: file:///home/svn/framework3/trunk@8595 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 03:34:09 +00:00
HD Moore
80f1f48b2d
Merge in loot and user, fix up telnet to handle eof better
...
git-svn-id: file:///home/svn/framework3/trunk@8594 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 23:45:43 +00:00
Joshua Drake
f8ca490b98
move meterpreter on_session functionality into a mixin
...
git-svn-id: file:///home/svn/framework3/trunk@8586 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 21:05:08 +00:00
HD Moore
29cd1f1b4c
Fix up report_event
...
git-svn-id: file:///home/svn/framework3/trunk@8585 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 19:31:21 +00:00
HD Moore
6b50ae0830
Prevent the lack of db from crashing
...
git-svn-id: file:///home/svn/framework3/trunk@8584 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 19:04:15 +00:00
HD Moore
479f2939fc
Track the target host/workspace through the entire tree, expose to RPC, and use this telnet_login
...
git-svn-id: file:///home/svn/framework3/trunk@8583 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 17:54:44 +00:00
HD Moore
2fc9b1d576
Make sure nil is not reported in the session fields (breaks XMLRPC).
...
git-svn-id: file:///home/svn/framework3/trunk@8579 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 17:15:36 +00:00
Joshua Drake
efd1146d10
adjust to_jsp_war to work with jboss (tested OK on tomcat too)
...
git-svn-id: file:///home/svn/framework3/trunk@8573 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-21 01:40:52 +00:00
HD Moore
8296dc85b3
Cache the local interface/netmask
...
git-svn-id: file:///home/svn/framework3/trunk@8571 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-20 18:52:13 +00:00
HD Moore
551e7d57ba
Speed up packet injection
...
git-svn-id: file:///home/svn/framework3/trunk@8570 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-20 18:31:46 +00:00
HD Moore
445676b932
Merge in the current workspace name
...
git-svn-id: file:///home/svn/framework3/trunk@8567 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-20 05:50:38 +00:00
HD Moore
0a8696436e
Fix up the telnet login code to handle varied responses better
...
git-svn-id: file:///home/svn/framework3/trunk@8565 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-20 05:49:40 +00:00
natron
474228a132
Woops, forgot to push the updated mixin.
...
git-svn-id: file:///home/svn/framework3/trunk@8560 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-19 06:06:30 +00:00
Mike Smith
e59082f6b5
Added "created_at" and "updated_at" timestamps all primary tables ( fixes #838 )
...
git-svn-id: file:///home/svn/framework3/trunk@8555 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-18 21:57:01 +00:00
Joshua Drake
0071a5532b
allow caller to specify jsp name via :jsp_name opt
...
git-svn-id: file:///home/svn/framework3/trunk@8549 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-18 18:03:22 +00:00
HD Moore
4c4c747caf
Update all db methods to have a workspace parameter, default to the db.workspace where possible, updated the command dispatchers.
...
git-svn-id: file:///home/svn/framework3/trunk@8546 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-18 06:40:38 +00:00
Tod Beardsley
4197f00701
Moves @credentials_tried and @credentials_good into auth_brute proper, though modules still
...
need to handle them themselves... which telnet and ssh both do now.
git-svn-id: file:///home/svn/framework3/trunk@8542 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-17 21:55:02 +00:00
Joshua Drake
089a522df0
various fixes
...
1. allow passing payload to generate_cmdstager (needed for html server sploits)
2. cleanup whitespace here and there
3. removed rendundant pattern match
4. removed use of sleep in favor of select idiom
git-svn-id: file:///home/svn/framework3/trunk@8539 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-17 20:04:54 +00:00
HD Moore
9f1009b401
Import the service and OS fingerprints from NeXpose
...
git-svn-id: file:///home/svn/framework3/trunk@8531 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-17 06:01:53 +00:00
Joshua Drake
0d526a26af
add cmdstager to mixins, oops
...
git-svn-id: file:///home/svn/framework3/trunk@8526 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 20:26:31 +00:00
Joshua Drake
4800d6841c
commit cmd stager stuff from bannedit
...
git-svn-id: file:///home/svn/framework3/trunk@8518 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 16:38:19 +00:00
HD Moore
2149e0a974
Returning from the parser doesn't work so well, just skip reporting instead
...
git-svn-id: file:///home/svn/framework3/trunk@8509 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-15 22:59:55 +00:00