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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
c3038d4027
Add the payload_data method back in
...
git-svn-id: file:///home/svn/framework3/trunk@8027 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 23:37:36 +00:00
036ac8fb90
show warning if -L was specified but readline failed to load
...
git-svn-id: file:///home/svn/framework3/trunk@8024 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 21:54:03 +00:00
922cef26fa
Store the domain name in the SMB client object, along with other fields provided by NTLMSSP responses. Show the domain name and netbios name in the version scanner. Update MS06-070 to remove the default target, use the domain name from the server response, and use a more reliable return address for 2000 SP4.
...
git-svn-id: file:///home/svn/framework3/trunk@8022 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 14:00:49 +00:00
488b0cba5d
Fix "dbfile" deprecation warning when using SQLite.
...
Replaced the deprecated "dbfile" option with "database" so that Rails
2.3.5 will not print a warning message.
git-svn-id: file:///home/svn/framework3/trunk@8018 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 01:27:11 +00:00
1d1f94593c
Add -t asp to msfencode :)
...
git-svn-id: file:///home/svn/framework3/trunk@8013 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 22:41:43 +00:00
a247de77ec
add the SingleStaticBit for the CVE-2008-4193 exploit - comments welcome
...
git-svn-id: file:///home/svn/framework3/trunk@8011 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 20:39:43 +00:00
8aff26edb4
add a method for waiting on a task to finish
...
git-svn-id: file:///home/svn/framework3/trunk@8009 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 20:15:33 +00:00
3f59ea2f95
Handle a return() from a proc a bit more gracefully, add a test case
...
git-svn-id: file:///home/svn/framework3/trunk@8008 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 19:44:14 +00:00
a414d5fc8f
Fixes an issue identified by egypt when the task's proc returns. This also stores the return value in task.retval
...
git-svn-id: file:///home/svn/framework3/trunk@8007 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 19:37:14 +00:00
bb84e76e40
Upgrade the bundled Racket to version 1.0.7
...
git-svn-id: file:///home/svn/framework3/trunk@8003 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 13:26:56 +00:00
5757216f9a
This overhauls the database reporting code - all report_* functions now add their write operation to a queue that is processed sequentially in the background. This prevents concurrency issues around database writes, but prevents modules from immediately using the results of their report_* calls in the database. Still todo is a method for waiting on the write to have occurred
...
git-svn-id: file:///home/svn/framework3/trunk@7997 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 00:21:21 +00:00
4c6fd97b0e
Handles some broken TCP stack implementations better (but not perfectly)
...
git-svn-id: file:///home/svn/framework3/trunk@7991 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-27 07:02:55 +00:00
308bdcccb2
Fixes #733 (using open vs ::Up, may need a revert and a change to the importers instead). Update the sweep_udp module to store host, mac, name info
...
git-svn-id: file:///home/svn/framework3/trunk@7990 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 22:08:49 +00:00
0bf2f7dd9e
Clean up trailing whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@7987 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:29:24 +00:00
de7cabaed1
Handle dashes in the version strings and add generic catch-alls for windows
...
git-svn-id: file:///home/svn/framework3/trunk@7986 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:26:24 +00:00
b80ebd45f1
Better parsing of Windows 2008 versions (should handle Hyper-V variants now)
...
git-svn-id: file:///home/svn/framework3/trunk@7985 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:17:35 +00:00
c8e60da5ee
Fix warning on 1.8
...
git-svn-id: file:///home/svn/framework3/trunk@7982 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 09:01:08 +00:00
4331c111f1
Add a mysql mixin that wraps ruby-mysql (tmtm.org)
...
git-svn-id: file:///home/svn/framework3/trunk@7977 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 05:21:21 +00:00
ec9bc73e0f
Allow an existing socket to be passed in
...
git-svn-id: file:///home/svn/framework3/trunk@7976 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 04:08:59 +00:00
fd24634fcc
Rename to rbmysql, fix main script as well
...
git-svn-id: file:///home/svn/framework3/trunk@7975 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 04:06:40 +00:00
81b3470ef5
Rename the main class to prevent conflicts:
...
git-svn-id: file:///home/svn/framework3/trunk@7974 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 04:04:15 +00:00
8f47140ddf
Add the README file from upstream
...
git-svn-id: file:///home/svn/framework3/trunk@7973 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 03:58:34 +00:00
c9777b993a
Rename to prevent system level conflicts
...
git-svn-id: file:///home/svn/framework3/trunk@7972 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 03:57:49 +00:00
a7f672c2cd
Import the ruby-mysql library
...
git-svn-id: file:///home/svn/framework3/trunk@7971 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 03:57:05 +00:00
8f2138a464
and remove the empty xdr.rb
...
git-svn-id: file:///home/svn/framework3/trunk@7965 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-24 00:21:36 +00:00
744c4cd02f
Store the current workspace's name instead of the whole Workspace object.
...
This ensures that the most up-to-date data is reloaded from the database
when you ask for it, instead of returning cached results.
git-svn-id: file:///home/svn/framework3/trunk@7963 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 20:37:30 +00:00
a9ec7c8b21
Ignore proxy errors during scanning
...
git-svn-id: file:///home/svn/framework3/trunk@7962 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 15:29:22 +00:00
b13e185943
Giant update from tebo, fixing up SunRPC and the nsfmount module
...
git-svn-id: file:///home/svn/framework3/trunk@7961 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 13:44:53 +00:00
556b28e6ca
Switching focus to 3.3.4-dev
...
git-svn-id: file:///home/svn/framework3/trunk@7960 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 13:44:19 +00:00
eb58e8801a
Tagging this as 3.3.3-release
...
git-svn-id: file:///home/svn/framework3/trunk@7957 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 06:03:57 +00:00
dde54bf99c
Allow minrank to be specified via -R
...
git-svn-id: file:///home/svn/framework3/trunk@7952 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 03:53:16 +00:00
86f1616d24
less verbose inspect method for modules
...
git-svn-id: file:///home/svn/framework3/trunk@7951 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 01:46:20 +00:00
0708798598
more concise inspect output for Session objects
...
git-svn-id: file:///home/svn/framework3/trunk@7949 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 01:03:51 +00:00
89695b40fe
add ability to specify columns for db_{hosts,services} output
...
git-svn-id: file:///home/svn/framework3/trunk@7948 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 22:20:58 +00:00
4f92d9f431
Revamp the event system and add some ui hooks. Sessions are still ghetto -- we get interact events (in a lame way) but no input or output events yet. see 619
...
git-svn-id: file:///home/svn/framework3/trunk@7947 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 18:52:48 +00:00
d3e8132532
Fix (ruby 1.8.7) issue where data appeared under the wrong column.
...
git-svn-id: file:///home/svn/framework3/trunk@7944 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 02:48:54 +00:00
7935656355
Fixes #708 . Enforces a timeout around SSL's connect()
...
git-svn-id: file:///home/svn/framework3/trunk@7938 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 22:48:40 +00:00
655e864ee3
See #708 . Sets a default timeout for http requests
...
git-svn-id: file:///home/svn/framework3/trunk@7937 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 22:42:21 +00:00
111d49135e
Fixes #609 . Revert back to ExitProcess(0) as default, this resolves a number of small bugs
...
git-svn-id: file:///home/svn/framework3/trunk@7935 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 20:44:44 +00:00
6147db8722
Fixes #696 . Default direct to FALSE if port is 139
...
git-svn-id: file:///home/svn/framework3/trunk@7933 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 19:04:28 +00:00
1f7b184fe5
Use SQL to filter/sort the hosts & services records, instead of ruby.
...
git-svn-id: file:///home/svn/framework3/trunk@7930 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 16:46:11 +00:00
2d399f9b52
Handle the native win32 errno as well
...
git-svn-id: file:///home/svn/framework3/trunk@7923 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-19 15:08:37 +00:00
1eceebc950
Fixes #697 . This prevents a closed socket from being passed to select() and handles the case where a race condition allowed this to happen anyways (one thread closes, one thread selects). This should prevent most 'invalid handle' exceptions on Cygwin and prevent Win32 native from crashing due to the native exception.
...
git-svn-id: file:///home/svn/framework3/trunk@7922 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-19 15:02:26 +00:00
addcba5131
0x7f isn't printable!
...
git-svn-id: file:///home/svn/framework3/trunk@7915 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-18 20:40:08 +00:00
fc1e0b88fb
change db_hosts and db_services output to be more thorough, see 619
...
git-svn-id: file:///home/svn/framework3/trunk@7912 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-18 01:14:05 +00:00
39d37065de
See #485 . This patch allows the very basics of metasploit to work under jRuby 1.4.0. Many, many things are still broken
...
git-svn-id: file:///home/svn/framework3/trunk@7906 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 08:02:11 +00:00
c4c0fd2b55
deal with broken Date.parse in 1.8.6 and older by just not printing the last updated date. fixes 693
...
git-svn-id: file:///home/svn/framework3/trunk@7897 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 03:17:37 +00:00
06427b53c9
document the detection for 2k SP0
...
git-svn-id: file:///home/svn/framework3/trunk@7887 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 23:08:28 +00:00
f76a9a43e6
Switch compat payloads to normal vs ranked
...
git-svn-id: file:///home/svn/framework3/trunk@7877 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 13:14:01 +00:00
f1a5103b32
allow the browser_autopwn mixin access to exploit modules' Rank constants. see 628
...
git-svn-id: file:///home/svn/framework3/trunk@7876 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 07:21:17 +00:00
b6c497467e
add a message about requiring libmysqlclient-dev, fixes 535
...
git-svn-id: file:///home/svn/framework3/trunk@7866 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 23:40:21 +00:00
f9ffc8b8bc
Add db_workspace command & other db refactoring.
...
* Added "workspaces" table and associated ActiveRecord class.
* Moved ActiveRecord models from db_objects.rb into separate files.
* Do the DB migration check every time you connect (was previously done
during db_create).
* Use :dependent => :destroy associations so that we don't have to
manually delete the dependent objects.
git-svn-id: file:///home/svn/framework3/trunk@7861 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 22:52:34 +00:00
4311c20ee1
Warn the user when nessusv2 is specified (only v1 supported). See #690
...
git-svn-id: file:///home/svn/framework3/trunk@7857 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 22:00:54 +00:00
a03e3bf823
adds support for regular shell sessions when running commands with 'sessions -c'. Commands are run sequentially, so will take forever on large numbers of sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@7855 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 21:17:49 +00:00
bce6355df1
Make sure we use a real module class instance when ranking
...
git-svn-id: file:///home/svn/framework3/trunk@7844 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 23:41:25 +00:00
e2cc45e4d4
Use the not-so-explicit platform
...
git-svn-id: file:///home/svn/framework3/trunk@7843 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:46:44 +00:00
89da53d570
Updates to encode_shellcode_stub
...
git-svn-id: file:///home/svn/framework3/trunk@7842 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:43:17 +00:00
40fb409343
Adds encode_shellcode_stub() to the exploit class, this allows arbitrary shellecode bits to be easily encoded
...
git-svn-id: file:///home/svn/framework3/trunk@7841 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:31:17 +00:00
7e4d03be86
This adds support for the old exe format to msfencode using -t exe-small and allows encoder modules to change preferences based on the platform, which fully solves #430 .
...
git-svn-id: file:///home/svn/framework3/trunk@7840 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:03:35 +00:00
c287573213
A few more wmap cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@7839 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 06:56:01 +00:00
a1f71fa994
Fixes #683 . This triggers when running on ruby 1.9 and is probably one of many like this and one of the reasons this interface is not maintained. However, since you wen to the effort of reporting it, the least we can do is fix it ;)
...
git-svn-id: file:///home/svn/framework3/trunk@7838 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 05:30:34 +00:00
1029ecd7f8
Cleanup wmap, add the missing database tables back, rename to have a wmap_prefix
...
git-svn-id: file:///home/svn/framework3/trunk@7837 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 05:24:48 +00:00
23a63991b2
add -c option to sessions command to allow running a shell command on running meterpreter sesions; see #663
...
git-svn-id: file:///home/svn/framework3/trunk@7831 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-12 00:49:48 +00:00
004c2864f4
This adds an option to the sessions command (-s). Using it allows running a script for each open meterpreter session, see #663
...
git-svn-id: file:///home/svn/framework3/trunk@7830 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 23:19:19 +00:00
eac301484c
Forgot to update the timeout() wrapper class for refernces
...
git-svn-id: file:///home/svn/framework3/trunk@7829 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 21:46:44 +00:00
0bc4ba6211
Major overhaul to how db_autopwn works, should be substantially faster and less error prone
...
git-svn-id: file:///home/svn/framework3/trunk@7824 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 20:21:18 +00:00
e2a5cb0ebe
Pass the password argument in db_create
...
git-svn-id: file:///home/svn/framework3/trunk@7823 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 18:54:19 +00:00
c94c2ee892
Resolved Mac OS X compatibility with the tar, switching back to 3.3.3-dev
...
git-svn-id: file:///home/svn/framework3/trunk@7817 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 22:32:36 +00:00
f1bf7ec7cf
Bumping back to 3.3.2 for a second to build a tarball for OS X (._main bug)
...
git-svn-id: file:///home/svn/framework3/trunk@7816 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 22:26:59 +00:00
8179472a35
Hurray 3.3.2 is out - back to work on 3.3.3
...
git-svn-id: file:///home/svn/framework3/trunk@7809 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 20:26:40 +00:00
d976df897a
3.3.2 done
...
git-svn-id: file:///home/svn/framework3/trunk@7808 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 19:14:45 +00:00
a16feb01bc
Minor tweaks to http processing
...
git-svn-id: file:///home/svn/framework3/trunk@7805 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 18:12:38 +00:00
5ef9a1c040
Wipe the headers before reparsing
...
git-svn-id: file:///home/svn/framework3/trunk@7801 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 17:04:52 +00:00
1c98368351
Loop until a non-100 is found or the resp parser fails
...
git-svn-id: file:///home/svn/framework3/trunk@7800 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 16:57:21 +00:00
006d5d51fc
Fixes #674 by adding 100-continue support
...
git-svn-id: file:///home/svn/framework3/trunk@7799 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 16:54:27 +00:00
afa5b46674
Default the minrank for autopwn, otherwise this prevents usage from being shown when no args are present. Also breaks -t -p when no rank is specified
...
git-svn-id: file:///home/svn/framework3/trunk@7798 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 15:12:59 +00:00
75c90b8ef9
Handle Errno::EINTR gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@7796 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 06:13:14 +00:00
d2694ce5b9
Ignore errors on shutdown for the relay
...
git-svn-id: file:///home/svn/framework3/trunk@7795 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 06:09:15 +00:00
2a5a5207f5
Switch trunk to 3.3.2-testing until we cut this
...
git-svn-id: file:///home/svn/framework3/trunk@7794 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 05:48:12 +00:00
e731426666
Fixes #662 . The socket pivoting is still not perfect, but this goes a long way
...
git-svn-id: file:///home/svn/framework3/trunk@7792 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 05:40:26 +00:00
4cb050010b
add exploitability detection (by trying %n)
...
git-svn-id: file:///home/svn/framework3/trunk@7791 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 23:53:26 +00:00
8d25dc00bc
bail if MinimumRank is invalid
...
git-svn-id: file:///home/svn/framework3/trunk@7787 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 23:07:58 +00:00
084a10ded5
remove a debug print and deal with minrank being absent
...
git-svn-id: file:///home/svn/framework3/trunk@7786 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 22:42:06 +00:00
318750c68c
oops, forgot to update fmtstr_count_printed
...
git-svn-id: file:///home/svn/framework3/trunk@7785 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 22:37:34 +00:00
4a363329cb
fixed generating fmts from buffers with small value delta (eg \x02\x01\x03\x01)
...
git-svn-id: file:///home/svn/framework3/trunk@7781 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 21:50:17 +00:00
e0bd6dd6ed
don't bother checking for an address if our range is empty
...
git-svn-id: file:///home/svn/framework3/trunk@7779 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 21:28:44 +00:00
898c8655ff
Default rank to manual for the search command
...
git-svn-id: file:///home/svn/framework3/trunk@7773 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 13:57:46 +00:00
961e70fc34
add -f flag to exploit command to force running despite a conflicting MinimumRank value. fixes 628
...
git-svn-id: file:///home/svn/framework3/trunk@7770 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 02:49:27 +00:00
061b4a36cf
add stack reading and detection for dpa/fpu fmt specifiers
...
git-svn-id: file:///home/svn/framework3/trunk@7768 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 02:18:12 +00:00
6989949720
adds a global option, MinimumRank, which db_autopwn now checks to prevent running exploits below a certain rank. fixes #625 , see #628
...
git-svn-id: file:///home/svn/framework3/trunk@7767 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 01:54:20 +00:00
f383949540
fix 1.9.1 compatability
...
git-svn-id: file:///home/svn/framework3/trunk@7764 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 23:50:29 +00:00
9abe0c0b03
added support for direct parameter access
...
git-svn-id: file:///home/svn/framework3/trunk@7763 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 23:50:02 +00:00
87c85b5176
removed executable generation routines from Rex::Text (use Msf::Util::EXE), Fixes #660
...
git-svn-id: file:///home/svn/framework3/trunk@7760 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 21:24:45 +00:00
54c10c0c3d
Fixes #623 and fixes #622 , implements a number of changes to the core channel dispatch code, sets timeouts on unmatched responses, and handles tcp relay writes with a threaded/timeout wrapper to avoid delays.
...
git-svn-id: file:///home/svn/framework3/trunk@7753 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 18:32:26 +00:00
7427640fb0
don't wait for a message body that will never come. fixes 659
...
git-svn-id: file:///home/svn/framework3/trunk@7748 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 02:26:37 +00:00
47fdec6ab3
add ability to search by minimum rank, fixes 627
...
git-svn-id: file:///home/svn/framework3/trunk@7747 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 23:15:13 +00:00
61b556a0d1
Initialize the database schema using ActiveRecord migrations
...
git-svn-id: file:///home/svn/framework3/trunk@7739 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:03:27 +00:00
05a4212e1d
Minor db improvements
...
Use find_each for better scalability with large databases.
No need to call save immediately after create.
git-svn-id: file:///home/svn/framework3/trunk@7737 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:03:21 +00:00
765a1d72eb
replace old clear color code with the new one ('%clr'). fixes 610
...
git-svn-id: file:///home/svn/framework3/trunk@7736 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:00:05 +00:00
0b8917a39e
Add HD's optimization for faster DLL reading (ala the x86 counterpart).
...
git-svn-id: file:///home/svn/framework3/trunk@7731 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:58:28 +00:00
7d3ff93ec9
Fix a few bugs in the parsing of exception directories on PE64 binaries.
...
git-svn-id: file:///home/svn/framework3/trunk@7730 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:56:54 +00:00
4fb212b54e
Go back to using select instead of sleep for the waiters.
...
git-svn-id: file:///home/svn/framework3/trunk@7729 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:55:31 +00:00
02a62967e4
register the 'rex' log source, see #577
...
git-svn-id: file:///home/svn/framework3/trunk@7727 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 18:09:27 +00:00
1f5a0be9ca
Fixes #630 by correct the constant typo
...
git-svn-id: file:///home/svn/framework3/trunk@7726 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 14:51:15 +00:00
8df719e7a8
See #624 . Adds the module ranking to all text-base displays, this may be enough to close the ticket
...
git-svn-id: file:///home/svn/framework3/trunk@7725 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 14:35:16 +00:00
42e6486fb4
Module loading broken again by revision r7709.
...
git-svn-id: file:///home/svn/framework3/trunk@7711 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-05 11:10:46 +00:00
43f65b2851
fix for the NLS_LANG issue. (rory)
...
git-svn-id: file:///home/svn/framework3/trunk@7709 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 23:01:54 +00:00
2c92856612
Fixes #604 . This fixes a long-standing race condition with meterpreter channels that received data as soon as they were open (TCP).
...
git-svn-id: file:///home/svn/framework3/trunk@7708 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 21:08:34 +00:00
a96a23f95c
add cidr parsing for ipv6
...
git-svn-id: file:///home/svn/framework3/trunk@7707 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 20:17:28 +00:00
1e6b6b3d62
fix ipv6 handling for single addresses
...
git-svn-id: file:///home/svn/framework3/trunk@7706 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:55:58 +00:00
5952e29040
modify address range specification (for e.g. RHOSTS) to use nmap notation, fixes #182
...
git-svn-id: file:///home/svn/framework3/trunk@7705 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:37:14 +00:00
0458622cb7
attempt to persist left over data across calls
...
git-svn-id: file:///home/svn/framework3/trunk@7704 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:20:14 +00:00
ee0c1d460a
remove the lock that was causing segfaults on 1.9; fixes #513 , see #514
...
git-svn-id: file:///home/svn/framework3/trunk@7703 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:16:28 +00:00
9b2d5fcd24
Fixes #605 by re-raising the correct exception class
...
git-svn-id: file:///home/svn/framework3/trunk@7701 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 18:38:59 +00:00
a544d71f4e
A few small changes to the ruby side of meterpreters packet dispatcher stuff. Allow for blocking a request indefinatly and add in a new command 'wait' to stdapi.sys.process.
...
git-svn-id: file:///home/svn/framework3/trunk@7697 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 17:32:56 +00:00
fda1083d13
Stop throwing an exception on module initialization, delay this until connect() to avoid breaking module enumeration tools. Clean up the tabs and indents. Delete the broken rescue clause with no begin
...
git-svn-id: file:///home/svn/framework3/trunk@7696 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 17:22:32 +00:00
821f515ff5
add PrependChrootBreak
...
git-svn-id: file:///home/svn/framework3/trunk@7692 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 07:49:05 +00:00
4ab9a59a39
now supporting sequential identical values!
...
git-svn-id: file:///home/svn/framework3/trunk@7691 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 07:45:08 +00:00
facebbc791
allow module search to continue even if one module fails to load
...
git-svn-id: file:///home/svn/framework3/trunk@7689 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 01:00:48 +00:00
93d02320cf
updated oracle mixin and adjusted affected modules. now compatible with ruby 1.8 and 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@7688 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 23:57:02 +00:00
d4f1314025
fixed problem reading long lines
...
git-svn-id: file:///home/svn/framework3/trunk@7687 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 21:52:59 +00:00
1d143a6ccf
fix silly bug, sorry
...
git-svn-id: file:///home/svn/framework3/trunk@7686 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 21:11:56 +00:00
d31d7f869f
split buffer to array conversion out
...
git-svn-id: file:///home/svn/framework3/trunk@7685 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 20:58:07 +00:00
7aeb7a08b3
first attempt at support for ftp continuations
...
git-svn-id: file:///home/svn/framework3/trunk@7684 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 20:56:08 +00:00
b1b7ef0350
Improves the NeXpose plugin, adds the ability to do discovery outside of NeXpose and then scan the results using the database as input (-d).
...
git-svn-id: file:///home/svn/framework3/trunk@7681 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 15:26:30 +00:00
a4fc468700
Handles exception where exec is a directory, or permission is denied.
...
git-svn-id: file:///home/svn/framework3/trunk@7678 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 08:17:14 +00:00
5182d1c927
allow the Connection header to specify keep-alive in a less strict manner. this is more rfc2616 compliant and fixes #601
...
git-svn-id: file:///home/svn/framework3/trunk@7677 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 07:40:37 +00:00
fc983ef7e3
Many bug fixes to db_autopwn, cross-referencing of OS-level vulnerabilities, small bug fixes to HTTP client API
...
git-svn-id: file:///home/svn/framework3/trunk@7676 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 01:36:17 +00:00
7b4a942ed6
revert logging change from r7653 which broke meterpreter sessions
...
git-svn-id: file:///home/svn/framework3/trunk@7671 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 19:11:11 +00:00
626d085dd4
expand ryan linn's idea of more verbose job info to include start time, see #586
...
git-svn-id: file:///home/svn/framework3/trunk@7668 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 03:32:48 +00:00
dfabd1e3fc
fixes #587 ; add http xmlrpc support from Ryan Linn, invoke it with 'load xmlrpc ServerType=Web' or ./msfrpcd -t Web
...
git-svn-id: file:///home/svn/framework3/trunk@7667 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 00:00:11 +00:00
e427bd5f81
spaces to tabs
...
git-svn-id: file:///home/svn/framework3/trunk@7666 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 23:15:07 +00:00
0da80965d6
more info about a job, thanks Ryan Linn for the patch; fixes #586
...
git-svn-id: file:///home/svn/framework3/trunk@7665 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 23:11:12 +00:00
b486654975
nothing actually uses the zip library, ripping it out. fixes 591
...
git-svn-id: file:///home/svn/framework3/trunk@7663 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 22:34:45 +00:00
c2fac74ae2
make irb more useful by eliding unnecessary stuff from framework.inspect
...
git-svn-id: file:///home/svn/framework3/trunk@7662 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 21:42:14 +00:00
e73842251e
add a kill command and clean up tabbing for jobs
...
git-svn-id: file:///home/svn/framework3/trunk@7659 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 18:24:11 +00:00
b7addee664
Release cut, back to 3.4-dev
...
git-svn-id: file:///home/svn/framework3/trunk@7656 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 03:57:09 +00:00
cae9880c28
Tag this as 3.3.1-release
...
git-svn-id: file:///home/svn/framework3/trunk@7654 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 03:08:48 +00:00
125f0aab0a
map any attempt to log to an unknown logsink to the core logsink, fixes 577
...
git-svn-id: file:///home/svn/framework3/trunk@7653 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 22:03:53 +00:00
ed7b7ac6f0
Fixes #491 and fixes #543 by updating the HTTP stack and validating configuration options
...
git-svn-id: file:///home/svn/framework3/trunk@7652 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 21:15:06 +00:00
1189ac1dcd
Updates to the PE class to support TLS/Exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@7651 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 20:18:37 +00:00
c72ec65474
Tag this as 3.3.1-dev until we cut 3.3.1-release, then back to 3.4-dev
...
git-svn-id: file:///home/svn/framework3/trunk@7650 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 20:17:55 +00:00
b8804e48cd
Add (incomplete) support for TLS callbacks
...
git-svn-id: file:///home/svn/framework3/trunk@7648 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 19:48:35 +00:00
38c8714db1
Fixes #585 . Klunky right now but well tested
...
git-svn-id: file:///home/svn/framework3/trunk@7647 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 19:24:47 +00:00
53e9907a7d
remove reports record
...
git-svn-id: file:///home/svn/framework3/trunk@7644 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 03:23:38 +00:00
05733b9d8d
Correct tab indention
...
git-svn-id: file:///home/svn/framework3/trunk@7642 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 23:36:40 +00:00
bfe2cc0c53
Force stale connections to be freed, fixes #513 .
...
git-svn-id: file:///home/svn/framework3/trunk@7641 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 17:17:24 +00:00
b0c68d3fd2
Faster DLL reading (ruby will yield to background threads on 4k blocks otherwise)
...
git-svn-id: file:///home/svn/framework3/trunk@7639 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 04:23:33 +00:00
63b6cf1713
Remove unused libraries from the tree
...
git-svn-id: file:///home/svn/framework3/trunk@7637 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 22:56:40 +00:00
3ef0987aae
Remove unused libraries (packetfu will be re-integrated when the next rev is done)
...
git-svn-id: file:///home/svn/framework3/trunk@7634 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 22:48:36 +00:00
ff93072d1e
Fixes #578 . Only register a new meterpreter sink if one doesnt already exist
...
git-svn-id: file:///home/svn/framework3/trunk@7632 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 16:34:46 +00:00
9d2ab30f9d
create the history file if it doesn't exist
...
git-svn-id: file:///home/svn/framework3/trunk@7627 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 07:13:21 +00:00
d6a732d619
move histfile reading into rex
...
git-svn-id: file:///home/svn/framework3/trunk@7625 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 06:03:05 +00:00
3412a38146
register a 'meterpreter' logsink
...
git-svn-id: file:///home/svn/framework3/trunk@7622 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 02:46:04 +00:00
fd61df4e9e
add full support for persistent history, works in msfweb as well. fixes #523
...
git-svn-id: file:///home/svn/framework3/trunk@7621 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 02:18:02 +00:00
1b4aa0380b
read in a history file. beginnings of persistent history. see #523
...
git-svn-id: file:///home/svn/framework3/trunk@7620 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 01:01:27 +00:00
723aa65df0
refuse to migrate into the current process. fixes #418
...
git-svn-id: file:///home/svn/framework3/trunk@7618 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 23:24:01 +00:00
f3006f78c9
Fix up handling of service-less vulnerabilities
...
git-svn-id: file:///home/svn/framework3/trunk@7612 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 18:03:25 +00:00
6bd2e7f5b4
dup http resource so modules don't inadvertantly modify it
...
git-svn-id: file:///home/svn/framework3/trunk@7608 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:45:14 +00:00
70d5e219e4
Additional reporting methods removed
...
git-svn-id: file:///home/svn/framework3/trunk@7607 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:20:21 +00:00
252cdcfb92
Removing unnecesary reporting methods
...
git-svn-id: file:///home/svn/framework3/trunk@7606 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:11:52 +00:00
5b81d85447
Replaced reporting to use notes
...
git-svn-id: file:///home/svn/framework3/trunk@7605 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:08:28 +00:00
b460843929
Fixes #574 . Uses compatible_payloads as the initial list for finding a match
...
git-svn-id: file:///home/svn/framework3/trunk@7604 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 02:24:41 +00:00
49b6111dbc
Correctly print vulnerability references when there is no associated service
...
git-svn-id: file:///home/svn/framework3/trunk@7600 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 01:44:55 +00:00
d5e09a90e2
add minver and maxver options and prepare for universal module ranking
...
git-svn-id: file:///home/svn/framework3/trunk@7598 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 21:40:02 +00:00
3796cf3865
Fixes #567 , hands the case where the svn directories were moved
...
git-svn-id: file:///home/svn/framework3/trunk@7593 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 12:47:05 +00:00
e354c8dbcc
Multiple headers handling bug fixes
...
git-svn-id: file:///home/svn/framework3/trunk@7588 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 05:27:11 +00:00
f8d84a7dc9
prevent loading the same dispatcher multiple times. fixes #560
...
git-svn-id: file:///home/svn/framework3/trunk@7587 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 01:07:19 +00:00
a3d4e1c44a
Added command to launch msfproxy from console
...
git-svn-id: file:///home/svn/framework3/trunk@7584 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-23 03:38:05 +00:00
6e7c4a77a9
add detection for ie6 on xpsp2
...
git-svn-id: file:///home/svn/framework3/trunk@7572 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-20 06:08:09 +00:00
3b6126bfd9
actually commit what i said i was committing. =(
...
git-svn-id: file:///home/svn/framework3/trunk@7567 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 06:35:44 +00:00
14a0040b8a
move nmap xml parsing into Rex::Parser; add a test to make sure it works
...
git-svn-id: file:///home/svn/framework3/trunk@7566 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 06:15:45 +00:00
f327418804
Fixes #553 . Adds a timeout for all FTP commands and removes the unbounded fd.get
...
git-svn-id: file:///home/svn/framework3/trunk@7564 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 03:04:25 +00:00
56f0ef00e6
fix pad handling
...
git-svn-id: file:///home/svn/framework3/trunk@7562 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 00:50:44 +00:00
0ebff0e5ea
allow target override
...
git-svn-id: file:///home/svn/framework3/trunk@7559 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 23:30:17 +00:00
dd62aa6a98
add format string exploit mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7558 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 22:29:43 +00:00
98c60be1f1
rough cut at some format string support
...
git-svn-id: file:///home/svn/framework3/trunk@7556 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 22:14:44 +00:00
4b9a54a2f6
Fixes #529 by correcting the variable name
...
git-svn-id: file:///home/svn/framework3/trunk@7555 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 12:45:34 +00:00
e88ef79af8
And here we go again...
...
git-svn-id: file:///home/svn/framework3/trunk@7554 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 04:01:10 +00:00
c7712d45d6
Mark this as 3.3-release, hopefully this is the last commit before 3.4-dev starts
...
git-svn-id: file:///home/svn/framework3/trunk@7551 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 00:06:44 +00:00
a92fbb1ff4
Fixes #526 . Correct socket name and call to super in the socket output io
...
git-svn-id: file:///home/svn/framework3/trunk@7548 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 23:35:34 +00:00
9b1935eb2a
Fixes #522 . Allow RHOSTS to contain hostnames with dashes
...
git-svn-id: file:///home/svn/framework3/trunk@7547 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 23:20:59 +00:00
dc0dc98771
Fixes #517 . Disables meterpreter stages for passivex stagers
...
git-svn-id: file:///home/svn/framework3/trunk@7546 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 22:45:33 +00:00
d8b9e030e3
really fixed, test case: "db_create/db_nmap -P"
...
git-svn-id: file:///home/svn/framework3/trunk@7543 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 19:13:33 +00:00
6d18c6dd53
bugfix for NMAP failure, test case: "db_nmap -P"
...
git-svn-id: file:///home/svn/framework3/trunk@7542 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 19:06:42 +00:00
36921e6d4b
fix a bug where a failed encoder would try to convert nil to Integer. see #519
...
git-svn-id: file:///home/svn/framework3/trunk@7540 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:57:04 +00:00
3f811a801e
Fixes #509 . Fix the last shadowed var issue, the rest dont seem significant
...
git-svn-id: file:///home/svn/framework3/trunk@7537 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:34:08 +00:00
0251f21dc9
See #509
...
git-svn-id: file:///home/svn/framework3/trunk@7536 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:30:07 +00:00
58711ec7ad
See #509
...
git-svn-id: file:///home/svn/framework3/trunk@7535 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:28:45 +00:00
8cadfe66cf
Mostly cosmetic
...
git-svn-id: file:///home/svn/framework3/trunk@7530 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 15:16:08 +00:00
ba5da501bf
Log the exploit name when the module raises an exception, helps track down bugs during automation
...
git-svn-id: file:///home/svn/framework3/trunk@7529 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 15:08:58 +00:00
5c39fd102a
Tag this a rc1, one more big bug shakeout
...
git-svn-id: file:///home/svn/framework3/trunk@7526 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 03:30:16 +00:00
d67cb3cdde
Really fixes #464
...
git-svn-id: file:///home/svn/framework3/trunk@7525 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:52:23 +00:00
ba9f7b41b3
Fix save() again
...
git-svn-id: file:///home/svn/framework3/trunk@7524 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:48:00 +00:00
1ad262a53e
Fixes #464 by using the correct logic to only save user defined variables and to reset default options after a register_*_options call by a mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7523 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:39:08 +00:00
18ba91cebc
Adds the find/save wrapper back, it seems to help a little, but doesn't solve all cases. See #514
...
git-svn-id: file:///home/svn/framework3/trunk@7517 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 22:11:53 +00:00
291aad8cc1
Fixes #516 and fixes #515 . This patch makes database support a little more user-friendly. The db commands now accept -h and --help, the db_drivers command will indicate how to install support for a given database, the db_create/db_destroy commands will indicate what tools are required to use them, and the postgres driver will now roperly handle sameuser authentication over a unix domain socket with postgres-pr
...
git-svn-id: file:///home/svn/framework3/trunk@7516 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 21:41:38 +00:00
e296ec92ea
more uninitalized var warnings
...
git-svn-id: file:///home/svn/framework3/trunk@7513 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 06:21:22 +00:00
d3d406f405
more unitialized goodness
...
git-svn-id: file:///home/svn/framework3/trunk@7501 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 23:53:17 +00:00
f011c7d580
rc1 -> testing
...
git-svn-id: file:///home/svn/framework3/trunk@7498 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:52:29 +00:00
eabfff5aca
Adds the last updated date to the output
...
git-svn-id: file:///home/svn/framework3/trunk@7497 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:50:12 +00:00
a3c020fef2
more uninitialized var warnings
...
git-svn-id: file:///home/svn/framework3/trunk@7495 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:11:52 +00:00
8471baa62a
fix another uninitialized class var warning
...
git-svn-id: file:///home/svn/framework3/trunk@7494 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:00:16 +00:00
80ee6157ed
fix a few warnings
...
git-svn-id: file:///home/svn/framework3/trunk@7492 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 20:28:36 +00:00
b762ca5ece
fix '@initialized not initialized' warning
...
git-svn-id: file:///home/svn/framework3/trunk@7489 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 17:31:57 +00:00
8c28c38da3
remove busted unit test
...
git-svn-id: file:///home/svn/framework3/trunk@7482 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 19:49:35 +00:00
500eb85a58
Fix a typo in ^L support
...
git-svn-id: file:///home/svn/framework3/trunk@7476 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 06:31:50 +00:00
8c65a0f48c
Handle interrupts without showing a backtrace
...
git-svn-id: file:///home/svn/framework3/trunk@7473 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 05:56:52 +00:00
62470e47a7
Skip closed/filtered ports when db_autopwning
...
git-svn-id: file:///home/svn/framework3/trunk@7462 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:58:08 +00:00
c7967e00d7
handle both 'open' and 'up' for port state in db_services
...
git-svn-id: file:///home/svn/framework3/trunk@7460 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:29:44 +00:00
029d0bae47
save the port state regardless of whether we know the name
...
git-svn-id: file:///home/svn/framework3/trunk@7459 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:22:03 +00:00
73a0ef8b64
actually save port state
...
git-svn-id: file:///home/svn/framework3/trunk@7458 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:16:52 +00:00
78c88c888f
don't backtrace just because the client cancelled
...
git-svn-id: file:///home/svn/framework3/trunk@7453 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 19:38:18 +00:00
7e177962bf
tell the user what port we're listening on
...
git-svn-id: file:///home/svn/framework3/trunk@7452 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 17:39:51 +00:00
b64d12c846
sort jobs numerically
...
git-svn-id: file:///home/svn/framework3/trunk@7451 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 17:16:49 +00:00
3dfaf32bc8
trying out bold colors
...
git-svn-id: file:///home/svn/framework3/trunk@7450 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:49:26 +00:00
2cbb32550c
fix meterp sessions getting initialized improperly, fix msf> prompt in exploit context after color cmd
...
git-svn-id: file:///home/svn/framework3/trunk@7449 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:10:39 +00:00
2c3cace80c
Fix up the classes needed by msfweb. Fixes #495
...
git-svn-id: file:///home/svn/framework3/trunk@7447 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:59:49 +00:00
3628a3d3c6
fix sessions breaking right away when interacting. command dispatcher still appears to be hosed
...
git-svn-id: file:///home/svn/framework3/trunk@7446 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:55:42 +00:00
3db9bbfaae
See #493 . Initialize the prompt
...
git-svn-id: file:///home/svn/framework3/trunk@7445 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:33:14 +00:00
69dbb7b4b0
Address some of #493
...
git-svn-id: file:///home/svn/framework3/trunk@7444 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:26:40 +00:00
daf58b6deb
get rid of the single-character escapes so we're less likely to see accidental color substitutions
...
git-svn-id: file:///home/svn/framework3/trunk@7443 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 07:12:56 +00:00
fd4e4154cd
add a new 'color' command that lets the user force color on or off.
...
git-svn-id: file:///home/svn/framework3/trunk@7442 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 06:58:01 +00:00
a8d9da0d3d
initial color support. will add ability to change colors from console soon. see #344
...
git-svn-id: file:///home/svn/framework3/trunk@7440 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 03:27:48 +00:00
2bec0701a7
Fixes a crash on startup when no svn directories are present
...
git-svn-id: file:///home/svn/framework3/trunk@7438 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 03:05:12 +00:00
acea0f87fb
Correct the formatting of the old age warning. Obviously nobody would have seen this for another 5 days :)
...
git-svn-id: file:///home/svn/framework3/trunk@7436 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 23:45:21 +00:00
e73d4ead7f
handle a broken socket gracefully, fixes a backtrace in msfd
...
git-svn-id: file:///home/svn/framework3/trunk@7432 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 20:10:53 +00:00
9f2845dcaf
Add channel support back in, patch from dragorn
...
git-svn-id: file:///home/svn/framework3/trunk@7430 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 19:52:18 +00:00
493f56be57
https://metasploit.com/redmine/issues/430
...
Change this line so that 0xf0 is now used as an xor base
git-svn-id: file:///home/svn/framework3/trunk@7428 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 18:47:46 +00:00
7007a80c13
make the vbs generation a little faster and the generated file a little smaller
...
git-svn-id: file:///home/svn/framework3/trunk@7427 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 18:32:03 +00:00
95d9f5e676
raise instead of exit
...
git-svn-id: file:///home/svn/framework3/trunk@7426 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 18:27:30 +00:00
927fe6b6c2
update pattern_offset to show all ocurrences
...
git-svn-id: file:///home/svn/framework3/trunk@7425 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 17:50:53 +00:00
c372c68f48
fix whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@7423 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 06:19:59 +00:00
3853073731
Fixes #489 . Change this a bit to be proper syntax
...
git-svn-id: file:///home/svn/framework3/trunk@7422 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 06:16:29 +00:00
07cfae0f14
added myself to author.rb
...
git-svn-id: file:///home/svn/framework3/trunk@7420 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 04:45:22 +00:00
d29f6e17dc
Fixes #486 . Add the Revision constant abck
...
git-svn-id: file:///home/svn/framework3/trunk@7416 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 03:22:24 +00:00
5581f5a73b
Parse SVN information and warns folks with out of date installations
...
git-svn-id: file:///home/svn/framework3/trunk@7415 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 01:50:44 +00:00
176e999f08
Merge patches from Ryan Linn. Fixes #438
...
git-svn-id: file:///home/svn/framework3/trunk@7413 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:33:40 +00:00
dbde29521c
Minor typo fixed
...
git-svn-id: file:///home/svn/framework3/trunk@7412 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:15:54 +00:00
6885ffa48f
Improvements to the SSL TCP Server mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7409 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:13:25 +00:00
e92a193f8c
Correct a typo
...
git-svn-id: file:///home/svn/framework3/trunk@7408 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:11:47 +00:00
1b7fb68f52
More useful error when given invalid register name, fix error message to be consistent with code when offset is too large
...
git-svn-id: file:///home/svn/framework3/trunk@7407 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-08 19:42:58 +00:00
06372f3c40
See #430 . This adds the AllowWin32SEH option to the upper/mixed alphanumeric encoders, providing 100% alphanumeric payloads for Windows platforms
...
git-svn-id: file:///home/svn/framework3/trunk@7405 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-08 00:45:51 +00:00
d09d151f31
Disable stager + single chaining, it causes confusion and often breaks.
...
git-svn-id: file:///home/svn/framework3/trunk@7400 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-07 22:13:04 +00:00
7b832b9d3e
Wmap checking for vulnerabilities and launching exploits
...
git-svn-id: file:///home/svn/framework3/trunk@7399 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-07 21:55:33 +00:00
0fe06c614f
Fixes #473 . Import Sussaro's patch (wee!)
...
git-svn-id: file:///home/svn/framework3/trunk@7395 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 21:08:34 +00:00
cae79f8b3b
Add a comment describing the extension
...
git-svn-id: file:///home/svn/framework3/trunk@7394 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 21:00:13 +00:00
836624570b
Disabling unfinished ESPIA commands
...
git-svn-id: file:///home/svn/framework3/trunk@7393 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:58:57 +00:00
d82d687ea6
Fixes #478 . Handles the screenshot command better, defaults to a random bmp
...
git-svn-id: file:///home/svn/framework3/trunk@7392 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:58:24 +00:00
c5ace6ef28
Use the open_file API
...
git-svn-id: file:///home/svn/framework3/trunk@7391 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:47:45 +00:00
5d129bdb53
Add open_file() to work around url vs file handling issues on cygwin
...
git-svn-id: file:///home/svn/framework3/trunk@7390 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:43:00 +00:00
1dad276f58
...and back again. Looks like cygwin / 1.9.1 DL is a little different
...
git-svn-id: file:///home/svn/framework3/trunk@7389 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:28:25 +00:00
1a280c3a0a
Switch to shell open
...
git-svn-id: file:///home/svn/framework3/trunk@7388 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:26:05 +00:00
1bb29e2835
See #478 . Handle cygwin better for open url
...
git-svn-id: file:///home/svn/framework3/trunk@7387 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:22:28 +00:00
948e1ba5e9
Dont repeat the stdout
...
git-svn-id: file:///home/svn/framework3/trunk@7386 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:15:12 +00:00
0cc3db65be
This works but stdout needs to be hidden
...
git-svn-id: file:///home/svn/framework3/trunk@7385 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:43:13 +00:00
dc2c355703
Use nmap without the absolute path... Cygwin is annoying.
...
git-svn-id: file:///home/svn/framework3/trunk@7384 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:32:13 +00:00
f985349a26
Place all arguments in quotes
...
git-svn-id: file:///home/svn/framework3/trunk@7383 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:30:25 +00:00
bf0e856c1f
Trying a different approach - buffing output to a file and using system to overcome bugs in IO.popen on Cygwin
...
git-svn-id: file:///home/svn/framework3/trunk@7382 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:27:28 +00:00
55b5b828f2
Use the relative path to nmap
...
git-svn-id: file:///home/svn/framework3/trunk@7381 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:15:26 +00:00
1c51182b39
One more shot
...
git-svn-id: file:///home/svn/framework3/trunk@7380 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:12:19 +00:00
5de9a090a9
Another attempt at correct path translation
...
git-svn-id: file:///home/svn/framework3/trunk@7379 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:09:31 +00:00
adf5b531eb
make sure the address type is IP (not mac). fixes #476
...
git-svn-id: file:///home/svn/framework3/trunk@7378 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:44:02 +00:00
0604fbfd71
Workaround broken cygpath behavior with the cygwin path contains 8.3 names
...
git-svn-id: file:///home/svn/framework3/trunk@7377 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:43:14 +00:00
43edce7db8
Correct implementation (any instance of cygdrive in the path indicates a file outside the environment)
...
git-svn-id: file:///home/svn/framework3/trunk@7376 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:03:40 +00:00
4fde76e8f6
Expand to a windows path if the exe is outside of the cygwin installation
...
git-svn-id: file:///home/svn/framework3/trunk@7375 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:01:24 +00:00
48fb445609
Fixes #446 . Oddly enough, stty on cygwin uses term escapes in stderr as well as stdout to set the console mode. This is going to reopen #426 (errors when stdin isnt a tty). A better solution for #426 is going to be checking for stdin = terminal and ignoring readline entirely
...
git-svn-id: file:///home/svn/framework3/trunk@7374 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 15:27:13 +00:00
df2f2c0711
typo
...
git-svn-id: file:///home/svn/framework3/trunk@7369 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 21:23:28 +00:00
e3e2d01fd2
parse nmap xml with a stream parser instead of a tree parser. fixes #251 , i hope
...
git-svn-id: file:///home/svn/framework3/trunk@7368 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 20:26:28 +00:00
566234bcb1
Import Max's VBA2EXE code
...
git-svn-id: file:///home/svn/framework3/trunk@7364 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 02:48:56 +00:00
8309599ca3
Fixes #463 . Missing a return value in exe.rb and missing a default format in msfencode
...
git-svn-id: file:///home/svn/framework3/trunk@7357 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 21:30:00 +00:00
34d76a72e0
Fixes #462 . Handle proxy errors like regular socket errors. This can lead to missing results in tests, so we may need to add special proxy exception checks to the scanner mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7352 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 16:36:06 +00:00
45391a9ba9
Fixes byte vs char handling on Ruby 1.9.1, partial solution for see #430 .
...
git-svn-id: file:///home/svn/framework3/trunk@7349 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 05:31:54 +00:00
58ac7efcfa
Fixes #457 . Oddly enough, it was the nop sled garbling registers
...
git-svn-id: file:///home/svn/framework3/trunk@7342 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 23:50:32 +00:00
70bb99b0df
Fixes #458 . Break VBS lines into shorter ones
...
git-svn-id: file:///home/svn/framework3/trunk@7339 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 20:31:28 +00:00
785ab0921d
Clean up argument passing, cosmetic
...
git-svn-id: file:///home/svn/framework3/trunk@7338 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 20:00:43 +00:00
83fece42fe
Handle HTTP failures more gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@7335 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 18:10:09 +00:00
737dc327a3
Fixes #435 . Resolves a long-standing issue where datastore entries with a default of 'false' were being ignored.
...
git-svn-id: file:///home/svn/framework3/trunk@7334 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 18:09:05 +00:00
7da02115c6
Fixes #453 - 'spoof' the real readline to prevent future requires from loading it
...
git-svn-id: file:///home/svn/framework3/trunk@7327 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 20:18:49 +00:00
1b5cc24eab
See #434 . Some libraries used the wrong exception class
...
git-svn-id: file:///home/svn/framework3/trunk@7325 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:20:02 +00:00
075b8c5fa4
Fixes #434 . Always use Timeout.timeout() -- on Ruby 1.9 this results in the Timeout::TimeoutError exception vs RuntimeError
...
git-svn-id: file:///home/svn/framework3/trunk@7323 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:14:57 +00:00
176996fe61
Fixes #452 . Solves a number of crashes caused by Regexp.new() on 1.9 without an explicit language specified
...
git-svn-id: file:///home/svn/framework3/trunk@7320 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 17:09:13 +00:00
Mike Smith
HD Moore
James Lee
Joshua Drake
Stephen Fewer
Mario Ceballos
Patrick Webster
et