Matt Miller
c8bbefcab0
added some comments, and introduced the DatabaseEvent mixin
...
git-svn-id: file:///home/svn/framework3/trunk@4472 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-25 21:25:41 +00:00
Matt Miller
117d004e01
fixed unit tests in core
...
git-svn-id: file:///home/svn/framework3/trunk@4464 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-24 06:35:03 +00:00
Matt Miller
58708378d1
ensure that module counts are reflected accurately, and add option to specify a module path to msfconsole, fixes #25
...
git-svn-id: file:///home/svn/framework3/trunk@4462 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-24 05:29:05 +00:00
Matt Miller
3a8b138e74
don't modify the module cache when a temporary module path is added, fixes #24 . also added support for specifying permanent module paths in the global datastore with the MsfModulePaths variable
...
git-svn-id: file:///home/svn/framework3/trunk@4461 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-24 03:32:32 +00:00
Matt Miller
4d60b8f146
fixes #19 , don't skip if overwrite is false
...
git-svn-id: file:///home/svn/framework3/trunk@4449 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-21 03:10:48 +00:00
Matt Miller
fbd91e48d4
fixes #20 , re-import default options when flushing all options
...
git-svn-id: file:///home/svn/framework3/trunk@4448 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-21 03:07:12 +00:00
Matt Miller
d4a739f85a
fixes #1
...
git-svn-id: file:///home/svn/framework3/trunk@4435 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 12:08:11 +00:00
HD Moore
904901d163
Change ARCH and PLATFORM to advanced options
...
git-svn-id: file:///home/svn/framework3/trunk@4433 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 07:38:31 +00:00
HD Moore
24f0608974
Update the smb/dcerpc mixins to use the newly named options
...
git-svn-id: file:///home/svn/framework3/trunk@4430 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 07:06:30 +00:00
HD Moore
1d1f55f9e9
Added CHOST/CPORT as advanced options. Split out uncommon SMB options as advanced
...
git-svn-id: file:///home/svn/framework3/trunk@4429 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 07:02:47 +00:00
HD Moore
ddb22785ee
The datastore is now case insensitive, but this may lead to some confusion... lets see :-)
...
git-svn-id: file:///home/svn/framework3/trunk@4398 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-16 05:39:38 +00:00
HD Moore
9826b57b11
Added capture mixin (going to replace pcap)
...
git-svn-id: file:///home/svn/framework3/trunk@4393 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-15 21:14:36 +00:00
HD Moore
52b0f8c2aa
More code from alex
...
git-svn-id: file:///home/svn/framework3/trunk@4392 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-15 21:14:11 +00:00
Matt Miller
93da259db2
additions to the user guide, fix data store to not import globally defined values, added ability to flush datastores
...
git-svn-id: file:///home/svn/framework3/trunk@4387 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-15 08:02:47 +00:00
HD Moore
a1c6dda462
Patches from solar to add symlink support to mod dirs and prevent caching of broken modules
...
git-svn-id: file:///home/svn/framework3/trunk@4384 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-15 05:32:48 +00:00
HD Moore
9d8fd125a6
Updated the ActiveRecord loader to work properly with new gems package
...
git-svn-id: file:///home/svn/framework3/trunk@4364 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 23:47:34 +00:00
HD Moore
8a797e6bcc
Support for killing sessions from the UI and killing all running jobs with jobs -a
...
git-svn-id: file:///home/svn/framework3/trunk@4361 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 23:24:25 +00:00
HD Moore
4d205cdcd8
Consistency fixes for the print_* routines
...
git-svn-id: file:///home/svn/framework3/trunk@4358 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 19:40:33 +00:00
Matt Miller
df10ee412d
typos
...
git-svn-id: file:///home/svn/framework3/trunk@4349 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 03:16:08 +00:00
Matt Miller
cbd0a8ca35
normalize general framework events to be like other events
...
git-svn-id: file:///home/svn/framework3/trunk@4307 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-02 03:45:37 +00:00
Matt Miller
279c0e3e52
defanged mode
...
git-svn-id: file:///home/svn/framework3/trunk@4303 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-30 04:48:35 +00:00
HD Moore
0012389ba0
Adds support for bind payloads in passive exploits
...
git-svn-id: file:///home/svn/framework3/trunk@4281 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-18 03:51:15 +00:00
Matt Miller
d63d365af2
svnserve
...
git-svn-id: file:///home/svn/framework3/trunk@4265 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-05 06:38:24 +00:00
HD Moore
68274d6870
PHP tags are now added by the php_include handler and no longer a part of the payloads themselves
...
git-svn-id: file:///home/svn/framework3/trunk@4254 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-05 03:31:18 +00:00
Matt Miller
851f2ccb29
fix for connect_login
...
git-svn-id: file:///home/svn/framework3/trunk@4243 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-29 11:33:16 +00:00
HD Moore
2bc1d4be18
Updates to the client API
...
git-svn-id: file:///home/svn/framework3/trunk@4242 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-28 23:42:54 +00:00
HD Moore
43df6869b2
Compatible encoder list from Diaul
...
git-svn-id: file:///home/svn/framework3/trunk@4235 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-28 15:47:00 +00:00
Matt Miller
e1565e2af4
fixed a few issues with the alpha2 implementation
...
git-svn-id: file:///home/svn/framework3/trunk@4230 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-28 05:19:31 +00:00
HD Moore
804df25240
Initial overhaul of the HTTP client api. This removes nearly all of the client evasion methods, but leaves the code in a great state to reimplement them with less issues.
...
git-svn-id: file:///home/svn/framework3/trunk@4222 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-19 07:11:55 +00:00
HD Moore
239fe1e8ae
Removing the obsolete evasion levels API
...
git-svn-id: file:///home/svn/framework3/trunk@4221 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-19 04:32:07 +00:00
HD Moore
ffc626675b
Initial support for PHP payloads
...
git-svn-id: file:///home/svn/framework3/trunk@4215 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-17 07:57:51 +00:00
Matt Miller
ddd40907d5
fix for service management issue with tcp server/http server mixins
...
git-svn-id: file:///home/svn/framework3/trunk@4213 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-17 07:12:04 +00:00
Matt Miller
d16a368ea2
fix for tcp server/http server compat
...
git-svn-id: file:///home/svn/framework3/trunk@4210 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-17 06:49:04 +00:00
HD Moore
6fef5abeda
Resolve a crash bug in the send_response_html() method
...
Add the MS06_013 CreateTextRange() exploit
git-svn-id: file:///home/svn/framework3/trunk@4208 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-17 02:34:27 +00:00
Matt Miller
fb161fc3dd
ported putty exploit, untested
...
git-svn-id: file:///home/svn/framework3/trunk@4198 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-14 02:20:21 +00:00
Matt Miller
6ea76fdfbc
squid ntlm authenticate ported, fixed bugs in brute force mixni
...
git-svn-id: file:///home/svn/framework3/trunk@4192 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-14 00:23:56 +00:00
HD Moore
feac78350f
Break on ^c
...
git-svn-id: file:///home/svn/framework3/trunk@4174 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-10 06:04:51 +00:00
HD Moore
ea204ee0ff
API change for the HTML mixin, the send_response method is no longer overloaded, instead exploits must call send_response_html to enable HTML evasion. The old method caused problems when a exploit needed HTML and non-HTML response capabilities
...
git-svn-id: file:///home/svn/framework3/trunk@4173 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-10 03:26:53 +00:00
HD Moore
f91a4dd9d4
Fix a typo (Html -> HTML)
...
git-svn-id: file:///home/svn/framework3/trunk@4171 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-10 03:11:48 +00:00
HD Moore
45066abcd3
Changed Html to HTML
...
git-svn-id: file:///home/svn/framework3/trunk@4170 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-10 02:55:25 +00:00
HD Moore
9c7cdef7de
Fixes to "extra" commands provided by the auxiliary modules
...
git-svn-id: file:///home/svn/framework3/trunk@4161 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-03 17:46:34 +00:00
HD Moore
f4d6983a74
Add pattern_create to exploit mixins
...
git-svn-id: file:///home/svn/framework3/trunk@4147 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-16 06:09:28 +00:00
HD Moore
1fad9eef5c
Force the interface up when open_wifi is called
...
git-svn-id: file:///home/svn/framework3/trunk@4132 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-12 21:33:33 +00:00
HD Moore
f925120ddd
Wifi updates
...
git-svn-id: file:///home/svn/framework3/trunk@4129 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-11 21:45:28 +00:00
HD Moore
e2a78bc758
Move eton into the mixin
...
git-svn-id: file:///home/svn/framework3/trunk@4117 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-09 07:46:31 +00:00
HD Moore
54cef446f9
Thanks Rhys
...
git-svn-id: file:///home/svn/framework3/trunk@4115 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-07 14:39:13 +00:00
HD Moore
777e70b088
Addition of the new Pcap interface
...
Force user to install the pcapx and lorcon libs
git-svn-id: file:///home/svn/framework3/trunk@4114 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-06 05:29:56 +00:00
HD Moore
2982440a28
Removed msflorcon in favor of the new ruby-lorcon module
...
git-svn-id: file:///home/svn/framework3/trunk@4105 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-06 00:26:35 +00:00
HD Moore
44bb7e0901
Typo
...
git-svn-id: file:///home/svn/framework3/trunk@4099 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-01 20:14:05 +00:00
HD Moore
c7b95f4a5c
Add WVE and fixes milw0rm
...
git-svn-id: file:///home/svn/framework3/trunk@4098 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-01 20:11:56 +00:00
HD Moore
8d007b2de8
Commenting this out til its committored
...
git-svn-id: file:///home/svn/framework3/trunk@4092 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-31 23:19:57 +00:00
HD Moore
b9834c8524
VoIP module from david maynor
...
git-svn-id: file:///home/svn/framework3/trunk@4091 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-31 23:18:54 +00:00
HD Moore
652cc08711
Only set the abortive_close flag if the socket type supports it
...
git-svn-id: file:///home/svn/framework3/trunk@4089 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-31 02:11:18 +00:00
HD Moore
fa91b4b5dd
Bug fixes to rescue statements (was catching relative exception class, not the main exception class)
...
git-svn-id: file:///home/svn/framework3/trunk@4086 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-29 17:41:19 +00:00
HD Moore
6c245f561c
Cosmetic changes, removal of advanced/evasion options from dumps
...
git-svn-id: file:///home/svn/framework3/trunk@4085 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-29 17:31:53 +00:00
HD Moore
4281e18e45
Decrementing the minimal byte size to match lower-mtu networks
...
git-svn-id: file:///home/svn/framework3/trunk@4083 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-29 05:24:39 +00:00
Matt Miller
68a5fb928d
added PrependUser and AppendUser to extended options
...
git-svn-id: file:///home/svn/framework3/trunk@4056 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-26 01:48:10 +00:00
Matt Miller
5ae0993151
added PrependUser and AppendUser to extended options
...
git-svn-id: file:///home/svn/framework3/trunk@4055 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-26 01:44:25 +00:00
HD Moore
d366f3a90c
Working lorcon interface
...
git-svn-id: file:///home/svn/framework3/trunk@4053 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-25 19:16:55 +00:00
Matt Miller
2c5cf95d0f
removed modules that don't currently function
...
git-svn-id: file:///home/svn/framework3/trunk@4052 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-25 13:29:25 +00:00
Matt Miller
6c2ad54dfd
license array
...
git-svn-id: file:///home/svn/framework3/trunk@4050 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-20 14:24:02 +00:00
Matt Miller
e6b9e4f24b
a few tweaks to make things more reliable, added wfs_delay
...
git-svn-id: file:///home/svn/framework3/trunk@4045 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-17 00:16:04 +00:00
Matt Miller
465ea3c677
initial integration of basic kernel-mode payload support
...
git-svn-id: file:///home/svn/framework3/trunk@4044 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-16 23:59:14 +00:00
Matt Miller
fa14510b78
starting integration of kernel-mode payloads
...
git-svn-id: file:///home/svn/framework3/trunk@4043 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-16 21:40:38 +00:00
Matt Miller
c12e3f2992
better implementation
...
git-svn-id: file:///home/svn/framework3/trunk@4042 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-16 19:04:39 +00:00
Matt Miller
34f388d0e5
added code to support HEX var substitution
...
git-svn-id: file:///home/svn/framework3/trunk@4041 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-16 18:51:34 +00:00
Matt Miller
7b0c80b922
mixins method
...
git-svn-id: file:///home/svn/framework3/trunk@4040 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-16 08:06:52 +00:00
Matt Miller
b354c82258
ypops overflow ported
...
git-svn-id: file:///home/svn/framework3/trunk@4021 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-12 03:24:31 +00:00
Matt Miller
abf2e057c8
apache chunked encoding win32 port
...
git-svn-id: file:///home/svn/framework3/trunk@4017 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-11 08:31:54 +00:00
Matt Miller
b477547a3d
partial fix for mod cache issue? committed vlad's new stagers
...
git-svn-id: file:///home/svn/framework3/trunk@4013 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-10 06:44:15 +00:00
HD Moore
dea617c67a
Unspammed
...
git-svn-id: file:///home/svn/framework3/trunk@4011 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-06 04:02:55 +00:00
Spoon M
c7ffe342e5
ug, I hate the world
...
git-svn-id: file:///home/svn/framework3/trunk@4010 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-05 03:08:15 +00:00
HD Moore
17e97fc84c
Fix the duplicate connection problem for dcerpc bugs
...
git-svn-id: file:///home/svn/framework3/trunk@4008 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-02 21:32:00 +00:00
HD Moore
070f9af55f
Reverse connection payloads now listen on 0.0.0.0 by default.
...
git-svn-id: file:///home/svn/framework3/trunk@4000 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-01 16:56:17 +00:00
HD Moore
f14f8d144c
Updated the framework revision
...
git-svn-id: file:///home/svn/framework3/trunk@3997 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-01 05:26:02 +00:00
HD Moore
ec987e0f28
Bug fix for passive-exploits
...
Bug fix for a crash in the DB import for XML
git-svn-id: file:///home/svn/framework3/trunk@3920 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-21 14:51:58 +00:00
Matt Miller
d3670564a0
hopeful commit to uber session stupid number 2
...
git-svn-id: file:///home/svn/framework3/trunk@3905 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-17 07:26:22 +00:00
HD Moore
f3b79d2c2c
Default to X86
...
git-svn-id: file:///home/svn/framework3/trunk@3903 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-17 05:07:47 +00:00
HD Moore
7fc40e4734
More work towards automation
...
git-svn-id: file:///home/svn/framework3/trunk@3902 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-17 00:39:23 +00:00
HD Moore
0d1137e562
More work on the database backend
...
git-svn-id: file:///home/svn/framework3/trunk@3901 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-16 20:08:13 +00:00
HD Moore
a309a6755b
Fix background job support
...
git-svn-id: file:///home/svn/framework3/trunk@3899 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-16 20:07:07 +00:00
HD Moore
6a9f9ebee7
Cleanups for database management, use a persistent sqlite3 database with the db_sqlite3 plugin
...
git-svn-id: file:///home/svn/framework3/trunk@3897 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-16 06:45:06 +00:00
HD Moore
033da6245a
Display an ugly warning message if a broken module is found in the tree
...
git-svn-id: file:///home/svn/framework3/trunk@3896 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-16 06:27:14 +00:00
HD Moore
ccbe1cc876
Import CONST
...
git-svn-id: file:///home/svn/framework3/trunk@3888 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-14 05:51:24 +00:00
Matt Miller
d11604cca9
filter out privileged payloads used with non-privileged exploits
...
git-svn-id: file:///home/svn/framework3/trunk@3869 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-12 05:58:07 +00:00
Matt Miller
3e69f46a3a
added support for manual ranking
...
git-svn-id: file:///home/svn/framework3/trunk@3866 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-12 05:34:58 +00:00
HD Moore
47039ff3fa
First round of bugfixes for encoders. Alphanumeric encoders no longer default the BufferRegister option, since this can lead to non-compatible exploits falling through to these encoders, selecting them, and then crashing. The new method uses a dynamic (not quite poly) geteip generator, that while not yet alphanumeric compatible, it handles most of the known use cases. Remaining items:
...
1) Figure out how to handle unicode geteip (unicode encoded, alphanum probably)
2) Add keys to the unicode payloads to force a corresponding keyu on the exploit side to enable
git-svn-id: file:///home/svn/framework3/trunk@3863 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-10 05:10:48 +00:00
pusscat
366dea259c
Add smtp mixin for exchange exploit.
...
git-svn-id: file:///home/svn/framework3/trunk@3855 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-06 17:44:12 +00:00
HD Moore
904449b923
Post-Beta2 bugfix for 'show payloads' and the new generic payload system.
...
git-svn-id: file:///home/svn/framework3/trunk@3847 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-28 05:45:36 +00:00
HD Moore
7a0c8d2c8d
Cleanup
...
git-svn-id: file:///home/svn/framework3/trunk@3846 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-28 00:24:34 +00:00
Matt Miller
e7ffef974c
fix to make it so there aren't errors with Msf::Payload::Generic
...
git-svn-id: file:///home/svn/framework3/trunk@3845 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-27 06:56:32 +00:00
Matt Miller
ea06abe5bb
support for generic payloads
...
git-svn-id: file:///home/svn/framework3/trunk@3843 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-26 02:13:25 +00:00
Matt Miller
66b99d69ae
more fixes for the meterpreter pivoting issues
...
git-svn-id: file:///home/svn/framework3/trunk@3840 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-22 07:19:59 +00:00
Matt Miller
cc6900d2ec
fix to bind_tcp handler where it wouldn't use the proper comm
...
git-svn-id: file:///home/svn/framework3/trunk@3834 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-17 01:57:52 +00:00
Matt Miller
a724d42aa0
added mcafee mcsubmgr exploit, added functional avoid utf8 encoder
...
git-svn-id: file:///home/svn/framework3/trunk@3830 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-14 08:55:37 +00:00
HD Moore
90fc7fa94e
Abstracted the RHOST references from inside the mixins.
...
Added a mssql_ping_parse method to the mssql mixin
git-svn-id: file:///home/svn/framework3/trunk@3827 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-13 18:03:28 +00:00
HD Moore
845f80af59
Bug fix to AddressRange option
...
Reworked TCP/UDP exploit mixins to allow the source of rhost/rport/etc to be overloaded
Reworked Scanner mixin to deregister RHOST and overflow self.rhost
git-svn-id: file:///home/svn/framework3/trunk@3823 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-12 23:08:20 +00:00
HD Moore
c5542fd347
Major reworking of the recon stuff, there is a new mixin called Auxiliary::Scanner that
...
supports per-range, per-host, and per-batch requests. The reporting stuff has been moved
into a new mixin for it. The old recon stuff was pulled out and sample modules for the
scanner mixin were added. Almost time to re-import skape's old recon foo using Scanner :-)
git-svn-id: file:///home/svn/framework3/trunk@3820 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-12 08:31:38 +00:00
Matt Miller
7bd26e4925
fixed bug in service manager hardcore alias, new passivex dll/proj files
...
git-svn-id: file:///home/svn/framework3/trunk@3807 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-08 03:29:26 +00:00
HD Moore
c36519cfbf
Fix bind_Tcp being killed too early
...
git-svn-id: file:///home/svn/framework3/trunk@3792 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-31 06:58:29 +00:00
Matt Miller
7594389a96
added midstager support for staging over-sized payloads
...
git-svn-id: file:///home/svn/framework3/trunk@3780 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-30 22:49:19 +00:00
HD Moore
164f34cc80
Massive speed improvements to set PAYLOAD.
...
Tab completion for exploit names works for demand-loaded modules
git-svn-id: file:///home/svn/framework3/trunk@3779 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-30 22:28:47 +00:00
Matt Miller
144249b34d
bump thread priority in encoded payload generation to fix thread starvation issues
...
git-svn-id: file:///home/svn/framework3/trunk@3777 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-30 18:45:36 +00:00
HD Moore
817c4c189f
Timeouts added for handlers
...
git-svn-id: file:///home/svn/framework3/trunk@3773 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-29 22:37:39 +00:00
HD Moore
651508ea46
ar4 -> b1
...
git-svn-id: file:///home/svn/framework3/trunk@3768 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-27 22:46:09 +00:00
HD Moore
6677b4ba71
Minor bug fixes to remove extra 'p' calls
...
Rewrite of stdio/readline to support Windows
git-svn-id: file:///home/svn/framework3/trunk@3766 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-27 22:28:19 +00:00
HD Moore
5c142b2059
Random fixes for warntings
...
git-svn-id: file:///home/svn/framework3/trunk@3750 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-19 07:24:47 +00:00
HD Moore
ff28b148d1
Fix from nico
...
git-svn-id: file:///home/svn/framework3/trunk@3745 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-18 01:32:21 +00:00
HD Moore
d1efbad1e7
Minor updates
...
git-svn-id: file:///home/svn/framework3/trunk@3722 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-23 06:20:52 +00:00
HD Moore
14dabc399e
Added DOS aux modules
...
Temporarily added RRAS_MAGIC
git-svn-id: file:///home/svn/incoming/trunk@3666 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 15:52:01 +00:00
bmc
d89f5fa9d1
* change where NDR is grabbed from
...
git-svn-id: file:///home/svn/incoming/trunk@3660 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-13 21:27:01 +00:00
Matt Miller
1a61d3d2fb
changes to support native win32
...
git-svn-id: file:///home/svn/incoming/trunk@3654 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-08 20:53:15 +00:00
HD Moore
7d0690ed2e
Cleanups in preparation for alpha-r4
...
git-svn-id: file:///home/svn/incoming/trunk@3645 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-30 15:44:48 +00:00
HD Moore
18bb4f9e6d
Fixed spaces before paranethesis issues in dcerpc/packet.rb
...
Fixed comment in smb/client.rb
Fixed ReadAndX in smb/client.rb
Updated ReadAndX struct in constants.rb
git-svn-id: file:///home/svn/incoming/trunk@3643 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-15 16:44:44 +00:00
HD Moore
43387ea793
register_options() always overrides the datastore
...
resolves the problem reported by Nicolas P.
git-svn-id: file:///home/svn/incoming/trunk@3642 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-11 16:11:06 +00:00
pusscat
c02749067f
Add nonupper encoder, like nonalpha, but with badchar support instead of lowercase char range
...
git-svn-id: file:///home/svn/incoming/trunk@3641 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-08 15:04:50 +00:00
HD Moore
f959995bb1
Added the missing BSD license
...
git-svn-id: file:///home/svn/incoming/trunk@3638 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-06 17:13:22 +00:00
HD Moore
64827d1238
New evasion options for controlling how many fake uuids to place before and after the real uid when eexploiting DCERPC bugs
...
Added a new evasion option for picking readAndX/writeAndX or transNamedPipe methods for DCERPC delivery, however a struct2 issue seems to be breaking this (will investigate tomorrow).
Fixed a typo in the initialize method of the OpenPipe class
git-svn-id: file:///home/svn/incoming/trunk@3634 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-03 05:53:37 +00:00
HD Moore
304001a454
Removal of obsolete DCERPC code
...
git-svn-id: file:///home/svn/incoming/trunk@3633 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-03 05:23:52 +00:00
HD Moore
1fd5d698a2
Migrated client.rb to new smb time api (missed one)
...
Removed debugging print from the SMB mixin
git-svn-id: file:///home/svn/incoming/trunk@3632 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-03 04:49:47 +00:00
HD Moore
1a54cc810a
Fixed numerous issues involving smb/dcerpc interaction
...
Fixed 'bad' use of method definition (space after method name, will be depreciated soon)
git-svn-id: file:///home/svn/incoming/trunk@3626 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-30 19:49:27 +00:00
HD Moore
f9b23371b8
aux -> auxiliary to fix a windows isue
...
git-svn-id: file:///home/svn/incoming/trunk@3624 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-27 05:16:03 +00:00
HD Moore
d0b3483d41
Fixored
...
git-svn-id: file:///home/svn/incoming/trunk@3621 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 16:51:05 +00:00
HD Moore
55e7111d6a
Blacklist bytes making up the actual badchars too
...
git-svn-id: file:///home/svn/incoming/trunk@3619 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 05:26:17 +00:00
HD Moore
07e157efdf
Working on encoder fixes
...
git-svn-id: file:///home/svn/incoming/trunk@3618 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 05:14:55 +00:00
pusscat
7ef4741966
Hehe - sorry guys ;)
...
git-svn-id: file:///home/svn/incoming/trunk@3606 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-21 12:31:11 +00:00
pusscat
f678425f07
Add non-alpha encoder (not quite done, but passes tests with \xcc)
...
git-svn-id: file:///home/svn/incoming/trunk@3604 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-20 21:11:33 +00:00
HD Moore
da41886856
lib/msf/core/module_manager.rb - bug fixes to make it work with ruby-cvs
...
lib/rex/arch/x86.rb - removed illegal 'break' statements
lib/rex/peparsey* - imported from spn/, renamed classes to Rex
msfpescan - first version from spoonm
git-svn-id: file:///home/svn/incoming/trunk@3598 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-15 20:26:41 +00:00
HD Moore
457f476b4c
Changed to use spoon's meethod
...
git-svn-id: file:///home/svn/incoming/trunk@3590 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-03 04:50:26 +00:00
HD Moore
7b4fb0d6aa
Tons of fixes for aux/recon/db
...
git-svn-id: file:///home/svn/incoming/trunk@3589 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-03 04:33:30 +00:00
HD Moore
bd6ee5ecf8
Background auxiliary modules
...
git-svn-id: file:///home/svn/incoming/trunk@3588 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-03 00:33:06 +00:00
HD Moore
ccb5aeac2f
No need, since exploit mixins are now compat
...
git-svn-id: file:///home/svn/incoming/trunk@3587 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-02 23:32:17 +00:00
HD Moore
2299abf723
More recon hackery
...
git-svn-id: file:///home/svn/incoming/trunk@3586 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-02 23:26:33 +00:00
HD Moore
b4189e521d
More recon hackery
...
git-svn-id: file:///home/svn/incoming/trunk@3585 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-02 22:33:34 +00:00
HD Moore
096a7e6c71
Fixed event dispatching for db objects
...
git-svn-id: file:///home/svn/incoming/trunk@3574 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-21 05:29:26 +00:00
HD Moore
bab8745ba8
Backend code
...
git-svn-id: file:///home/svn/incoming/trunk@3573 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-21 04:37:48 +00:00
Matt Miller
a6726c8df7
fix for option import issue when options had spaces
...
git-svn-id: file:///home/svn/incoming/trunk@3571 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-16 16:33:32 +00:00
HD Moore
05bda2529a
More aux, first hack on multi-target firefox exploit
...
git-svn-id: file:///home/svn/incoming/trunk@3565 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-09 17:32:53 +00:00
HD Moore
5411701d3f
Aux mode updates
...
git-svn-id: file:///home/svn/incoming/trunk@3564 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-09 17:28:37 +00:00
bmc
1f9b1d3806
* add request fragmentation as an IDS evasion
...
git-svn-id: file:///home/svn/incoming/trunk@3563 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-08 19:14:10 +00:00
Matt Miller
e22b38ee8c
one other change
...
git-svn-id: file:///home/svn/incoming/trunk@3555 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-07 07:07:00 +00:00
Matt Miller
8b4ddab401
fix for module caching issues with rexploit
...
git-svn-id: file:///home/svn/incoming/trunk@3554 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-07 07:05:41 +00:00
HD Moore
c0a8b6cf22
Fixed auxiliarytarget issue, updated frame.rb to handle on-demand module loading
...
git-svn-id: file:///home/svn/incoming/trunk@3551 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-04 16:46:15 +00:00
HD Moore
0b1d97f653
Committed
...
git-svn-id: file:///home/svn/incoming/trunk@3550 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-01 16:16:08 +00:00
bmc
29b182eea8
* expose junk uri end
...
* expose junk param start
git-svn-id: file:///home/svn/incoming/trunk@3547 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-27 19:59:41 +00:00
Matt Miller
abd3c7a77f
fix for module reloading with rexploit
...
git-svn-id: file:///home/svn/incoming/trunk@3542 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-24 15:47:10 +00:00
Matt Miller
7cc1d53247
more improvements to demand module loading, fixes some incorrect assumptions
...
git-svn-id: file:///home/svn/incoming/trunk@3539 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-21 17:58:21 +00:00
Matt Miller
f796330f60
fix for warnings and file does not exist errors in demand loading
...
git-svn-id: file:///home/svn/incoming/trunk@3538 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-21 17:17:25 +00:00
Matt Miller
20550431d6
fix for error when exploit is removed
...
git-svn-id: file:///home/svn/incoming/trunk@3537 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-21 16:36:58 +00:00
Matt Miller
3a37749de6
support for demand-loading of modules to improve load speed, expect problems
...
git-svn-id: file:///home/svn/incoming/trunk@3534 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-21 03:10:58 +00:00
bmc
553144418a
* two tiny optimizations:
...
* Platform is far more frequently the reason for skipping, so make that first.
* compact!, the builtin for deleting nil entries in an array
git-svn-id: file:///home/svn/incoming/trunk@3532 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-19 04:09:18 +00:00
bmc
a73f024ce1
* less duplication, since the common case is just fine for all but a few instances
...
git-svn-id: file:///home/svn/incoming/trunk@3531 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-19 03:58:18 +00:00
vlad902
f2ab112647
Add verbosity flag (except for errors.)
...
git-svn-id: file:///home/svn/incoming/trunk@3530 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-18 17:12:25 +00:00
bmc
882e8601d3
* use utf-7 'mode' instead of utf-7
...
git-svn-id: file:///home/svn/incoming/trunk@3527 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-13 22:52:55 +00:00
bmc
a0af1e9598
* a more complete selection of various unicode types supported by most browsers
...
git-svn-id: file:///home/svn/incoming/trunk@3523 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-10 17:29:37 +00:00
bmc
1c51681efe
* add <object> base64 encoded objects, with 1 byte pad, 2 byte pad, and random space injection. Works fine on ie 4, firefox, and safari.
...
git-svn-id: file:///home/svn/incoming/trunk@3522 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-10 15:45:37 +00:00
Matt Miller
9c537c42fd
missed option
...
git-svn-id: file:///home/svn/incoming/trunk@3520 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-08 01:12:26 +00:00
Matt Miller
6a52aae59a
switch to use a service specific user/pass datastore option to avoid payload conflicts
...
git-svn-id: file:///home/svn/incoming/trunk@3519 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-08 01:07:47 +00:00
bmc
ca315abe1b
* add uri-encoding as an evasion method (though, exploits could hard code it if they need to...)
...
git-svn-id: file:///home/svn/incoming/trunk@3516 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-06 22:48:10 +00:00
bmc
32dfdc114c
* allow a request to pass a timeout (and by allowing passing a timeout, the ability to not parse the response)
...
git-svn-id: file:///home/svn/incoming/trunk@3511 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-06 20:22:47 +00:00
HD Moore
5b497d5e4d
Added Irix platform
...
Tweaked reverse.rb to use a subshell and background it
Added Irix lpdexec
git-svn-id: file:///home/svn/incoming/trunk@3505 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-05 18:10:08 +00:00
vlad902
3acdd81b9e
metasploit -> mozilla
...
git-svn-id: file:///home/svn/incoming/trunk@3504 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-05 01:56:34 +00:00
HD Moore
868d7bf561
Working findtag + samba
...
Removed call to evasions that didnt have corresponding definition
git-svn-id: file:///home/svn/incoming/trunk@3501 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-04 21:04:50 +00:00
bmc
40961655d6
* enable evasions on the socket as they come in
...
git-svn-id: file:///home/svn/incoming/trunk@3498 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-03 19:56:50 +00:00
bmc
3adb2211b8
* add tcp segment size evasion
...
* add tcp write delay evasion
git-svn-id: file:///home/svn/incoming/trunk@3497 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-03 19:55:56 +00:00
bmc
620dfad4a9
gee, these were not cut and paste targets...
...
git-svn-id: file:///home/svn/incoming/trunk@3490 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-01 22:33:49 +00:00
bmc
2f2790386f
providing the XDR alias is important...
...
git-svn-id: file:///home/svn/incoming/trunk@3489 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-01 22:31:28 +00:00
bmc
d4d73114c1
* add the following evasions for attacks against HTTP servers:
...
HTTP::chunked
HTTP::header_folding
HTTP::junk_headers
HTTP::junk_slashes
HTTP::junk_directories
HTTP::junk_params
HTTP::junk_self_referring_directories
HTTP::junk_pipeline
* add the following evasions for attacks against HTTP clients:
HTTP::junk_headers
HTTP::compression (was gzip)
* added an exploit mixin for HTML based attacks with HTML based evasions. eg: aim_goaway.rb
HTML::unicode
HTML::javascript::base64
HTML::javascript::escape
git-svn-id: file:///home/svn/incoming/trunk@3458 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 22:02:35 +00:00
HD Moore
b4ad4a5d75
Tabs vs Spaces
...
git-svn-id: file:///home/svn/incoming/trunk@3453 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 05:33:08 +00:00
bmc
7f9baa9744
* update OptEnum so that desc displays the valid options, less duplication of data
...
* add OptEnum to the test suite
git-svn-id: file:///home/svn/incoming/trunk@3442 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-25 19:15:09 +00:00
HD Moore
bdfd2c5152
Recon modules and the recon event subsystem have been temporarily removed.
...
The 'auxiliary' system is designed to replace it and recon features will
slowly be moved back into the framework
git-svn-id: file:///home/svn/incoming/trunk@3438 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-24 03:59:44 +00:00
HD Moore
9dc316e932
Updated license
...
git-svn-id: file:///home/svn/incoming/trunk@3429 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-22 19:28:05 +00:00
HD Moore
f485585e7c
License information displayed by info
...
git-svn-id: file:///home/svn/incoming/trunk@3428 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-22 19:25:55 +00:00
HD Moore
1bffccf605
New licensing terms, revision bump to v3
...
git-svn-id: file:///home/svn/incoming/trunk@3425 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-21 22:10:20 +00:00
vlad902
0d2fab2f27
Support for SunRPC
...
git-svn-id: file:///home/svn/incoming/trunk@3422 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-21 02:45:07 +00:00
vlad902
126c71d25a
Basic sunrpc interface
...
git-svn-id: file:///home/svn/incoming/trunk@3421 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-21 02:44:54 +00:00
HD Moore
737a1cb711
Pass socket context to child sockets from server, pass context from http mixin to socket
...
git-svn-id: file:///home/svn/incoming/trunk@3402 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-17 04:35:44 +00:00
HD Moore
e02eb0d2eb
Fixed to NOP vs Nop, Encoder vs ENCODER, setting the preferred NOP
...
Fixed multiple CPU spinning bugs in the alpha2 encoders
Fixed SiteReference to expose site type and value
git-svn-id: file:///home/svn/incoming/trunk@3401 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-17 04:09:40 +00:00
Matt Miller
ba0b13292b
support for preferred nop
...
git-svn-id: file:///home/svn/incoming/trunk@3399 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-17 01:11:26 +00:00
HD Moore
de9452dc34
Enum fix
...
git-svn-id: file:///home/svn/incoming/trunk@3396 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 23:32:51 +00:00
HD Moore
374f7f0c11
Added Enum
...
git-svn-id: file:///home/svn/incoming/trunk@3395 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 23:30:59 +00:00
Matt Miller
ef8e171e2a
fix clearing user defined options to work correctly
...
git-svn-id: file:///home/svn/incoming/trunk@3389 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 16:11:32 +00:00
HD Moore
64f86f88aa
alpha-2
...
git-svn-id: file:///home/svn/incoming/trunk@3388 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 04:32:30 +00:00
Matt Miller
f1596d0d26
fix for obscure ruby thing
...
git-svn-id: file:///home/svn/incoming/trunk@3380 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 03:56:08 +00:00
HD Moore
08027a53c7
Added HPUX, defined licensing in COPYING
...
git-svn-id: file:///home/svn/incoming/trunk@3378 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 03:36:43 +00:00
Matt Miller
2e19a86843
added license to all modules
...
git-svn-id: file:///home/svn/incoming/trunk@3377 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 02:59:47 +00:00
HD Moore
884fffa28c
Ported the unix revers command payloads and handler
...
git-svn-id: file:///home/svn/incoming/trunk@3372 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-14 20:12:53 +00:00
Matt Miller
c81e6a799d
properly pass encoder selection on to payload encoder
...
git-svn-id: file:///home/svn/incoming/trunk@3367 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-11 18:16:33 +00:00
Matt Miller
79e055c7fd
fix termination of bind handler thread
...
git-svn-id: file:///home/svn/incoming/trunk@3349 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 19:49:14 +00:00
Matt Miller
60abf5cff5
fix for compat matching with one side set and one side not
...
git-svn-id: file:///home/svn/incoming/trunk@3343 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 03:19:11 +00:00
Matt Miller
8e72f20095
better support for random uri base in px
...
git-svn-id: file:///home/svn/incoming/trunk@3331 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 20:11:21 +00:00
Matt Miller
b6395069ee
fixed a few bugs for px
...
git-svn-id: file:///home/svn/incoming/trunk@3323 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 18:59:04 +00:00
Matt Miller
ae5c816e85
various enhancements to support passivex, seems to be functional, somewhat
...
git-svn-id: file:///home/svn/incoming/trunk@3322 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 10:04:30 +00:00
Matt Miller
7a24c3556c
to_native
...
git-svn-id: file:///home/svn/incoming/trunk@3320 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-06 15:35:06 +00:00
Matt Miller
237af88317
update to encoder and exploit classes to support target/exploit specific encoder type/encoder options
...
git-svn-id: file:///home/svn/incoming/trunk@3315 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-06 02:25:47 +00:00
Matt Miller
f9d058887b
initial import of alpha2 from pusscat
...
git-svn-id: file:///home/svn/incoming/trunk@3313 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-06 00:57:14 +00:00
HD Moore
8049b32cbc
Patches from <anon>
...
git-svn-id: file:///home/svn/incoming/trunk@3310 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-05 22:20:28 +00:00
HD Moore
d0c8775f56
Adds a new 'evasion' option type
...
git-svn-id: file:///home/svn/incoming/trunk@3309 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-05 03:57:12 +00:00
Matt Miller
a590caaf77
fix for merging compat options and for mirroring Payload->Compat with Compat->Payload
...
git-svn-id: file:///home/svn/incoming/trunk@3304 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-03 04:43:40 +00:00
Matt Miller
e63ba080a8
added support for use_gzip
...
git-svn-id: file:///home/svn/incoming/trunk@3303 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-03 04:24:03 +00:00
HD Moore
96d4591b87
Updates to httpserver mixin, gzip encoding added to text, bugfix to wordstar, added metafile exploit, will rename and make it nice later
...
git-svn-id: file:///home/svn/incoming/trunk@3299 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-02 07:49:52 +00:00
HD Moore
9fc93bbe56
Miscellaneous fixes, changes to CMD payloads
...
git-svn-id: file:///home/svn/incoming/trunk@3296 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-02 01:12:36 +00:00
Matt Miller
09d21fbced
remove puts
...
git-svn-id: file:///home/svn/incoming/trunk@3295 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-01 22:26:18 +00:00
Matt Miller
6bbc5f7e17
remove all non-user defined datastore params when switching payloads
...
git-svn-id: file:///home/svn/incoming/trunk@3293 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-31 20:26:17 +00:00
HD Moore
8de634c25f
timing fixes
...
git-svn-id: file:///home/svn/incoming/trunk@3292 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-31 19:49:12 +00:00
Matt Miller
f2002f32d2
restore original buffer when init_state is called since encoders might modify it
...
git-svn-id: file:///home/svn/incoming/trunk@3290 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-31 18:47:53 +00:00
Matt Miller
00d15f8f1d
reinitializing counters
...
git-svn-id: file:///home/svn/incoming/trunk@3289 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-31 18:26:34 +00:00
Matt Miller
e9318c64d7
catch all exceptions
...
git-svn-id: file:///home/svn/incoming/trunk@3288 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-31 18:23:30 +00:00
HD Moore
f468b10cff
Tweaks
...
git-svn-id: file:///home/svn/incoming/trunk@3286 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-31 18:03:02 +00:00
HD Moore
2029e8a335
Revert stupid hack, done right now
...
git-svn-id: file:///home/svn/incoming/trunk@3277 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-30 06:49:25 +00:00
HD Moore
1d673f144c
Claim the socket when a shell is found, regardless of the return value of create_session()..
...
git-svn-id: file:///home/svn/incoming/trunk@3276 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-30 06:40:41 +00:00
HD Moore
f7e0579a3c
Updates to sparc/ppc encoders, added find_key_verify()
...
git-svn-id: file:///home/svn/incoming/trunk@3274 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-30 06:05:23 +00:00
Matt Miller
a4b622d425
fix for nop ui thing maybe
...
git-svn-id: file:///home/svn/incoming/trunk@3267 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-30 02:38:18 +00:00
Matt Miller
e537fadb05
shikata ga nai
...
git-svn-id: file:///home/svn/incoming/trunk@3266 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-30 01:14:56 +00:00
HD Moore
c8d273cec0
Wee, works
...
git-svn-id: file:///home/svn/incoming/trunk@3258 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-27 04:16:23 +00:00
Matt Miller
03ab9e8340
fix for nil deref and allow multi word compares in compat
...
git-svn-id: file:///home/svn/incoming/trunk@3256 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-27 02:42:46 +00:00
HD Moore
97129d0303
New modules, module renames
...
git-svn-id: file:///home/svn/incoming/trunk@3254 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-26 14:34:22 +00:00
HD Moore
412629e5c3
Stuff.. more changes to come
...
git-svn-id: file:///home/svn/incoming/trunk@3253 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-25 22:47:38 +00:00
Matt Miller
2baa7687fe
only user-defined options are saved now
...
git-svn-id: file:///home/svn/incoming/trunk@3249 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-21 02:51:23 +00:00
HD Moore
7a26ec55bf
Proxy chaining patch from bmc
...
git-svn-id: file:///home/svn/incoming/trunk@3244 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-18 02:19:21 +00:00
HD Moore
082a62afd7
NetDDE + smb code frmo pusscat
...
git-svn-id: file:///home/svn/incoming/trunk@3243 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-18 02:07:33 +00:00
HD Moore
88658064df
/usr/bin/ruby vs /usr/bin/env ruby
...
git-svn-id: file:///home/svn/incoming/trunk@3242 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-17 06:46:23 +00:00
Matt Miller
e434262050
fix for next
...
git-svn-id: file:///home/svn/incoming/trunk@3241 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-16 01:04:08 +00:00
Matt Miller
410770bae6
fixes for some socket association stuff
...
git-svn-id: file:///home/svn/incoming/trunk@3233 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-15 04:46:52 +00:00
HD Moore
6d087fe0f3
exploit.target now returns the default target_idx, even if its 0
...
git-svn-id: file:///home/svn/incoming/trunk@3232 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-15 04:34:26 +00:00
HD Moore
3d2bfd521c
Fixed options() problem in the mixin, minor tweak in remote_agent
...
git-svn-id: file:///home/svn/incoming/trunk@3229 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-15 04:16:30 +00:00
HD Moore
f2582ac38e
/me feels slapped around
...
git-svn-id: file:///home/svn/incoming/trunk@3226 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-14 05:15:06 +00:00
HD Moore
2ecec3db87
More
...
git-svn-id: file:///home/svn/incoming/trunk@3223 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-14 03:14:51 +00:00
Matt Miller
f37776f830
fix for mod platform
...
git-svn-id: file:///home/svn/incoming/trunk@3222 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-14 00:43:18 +00:00
Matt Miller
8d7e729261
fix for platform problem
...
git-svn-id: file:///home/svn/incoming/trunk@3221 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-14 00:37:19 +00:00
HD Moore
e79c9f8658
Something is still breaking, use w3who, show payloads, exploit, breaks
...
git-svn-id: file:///home/svn/incoming/trunk@3218 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-14 00:21:23 +00:00
HD Moore
557153e01c
Code from Brian Caswell
...
git-svn-id: file:///home/svn/incoming/trunk@3210 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-13 06:08:40 +00:00
Matt Miller
22278ce458
vncinject payload
...
git-svn-id: file:///home/svn/incoming/trunk@3201 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-12 07:07:19 +00:00
HD Moore
b9638a7aa2
Removed debugging line
...
git-svn-id: file:///home/svn/incoming/trunk@3199 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-09 05:23:53 +00:00
Matt Miller
be449c54a5
stagers stat works
...
git-svn-id: file:///home/svn/incoming/trunk@3183 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-06 19:37:59 +00:00
HD Moore
6c2da4d313
Imap exploits
...
Addition of MC as a common author
Added the IMAP mixin
Fixed bug in base64
git-svn-id: file:///home/svn/incoming/trunk@3172 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-05 05:00:27 +00:00
HD Moore
9b977bee1b
Fixed some authors
...
git-svn-id: file:///home/svn/incoming/trunk@3163 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-02 01:18:51 +00:00
HD Moore
4d43e8f482
mnor
...
git-svn-id: file:///home/svn/incoming/trunk@3159 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-29 02:57:04 +00:00
Matt Miller
ebf9cf5c48
add none to default
...
git-svn-id: file:///home/svn/incoming/trunk@3158 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-29 02:43:20 +00:00
Matt Miller
a2df616bd4
devguide samples
...
git-svn-id: file:///home/svn/incoming/trunk@3154 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-28 23:49:48 +00:00
Matt Miller
5a42b1d86b
msfd fixes
...
git-svn-id: file:///home/svn/incoming/trunk@3150 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-28 20:41:11 +00:00
Matt Miller
5bb104c993
msfd
...
git-svn-id: file:///home/svn/incoming/trunk@3146 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-28 16:36:06 +00:00
Matt Miller
d99f972357
changes to comments
...
git-svn-id: file:///home/svn/incoming/trunk@3144 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-28 12:40:13 +00:00
HD Moore
9340ecdeab
IIS exploits ported
...
Added on_new_session callback and session_created? flag to exploit
Fixed socket fd leak in Comm::Local
git-svn-id: file:///home/svn/incoming/trunk@3135 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-27 18:42:44 +00:00
HD Moore
7624b4d78a
Bug fixes for alphanum vs alphanumeric
...
Added some target print code to the brightstor explotis
Added the backupexec epxloits
git-svn-id: file:///home/svn/incoming/trunk@3132 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-27 01:51:50 +00:00
HD Moore
40aa62968f
Arkeia exploits added
...
git-svn-id: file:///home/svn/incoming/trunk@3129 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-26 19:56:03 +00:00
HD Moore
f4d6a11fd7
Mixins
...
git-svn-id: file:///home/svn/incoming/trunk@3123 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-26 11:16:50 +00:00
HD Moore
7403e8bf23
Mssql code!
...
git-svn-id: file:///home/svn/incoming/trunk@3122 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-26 11:16:36 +00:00
HD Moore
9bf0d901cf
Added the egghunter mixin
...
Consolidated all unicode routines to go through Rex::Text.to_unicode()
Added a new function for sending evil blobs through smb
git-svn-id: file:///home/svn/incoming/trunk@3114 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-26 02:34:39 +00:00
HD Moore
fb8b56f55f
Changed up the way mixins are handled, all exploits just require 'msf/core' and
...
all current mixins will be loaded. Egghunter was moved to a mixin and generates
based on target arch and platform.
git-svn-id: file:///home/svn/incoming/trunk@3111 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-26 00:04:26 +00:00
HD Moore
fb47661a8f
Serv-U exploit working, depends on searcher() in x86, many fixes to FTP mixin
...
git-svn-id: file:///home/svn/incoming/trunk@3103 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-25 20:02:21 +00:00
Matt Miller
6c4703add7
fix generation stuff
...
git-svn-id: file:///home/svn/incoming/trunk@3093 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-25 02:07:35 +00:00
Matt Miller
04a27c3475
msfweb payload generation functional
...
git-svn-id: file:///home/svn/incoming/trunk@3092 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-25 01:59:54 +00:00
Matt Miller
32c471498a
more msfweb action
...
git-svn-id: file:///home/svn/incoming/trunk@3089 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 20:41:56 +00:00
Matt Miller
88c4916967
catch IOErrors in disconnect
...
git-svn-id: file:///home/svn/incoming/trunk@3084 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 19:15:24 +00:00
Matt Miller
96d75dcbb4
support for aborting sockets once a remote, non-find exploit succeeds
...
git-svn-id: file:///home/svn/incoming/trunk@3082 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 18:50:33 +00:00
HD Moore
81a1de755b
SEH frame stuff integrated into ftp modules, added generate_seh_payload
...
git-svn-id: file:///home/svn/incoming/trunk@3081 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 18:30:56 +00:00
HD Moore
bbe464e358
Added note to TODO, reordered some functios in FTP, will change these again
...
once we get the socket abort stuff going
git-svn-id: file:///home/svn/incoming/trunk@3080 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 17:45:00 +00:00
Matt Miller
68e661065d
more msfweb foo
...
git-svn-id: file:///home/svn/incoming/trunk@3077 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 05:13:40 +00:00
Matt Miller
a19e98757d
more hackery on msfweb
...
git-svn-id: file:///home/svn/incoming/trunk@3076 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 04:23:43 +00:00
Matt Miller
adc09f4aa1
hacking on msfweb
...
git-svn-id: file:///home/svn/incoming/trunk@3069 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 03:31:23 +00:00
Matt Miller
2f05b6959f
updated sample to support console command dispatcher registration
...
git-svn-id: file:///home/svn/incoming/trunk@3059 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-23 14:34:11 +00:00
Matt Miller
36f6c79986
fixed up plugins to be loadable with local input/output handles
...
git-svn-id: file:///home/svn/incoming/trunk@3058 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-23 14:02:30 +00:00
Matt Miller
09a41d4d5c
framework plugins
...
git-svn-id: file:///home/svn/incoming/trunk@3053 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-19 16:25:26 +00:00
Matt Miller
0e9c5bab5b
logging fix, meterpreter multi-load fixed, advanced option display, meterpreter optino to autoload stdapi
...
git-svn-id: file:///home/svn/incoming/trunk@3052 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-19 15:09:41 +00:00
Matt Miller
cbbce06ee0
fix for multiple exploit
...
git-svn-id: file:///home/svn/incoming/trunk@3046 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-18 00:26:19 +00:00
Matt Miller
07328a0841
partial fix
...
git-svn-id: file:///home/svn/incoming/trunk@3045 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-17 23:03:53 +00:00
HD Moore
4edf57d731
ms04_011 works perfectly
...
updated smb, evasion can be set via SMBEvasion datastore (temporary)
added the first osx exploit, cant test for a week or so
git-svn-id: file:///home/svn/incoming/trunk@3044 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-17 19:41:54 +00:00
HD Moore
ee3745ef8c
More tweaks
...
git-svn-id: file:///home/svn/incoming/trunk@3043 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-17 04:25:30 +00:00
HD Moore
16c5e232f5
Addition of get_once() in io::stream, rewritten recv code for smb/dcerpc, error handling in exploit mixins
...
git-svn-id: file:///home/svn/incoming/trunk@3042 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-16 17:56:07 +00:00
HD Moore
3150bd2f3a
SMB mixin is mostly working now
...
git-svn-id: file:///home/svn/incoming/trunk@3037 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 23:02:17 +00:00
Matt Miller
510669e7ef
option normalization
...
git-svn-id: file:///home/svn/incoming/trunk@3035 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 21:50:10 +00:00
Matt Miller
fc42fef941
exploits now pass context when creating sockets
...
git-svn-id: file:///home/svn/incoming/trunk@3034 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 21:25:23 +00:00
Matt Miller
5676117bff
last of normalized docs from last night
...
git-svn-id: file:///home/svn/incoming/trunk@3030 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 15:11:43 +00:00
Matt Miller
b89a92f28f
payloads now display multiple stages
...
git-svn-id: file:///home/svn/incoming/trunk@3025 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-12 05:11:56 +00:00
Matt Miller
eeda1d06d7
woop
...
git-svn-id: file:///home/svn/incoming/trunk@3023 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-11 01:49:02 +00:00
Matt Miller
2f52fc9e02
bugfix
...
git-svn-id: file:///home/svn/incoming/trunk@3022 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-11 01:27:57 +00:00
Matt Miller
05a84cc7da
bug fixes in x86 asm, jmp call additive, payload generation, and new exploit
...
git-svn-id: file:///home/svn/incoming/trunk@3021 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-11 01:22:03 +00:00
Matt Miller
61456015da
persistent storage work
...
git-svn-id: file:///home/svn/incoming/trunk@3019 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-09 03:28:21 +00:00
Matt Miller
d0a66d9ec1
route integration into the ui
...
git-svn-id: file:///home/svn/incoming/trunk@3017 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-08 18:00:17 +00:00
Matt Miller
ac9b0edf94
bug fix
...
git-svn-id: file:///home/svn/incoming/trunk@3012 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-03 00:18:12 +00:00
Matt Miller
efc687de84
fix up handlers
...
git-svn-id: file:///home/svn/incoming/trunk@3007 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 17:32:34 +00:00
Matt Miller
39c9af8069
updated comments to be more uniformed in class definition
...
git-svn-id: file:///home/svn/incoming/trunk@3005 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 16:56:39 +00:00
Matt Miller
6a5870ddcd
updated comments to be more uniformed in class definition
...
git-svn-id: file:///home/svn/incoming/trunk@3004 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 16:49:45 +00:00
Matt Miller
15ce3c424b
added is_usable check
...
git-svn-id: file:///home/svn/incoming/trunk@3003 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 14:18:50 +00:00
Matt Miller
1c3fc58349
updated logging levels and defined guidelines
...
git-svn-id: file:///home/svn/incoming/trunk@3002 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 00:27:59 +00:00
Matt Miller
a9c7ecc42b
bind and reverse handler unit tests
...
git-svn-id: file:///home/svn/incoming/trunk@2999 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-01 02:41:29 +00:00
Matt Miller
1605e575cd
implemented some unit tests for modules
...
git-svn-id: file:///home/svn/incoming/trunk@2998 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-01 00:48:40 +00:00
Matt Miller
efa51ca309
unit tests for encoders
...
git-svn-id: file:///home/svn/incoming/trunk@2997 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-01 00:30:20 +00:00
Matt Miller
db6a30693b
foo
...
git-svn-id: file:///home/svn/incoming/trunk@2996 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-01 00:02:51 +00:00
Matt Miller
27b8f880ff
basic workings of auto-recon
...
git-svn-id: file:///home/svn/incoming/trunk@2987 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-31 15:56:59 +00:00
Matt Miller
204a215bc7
corrected some stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2982 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-30 22:45:29 +00:00
Matt Miller
2e7a7dbe8d
fixed up contextual recon event notifications
...
git-svn-id: file:///home/svn/incoming/trunk@2981 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-30 22:35:32 +00:00
Matt Miller
a6d6cedd1d
automatic module subscription to events
...
git-svn-id: file:///home/svn/incoming/trunk@2980 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-30 22:20:29 +00:00
Matt Miller
1fc49df4d2
more recon work, starting to become functional
...
git-svn-id: file:///home/svn/incoming/trunk@2979 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-29 13:47:07 +00:00
Matt Miller
cc7add451d
more work on recon module stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2976 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-27 03:23:38 +00:00
Matt Miller
c7eb56cab2
laying the groundwork for recon
...
git-svn-id: file:///home/svn/incoming/trunk@2975 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-27 02:54:39 +00:00
Matt Miller
712f7ef776
more docs
...
git-svn-id: file:///home/svn/incoming/trunk@2974 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-19 03:37:22 +00:00
Matt Miller
81c8cf3104
documentation fixes, code cleanup
...
git-svn-id: file:///home/svn/incoming/trunk@2973 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-19 03:20:20 +00:00
Matt Miller
b06a2ca030
initial support for compat filtering, may be buggy
...
git-svn-id: file:///home/svn/incoming/trunk@2971 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-19 01:48:10 +00:00
Matt Miller
7cdf02d8da
support for module reloading
...
git-svn-id: file:///home/svn/incoming/trunk@2956 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-10 00:30:14 +00:00
HD Moore
a5cde85299
More SMB
...
git-svn-id: file:///home/svn/incoming/trunk@2954 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-03 13:51:05 +00:00
Matt Miller
be79a295b7
opty2 ported
...
git-svn-id: file:///home/svn/incoming/trunk@2952 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-02 19:32:52 +00:00
Matt Miller
ad6273ce35
cleanup payload and exploit after failure
...
git-svn-id: file:///home/svn/incoming/trunk@2950 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-02 18:39:51 +00:00
Matt Miller
17071db65c
msfcli action
...
git-svn-id: file:///home/svn/incoming/trunk@2944 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-02 05:48:05 +00:00
Matt Miller
b955e21a8b
no .log
...
git-svn-id: file:///home/svn/incoming/trunk@2941 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-02 04:06:31 +00:00
Matt Miller
1a8bb86843
improved session logging
...
git-svn-id: file:///home/svn/incoming/trunk@2939 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-02 03:57:46 +00:00
Matt Miller
db40a55547
session logging support
...
git-svn-id: file:///home/svn/incoming/trunk@2938 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-02 03:21:26 +00:00
Matt Miller
fd38a7e39f
variable validation, fixed tab complete
...
git-svn-id: file:///home/svn/incoming/trunk@2937 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-01 21:51:45 +00:00
Matt Miller
a220e67128
msfencode and msfpayload updates
...
git-svn-id: file:///home/svn/incoming/trunk@2934 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-01 21:26:17 +00:00
Matt Miller
17a596186e
added the concept of payload convention
...
git-svn-id: file:///home/svn/incoming/trunk@2925 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-01 06:09:46 +00:00
Matt Miller
dd20214f32
added target specific stuff, generic stack adjustment, etc
...
git-svn-id: file:///home/svn/incoming/trunk@2924 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-01 05:55:15 +00:00
Matt Miller
ccd1e8f10a
payload info can now be target specific
...
git-svn-id: file:///home/svn/incoming/trunk@2923 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-30 07:12:32 +00:00
Matt Miller
6f6924e001
meterpreter comm session implemented, untested
...
git-svn-id: file:///home/svn/incoming/trunk@2920 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-30 05:59:44 +00:00
Matt Miller
6ec3700b16
pivoting with portfwd command
...
git-svn-id: file:///home/svn/incoming/trunk@2916 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-29 20:18:24 +00:00
Matt Miller
fdf9553991
fix for argument error
...
git-svn-id: file:///home/svn/incoming/trunk@2914 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-27 00:35:51 +00:00
Matt Miller
89f184335d
defaults
...
git-svn-id: file:///home/svn/incoming/trunk@2901 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-25 23:55:32 +00:00
Matt Miller
109aa7f63b
smaller
...
git-svn-id: file:///home/svn/incoming/trunk@2898 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-25 19:47:48 +00:00
Matt Miller
6f33b93f37
comment
...
git-svn-id: file:///home/svn/incoming/trunk@2893 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-24 19:47:56 +00:00
Matt Miller
8090968279
add regenerate_payload
...
git-svn-id: file:///home/svn/incoming/trunk@2891 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-24 19:37:27 +00:00
Matt Miller
501d7da9f9
aim goaway exploit ported, fixed a few bugs in sled gen
...
git-svn-id: file:///home/svn/incoming/trunk@2888 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-24 19:17:07 +00:00
Matt Miller
c05ea5839b
update testing suites
...
git-svn-id: file:///home/svn/incoming/trunk@2886 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-24 18:42:29 +00:00
Matt Miller
d07b602089
TODO update
...
git-svn-id: file:///home/svn/incoming/trunk@2882 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-24 18:02:24 +00:00
Matt Miller
4400f659ec
seh mixin
...
git-svn-id: file:///home/svn/incoming/trunk@2881 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-24 18:02:03 +00:00
Matt Miller
bde47f6ce2
exploit error catching
...
git-svn-id: file:///home/svn/incoming/trunk@2877 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-24 00:19:27 +00:00
Matt Miller
6f8f862e2a
support for multiple con-current sessions
...
git-svn-id: file:///home/svn/incoming/trunk@2869 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-23 06:08:04 +00:00
Matt Miller
3116a654d4
enhanced logging a bit, added a few badchars to ie obj type, improving job support
...
git-svn-id: file:///home/svn/incoming/trunk@2868 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-23 05:51:09 +00:00
Matt Miller
b522132350
moved some stuff around, working on adding the concept of jobs
...
git-svn-id: file:///home/svn/incoming/trunk@2864 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-22 04:53:46 +00:00
Matt Miller
fe0a151d7e
ported ie object type, more work on http stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2861 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-22 03:24:32 +00:00
Matt Miller
811789fa01
back from the dead, ignore service manager stuff for now, it sux
...
git-svn-id: file:///home/svn/incoming/trunk@2860 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-21 04:48:37 +00:00
HD Moore
8c1fc64517
Removed comments from the __DATA__
...
git-svn-id: file:///home/svn/incoming/trunk@2853 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-16 03:30:13 +00:00
HD Moore
5e5f7eed24
DCERPC foo
...
git-svn-id: file:///home/svn/incoming/trunk@2852 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-16 03:29:27 +00:00
HD Moore
66ae46394a
Typo fix
...
git-svn-id: file:///home/svn/incoming/trunk@2848 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-15 07:16:03 +00:00
Matt Miller
d99e5b4f89
fix module dependency problem, made it so the server sock in meterp isn't inherited
...
git-svn-id: file:///home/svn/incoming/trunk@2842 4d416f70-5f16-0410-b530-b9f4589650da
2005-08-22 01:42:13 +00:00
HD Moore
897e69a972
Changed to match the new API
...
git-svn-id: file:///home/svn/incoming/trunk@2831 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-25 09:47:49 +00:00
Matt Miller
8f0d107c1a
some improvements to stuff and or things
...
git-svn-id: file:///home/svn/incoming/trunk@2800 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-22 00:30:13 +00:00
Matt Miller
c494a71957
find port/tag stagers
...
git-svn-id: file:///home/svn/incoming/trunk@2799 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-19 14:33:25 +00:00
Matt Miller
632a97823f
moved some code around for interactive channels, still not functional yet, boohoo
...
git-svn-id: file:///home/svn/incoming/trunk@2797 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-19 04:21:15 +00:00
Matt Miller
203f185ad7
rockin 32 windows payloads, fixed some bugs, other cool shit, OptInt, what what what
...
git-svn-id: file:///home/svn/incoming/trunk@2796 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 23:32:34 +00:00
Matt Miller
9a420ac750
meterp fs wrapper action rockin the house
...
git-svn-id: file:///home/svn/incoming/trunk@2793 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 07:46:54 +00:00
Matt Miller
4679586c49
more meterp action
...
git-svn-id: file:///home/svn/incoming/trunk@2791 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 05:13:21 +00:00
Matt Miller
7f8db62b9c
workin on integrating meterp client
...
git-svn-id: file:///home/svn/incoming/trunk@2790 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 04:07:56 +00:00
Matt Miller
577a5c3095
dll injection working, had to fix nop stack alignment crap
...
git-svn-id: file:///home/svn/incoming/trunk@2788 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 02:01:36 +00:00
Matt Miller
120e6b5a2b
fix for missing min
...
git-svn-id: file:///home/svn/incoming/trunk@2784 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 00:03:29 +00:00
HD Moore
48b59caeff
Minor tweaks
...
git-svn-id: file:///home/svn/incoming/trunk@2782 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 10:30:11 +00:00
HD Moore
e6aa776371
Tweaky tweak
...
git-svn-id: file:///home/svn/incoming/trunk@2779 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 08:24:30 +00:00
Matt Miller
97ec0cf7d8
fixed port regex
...
git-svn-id: file:///home/svn/incoming/trunk@2777 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 08:03:54 +00:00
Matt Miller
cc32a21386
bind tcp stager/inline for linux
...
git-svn-id: file:///home/svn/incoming/trunk@2776 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 07:43:24 +00:00
Matt Miller
46c2cd2ac1
added ui subscriber stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2775 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 07:06:05 +00:00
Matt Miller
11724ac797
fixed stager merging, made things a bit more pimply
...
git-svn-id: file:///home/svn/incoming/trunk@2774 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 06:01:11 +00:00
Matt Miller
3d976dc22c
minor improvements to session interaction, dumping sessions, interacting with sessions that are backgrounded
...
git-svn-id: file:///home/svn/incoming/trunk@2772 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 02:04:39 +00:00
Matt Miller
5ee93e6be6
added threadsafe wrapper foo
...
git-svn-id: file:///home/svn/incoming/trunk@2771 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 00:52:47 +00:00
Matt Miller
9dc387049f
fixed booboo
...
git-svn-id: file:///home/svn/incoming/trunk@2770 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-16 16:06:44 +00:00
Matt Miller
24c4a2513a
some more madness
...
git-svn-id: file:///home/svn/incoming/trunk@2765 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-16 08:12:58 +00:00
Matt Miller
2f2363d141
it lives, major changes, fixed bugs, exploiting works with the test exploit
...
git-svn-id: file:///home/svn/incoming/trunk@2763 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-16 07:32:11 +00:00
Matt Miller
be2414a8b2
exploitation progress
...
git-svn-id: file:///home/svn/incoming/trunk@2762 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-15 23:46:05 +00:00
Matt Miller
645725a3b5
config file parsing, datastore persistence, shared data stores, save in the ui
...
git-svn-id: file:///home/svn/incoming/trunk@2761 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-15 22:30:04 +00:00
Matt Miller
aa778d7a99
added ambiguous module name detection
...
git-svn-id: file:///home/svn/incoming/trunk@2754 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-14 20:05:41 +00:00
Matt Miller
fd02a5de71
some work on compatible payload stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2753 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-14 14:46:18 +00:00
Matt Miller
55516ba790
more pimpage, added an internal test exploit
...
git-svn-id: file:///home/svn/incoming/trunk@2752 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-14 07:32:11 +00:00
Matt Miller
d62566a68f
lots of changes, making the simple wrapper better, lots of improvements
...
git-svn-id: file:///home/svn/incoming/trunk@2750 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-14 06:34:58 +00:00
Matt Miller
e5186edd13
option import fix, switched to using shellwords
...
git-svn-id: file:///home/svn/incoming/trunk@2748 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-13 22:57:29 +00:00
Matt Miller
2a1cbf38e1
force encoding if an encoder is supplied
...
git-svn-id: file:///home/svn/incoming/trunk@2747 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-13 21:47:01 +00:00
Matt Miller
72ad97dfd1
fixed up encoding, made payload generation pimper
...
git-svn-id: file:///home/svn/incoming/trunk@2746 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-13 21:09:07 +00:00
Matt Miller
d4f569dddf
switched to x86 from ia32
...
git-svn-id: file:///home/svn/incoming/trunk@2745 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-13 18:54:41 +00:00
Matt Miller
f1691c5470
worked on payload encoding, exploit driver wrapper, platforms updates, spoon would probably hate it
...
git-svn-id: file:///home/svn/incoming/trunk@2744 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-13 18:06:12 +00:00
Matt Miller
cc2c80586c
yup yup
...
git-svn-id: file:///home/svn/incoming/trunk@2743 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-12 23:06:27 +00:00
Matt Miller
d18effdbad
formatting and other stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2742 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-12 23:05:23 +00:00
Matt Miller
fed011fd09
get save registers properly
...
git-svn-id: file:///home/svn/incoming/trunk@2741 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-12 22:42:58 +00:00
Matt Miller
0ee47e9b0e
brute force target info
...
git-svn-id: file:///home/svn/incoming/trunk@2740 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-12 22:33:46 +00:00
Matt Miller
ea047805a7
brute force mixin for exploits, untested
...
git-svn-id: file:///home/svn/incoming/trunk@2739 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-12 22:32:46 +00:00
Matt Miller
41b656d45e
commenting
...
git-svn-id: file:///home/svn/incoming/trunk@2738 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-12 14:32:44 +00:00
Matt Miller
5342128907
some readline stuff, tab completion, add spoon's hashed payload stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2736 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-12 05:39:44 +00:00
Matt Miller
4c1129a962
reverse include, weird, don't get it yet
...
git-svn-id: file:///home/svn/incoming/trunk@2735 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 23:10:48 +00:00
Matt Miller
9e48b1393e
changed payload names around so little spoony can get his way
...
git-svn-id: file:///home/svn/incoming/trunk@2734 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 22:51:25 +00:00
Matt Miller
426e890280
switch
...
git-svn-id: file:///home/svn/incoming/trunk@2733 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 20:49:33 +00:00
Matt Miller
521dd0194b
spoonfu rocking the non-eval
...
git-svn-id: file:///home/svn/incoming/trunk@2732 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 20:48:13 +00:00
Matt Miller
2d66aeaeaf
removing opts
...
git-svn-id: file:///home/svn/incoming/trunk@2731 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 20:32:56 +00:00
Matt Miller
86d519f447
fixed up references
...
git-svn-id: file:///home/svn/incoming/trunk@2730 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 16:46:47 +00:00
Matt Miller
0e357337a5
started working on exploit stuff, changed aliases a bit for windows payloads, pimped targets to the max, added wrappers to exploit for payload stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2729 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 15:34:31 +00:00
Matt Miller
543dce4684
added option deregistration, kinda lame, need to think of a better way
...
git-svn-id: file:///home/svn/incoming/trunk@2723 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 05:21:19 +00:00
Matt Miller
1237b31617
win32 add user, need a way to hide options
...
git-svn-id: file:///home/svn/incoming/trunk@2722 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 05:15:30 +00:00
Matt Miller
1be7b9337e
implemented a single payload for grins, spoon will hate it
...
git-svn-id: file:///home/svn/incoming/trunk@2721 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 04:24:11 +00:00
Matt Miller
f1aba8e7ba
introducing handlers to the mix
...
git-svn-id: file:///home/svn/incoming/trunk@2719 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 04:07:52 +00:00
Matt Miller
5d6c67ee69
started working on handlers
...
git-svn-id: file:///home/svn/incoming/trunk@2718 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 02:03:48 +00:00
Matt Miller
8fec1a1741
die die die
...
git-svn-id: file:///home/svn/incoming/trunk@2717 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 23:41:35 +00:00
Spoon M
a20d99dd4f
all for the crabbot
...
git-svn-id: file:///home/svn/incoming/trunk@2716 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 23:38:50 +00:00
Matt Miller
f0e18799ba
basic module display info
...
git-svn-id: file:///home/svn/incoming/trunk@2714 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 21:01:05 +00:00
Matt Miller
9fe92b5347
added another encoder, fixed up some encoding stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2713 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 20:49:13 +00:00
Matt Miller
f1975a4b0f
tearing up the house, fixed some invalid exception names, payload encoding rocks
...
git-svn-id: file:///home/svn/incoming/trunk@2712 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 19:35:46 +00:00
Matt Miller
8dc1128b3c
more cool shit
...
git-svn-id: file:///home/svn/incoming/trunk@2711 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 19:21:40 +00:00
Matt Miller
62c50e6b04
yea, stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2701 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 04:56:33 +00:00
Matt Miller
ddb75822ad
dump dump dump
...
git-svn-id: file:///home/svn/incoming/trunk@2700 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 00:49:12 +00:00
Matt Miller
bbcc7d3abf
made merging of info better
...
git-svn-id: file:///home/svn/incoming/trunk@2699 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 00:16:48 +00:00
Matt Miller
558b6300b1
fixed the module loader a bit, still needs more work
...
git-svn-id: file:///home/svn/incoming/trunk@2698 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 23:48:41 +00:00
Spoon M
7bbae355d6
mass require moving of /lib
...
git-svn-id: file:///home/svn/incoming/trunk@2690 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 21:18:49 +00:00
Spoon M
bb264d9ad7
waka
...
git-svn-id: file:///home/svn/incoming/trunk@2684 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 19:54:56 +00:00
Matt Miller
21f440028c
stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2683 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 19:35:29 +00:00
Spoon M
b0d839da1d
Cleanup, removed the instance from_a
...
git-svn-id: file:///home/svn/incoming/trunk@2682 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 19:30:20 +00:00
Spoon M
c62c46a3cd
some cleanup, moving things around, fixing crap
...
git-svn-id: file:///home/svn/incoming/trunk@2681 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 17:09:46 +00:00