Commit Graph

3284 Commits (77aa35c53fe24fe4bfd2e0fcb6f80cbd9317861f)

Author SHA1 Message Date
HD Moore 108362cf95 Switch to recvfrom_nonsock, solves a hang with win32 + 1.9.1
git-svn-id: file:///home/svn/framework3/trunk@9045 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-10 17:31:40 +00:00
HD Moore 3ad0560d00 Use the kernel select in 1.9, its less buggy and doesn't have the issues that lead us to create our own in the first place
git-svn-id: file:///home/svn/framework3/trunk@9044 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-09 22:48:31 +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
Joshua Drake 9a8d14a5ec use RL_PROMPT_ constants for places where a prompt is colorized (only)
git-svn-id: file:///home/svn/framework3/trunk@9039 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 23:37:49 +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
Joshua Drake 71a2064520 closes #1408 - merge patch from Mike Ryan
git-svn-id: file:///home/svn/framework3/trunk@8963 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-31 02:25:44 +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
HD Moore 52da4d13bf Correct variable used
git-svn-id: file:///home/svn/framework3/trunk@8926 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-26 01:12:03 +00:00
HD Moore 2d96570ce5 Leftover change from the initialize() to prepare_http_client() move
git-svn-id: file:///home/svn/framework3/trunk@8925 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-26 01:08:22 +00:00
HD Moore cd71cfbad1 Handle buggy HTTP servers better
git-svn-id: file:///home/svn/framework3/trunk@8921 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 21:35:37 +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
HD Moore 3e29a2fd2f Adds bgrun, bglist, bgkill to run Meterpreter scripts in the background
git-svn-id: file:///home/svn/framework3/trunk@8917 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 15:54:43 +00:00
HD Moore dde2531194 Rename to match the class name
git-svn-id: file:///home/svn/framework3/trunk@8914 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 03:51:04 +00:00
HD Moore 1a53881e3b Add Kurt Grutzmacher's VNC password dumper
git-svn-id: file:///home/svn/framework3/trunk@8913 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 03:50:25 +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
James Lee 2a2682052b patch from Mark Fioravanti for detecting chrome vs safari
git-svn-id: file:///home/svn/framework3/trunk@8897 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 16:13:59 +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 756e00c3bb A little more work for each connection, but this should be slightly more robust
git-svn-id: file:///home/svn/framework3/trunk@8895 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 14:50:25 +00:00
HD Moore e28e4ac923 Document how the ssl verification (or lack of) should be implemented. Handle oddball connection errors gracefully with a retry
git-svn-id: file:///home/svn/framework3/trunk@8894 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 14:47:30 +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 189dd8eb21 Fixes #770. Update Racket UDP checksum to play nice with 1.9
git-svn-id: file:///home/svn/framework3/trunk@8875 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 13:01:50 +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
Tod Beardsley a29ff6f435 Adding a Rex library method for generating an array of mixed case strings.
git-svn-id: file:///home/svn/framework3/trunk@8841 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 17:47:08 +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 9ccce2a166 Move the nexpose api code into a separate file
git-svn-id: file:///home/svn/framework3/trunk@8821 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-15 03:19:25 +00:00
HD Moore 5dd404abd6 Fix an issue with 1.9.1 compat
git-svn-id: file:///home/svn/framework3/trunk@8818 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 16:20:24 +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 aa12dc912f Add a file output type
git-svn-id: file:///home/svn/framework3/trunk@8792 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 18:58:20 +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
Stephen Fewer be93341cff Commit the ruby side for the new screenshot/session stuff.
git-svn-id: file:///home/svn/framework3/trunk@8788 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 17:11:27 +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 89c62bc838 Fixes #1079. Handle a closed SSL socket gracefully
git-svn-id: file:///home/svn/framework3/trunk@8783 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 14:13:53 +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 dc90b43bcd Emulate a much more common client version
git-svn-id: file:///home/svn/framework3/trunk@8755 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-09 04:37:59 +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
Stephen Fewer 195d1ab4b8 Commit snojobs jpeg patch for espia with an x64 build and some minor changes on the ruby side (The 'screenshot' command is now 'screengrab' to avoid a future conflict with changes happening in stdapi).
git-svn-id: file:///home/svn/framework3/trunk@8726 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 15:50:24 +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
Stephen Fewer a44358df67 Simple fix for #1013 and the migration permission error message.
git-svn-id: file:///home/svn/framework3/trunk@8714 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 19:31:36 +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 f40a9a5c4b new ie fingerprint
git-svn-id: file:///home/svn/framework3/trunk@8707 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 07:17:10 +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 dea2ba3420 try a little harder not to break things by making sure there's a space in front of comments before removing them
git-svn-id: file:///home/svn/framework3/trunk@8704 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 03:20:52 +00:00
James Lee 506fdb63ff remove comments after obfuscating strings so things like 'http://example.com' in a string doesn't get mangled. will still have problems with a string like that and no string obfu
git-svn-id: file:///home/svn/framework3/trunk@8702 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 20:51:29 +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 15b13d2472 make string obfuscation produce correct code more often (should be 100% now, but no guarantees). stops doing hex-encoding (more hassle than it's worth) and adds random split/concats (jduck's idea)
git-svn-id: file:///home/svn/framework3/trunk@8690 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 14:36:09 +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
James Lee b16a08c4cd whitespace
git-svn-id: file:///home/svn/framework3/trunk@8687 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 11:10:23 +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 ac517fafea Remove the db dependency from Meterpreter scripts
git-svn-id: file:///home/svn/framework3/trunk@8676 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-28 19:29:43 +00:00
Tod Beardsley 341f4a258d Removing net-ssh's ability to write to your known_hosts file. Some day, make this an optional behavior, but for now, turn that rudeness off.
git-svn-id: file:///home/svn/framework3/trunk@8675 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 22:45:58 +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 d03c26430c Max is 32k
git-svn-id: file:///home/svn/framework3/trunk@8670 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 21:18:58 +00:00
James Lee c4fe7193f1 print_raw receives color-substituted strings, don't override print
git-svn-id: file:///home/svn/framework3/trunk@8669 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 20:10:18 +00:00
HD Moore 303d99650a Store the workspace in the script object
git-svn-id: file:///home/svn/framework3/trunk@8668 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:50:33 +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
James Lee 3b0c82b131 args should be an array, fixes 981
git-svn-id: file:///home/svn/framework3/trunk@8666 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:26:34 +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
Stephen Fewer 88cc851a41 Commit the stager_sysenter_hook win32 kernel shellcode source and mixin patch, resolves #405.
git-svn-id: file:///home/svn/framework3/trunk@8655 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 13:41:16 +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
Tod Beardsley e7a7f254e4 Fixes SSH scanning in to recover in the face of tarpits and tcpwrappers and the like.
git-svn-id: file:///home/svn/framework3/trunk@8639 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 17:42:51 +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
HD Moore c1609d0db1 Woops!
git-svn-id: file:///home/svn/framework3/trunk@8631 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 23:15:01 +00:00
HD Moore 2f195694f4 Switch shell to a base class, allow the base class to use a null sink for output when no user_output is set.
git-svn-id: file:///home/svn/framework3/trunk@8630 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 23:07:08 +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
HD Moore 4220c33675 Stuff meterpreter scripts into a dedicated object
git-svn-id: file:///home/svn/framework3/trunk@8603 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 17:59:35 +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 455434a9f2 typo fix, thanks SubINacls for catching it
git-svn-id: file:///home/svn/framework3/trunk@8597 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 06:25:19 +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
James Lee 06b369a79b add a class method for route_exists?
git-svn-id: file:///home/svn/framework3/trunk@8591 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 22:30:37 +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
James Lee a12670b311 check for existence before stat'ing. fixes #893
git-svn-id: file:///home/svn/framework3/trunk@8581 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 17:27:54 +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
Joshua Drake b5e1e56f44 fix slicing of compressed deflate data
git-svn-id: file:///home/svn/framework3/trunk@8572 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-21 01:37:04 +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 94befada32 Wrap the transport connection in a mutex, this works around a deadlock in multi-threaded situations. See #894
git-svn-id: file:///home/svn/framework3/trunk@8568 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-20 15:19:24 +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
Tod Beardsley ab3b173040 So, funny story with net-ssh. Turns out, there's insufficient housekeeping on closing out connections in the event of authentication failures, which means you can start sucking up connections pretty good when you fail authentication a whole bunch of times. Fixed in the library, so now, if you pass a block to Net::SSH.start, and the authentication fails, the connection will still close out correctly, just as it would when the authentication succeeds.
Protip: If you don't pass a block, it's *still on the caller* to deal with the connection somehow. You'll want to basically always assign the connection to someplace you control, like so: sock = Net::SSH.start(whatever); sock.close). Otherwise, if you just Net::SSH.start without a block /or/ without assignment, you'll be stuck with all these useless connections hanging around.



git-svn-id: file:///home/svn/framework3/trunk@8556 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-19 03:02:25 +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
Tod Beardsley 627478d88b See #842. Convering TCPSocket calls to Rex::Socket::Tcp calls.
git-svn-id: file:///home/svn/framework3/trunk@8527 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 22:49:27 +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
Tod Beardsley 59eeec83a0 See #841. Simple test cases for ssh.
git-svn-id: file:///home/svn/framework3/trunk@8525 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 20:21:57 +00:00
Tod Beardsley fdae07d861 Adding a msf3 method to net-ssh, in case we need to ever distinguish between our native fork and anyone else's.
git-svn-id: file:///home/svn/framework3/trunk@8524 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 19:25:01 +00:00
Tod Beardsley 810133acc2 Fixes #841. Initial commit for net-ssh by Jamis Buck. http://github.com/jamis/net-ssh
Note that net-ssh is no longer actively maintained: http://weblog.jamisbuck.org/2009/2/25/net-ssh-capistrano-and-saying-goodbye



git-svn-id: file:///home/svn/framework3/trunk@8523 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 19:18:19 +00:00
Tod Beardsley a74b67d73f See #808. Converts the metasploit fork of postgres-pr to use Rex::Socket instead of
TCPSocket. Now we need to remove the connection test hacks from the postgres modules.



git-svn-id: file:///home/svn/framework3/trunk@8520 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 17:42:38 +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
Stephen Fewer 17de90a902 Modify the client core to use compression for the loading of extensions and migration for a speed boost.
git-svn-id: file:///home/svn/framework3/trunk@8517 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 15:01:06 +00:00
Stephen Fewer 4b4b2d62b1 Commit the Ruby side for channel/TLV compression.
git-svn-id: file:///home/svn/framework3/trunk@8516 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 14:58:23 +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
Joshua Drake 85cd572df1 minor cleanups
git-svn-id: file:///home/svn/framework3/trunk@8506 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-15 22:38:25 +00:00
HD Moore 8c3ee77f3b Skip processing of dead hosts. Sometimes the host is already found using another method and nmap will mark the live host as dead again
git-svn-id: file:///home/svn/framework3/trunk@8501 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-15 01:34:04 +00:00
HD Moore a2f9f1bb7a Default the OS to the 100% match string
git-svn-id: file:///home/svn/framework3/trunk@8500 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-15 01:20:42 +00:00
HD Moore cdaebc2931 Big change to how report_note() works, it now accepts an :update parameter that defines whether the data is unique for the host/ntype (:unique), unique for the host/ntype/data (:unique_data), or should be inserted no matter what (:insert)
git-svn-id: file:///home/svn/framework3/trunk@8495 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 19:34:22 +00:00
HD Moore 2539a6fc09 Updated nmap parsing, store notes for last boot and os matches
git-svn-id: file:///home/svn/framework3/trunk@8494 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 19:07:15 +00:00
HD Moore 2460037fdd More nmap import foo
git-svn-id: file:///home/svn/framework3/trunk@8493 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 18:55:49 +00:00
HD Moore c47e4db74d Parse the OS properly
git-svn-id: file:///home/svn/framework3/trunk@8492 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 18:40:27 +00:00
HD Moore bfa3ae28cb Import OS and hostname information
git-svn-id: file:///home/svn/framework3/trunk@8491 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 18:32:37 +00:00
HD Moore 25f9339c7c Additional operating systems, changing the case of Mac OS X
git-svn-id: file:///home/svn/framework3/trunk@8487 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 15:04:39 +00:00
HD Moore f3edce86a1 Store module_run events as a hash
git-svn-id: file:///home/svn/framework3/trunk@8465 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-12 17:37:20 +00:00
HD Moore 5dff9c4efc Fixes #807. Make the html encoded output standards compliant
git-svn-id: file:///home/svn/framework3/trunk@8462 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-12 05:08:16 +00:00
Joshua Drake 070d6e20cd fix bug from natron
"show info" was displaying the default target as index 0 when it was really 4

git-svn-id: file:///home/svn/framework3/trunk@8461 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-12 02:11:52 +00:00
HD Moore 993ba44fcf SMB updates, better reporting of SSL status for HTTP
git-svn-id: file:///home/svn/framework3/trunk@8459 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 22:37:00 +00:00
Joshua Drake d4d271eef3 add OLE library as Rex::OLE
git-svn-id: file:///home/svn/framework3/trunk@8457 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 18:36:38 +00:00
Joshua Drake 7285e7a2bb whitespace fixed, also see r8452 which fixes #805
git-svn-id: file:///home/svn/framework3/trunk@8453 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 07:48:56 +00:00
Joshua Drake a3bf0fd94f handle arch parameters passed as array
oops, these other two functions didn't benefit from the same level of checking as endian? did.

git-svn-id: file:///home/svn/framework3/trunk@8452 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 07:42:26 +00:00
HD Moore 9b4df1cf42 Add the datastore.clear method
git-svn-id: file:///home/svn/framework3/trunk@8450 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 05:14:36 +00:00
Joshua Drake cbba235ba5 change Msf::Util::EXE.to_jsp_war to use Rex::Zip
git-svn-id: file:///home/svn/framework3/trunk@8449 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 04:27:56 +00:00
James Lee 2f4ab39712 new, much smaller, elf template
git-svn-id: file:///home/svn/framework3/trunk@8448 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 02:31:36 +00:00
Joshua Drake 13f837c340 fix zip module samples
git-svn-id: file:///home/svn/framework3/trunk@8447 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 00:18:37 +00:00
Joshua Drake 2c100083bf add a zip implementation, Rex::Zip, see lib/rex/zip/samples for more info
git-svn-id: file:///home/svn/framework3/trunk@8439 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-10 17:27:40 +00:00
Tod Beardsley 65c5eae59e Calling it postgres instead of postgresql for overall consistency.
git-svn-id: file:///home/svn/framework3/trunk@8435 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 20:44:23 +00:00
James Lee e2d70519d7 add the ability to check for a prompt before sending user/pass; now works with cisco, aix, solaris, linux, and windows telnetds
git-svn-id: file:///home/svn/framework3/trunk@8434 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 19:07:02 +00:00
Stephen Fewer 6335fde3e1 Commit the Ruby side for the UDP socket pivoting. Change the TCP client channel so the respective StreamAbstraction is responsible for monitoring its own rsock.
git-svn-id: file:///home/svn/framework3/trunk@8431 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 16:45:46 +00:00
HD Moore 55aaf69b4b Avoid a warning
git-svn-id: file:///home/svn/framework3/trunk@8425 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 04:12:34 +00:00
Joshua Drake 4a39cc13f6 oops, wrong syscall number for listen
git-svn-id: file:///home/svn/framework3/trunk@8420 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 00:05:15 +00:00
Joshua Drake 17bd4b8b7d fixed aix payloads to REALLY do variable substitution
git-svn-id: file:///home/svn/framework3/trunk@8418 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 22:41:36 +00:00
Tod Beardsley c763052c57 See #816. This came up while learning how to perform various postgre tasks via Metasploit.
This module in particular reads a text file on the remote machine, copies it to a temporary table, and then selects the table.

Looks like this:

http://pastie.org/private/uoxgaw7ibjpvuepolr1fuw



git-svn-id: file:///home/svn/framework3/trunk@8417 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 22:34:09 +00:00
HD Moore 885e396c4d Fix close/shutdown issue
git-svn-id: file:///home/svn/framework3/trunk@8415 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 20:44:59 +00:00
Tod Beardsley 0b6c44b2cb Adding reporting to postgres_login. Logging version info more verbosely for authenticated login, since it's way useful.
git-svn-id: file:///home/svn/framework3/trunk@8408 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 17:35:58 +00:00
Tod Beardsley 67bb7a1926 Cleaning up print_status messages for Postgres SQL module and Postgres library.
git-svn-id: file:///home/svn/framework3/trunk@8407 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 16:43:44 +00:00
Joshua Drake 79d2ecc227 don't slice a nil buffer
git-svn-id: file:///home/svn/framework3/trunk@8403 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 01:42:11 +00:00
HD Moore c8af3431b6 Typo
git-svn-id: file:///home/svn/framework3/trunk@8401 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 01:02:46 +00:00
HD Moore 5f76353e8e Woops, add the missing support files
git-svn-id: file:///home/svn/framework3/trunk@8400 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 00:59:29 +00:00
Joshua Drake d68efa61d2 initial commit of aix cmsd exploit (not fully working yet)
git-svn-id: file:///home/svn/framework3/trunk@8397 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 00:44:37 +00:00
Joshua Drake 7d9d169a1a exploit/sunrpc: return nil on error
git-svn-id: file:///home/svn/framework3/trunk@8394 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-07 03:51:14 +00:00
James Lee 3b0b2731fd fix telnet scanner
git-svn-id: file:///home/svn/framework3/trunk@8392 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-07 00:14:29 +00:00
Joshua Drake 80bdf77b39 cleanup sunrpc_call error handling
git-svn-id: file:///home/svn/framework3/trunk@8388 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 21:50:11 +00:00
Stephen Fewer e19633354b Bug fix for a rare edge case with channels. When creating a Rex::Post::Meterpreter::Stream instance we should initialize_abstraction() before super() as we can get a scenario where dio_write_handler() is called with data to write to the rsock but rsock has not yet been initialized. This happens if the channel is registered (client.add_channel(self) in Channel.initialize) to a session and a 'core_channel_write' request comes in before we have called self.initialize_abstraction()
git-svn-id: file:///home/svn/framework3/trunk@8386 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 20:12:52 +00:00
Stephen Fewer fd2469db24 Commit the Ruby end for TCP server channels, the modified TCP client channels and the support for pivoting a reverse_tcp meterpreter.
git-svn-id: file:///home/svn/framework3/trunk@8384 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 17:59:25 +00:00
Tod Beardsley 43bbfefa8f Adding a Windows signature for Postgres.
git-svn-id: file:///home/svn/framework3/trunk@8374 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 18:02:13 +00:00
HD Moore 37cc7fa4ae Revert previous change to host status parser
git-svn-id: file:///home/svn/framework3/trunk@8373 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 15:51:46 +00:00
HD Moore 52dc906ba2 Port states can now be open/closed/filtered; removed the "up" syntax
git-svn-id: file:///home/svn/framework3/trunk@8372 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 15:43:24 +00:00
Tod Beardsley c8cdf9c938 Fixes #811 by implementing an enumerator for PostgreSQL.
git-svn-id: file:///home/svn/framework3/trunk@8371 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 15:20:59 +00:00
HD Moore b3a588b8cc Adds a module for kcope's samba filesystem traversal
git-svn-id: file:///home/svn/framework3/trunk@8369 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 06:38:24 +00:00
Tod Beardsley 6e8e6ef16a Fixes #769 by implementing a brute force module for Postgres. A couple notes: If you guess wrong at the database name, you still can try to login with a username and password -- you'll get a successful auth, but then get disconnected. So, that's pretty neat.
Also, since Postgres-PR uses the stock TCPSocket object, connection timeouts and other errors take forever. This is avoided in the brute forcer by pre-validating the connection with Rex::Socket, but this is a hack -- it would be better to convert Postgres-PR to a Rex::Socket flavor, so you also get nicer error messages and what all. I did fork it off the main distribute it already anyway, so may as well will open a feature bug on this, but it's pretty low priority.




git-svn-id: file:///home/svn/framework3/trunk@8366 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-03 21:45:13 +00:00
Joshua Drake a052340703 a few fixes to sunrpc code
this fixes a couple of errors handling error messages
also, some whitespace/indenting adjustments



git-svn-id: file:///home/svn/framework3/trunk@8365 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-03 20:30:09 +00:00
James Lee 4e582bd10b bah, debug print
git-svn-id: file:///home/svn/framework3/trunk@8359 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 23:15:12 +00:00
James Lee 84e366c28e reflect the new api in Aux::Report
git-svn-id: file:///home/svn/framework3/trunk@8358 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 23:14:33 +00:00
James Lee ea0f4d2e46 allow multiple resource files on the command line
git-svn-id: file:///home/svn/framework3/trunk@8357 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 23:13:42 +00:00
James Lee 65a303ee93 don't try to use an inactive database
git-svn-id: file:///home/svn/framework3/trunk@8356 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 23:11:59 +00:00
Tod Beardsley e0060a4f83 See #794. Fixing this better to ensure that we never end up with a nil for a source mac address on ARP packets.
git-svn-id: file:///home/svn/framework3/trunk@8354 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 22:05:24 +00:00
Tod Beardsley 3fe8d0375b Adds a print_debug message handler -- mostly useful during development to easily inspect objects.
git-svn-id: file:///home/svn/framework3/trunk@8353 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 21:03:07 +00:00
Tod Beardsley 2ffe4abb5d Fixes #730 by fixing up the Postgres query module and nicifying the output.
git-svn-id: file:///home/svn/framework3/trunk@8352 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 21:02:12 +00:00
Tod Beardsley 8e6e4f8e44 Fixes #806 by padding out TCP options with NOPs.
Note, users still must be careful to not set more than 40 bytes of options, and users still have no way of setting one-byte options (namely, NOP (0x01) and EOL (0x00).



git-svn-id: file:///home/svn/framework3/trunk@8348 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 17:17:29 +00:00
Tod Beardsley 01adf60550 See #730. First pass at a Postgres Query module. Doesn't handle errors very well yet (still need to work all that out and create some test cases).
git-svn-id: file:///home/svn/framework3/trunk@8344 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 01:40:48 +00:00
Tod Beardsley 95ace009ff Bad class for Exception (needed ::Exception)
git-svn-id: file:///home/svn/framework3/trunk@8343 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-01 21:26:23 +00:00
Tod Beardsley a65af9c8b3 See #730. Forking and adding Postgres-PR, with the following changes:
Namespaced everything under Msf::Db::PostgreSQL, renamed top-level include to postgres_msf to disambiguate.
Included recursive requires for all files.
Noted the IO monkeypatch -- should revisit.
Added a testcase for database connections.

The reason for the namespacing is to avoid stomping on any existing Postgres-PR installations, or any other requires named "postgres" or "postgresql" or even "pg," since these may or may not support the method's we're using here. The seperate namespace also allows for easier integration of custom commands later on.




git-svn-id: file:///home/svn/framework3/trunk@8342 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-01 19:49:36 +00:00
James Lee 554f46be43 fix syntax error
git-svn-id: file:///home/svn/framework3/trunk@8341 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-01 16:48:04 +00:00
Tod Beardsley d166c166b5 Fixes #794. I also couldn't reproduce -- whiten0ise's error makes is sound like he's running an old or broken version of pcaprub that's missing Pcap#lookupnet (present in at least 0.7-dev, just checked http://rubyforge.org/projects/pcaprub/
However, this should at least solve the split error, and give better hints on other errors. Implements check_pcaprub_loaded to ensure that Pcap is in fact available on lookupnet, openpcap, and inject, and implemented a begin/rescue around lookupnet to catch errors involving a bad interface.



git-svn-id: file:///home/svn/framework3/trunk@8340 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-01 15:11:35 +00:00
James Lee 55a82c1642 add simple detection for Chrome
git-svn-id: file:///home/svn/framework3/trunk@8330 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-30 21:09:38 +00:00
HD Moore 42b331b47f Fix #790. Initialize the client state to be alive, tweak a few things on the meterpreter side
git-svn-id: file:///home/svn/framework3/trunk@8327 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 18:52:44 +00:00
HD Moore 7d88f394b4 Use the impersonated token to spawn the shell by default
git-svn-id: file:///home/svn/framework3/trunk@8326 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 17:35:30 +00:00
Stephen Fewer 47b08fa6ef simple patch to get all privileges after a successful getsystem
git-svn-id: file:///home/svn/framework3/trunk@8321 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 11:04:24 +00:00
Stephen Fewer 77da632e61 update the ruby side.
git-svn-id: file:///home/svn/framework3/trunk@8319 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 01:13:28 +00:00
James Lee c396129d41 add a liveness test to meterpreter, fixes 698
git-svn-id: file:///home/svn/framework3/trunk@8314 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:53:15 +00:00
Tod Beardsley a76480d42c See #726. Cleaning up my gross whitespace.
git-svn-id: file:///home/svn/framework3/trunk@8311 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:08:39 +00:00
Tod Beardsley 9c1ceb1b8a Fixes #726. Adding in the test cases (and some slight fixes) closes this ticket.
git-svn-id: file:///home/svn/framework3/trunk@8310 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:01:32 +00:00
natron 69ad365b46 Added STDERR to pure java payload, cleaned up user's view.
git-svn-id: file:///home/svn/framework3/trunk@8308 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 22:53:36 +00:00
Stephen Fewer b36fe815f3 Add in the ruby side for the priv extensions getsystem command.
git-svn-id: file:///home/svn/framework3/trunk@8296 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 13:55:19 +00:00
Joshua Drake 9c0213e642 check for JAVA_HOME before using it
git-svn-id: file:///home/svn/framework3/trunk@8289 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 08:18:24 +00:00
Joshua Drake a28b727e3f oops! minor change fixes #785
git-svn-id: file:///home/svn/framework3/trunk@8288 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 07:48:12 +00:00
James Lee f8a09fdc06 fix infinite loop and typo
git-svn-id: file:///home/svn/framework3/trunk@8286 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 02:43:54 +00:00
James Lee c97798e11a unbreak cmd shell sessions
git-svn-id: file:///home/svn/framework3/trunk@8285 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 02:17:57 +00:00
James Lee b783052af3 get rid of the Object#id deprecation warning by making event reporting more robust
git-svn-id: file:///home/svn/framework3/trunk@8284 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 00:00:00 +00:00
HD Moore 214d624ddc Fix the report_host() code (broken by previous commit), add an advanced option to store db hosts from monlist
git-svn-id: file:///home/svn/framework3/trunk@8283 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 23:25:17 +00:00
Tod Beardsley 7c4d7c3d71 Fixes #782. Cleans up the various arp and inject methods so they're a little more sane to read, and streamlines the ARP process.
Still would like to a) experiment with keeping a persistent cache (with a cache timeout maybe, like a real arp cache), and b) see how caching negative replies will work out, but that's for another time.



git-svn-id: file:///home/svn/framework3/trunk@8280 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 22:46:41 +00:00
HD Moore c1bc6a617a Default host state is now Up
git-svn-id: file:///home/svn/framework3/trunk@8279 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 22:13:48 +00:00
Tod Beardsley 0711363b49 See #782. Added in a mechanism to determine if I should ARP. This brings synflood back up to speed.
git-svn-id: file:///home/svn/framework3/trunk@8278 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 21:19:23 +00:00
Tod Beardsley bedbc2c341 See #782. Deregistering filter and pcapfile (not needed for these), moving GATEWAY to advanced options.
git-svn-id: file:///home/svn/framework3/trunk@8277 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 20:58:45 +00:00
natron 3b85e44a7a Remove old comments; no longer relevant.
git-svn-id: file:///home/svn/framework3/trunk@8270 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 19:59:25 +00:00
natron cd5e5880d2 Initial commit of Msf::Exploit::Java mixin and multi/browser/java_signed_applet exploit.
git-svn-id: file:///home/svn/framework3/trunk@8267 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 19:46:39 +00:00
Tod Beardsley 2f76affadb See #782. Updating ldap exploit to use capture_sendto. Also updating capture.rb to include RHOST.
git-svn-id: file:///home/svn/framework3/trunk@8266 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 19:37:22 +00:00
Tod Beardsley 709c634bfa Renaming sendto to capture_sendto to give the user a hint as to where it came from.
git-svn-id: file:///home/svn/framework3/trunk@8260 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 18:21:33 +00:00
Tod Beardsley 3053bd702a See #782. Updated xmas.rb (again), now uses the nicer frontend function sendto. Diff against r8026 to get an idea of what's changed for module writers.
git-svn-id: file:///home/svn/framework3/trunk@8259 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 18:12:02 +00:00
Tod Beardsley 77771ca5be See #782. Completes integration of the secondary self.arp_capture object. Renames readreply to inject_reply to avoid collisions with existing modules. Implements a configurable "ARP_SECRET" cookie for the self.arp_capture filter.
git-svn-id: file:///home/svn/framework3/trunk@8258 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 17:51:16 +00:00
Tod Beardsley 5adb1aef7e See #782. Fixing GWHOST/GATEWAY, implementing a new capture option for ARP requests.
git-svn-id: file:///home/svn/framework3/trunk@8257 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 15:11:18 +00:00
James Lee 8be92ab010 default state to 'up'
git-svn-id: file:///home/svn/framework3/trunk@8253 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 04:48:27 +00:00
Tod Beardsley 7eafaab2b2 See #782. Moving the arp cache to a class variable of the capture object. Seems better than just making up my own datastore entry.
git-svn-id: file:///home/svn/framework3/trunk@8250 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 02:57:20 +00:00
Tod Beardsley 4bb6e650da See #782. Implemented a more sensible arp cache so as not to spam with UDP probes and arps. Also refactored xmas to use the new methods.
git-svn-id: file:///home/svn/framework3/trunk@8245 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 21:37:40 +00:00
Tod Beardsley c003a663d1 See #782. Extended the injection ARP query methods to handle local addresses more satisfactorially, fixed a couple errors, and added a bunch of inline documentation to explain how it all works together.
git-svn-id: file:///home/svn/framework3/trunk@8238 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 16:00:16 +00:00
Tod Beardsley cac3d6d56b See #782. This introduces some inject methods to the Capture mixin, and edits the ip_spoof module to take advantage of them.
git-svn-id: file:///home/svn/framework3/trunk@8237 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 06:38:41 +00:00
et 96d6e7bd9b In progress. crawling
git-svn-id: file:///home/svn/framework3/trunk@8236 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 04:21:07 +00:00
Tod Beardsley 5087ae25f7 Fixed test_gzip. Both strings happen to work, but this gets rid of the assert_equal error.
git-svn-id: file:///home/svn/framework3/trunk@8235 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:50:10 +00:00
Tod Beardsley 1652c75b7f Fixed Rex::Text.badchar_index to conform with the test requirement.
git-svn-id: file:///home/svn/framework3/trunk@8234 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:39:43 +00:00
Tod Beardsley d817ac11b4 Adding a convenience method for generating random hexadecimal characters.
git-svn-id: file:///home/svn/framework3/trunk@8233 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:35:13 +00:00
James Lee cdaeb27933 spaces -> tabs
git-svn-id: file:///home/svn/framework3/trunk@8232 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 00:01:55 +00:00
Tod Beardsley 0155deda99 Adding an explicit .ord to L3's checksum calculator for 1.9 compatability.
git-svn-id: file:///home/svn/framework3/trunk@8231 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 20:19:22 +00:00
Tod Beardsley 359e1ad53a See #726. Adds a DB2 scanner and brute forcer.
git-svn-id: file:///home/svn/framework3/trunk@8223 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 15:58:24 +00:00
HD Moore 12ef5437df 1.0.0.0/8 has been allocated, switch to 50.50.50.50
git-svn-id: file:///home/svn/framework3/trunk@8221 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 13:27:19 +00:00
Stephen Fewer b7fb95b302 fix for ps bug on OSX
git-svn-id: file:///home/svn/framework3/trunk@8220 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 10:49:51 +00:00
HD Moore acceb274da Integrate a sound plugin, based on Robin Wood's patch
git-svn-id: file:///home/svn/framework3/trunk@8215 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 18:33:32 +00:00
HD Moore f9049e0d50 Load win32api for cygwin as well
git-svn-id: file:///home/svn/framework3/trunk@8214 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 17:31:50 +00:00
HD Moore 1e2f421432 Remove references to DL, since it has a conflicting API between 1.8 and 1.9. Update all methods to use Win32API and add a play_sound() method
git-svn-id: file:///home/svn/framework3/trunk@8213 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 17:28:03 +00:00
Stephen Fewer 651fd5e834 fix for ps bug where the wrong arch was sometimes defaulted to if no arch was returned.
git-svn-id: file:///home/svn/framework3/trunk@8211 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-23 16:50:44 +00:00
James Lee 9b19755bf1 fix report_client
git-svn-id: file:///home/svn/framework3/trunk@8209 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-23 00:15:57 +00:00
James Lee ae673cccd7 add detections for newest IE8 on win7 and x64
git-svn-id: file:///home/svn/framework3/trunk@8206 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 23:47:50 +00:00
James Lee 7e5ad7bfa3 log more info about script failures
git-svn-id: file:///home/svn/framework3/trunk@8205 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 23:09:41 +00:00
Stephen Fewer 7b34b46b68 Commit the ruby side for the meterpreter migration overhaul.
git-svn-id: file:///home/svn/framework3/trunk@8199 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 19:47:36 +00:00
Joshua Drake c147575255 fix error message
git-svn-id: file:///home/svn/framework3/trunk@8196 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 17:39:51 +00:00
Joshua Drake 7d6607b517 add default compression level for zlib_deflate()
git-svn-id: file:///home/svn/framework3/trunk@8191 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-21 19:31:17 +00:00
James Lee 4d644ab895 add os_flavor detection for firefox
git-svn-id: file:///home/svn/framework3/trunk@8185 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-21 11:26:16 +00:00
James Lee 865a50594b add a telnet login scanner
git-svn-id: file:///home/svn/framework3/trunk@8179 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 03:25:34 +00:00
Joshua Drake 07a25af681 minor whitespace change
git-svn-id: file:///home/svn/framework3/trunk@8177 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 02:31:30 +00:00
James Lee e19f66ec1f use the new authbrute mixin
git-svn-id: file:///home/svn/framework3/trunk@8176 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:43:01 +00:00
James Lee fb025658f9 don't duplicate user/pass from datastore
git-svn-id: file:///home/svn/framework3/trunk@8174 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:35:16 +00:00
James Lee 29dd0d4fea don't bother saving the results of report_vuln
git-svn-id: file:///home/svn/framework3/trunk@8173 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:01:54 +00:00
James Lee 265d73b224 task.wait is expensive, so avoid find_or_create_* calls at the cost of a few extra queries; fixes 768
git-svn-id: file:///home/svn/framework3/trunk@8171 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 00:35:44 +00:00
Stephen Fewer 538d44aa8d commit the changes on the ruby side for new ps command. We now get the process architecture and parent pid (when possible) of each process.
git-svn-id: file:///home/svn/framework3/trunk@8157 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 10:47:01 +00:00
James Lee 08eb80f4a9 use the authbrute mixin
git-svn-id: file:///home/svn/framework3/trunk@8150 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:22:22 +00:00
James Lee d90ffdc015 use a username and password from the datastore if provided
git-svn-id: file:///home/svn/framework3/trunk@8149 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:21:39 +00:00
Joshua Drake c13841d902 base RegexScanner on Generic instead of JmpRegScanner
git-svn-id: file:///home/svn/framework3/trunk@8148 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:17:08 +00:00
James Lee 46b346239e don't always use the username as a password, let modules do that if they want it
git-svn-id: file:///home/svn/framework3/trunk@8147 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:03:02 +00:00
James Lee d8f7645094 : -> .
git-svn-id: file:///home/svn/framework3/trunk@8146 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 21:35:42 +00:00
HD Moore 0bafe814be Fix the RawL5 namspace after the Racket upgrade
git-svn-id: file:///home/svn/framework3/trunk@8144 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 04:36:31 +00:00
HD Moore b6b25b7f03 allow the default workspace to be purged and recreated
git-svn-id: file:///home/svn/framework3/trunk@8134 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 15:58:13 +00:00
HD Moore 2ba892aa69 Report host mac, name, and whether its a VM
git-svn-id: file:///home/svn/framework3/trunk@8133 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 15:49:13 +00:00
James Lee 61984579d5 don't report to the db if there isn't one
git-svn-id: file:///home/svn/framework3/trunk@8132 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 04:34:12 +00:00
James Lee 1e3662e3ad events need to be part of core, not base
git-svn-id: file:///home/svn/framework3/trunk@8128 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 01:29:54 +00:00
James Lee 26aa834600 base should not depend on ui
git-svn-id: file:///home/svn/framework3/trunk@8127 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 01:24:45 +00:00
James Lee 53662ed46e save events to the database. fixes 618
git-svn-id: file:///home/svn/framework3/trunk@8126 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 00:32:48 +00:00
HD Moore a753666073 Switch sysread back to get_once(). This reverts a previous change, but the sysread breaks SSL support
git-svn-id: file:///home/svn/framework3/trunk@8124 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 21:40:30 +00:00
HD Moore caa67aa3d5 Require the nmap XML parser
git-svn-id: file:///home/svn/framework3/trunk@8123 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 20:29:55 +00:00
James Lee 78808fe3c1 show the database driver in framework.inspect
git-svn-id: file:///home/svn/framework3/trunk@8122 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:57:54 +00:00
HD Moore a55dfa1bbc Adds scanner_progress for granular percentage
git-svn-id: file:///home/svn/framework3/trunk@8120 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:20:32 +00:00
James Lee 7be26761f5 merge bannedit's WAR payload patch
git-svn-id: file:///home/svn/framework3/trunk@8119 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:15:15 +00:00
HD Moore d84ca6d438 Replicants should receive the same module store as the original
git-svn-id: file:///home/svn/framework3/trunk@8118 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:14:44 +00:00
HD Moore 3823512ae9 This adds the ability to use the module as a hash
git-svn-id: file:///home/svn/framework3/trunk@8117 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:09:34 +00:00
James Lee 54095a585e update the auth bruteforcer, and use it in smb/login
git-svn-id: file:///home/svn/framework3/trunk@8116 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 16:58:43 +00:00
HD Moore bc9985d5da Minor fixes to the nessusv2 importer, allow the db_import command to work on it directly
git-svn-id: file:///home/svn/framework3/trunk@8115 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 15:26:20 +00:00
HD Moore 568770ae23 Fixes #690 by merging John Miller's patch to enable Nessus v2 support
git-svn-id: file:///home/svn/framework3/trunk@8114 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 12:57:26 +00:00
HD Moore b9e6c8eef7 Fixes #758 by setting the http content type
git-svn-id: file:///home/svn/framework3/trunk@8113 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 12:51:31 +00:00
HD Moore 9bb14e1c4e Add a telnet banner grabber
git-svn-id: file:///home/svn/framework3/trunk@8108 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-13 21:46:48 +00:00
James Lee 2890f3eeda missed this in the last commit
git-svn-id: file:///home/svn/framework3/trunk@8105 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-13 07:03:18 +00:00
James Lee fd89f4e6cd add an events table
git-svn-id: file:///home/svn/framework3/trunk@8104 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-13 06:40:34 +00:00
HD Moore 540beed83e Prevent the dcerpc NDR string functions from modifying their argument directly
git-svn-id: file:///home/svn/framework3/trunk@8102 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-12 23:15:07 +00:00
James Lee f6d0c4c353 add the beginnings of an authentication brute-force mixin
git-svn-id: file:///home/svn/framework3/trunk@8100 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-12 07:29:25 +00:00
HD Moore 01ddb5f41d Fix a loop when the client disconnects
git-svn-id: file:///home/svn/framework3/trunk@8097 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-11 19:47:33 +00:00
HD Moore de4add3a1f Whitespace cleanups
git-svn-id: file:///home/svn/framework3/trunk@8096 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-11 19:18:49 +00:00
James Lee 5fae88b0b8 take out stupid debug prints
git-svn-id: file:///home/svn/framework3/trunk@8094 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-11 01:30:53 +00:00
James Lee fd3373862b move lookups into the queue instead of just saves, fixes a race condition where multiple entities could be inserted with the same info
git-svn-id: file:///home/svn/framework3/trunk@8093 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-10 17:53:12 +00:00
James Lee e1ba7b9618 print a useful message instead of nothing when the given file doesn't exist
git-svn-id: file:///home/svn/framework3/trunk@8092 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-10 17:49:28 +00:00
James Lee f29402028e make the status a little more easily available
git-svn-id: file:///home/svn/framework3/trunk@8091 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-09 02:11:46 +00:00
James Lee 93a673fa1f allow multiple filename arguments to db_import and handle globs, see 750
git-svn-id: file:///home/svn/framework3/trunk@8089 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 21:51:18 +00:00
James Lee dd180a850b make errors less generic
git-svn-id: file:///home/svn/framework3/trunk@8088 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 21:30:14 +00:00
HD Moore 05a88c76ac Default port state to 'open'
git-svn-id: file:///home/svn/framework3/trunk@8087 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 20:28:58 +00:00
James Lee 30b897b6cd add a generic db_import command that auto-detects filetype, move import parsing into msf/core/db. fixes 750
git-svn-id: file:///home/svn/framework3/trunk@8085 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 19:06:29 +00:00
Carlos Perez 1bd6872c6f Applied fix provided by Amin for localhost socket connection fos testig and dev
git-svn-id: file:///home/svn/framework3/trunk@8084 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 17:54:21 +00:00
James Lee a9b1462e9d add a callback for session commands. fixes 618
git-svn-id: file:///home/svn/framework3/trunk@8075 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-06 05:06:12 +00:00
HD Moore 6a10d6b6ca Cleanup for tcp mixin, report smb version better, downcase service names
git-svn-id: file:///home/svn/framework3/trunk@8074 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-05 18:47:04 +00:00
James Lee b365a86aa1 save nmap version detections
git-svn-id: file:///home/svn/framework3/trunk@8073 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-05 18:23:28 +00:00
James Lee d261b39206 actually save the result of the merge
git-svn-id: file:///home/svn/framework3/trunk@8072 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-05 18:18:49 +00:00
James Lee 58cfcd99f8 record a vuln when opening a session. the format may need some more thought
git-svn-id: file:///home/svn/framework3/trunk@8066 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-04 21:54:32 +00:00
James Lee cb4ab4b0f6 sort the output for the show command
git-svn-id: file:///home/svn/framework3/trunk@8065 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-04 21:10:26 +00:00
Mike Smith 471b1e6ff8 Delete services one-by-one instead of calling 'delete_all', which doesn't exist. (fixes #748)
git-svn-id: file:///home/svn/framework3/trunk@8064 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-04 16:14:23 +00:00
HD Moore b35df262ba Fix db_del_port
git-svn-id: file:///home/svn/framework3/trunk@8060 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 23:14:37 +00:00
HD Moore 6e45d1e32f Sort by creation order vs pid
git-svn-id: file:///home/svn/framework3/trunk@8059 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 11:35:57 +00:00
HD Moore 1623b59a0c Decrease indents to save screen space
git-svn-id: file:///home/svn/framework3/trunk@8058 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 11:28:43 +00:00
HD Moore 42b3a5774d Adds the process username to the ps output (when possible).
git-svn-id: file:///home/svn/framework3/trunk@8056 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 03:41:21 +00:00
HD Moore 4d7aec7c2d Fixes #745. This commit changes how token manipulation works, adds the steal_token, drop_token, and getprivs commands. Tested on NT 4.0, 2000 SP4, XP SP3, 2003 SP2, Vista, and Windows 7
git-svn-id: file:///home/svn/framework3/trunk@8055 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 00:35:10 +00:00
HD Moore adc1c18f26 Fix the old warning url
git-svn-id: file:///home/svn/framework3/trunk@8052 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-01 15:17:02 +00:00
James Lee 5aaa7bb3de fix a latent bug where multiple hosts could be reported with the same info and make report_vuln() work
git-svn-id: file:///home/svn/framework3/trunk@8050 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-01 00:19:15 +00:00
HD Moore 98f83bbab1 Adds reg queryclass
git-svn-id: file:///home/svn/framework3/trunk@8046 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 15:52:30 +00:00
Mike Smith de55508a03 fix 'db_workspace -a'
git-svn-id: file:///home/svn/framework3/trunk@8043 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:51:12 +00:00
James Lee 90b2b4c77c fix the db_add* and db_del* commands, make note output readable on 1.8
git-svn-id: file:///home/svn/framework3/trunk@8042 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:27:04 +00:00
James Lee 3bc1f935fa fix amap mlog import
git-svn-id: file:///home/svn/framework3/trunk@8041 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:11:53 +00:00
James Lee 7fc5ada4c6 fix nessus nbe parsing
git-svn-id: file:///home/svn/framework3/trunk@8040 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 23:49:29 +00:00
James Lee 56c2b54369 remove a debug print
git-svn-id: file:///home/svn/framework3/trunk@8039 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 23:31:18 +00:00
Joshua Drake 2283e029db crossing fingers, big cr removal batch
git-svn-id: file:///home/svn/framework3/trunk@8038 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 22:24:22 +00:00
Joshua Drake ff515f5808 fixed exception when unable to connect, fixed formatting
git-svn-id: file:///home/svn/framework3/trunk@8037 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 22:15:12 +00:00
James Lee 653daac8e6 remove a debug print and default proto to 'tcp' if it wasn't given
git-svn-id: file:///home/svn/framework3/trunk@8034 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 17:43:47 +00:00
James Lee 02eb7ab80d massive changes to the database api. Auxiliary::Report is now just a bunch of stubs into the main DBManager, most aux modules should just work, but they haven't all been tested. introduces a get_auth_info method for pulling credentials out of the db. other db api methods should be more standardized now. cross your fingers
git-svn-id: file:///home/svn/framework3/trunk@8028 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 23:48:45 +00:00