HD Moore
7b516e06fe
Transfer the migration payload over SSL, still working on a crash bug after migration completes
...
git-svn-id: file:///home/svn/framework3/trunk@6756 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 03:22:10 +00:00
druid
63f7875723
Parenthesized arguments
...
git-svn-id: file:///home/svn/framework3/trunk@6752 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-08 20:51:47 +00:00
HD Moore
48e1e5f351
Merge Stephen Fewer's patches to enable support for Windows 7 (fixes support for NT and 2000 as well)
...
git-svn-id: file:///home/svn/framework3/trunk@6744 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-05 20:24:37 +00:00
druid
f14de093ed
Updated some of the looping code in regexp match method, added new putc and getc methods.
...
git-svn-id: file:///home/svn/framework3/trunk@6726 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-30 00:59:58 +00:00
HD Moore
5cbef4983f
Add detection of Windows Storage Server 2008
...
git-svn-id: file:///home/svn/framework3/trunk@6724 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-28 20:23:31 +00:00
HD Moore
8ba889e7be
Add signature for Windows 7
...
git-svn-id: file:///home/svn/framework3/trunk@6723 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-28 14:39:07 +00:00
HD Moore
a74d3a3f38
Switches meterpreter to SSL by default, using the PolarSSL library. To build this, just place polarssl.lib into an workspace/common/Release/
...
git-svn-id: file:///home/svn/framework3/trunk@6718 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-26 23:18:53 +00:00
HD Moore
45afe789af
Test case update
...
git-svn-id: file:///home/svn/framework3/trunk@6717 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-26 03:01:11 +00:00
HD Moore
b437190fc3
Speedup patch from Yoann Guillot
...
git-svn-id: file:///home/svn/framework3/trunk@6714 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-25 19:50:44 +00:00
HD Moore
e27691c543
Performance and debugging improvements from Yoann Guillot
...
git-svn-id: file:///home/svn/framework3/trunk@6712 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-25 17:59:51 +00:00
HD Moore
20b232b9d5
Bug fixes from Efrain
...
git-svn-id: file:///home/svn/framework3/trunk@6711 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 20:02:29 +00:00
HD Moore
83c34b10ce
Stop trying to use the non-existent note variable
...
git-svn-id: file:///home/svn/framework3/trunk@6709 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 19:14:19 +00:00
HD Moore
76ca3e7741
Fix up EXE to VBA handling
...
git-svn-id: file:///home/svn/framework3/trunk@6708 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 03:59:54 +00:00
HD Moore
d981332b89
Better search behavior for console and msfweb
...
git-svn-id: file:///home/svn/framework3/trunk@6706 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 01:31:16 +00:00
Ramon de C Valle
c2362ec409
All your POWER are belong to us.
...
git-svn-id: file:///home/svn/framework3/trunk@6698 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-23 03:49:25 +00:00
HD Moore
fdfcbaef01
Default EXITFUNC to thread - solves some common user goofs
...
git-svn-id: file:///home/svn/framework3/trunk@6695 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-21 20:30:55 +00:00
HD Moore
a13c01ed3e
Load the encoders/nops modules in msfpayload for encoding, load nops in msfencode
...
git-svn-id: file:///home/svn/framework3/trunk@6694 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-21 15:59:09 +00:00
HD Moore
0f61ce4ccb
Prefer $HOME over LOCALAPPDATA/APPDATA/USERPROFILE
...
git-svn-id: file:///home/svn/framework3/trunk@6692 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-21 14:16:39 +00:00
HD Moore
977447f56a
Add support for section dumping
...
git-svn-id: file:///home/svn/framework3/trunk@6686 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 17:53:53 +00:00
HD Moore
2283e0ffe4
Update executable template and API
...
git-svn-id: file:///home/svn/framework3/trunk@6682 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 17:42:17 +00:00
HD Moore
cd12fc0ca2
Ruby 1.9.1 fixes for incognito (thanks Carlos!)
...
git-svn-id: file:///home/svn/framework3/trunk@6681 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 16:55:40 +00:00
HD Moore
d9792d4beb
More ruby-1.9.1 compatibility fixes
...
git-svn-id: file:///home/svn/framework3/trunk@6679 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 14:26:22 +00:00
HD Moore
5a4ad7c1c9
Another 1.9.1 compatibility fix
...
git-svn-id: file:///home/svn/framework3/trunk@6676 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 03:18:04 +00:00
HD Moore
58fb65d4ef
Another ruby 1.9.1 compatibility fix
...
git-svn-id: file:///home/svn/framework3/trunk@6674 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 02:42:00 +00:00
HD Moore
e6e8a42090
Enforce maximum thread count on windows platforms
...
git-svn-id: file:///home/svn/framework3/trunk@6672 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-19 21:46:40 +00:00
HD Moore
832b66a03f
Fix the wrong class name (patch from antoine)
...
git-svn-id: file:///home/svn/framework3/trunk@6669 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-17 21:05:19 +00:00
James Lee
7cb96ed11f
typo
...
git-svn-id: file:///home/svn/framework3/trunk@6665 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-17 01:34:33 +00:00
HD Moore
9f69267759
Switch all warnings to stderr
...
git-svn-id: file:///home/svn/framework3/trunk@6663 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-15 02:40:28 +00:00
HD Moore
f9effa15c8
Indicate lack of JRuby support, pending completion of JRUBY-2739
...
git-svn-id: file:///home/svn/framework3/trunk@6662 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:37:02 +00:00
HD Moore
f78482d3f5
Indicate lack of support for ruby 1.9.0, indicate experimental support for ruby 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6661 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:30:56 +00:00
HD Moore
5757685b59
Remove the mutex/cv from the meterp handler, use a boring timeout instead, prevents a race on ruby 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6660 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:20:30 +00:00
HD Moore
5646e02a8a
Fix 1.9.1 compat for msfelfscan
...
git-svn-id: file:///home/svn/framework3/trunk@6659 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 20:18:38 +00:00
HD Moore
e841228ea5
allow the SSL option to be overridden
...
git-svn-id: file:///home/svn/framework3/trunk@6635 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-09 21:12:15 +00:00
HD Moore
0f6b6f6169
Allow the equal sign to be used as part of an option value
...
git-svn-id: file:///home/svn/framework3/trunk@6634 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-09 20:43:42 +00:00
HD Moore
c1cc193901
Quick update to allow address filtering (find unicode addresses,etc) via the -F [regex] parameter
...
git-svn-id: file:///home/svn/framework3/trunk@6630 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-08 15:59:38 +00:00
HD Moore
68888c469f
Indicate why database support is not enabled
...
git-svn-id: file:///home/svn/framework3/trunk@6623 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 16:28:28 +00:00
HD Moore
1c11bbb12d
Dont default to global, breaks in-module threading of send_request_cgi
...
git-svn-id: file:///home/svn/framework3/trunk@6620 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 05:05:29 +00:00
HD Moore
1e1d8124f0
Fix mips encoders
...
git-svn-id: file:///home/svn/framework3/trunk@6619 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 03:14:29 +00:00
HD Moore
0e35efaea2
Force binary string encoding in ruby 1.9.1, fix up a bad index call in x86.rb
...
git-svn-id: file:///home/svn/framework3/trunk@6618 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 03:02:42 +00:00
HD Moore
2b4e0f440b
Fix up the encoding xor to work with both old and new ruby
...
git-svn-id: file:///home/svn/framework3/trunk@6617 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 02:30:12 +00:00
HD Moore
51f0e8fc53
Another 1.9.1 compat change, this time for msfmachscan
...
git-svn-id: file:///home/svn/framework3/trunk@6616 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:43:48 +00:00
HD Moore
90af8f03db
Fixes up msfpescan/msfelfscan to work with both 1.8.6 and 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6615 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:39:54 +00:00
HD Moore
f7a7a528be
Moer ruby 1.9.1 fixes for msfpescan
...
git-svn-id: file:///home/svn/framework3/trunk@6614 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:24:35 +00:00
HD Moore
f81392f938
Dont crash if the PE has no resources
...
git-svn-id: file:///home/svn/framework3/trunk@6613 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:40:36 +00:00
HD Moore
147a292825
Minor fixes for ruby 1.9.1 compatibility, still quite a bit more to go
...
git-svn-id: file:///home/svn/framework3/trunk@6612 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:36:58 +00:00
HD Moore
9fabd18c24
Ruby 1.9 compatibility changes
...
git-svn-id: file:///home/svn/framework3/trunk@6591 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-29 13:46:12 +00:00
HD Moore
6a76e5d0a2
One of potentially many threading issues with ruby 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@6590 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-29 03:18:00 +00:00
et
7c16f5b5c9
Added wmap sql command to access db directly from wmap. XML reporting.
...
git-svn-id: file:///home/svn/framework3/trunk@6587 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-28 03:26:27 +00:00
HD Moore
3bc44cc395
Consolidate exe generation into a single to_executable() function. Will reduce code in exploit modules dropping later today...
...
git-svn-id: file:///home/svn/framework3/trunk@6586 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-27 13:37:41 +00:00
James Lee
99afc981d2
log a useful error message
...
git-svn-id: file:///home/svn/framework3/trunk@6573 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-21 23:37:07 +00:00
HD Moore
2a5060a934
Fix EOF seek and use a ghetto replacement for iconv to support older ruby versions
...
git-svn-id: file:///home/svn/framework3/trunk@6548 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-12 20:04:23 +00:00
Ramon de C Valle
6f2ff2d1d5
Do not handle Interrupt exception here.
...
git-svn-id: file:///home/svn/framework3/trunk@6545 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-11 18:16:54 +00:00
Ramon de C Valle
a044ac4661
Do not print backtrace when handling Exception.
...
git-svn-id: file:///home/svn/framework3/trunk@6544 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-11 17:51:02 +00:00
HD Moore
5384f5685a
Removing the lock to support joins, may introduce other bugs with concurrency, still testing
...
git-svn-id: file:///home/svn/framework3/trunk@6536 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-09 04:18:27 +00:00
Ramon de C Valle
caffa9da9f
Oops
...
git-svn-id: file:///home/svn/framework3/trunk@6534 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:27:40 +00:00
Ramon de C Valle
84f9f344cf
Case no Rex UDP socket is passed to RexUDPTransport use Standard UDP socket
...
git-svn-id: file:///home/svn/framework3/trunk@6533 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:26:22 +00:00
HD Moore
6bb267f31d
Add disasm method to -r
...
git-svn-id: file:///home/svn/framework3/trunk@6532 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:22:25 +00:00
Ramon de C Valle
d62822a9fb
Fixed SNMP Library
...
git-svn-id: file:///home/svn/framework3/trunk@6531 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 19:56:32 +00:00
HD Moore
8f63fc27e3
Adds the new SNMP mixin, still not working perfectly, but a good start
...
git-svn-id: file:///home/svn/framework3/trunk@6530 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 04:18:31 +00:00
HD Moore
6b5893f1f0
Import the ruby snmp library into the tree. Making a few adjustments to make it msf-friendly
...
git-svn-id: file:///home/svn/framework3/trunk@6529 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 03:35:59 +00:00
HD Moore
a3263e9c4a
Revert
...
git-svn-id: file:///home/svn/framework3/trunk@6525 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 21:37:01 +00:00
HD Moore
90ec694397
Dont log to a file
...
git-svn-id: file:///home/svn/framework3/trunk@6524 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 21:34:51 +00:00
HD Moore
2c5f13ca01
Fix up propids path
...
git-svn-id: file:///home/svn/framework3/trunk@6523 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 20:38:39 +00:00
HD Moore
43a03aa307
Big update from the ruby-ole trunk
...
git-svn-id: file:///home/svn/framework3/trunk@6522 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 20:31:41 +00:00
natron
6f8d309949
Passivex fixed. Reverting r6318 for rex/proto/http/packet. Works on IE8, tests on IE6/7 welcome.
...
git-svn-id: file:///home/svn/framework3/trunk@6514 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-30 20:38:57 +00:00
James Lee
fa23424b46
add -l to use and don't list already-loaded extensions in tab completion
...
git-svn-id: file:///home/svn/framework3/trunk@6509 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-30 06:09:42 +00:00
et
a8b64c56b5
Handle encoding of special chars
...
git-svn-id: file:///home/svn/framework3/trunk@6508 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-29 04:04:40 +00:00
et
03d8541b3f
espia early stages
...
git-svn-id: file:///home/svn/framework3/trunk@6499 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-27 03:43:22 +00:00
HD Moore
304944d792
db_del_port from jabra
...
git-svn-id: file:///home/svn/framework3/trunk@6498 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-26 14:53:37 +00:00
James Lee
3a2b0929ab
stupid typo
...
git-svn-id: file:///home/svn/framework3/trunk@6497 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-25 02:12:54 +00:00
HD Moore
3ede3a1d41
Patch from int_80
...
git-svn-id: file:///home/svn/framework3/trunk@6496 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-23 17:49:04 +00:00
Patrick Webster
0b14dac349
Added rand_text_highascii method.
...
git-svn-id: file:///home/svn/framework3/trunk@6487 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-16 03:02:41 +00:00
cg
a2891e86de
uhoh with personal stuff in exploit.rb
...
git-svn-id: file:///home/svn/framework3/trunk@6484 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-15 03:32:04 +00:00
cg
cf1d255a55
SMTP Banner Grabber Aux module
...
git-svn-id: file:///home/svn/framework3/trunk@6483 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-15 03:26:22 +00:00
James Lee
a8863ce330
possible fix to make postgres work again
...
git-svn-id: file:///home/svn/framework3/trunk@6478 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-12 07:09:03 +00:00
et
0c859dc35e
Minor fixes regarding target_host handling
...
git-svn-id: file:///home/svn/framework3/trunk@6477 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-12 02:00:50 +00:00
kris
17ad98e8e3
Add 'Msf' to 'Context' in the connect command's socket for db_tracker
...
git-svn-id: file:///home/svn/framework3/trunk@6476 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-11 12:07:50 +00:00
kris
162a835212
Keep the back command from removing the database backend stuff since it's
...
been moved to metasploit core
git-svn-id: file:///home/svn/framework3/trunk@6474 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-10 23:56:28 +00:00
kris
9bcc3b3167
update aux scanner error message
...
git-svn-id: file:///home/svn/framework3/trunk@6473 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-10 04:05:05 +00:00
kris
0a67b8ec74
show license info for aux modules
...
git-svn-id: file:///home/svn/framework3/trunk@6471 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 20:53:04 +00:00
kris
1253e7a044
Catch ENOENT for db_destroy for sqlite3 so no backtrace is printed. I decided
...
to give a little error message for trying to destroy a nonexistent db still.
git-svn-id: file:///home/svn/framework3/trunk@6468 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:30:18 +00:00
kris
b5a8c86241
use print_error
...
git-svn-id: file:///home/svn/framework3/trunk@6467 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:11:12 +00:00
kris
6b28b786ac
watch out for RuntimeError in loadpath
...
git-svn-id: file:///home/svn/framework3/trunk@6466 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:04:29 +00:00
James Lee
8fd36fecf5
make plugin load failure a bit more graceful
...
git-svn-id: file:///home/svn/framework3/trunk@6460 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-07 05:59:38 +00:00
kris
1eb8c8dfc0
meh, what can I say? I like my name
...
git-svn-id: file:///home/svn/framework3/trunk@6459 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-03 15:05:35 +00:00
HD Moore
67ab1cca92
Fixed #280 . Fix namespace lookup for "FileUtils", thanks grymoire
...
git-svn-id: file:///home/svn/framework3/trunk@6454 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-02 18:58:36 +00:00
et
ce9e47c06b
fixed error wmap modules crashing when vhost is nil
...
git-svn-id: file:///home/svn/framework3/trunk@6447 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-30 04:22:47 +00:00
HD Moore
1b205ee0ee
slight fixes for ruby 1.9 compatibility (1.9 will stil not work)
...
git-svn-id: file:///home/svn/framework3/trunk@6445 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-30 02:57:10 +00:00
HD Moore
932bd89ac2
Mangle up METASM stubs to solve integration problems
...
git-svn-id: file:///home/svn/framework3/trunk@6430 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 07:49:51 +00:00
HD Moore
1894dc4f1a
New metasm
...
git-svn-id: file:///home/svn/framework3/trunk@6429 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 07:30:54 +00:00
HD Moore
da119f29e7
Swapping metasm...
...
git-svn-id: file:///home/svn/framework3/trunk@6428 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 07:30:31 +00:00
HD Moore
1073b04eb7
Remove sqlite2 support, force load sqlite3 gem
...
git-svn-id: file:///home/svn/framework3/trunk@6425 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 03:40:25 +00:00
HD Moore
2552633f9b
Fix up batch mode aux scanners that dont use the tcp mixin. Minor changes to snmp_scan
...
git-svn-id: file:///home/svn/framework3/trunk@6422 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 03:11:56 +00:00
kris
62a1d3037d
just a whitespace fix
...
git-svn-id: file:///home/svn/framework3/trunk@6419 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 23:04:28 +00:00
HD Moore
191289450e
Meterpreter is now the default payload for windows autopwn targets
...
git-svn-id: file:///home/svn/framework3/trunk@6418 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 21:51:35 +00:00
HD Moore
709362ff53
This patch moves all database interaction into the metasploit core. Usage is about the same, except instead of loading a plugin, you call db_driver <driver_name>
...
git-svn-id: file:///home/svn/framework3/trunk@6417 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 21:42:30 +00:00
HD Moore
8b32f139d3
Skip svn directories for module searches, remove delay loading system (no longer used), enumerate available database drivers at load
...
git-svn-id: file:///home/svn/framework3/trunk@6416 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 20:45:46 +00:00
HD Moore
74d44235a2
Add the enumerable module as a standalone file
...
git-svn-id: file:///home/svn/framework3/trunk@6415 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 18:56:31 +00:00
HD Moore
3d6a0bab52
Fix up the version/options modules, make wmap_base_url display the vhost and use the host/port separator correctly
...
git-svn-id: file:///home/svn/framework3/trunk@6414 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 17:57:12 +00:00
HD Moore
89ad4df087
Fix WMAP modules to use the new scanner api; add wmap_base_url as a shorthand (extend in the future to do VHOST as well), general cosmetic cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@6413 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 17:45:14 +00:00
HD Moore
26b9903b0d
Changes Auxiliary::Scanner to use a new module instance for each thread, updates associated mixins and modules to support this change.
...
git-svn-id: file:///home/svn/framework3/trunk@6401 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 05:49:33 +00:00
HD Moore
89ecdd9ac8
Mostly working setdesktop code, removed grabdesktop
...
git-svn-id: file:///home/svn/framework3/trunk@6393 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 23:14:14 +00:00
HD Moore
753c7aa7d5
Apply patch to fix SSL server support
...
git-svn-id: file:///home/svn/framework3/trunk@6391 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 16:41:10 +00:00
HD Moore
dc68188c3b
Patch may resolv slowdowns during local file reads
...
git-svn-id: file:///home/svn/framework3/trunk@6382 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 21:04:39 +00:00
HD Moore
d3d3a88d10
Patch to avoid weird race conditions with mutexes, might solve concurrency issue, may cause new ones
...
git-svn-id: file:///home/svn/framework3/trunk@6381 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 20:57:53 +00:00
HD Moore
5be1222a1c
Adds the meterpreter client-side code for the keylogger
...
git-svn-id: file:///home/svn/framework3/trunk@6370 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 01:25:11 +00:00
HD Moore
13706d1bde
Tons of new Mac OS X code from Dino Dai Zovi and Charlie Miller, more to follow
...
git-svn-id: file:///home/svn/framework3/trunk@6353 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-18 23:28:24 +00:00
HD Moore
7debb6d52b
Make sure Rex::Compat is loaded (triggers on msfpescan -D)
...
git-svn-id: file:///home/svn/framework3/trunk@6352 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-17 21:48:17 +00:00
HD Moore
9ddc62fc40
Handle cases where RPORT is 139 and the user did not change SMBDirect to false
...
git-svn-id: file:///home/svn/framework3/trunk@6351 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-17 19:11:26 +00:00
HD Moore
a2bc8d928c
Removing the call to set evasions, looks like this was more broken that I realized
...
git-svn-id: file:///home/svn/framework3/trunk@6350 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-17 15:19:00 +00:00
HD Moore
2edc71ca05
Correct the http mixin to call the right evasion method
...
git-svn-id: file:///home/svn/framework3/trunk@6349 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-17 14:56:20 +00:00
natron
5069038ecd
Fixes meterpreter's migrate function to work on DEP-enabled boxes (ticket 275). Patch by Stephen Fewer (harmonysecurity.com).
...
git-svn-id: file:///home/svn/framework3/trunk@6347 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-16 21:10:58 +00:00
kris
ea1336d2f3
use more apt print methods for search messages
...
git-svn-id: file:///home/svn/framework3/trunk@6344 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-15 16:05:06 +00:00
HD Moore
ccbf88f5a3
Fixes TCP socket evasion (max_send_size and send_delay)
...
git-svn-id: file:///home/svn/framework3/trunk@6340 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-14 05:06:13 +00:00
HD Moore
f9eccd1a59
Fix up the fileformat mixin; some slightly wrong ruby and an extra \n at the end of the generated files
...
git-svn-id: file:///home/svn/framework3/trunk@6338 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-14 01:28:59 +00:00
kris
d0c9404aee
fix whitespace in error message
...
git-svn-id: file:///home/svn/framework3/trunk@6336 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-13 19:13:12 +00:00
kris
b1edecb728
Fix "route remove" by guarding against constant NameError/backtrace
...
git-svn-id: file:///home/svn/framework3/trunk@6330 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-10 16:47:53 +00:00
kris
b12a3d993e
update version command description and comment
...
git-svn-id: file:///home/svn/framework3/trunk@6329 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-10 16:25:00 +00:00
HD Moore
3c924b245a
Fix a metasm bug that causes a conflict with rails. Thanks h!
...
git-svn-id: file:///home/svn/framework3/trunk@6326 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-09 13:35:20 +00:00
James Lee
934d08bde2
fix unit tests to reflect new output
...
git-svn-id: file:///home/svn/framework3/trunk@6325 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-09 05:19:26 +00:00
James Lee
6d9a70c6ad
fix codepage_map_cache for unit tests
...
git-svn-id: file:///home/svn/framework3/trunk@6324 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-09 05:18:33 +00:00
James Lee
f3a7515a0a
more whitespace cleanup
...
git-svn-id: file:///home/svn/framework3/trunk@6323 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 23:05:26 +00:00
James Lee
7384a7aed8
more accurate comments, whitespace cleanup
...
git-svn-id: file:///home/svn/framework3/trunk@6322 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 23:02:53 +00:00
James Lee
491fb6b683
fix double header line bug introduced by my last commit
...
git-svn-id: file:///home/svn/framework3/trunk@6321 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 19:55:47 +00:00
James Lee
96c8f6127c
Replace += with << for Strings in a bunch of places.
...
git-svn-id: file:///home/svn/framework3/trunk@6318 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 07:55:47 +00:00
HD Moore
90c3586ac3
Fix error handling for the save command
...
git-svn-id: file:///home/svn/framework3/trunk@6317 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 07:41:28 +00:00
HD Moore
19749865b0
Performance patch from Yoann Guillot <john-metasploit[at]ofjj.net>
...
git-svn-id: file:///home/svn/framework3/trunk@6316 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:41:47 +00:00
HD Moore
f341e79157
Add new metasm checkout
...
git-svn-id: file:///home/svn/framework3/trunk@6314 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:03:38 +00:00
HD Moore
95f6aa0d02
Revert last commit temporarily
...
git-svn-id: file:///home/svn/framework3/trunk@6313 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:00:17 +00:00
HD Moore
aa4274a3bb
Upgrading metasm...
...
git-svn-id: file:///home/svn/framework3/trunk@6312 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 22:58:19 +00:00
HD Moore
2b2c6b983e
Switch to a future compatible method of when/case
...
git-svn-id: file:///home/svn/framework3/trunk@6311 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 18:18:38 +00:00
HD Moore
69c169bb2f
Replace unicode with raw hex for future compatibility
...
git-svn-id: file:///home/svn/framework3/trunk@6310 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 18:17:08 +00:00
HD Moore
3beeedb98a
Better error messages, complain about 1.9.9x
...
git-svn-id: file:///home/svn/framework3/trunk@6298 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-05 15:04:07 +00:00
kris
e316610f5d
remove unused vars
...
git-svn-id: file:///home/svn/framework3/trunk@6285 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-03 23:50:53 +00:00
natron
10f44dd364
Updated passivex to work with IE7/IE8. Launches multiple processes on IE8; will debug later.
...
git-svn-id: file:///home/svn/framework3/trunk@6261 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-27 23:13:53 +00:00
James Lee
616d0fdd46
add background command to meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@6257 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-27 03:12:20 +00:00
kris
08745cc6fd
several typos
...
git-svn-id: file:///home/svn/framework3/trunk@6240 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-21 19:22:06 +00:00
kris
e05b74a00c
Don't use old OpenSSL::Digest::Digest
...
git-svn-id: file:///home/svn/framework3/trunk@6239 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-21 17:48:36 +00:00
kris
05b5cd695b
add -z to connect command to just try the connection, then return (useful for
...
seeing if a host is reachable or not with certain settings)
git-svn-id: file:///home/svn/framework3/trunk@6236 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-19 14:24:07 +00:00
HD Moore
526012462e
Fix IPv6 targets
...
git-svn-id: file:///home/svn/framework3/trunk@6233 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-17 21:10:02 +00:00
James Lee
08fbd064d1
make the help command a little more helpful
...
git-svn-id: file:///home/svn/framework3/trunk@6230 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-17 04:53:06 +00:00
James Lee
8039bf729c
tab completion for loadpath
...
git-svn-id: file:///home/svn/framework3/trunk@6229 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 21:52:10 +00:00
kris
aed112ff67
a few trivial whitespace things
...
git-svn-id: file:///home/svn/framework3/trunk@6228 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 19:27:53 +00:00
kris
b9a8482302
delete old wx.rb
...
git-svn-id: file:///home/svn/framework3/trunk@6227 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 17:45:13 +00:00
James Lee
fd962ca307
type fix (route -> sessions)
...
git-svn-id: file:///home/svn/framework3/trunk@6226 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 05:12:28 +00:00
kris
cd9ad0f08d
Don't join/split args on spaces in load command as that breaks things like
...
using quotes to have multi-word tokens; shellwords takes care of this stuff
git-svn-id: file:///home/svn/framework3/trunk@6222 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 02:48:25 +00:00
James Lee
9a6025aacc
Add a plugin to capture packets
...
git-svn-id: file:///home/svn/framework3/trunk@6213 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-12 16:21:50 +00:00
kris
2c039a87d2
return host info if available in HostCommunicationError's addr_to_s
...
git-svn-id: file:///home/svn/framework3/trunk@6208 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-06 14:15:54 +00:00
kris
4e0bc60ce1
just use alias
...
git-svn-id: file:///home/svn/framework3/trunk@6207 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-05 21:49:50 +00:00
kris
a49c339a9a
Use CRLF in http proxy request for some stringent servers
...
git-svn-id: file:///home/svn/framework3/trunk@6206 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-05 21:29:15 +00:00
druid
7965a7de05
Wardialer
...
git-svn-id: file:///home/svn/framework3/trunk@6193 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-28 06:13:47 +00:00
kris
13cc54cbe5
Add -P source port option to connect
...
git-svn-id: file:///home/svn/framework3/trunk@6184 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-26 03:06:58 +00:00
kris
c60077bb1c
Revamp/fix-up http proxying by using Rex to parse the response (instead of
...
really strict matching)
git-svn-id: file:///home/svn/framework3/trunk@6182 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 14:48:18 +00:00
James Lee
fd435b48d9
http proxy support patch from Frederik Braun
...
git-svn-id: file:///home/svn/framework3/trunk@6181 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 06:32:06 +00:00
James Lee
55daaf64bd
remove dll option from reflectivemeterpreter, too
...
git-svn-id: file:///home/svn/framework3/trunk@6179 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 03:29:07 +00:00
James Lee
077c201f10
try any before specific LHOST
...
git-svn-id: file:///home/svn/framework3/trunk@6177 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-23 23:03:53 +00:00
James Lee
1d499a9756
fix empty body when Content-Length is not set
...
git-svn-id: file:///home/svn/framework3/trunk@6176 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-23 21:10:58 +00:00
kris
679fa424b1
add a colon to error message for clarity
...
git-svn-id: file:///home/svn/framework3/trunk@6175 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-23 18:37:48 +00:00
kris
32868c4b0f
adding db_import_amap_mlog for reading in from a thc-amap machine-readable log
...
git-svn-id: file:///home/svn/framework3/trunk@6169 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-21 02:12:10 +00:00
kris
4a15116fe6
move a stray alias to underneath the original method
...
git-svn-id: file:///home/svn/framework3/trunk@6168 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-20 02:15:19 +00:00
kris
a595def093
watch out for an already closed socket in connect (meterpreter session, etc)
...
git-svn-id: file:///home/svn/framework3/trunk@6161 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-18 01:21:42 +00:00
kris
17f4396d1d
add args checking for connect
...
git-svn-id: file:///home/svn/framework3/trunk@6160 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-18 00:00:26 +00:00
kris
d53ac9648c
typo: correct name in "sessions" help/usage
...
git-svn-id: file:///home/svn/framework3/trunk@6153 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 21:31:24 +00:00
kris
2e4edcaa83
support [dot] conversion in authors' emails
...
git-svn-id: file:///home/svn/framework3/trunk@6151 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 15:17:03 +00:00
HD Moore
cb327d40fc
Fix up the dialup code
...
git-svn-id: file:///home/svn/framework3/trunk@6150 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 05:46:10 +00:00
kris
6777023871
Notify handlers of socket creation for bare raw IP and TCP server sockets
...
git-svn-id: file:///home/svn/framework3/trunk@6149 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 00:27:37 +00:00
kris
8c8370e9b9
Notify handlers of before and after socket creation events for raw IP
...
git-svn-id: file:///home/svn/framework3/trunk@6148 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 00:15:33 +00:00
HD Moore
dc264cdcf3
Fix from Tom Hessman when the EDITOR environment variable is not set (relayed via Ed)
...
git-svn-id: file:///home/svn/framework3/trunk@6147 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 16:19:56 +00:00
HD Moore
4e2d29ec68
Fix from Ed Skoudis when EDITOR is not set
...
git-svn-id: file:///home/svn/framework3/trunk@6146 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 14:43:22 +00:00
HD Moore
463c67a322
Include the new TTY session type
...
git-svn-id: file:///home/svn/framework3/trunk@6143 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 07:13:55 +00:00
HD Moore
4678430946
Read the response from handler() and skip skipping the socket if active
...
git-svn-id: file:///home/svn/framework3/trunk@6142 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 07:08:40 +00:00
HD Moore
44caffbd87
Add a new TTY session type for customization
...
git-svn-id: file:///home/svn/framework3/trunk@6140 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 07:02:02 +00:00
HD Moore
5600b0b67d
Try harder to verify the socket if its a modem connection
...
git-svn-id: file:///home/svn/framework3/trunk@6139 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 06:52:23 +00:00
HD Moore
331eaaa602
Add basic framework for the new TTY architecture
...
git-svn-id: file:///home/svn/framework3/trunk@6136 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 06:46:32 +00:00
James Lee
9c6d8b86fb
patch from tebo; use standard printing methods
...
git-svn-id: file:///home/svn/framework3/trunk@6134 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-12 17:52:54 +00:00
James Lee
e7aecca838
more awesomeness from tebo
...
git-svn-id: file:///home/svn/framework3/trunk@6133 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-12 05:18:05 +00:00
James Lee
0dbdc977a0
missed part of the patch for tebo's mssql login scanner module
...
git-svn-id: file:///home/svn/framework3/trunk@6131 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-12 00:26:05 +00:00
James Lee
df2a28f2ce
allow character sets in Exploit::pattern_create
...
git-svn-id: file:///home/svn/framework3/trunk@6130 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-12 00:10:48 +00:00
HD Moore
beb276d1e6
Make the serialport/telephony require fail soft
...
git-svn-id: file:///home/svn/framework3/trunk@6129 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 17:30:26 +00:00
druid
4686367af2
Fixed some namespacing and method calling bugs
...
git-svn-id: file:///home/svn/framework3/trunk@6126 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 07:45:08 +00:00
druid
63401275bd
Fixed syntax error (mybad)
...
git-svn-id: file:///home/svn/framework3/trunk@6125 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 07:26:05 +00:00
druid
a9a7700121
Added code to support the FLOWCONTROL setting
...
git-svn-id: file:///home/svn/framework3/trunk@6124 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 07:23:43 +00:00
druid
a11df5fbbf
Added missing telephony.rb
...
git-svn-id: file:///home/svn/framework3/trunk@6123 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 07:17:57 +00:00
druid
8e4d9ad7b0
Updated to use generic method_missing def for pass-through methods to SerialPort
...
git-svn-id: file:///home/svn/framework3/trunk@6121 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 06:30:56 +00:00
druid
0d1ca42ed6
Adds support for exploitation over dialup via the new Telephony library.
...
git-svn-id: file:///home/svn/framework3/trunk@6120 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 06:09:02 +00:00
druid
4b3c8c3f33
The MSF Telephony Library. Initially provides the Modem Class
...
git-svn-id: file:///home/svn/framework3/trunk@6119 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 06:07:14 +00:00
James Lee
288075f7a0
add report_auth_info to some modules that authenticate. thanks, tebo
...
git-svn-id: file:///home/svn/framework3/trunk@6118 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 05:52:07 +00:00
James Lee
49cd8d7223
typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@6114 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 04:48:06 +00:00
kris
a1851b19db
just typos/misspellings
...
git-svn-id: file:///home/svn/framework3/trunk@6113 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 03:17:21 +00:00
James Lee
51b0e84691
fix report_auth_info when db has not been initialized
...
git-svn-id: file:///home/svn/framework3/trunk@6112 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 01:45:57 +00:00
kris
a61baaa1eb
deleting broken/useless timed_read()
...
git-svn-id: file:///home/svn/framework3/trunk@6110 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-10 17:46:23 +00:00
James Lee
959191cb8c
add heap spray function to HttpServer::HTML mixin
...
git-svn-id: file:///home/svn/framework3/trunk@6107 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-10 05:48:19 +00:00
kris
1c6715ff3b
Run multiple resource files from single command (was getting ArgumentError)
...
git-svn-id: file:///home/svn/framework3/trunk@6102 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 20:29:50 +00:00
kris
f6fd33a3eb
add usage/help to resource command
...
git-svn-id: file:///home/svn/framework3/trunk@6101 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 20:16:08 +00:00
kris
4b34d5a8b1
use print() for search usage
...
git-svn-id: file:///home/svn/framework3/trunk@6100 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 19:58:22 +00:00
Patrick Webster
65bbf8c052
Alphabetically sort the tab completion module name output.
...
git-svn-id: file:///home/svn/framework3/trunk@6098 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 07:36:58 +00:00
Patrick Webster
db2f420397
Some Aux modules have refs, but not printing the output.
...
git-svn-id: file:///home/svn/framework3/trunk@6097 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 07:02:03 +00:00
kris
8850ac2d87
comment updates
...
git-svn-id: file:///home/svn/framework3/trunk@6093 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 02:16:02 +00:00
cg
c92e135cb4
update author.rb
...
git-svn-id: file:///home/svn/framework3/trunk@6086 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-07 23:23:56 +00:00
Mario Ceballos
ee86b19834
added tns mixin to support oracle8i listener overflow and other tns
...
related stuff.
git-svn-id: file:///home/svn/framework3/trunk@6082 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-07 03:07:01 +00:00