Commit Graph

1531 Commits (301b1514f336e9f87c2c5b20b142619feaab3b36)

Author SHA1 Message Date
Matt Miller 71a7355e20 added the ability to track jobs, and made rexploit stop the existing job
git-svn-id: file:///home/svn/framework3/trunk@4644 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-04 02:49:08 +00:00
Matt Miller 67e39c15a1 display output on a different line from the prompt
git-svn-id: file:///home/svn/framework3/trunk@4643 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-04 02:38:15 +00:00
Matt Miller a319b8e582 got rid of duplicated code in browser exploits, fixes #71
git-svn-id: file:///home/svn/framework3/trunk@4642 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-04 02:04:37 +00:00
Matt Miller 14cff709bc update comment
git-svn-id: file:///home/svn/framework3/trunk@4641 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-03 07:56:57 +00:00
Matt Miller 2dd452e2f5 comment
git-svn-id: file:///home/svn/framework3/trunk@4636 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-03 07:36:33 +00:00
Matt Miller b74311c71d initial integration of alex's heaplib, and a port of the keyframe exploit
git-svn-id: file:///home/svn/framework3/trunk@4635 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-03 07:35:54 +00:00
HD Moore d31b36a4ca Add windows suppor to pe_memdump. Fix a stupid typo in pattern_create
git-svn-id: file:///home/svn/framework3/trunk@4629 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-03 02:42:30 +00:00
HD Moore 2958988454 Remove the int3 from the copy_to_stack code
git-svn-id: file:///home/svn/framework3/trunk@4620 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-02 06:26:16 +00:00
HD Moore 9333609211 Adds a second argument to encode_base64
git-svn-id: file:///home/svn/framework3/trunk@4618 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-02 06:23:14 +00:00
Matt Miller 97b6cf3636 here we go
git-svn-id: file:///home/svn/framework3/trunk@4613 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-02 05:51:22 +00:00
HD Moore dd2e9d87fb This adds SMTPDeliver exploit mixin, the SMTP version of the ANI exploit, accessor to Ole::Storage
git-svn-id: file:///home/svn/framework3/trunk@4608 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-02 05:27:19 +00:00
HD Moore 964c5b8081 This adds simple MIME support to the Rex library
git-svn-id: file:///home/svn/framework3/trunk@4607 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-02 03:58:11 +00:00
Matt Miller f9d8c4e820 modifications to support using an explicit target to regen payloads
git-svn-id: file:///home/svn/framework3/trunk@4602 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-01 21:21:10 +00:00
Matt Miller f0fcedf728 raw encoder type wasn't being enforced
git-svn-id: file:///home/svn/framework3/trunk@4599 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-01 21:00:51 +00:00
HD Moore ab6f961ea4 Removed the buggy errors.txt loader, embedded the error messages into the files
git-svn-id: file:///home/svn/framework3/trunk@4584 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-27 02:44:05 +00:00
HD Moore 2ce350b1fd This should fix a bad-argument call for memdump based images
git-svn-id: file:///home/svn/framework3/trunk@4583 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-27 01:56:19 +00:00
HD Moore 4b8e8dc0e8 Bumped the version of trunk to 3.1-dev
git-svn-id: file:///home/svn/framework3/trunk@4575 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-26 19:55:26 +00:00
fab 9d08dd81be parameters stuff
git-svn-id: file:///home/svn/framework3/trunk@4570 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-25 21:44:48 +00:00
HD Moore c01d7d6cab Updated to allow 1.8.2 on OS X, since technically it works fine
git-svn-id: file:///home/svn/framework3/trunk@4568 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-25 07:57:54 +00:00
HD Moore 46c9c510dd Minor cleanups, less matching, very minor speedup
git-svn-id: file:///home/svn/framework3/trunk@4567 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-25 07:38:11 +00:00
HD Moore 35680b10ca Update the release version
git-svn-id: file:///home/svn/framework3/trunk@4566 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-25 07:35:15 +00:00
fab 4d7ddb0e07 add parameters stuff (menu, widget, ...)
git-svn-id: file:///home/svn/framework3/trunk@4557 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-24 22:56:59 +00:00
HD Moore a1d3f0e4f7 Yet-another-Windows-fix
git-svn-id: file:///home/svn/framework3/trunk@4556 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-24 18:35:34 +00:00
HD Moore 3de67cf716 More fixes for cross-platform NASM shell support
git-svn-id: file:///home/svn/framework3/trunk@4555 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-24 18:31:44 +00:00
HD Moore 755278ca1a Compatibility fixes to the nasm shell
git-svn-id: file:///home/svn/framework3/trunk@4554 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-24 18:15:45 +00:00
HD Moore 1fd83b3fe6 Changes to the nasm wrapper to enable windows support
git-svn-id: file:///home/svn/framework3/trunk@4553 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-24 18:09:14 +00:00
HD Moore d529f11e9b The configuration directory is now based on $HOME -> $USERPROFILE -> $Root
git-svn-id: file:///home/svn/framework3/trunk@4548 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-24 06:41:44 +00:00
HD Moore 8c631e7063 Switches the socket class to use pack_sockaddr_in(). Fixes #58
git-svn-id: file:///home/svn/framework3/trunk@4545 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-22 22:15:26 +00:00
fab 1dd52c557d added treview for options dialog
git-svn-id: file:///home/svn/framework3/trunk@4544 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-21 22:32:36 +00:00
fab f18bf11a28 add a Gtk::Expander to the advanced options
git-svn-id: file:///home/svn/framework3/trunk@4543 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-21 21:01:49 +00:00
HD Moore 5f2d59ccad Added the support class, confined it load within the OLE namespace
git-svn-id: file:///home/svn/framework3/trunk@4542 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-20 18:25:19 +00:00
HD Moore 9c3bfaeee4 Imported the OLE modules from ruby-msg (GPLv2)
git-svn-id: file:///home/svn/framework3/trunk@4541 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-20 16:49:34 +00:00
fab 4b97911605 Stuff for the preference panel (skeleton class, glade)
git-svn-id: file:///home/svn/framework3/trunk@4540 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-19 23:15:49 +00:00
fab 79de2b7edb arrf, correct the changeset #4538
git-svn-id: file:///home/svn/framework3/trunk@4539 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-19 23:13:50 +00:00
fab 5ade413d8c - add hook for mail and http
git-svn-id: file:///home/svn/framework3/trunk@4538 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-19 23:11:18 +00:00
HD Moore d14221898d Merge in the new generic PHP exploit with new targets
Added type definitions to HTTP::Client



git-svn-id: file:///home/svn/framework3/trunk@4537 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-17 20:10:57 +00:00
Matt Miller d8dc31be15 added option validation to check path
git-svn-id: file:///home/svn/framework3/trunk@4536 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-17 19:39:30 +00:00
Matt Miller aaeb955fbd switch to using ruby mutex instead of rwlock to prevent oddness reported, fixes #52
git-svn-id: file:///home/svn/framework3/trunk@4526 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-12 00:50:50 +00:00
Matt Miller 449ca3c826 check to ensure that the step is valid as it will be normalized
git-svn-id: file:///home/svn/framework3/trunk@4525 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-12 00:35:02 +00:00
HD Moore 621d866375 Exploits can be launched from the web UI. Fixes #10
git-svn-id: file:///home/svn/framework3/trunk@4520 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-11 19:14:10 +00:00
HD Moore 4d87a3f9fb Adding the missing raw_headers function required for the recent php bug
git-svn-id: file:///home/svn/framework3/trunk@4518 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-11 16:28:13 +00:00
HD Moore b5e0a70528 Cleanup debugging statement
git-svn-id: file:///home/svn/framework3/trunk@4517 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-11 02:04:35 +00:00
HD Moore d3ff922169 Disable BruteStep for now, its still broken
git-svn-id: file:///home/svn/framework3/trunk@4516 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-11 01:43:51 +00:00
HD Moore 547ec3c6c6 This patch adds header folding, fixed hex-random and u-random encoding, fake uri end, fake uri parameters. This fixes #16, the remaining two options (chunked and pipelining), will be added in a future version.
git-svn-id: file:///home/svn/framework3/trunk@4513 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-10 05:58:14 +00:00
HD Moore 41809d5f0a Rescue Timeout and Runtime errors from the HTTP client. This fixes #42.
git-svn-id: file:///home/svn/framework3/trunk@4512 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-10 03:51:58 +00:00
Matt Miller c61e0e8931 change the behavior of nil non-required options, fixes #49
git-svn-id: file:///home/svn/framework3/trunk@4509 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-09 06:12:28 +00:00
fab 79421e5b69 major update (Payload generator, Gtk Error, ....)
git-svn-id: file:///home/svn/framework3/trunk@4507 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-08 22:44:55 +00:00
HD Moore e6f221ad80 Major updates to the HTTP api, re-addition of HTTP evasion, see #16
git-svn-id: file:///home/svn/framework3/trunk@4506 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-08 14:08:41 +00:00
HD Moore 30a93c33cb The rand_text_* methods now take an optional badchar list and default it to the payload_badchars data
git-svn-id: file:///home/svn/framework3/trunk@4503 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-06 21:02:38 +00:00
fab 8f6498038a Prepare the Gtk Meterpreter console
Gtk Console swicth to Gtk::Window
Now, in the same time, we could open multiple sessions
Remove old console stuff (code and glade)



git-svn-id: file:///home/svn/framework3/trunk@4500 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-01 22:09:01 +00:00
Matt Miller cfd9cbb1f1 added code to disable random nops/text generation if DEBUG is set, fixes #43, but still need to update some exploits
git-svn-id: file:///home/svn/framework3/trunk@4497 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-01 08:09:22 +00:00
Matt Miller 2981d476ff rescue Timeout::Error, not TimeoutError
git-svn-id: file:///home/svn/framework3/trunk@4496 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-01 07:47:40 +00:00
fab c28b11c156 del logs.rb (garbage)
git-svn-id: file:///home/svn/framework3/trunk@4494 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-28 22:06:13 +00:00
fab a0a788bfcf switch sessions.rb and correct all depencies to use $gtk2driver.session_tree
git-svn-id: file:///home/svn/framework3/trunk@4493 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-28 21:59:05 +00:00
fab 4058b1326c add the open_session method and few comments
git-svn-id: file:///home/svn/framework3/trunk@4492 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-28 21:38:38 +00:00
fab a01a28f725 remember the Gtk::TextBuffer for the console
git-svn-id: file:///home/svn/framework3/trunk@4491 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-28 21:30:10 +00:00
fab 81cc070abb add an output to logs buffer when a job stopped
add few comments


git-svn-id: file:///home/svn/framework3/trunk@4490 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-27 22:41:03 +00:00
fab 359a5afd93 add a kill job feature from job treeview Gtk::Menu
git-svn-id: file:///home/svn/framework3/trunk@4489 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-27 22:32:05 +00:00
HD Moore 88cc653478 The HTTP api now catches SIGPIPEs and just returns a nil response
git-svn-id: file:///home/svn/framework3/trunk@4483 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-27 09:31:23 +00:00
HD Moore 7087457f9e A few more updates to the HTTP exploit mixin, still needs some work before it is completed
git-svn-id: file:///home/svn/framework3/trunk@4481 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-27 09:15:53 +00:00
fab 797badb271 add remove job after framework_event_manager opened a session only if exploit.passive? return fase
rename MyTargetTree by MyJobTree and all the attr_accessor reference



git-svn-id: file:///home/svn/framework3/trunk@4479 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-26 23:19:59 +00:00
HD Moore 6d4c234187 Fix a problem where a dcerpc exploit will only work once before the framework must be reloaded
git-svn-id: file:///home/svn/framework3/trunk@4476 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-26 17:38:01 +00:00
Matt Miller 36462709c6 fix typo
git-svn-id: file:///home/svn/framework3/trunk@4474 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-26 03:11:51 +00:00
Matt Miller b30551b59d moved code around that sets the via exploit/payload to the handler code, fixes #32
git-svn-id: file:///home/svn/framework3/trunk@4473 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-26 03:09:55 +00:00
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
fab 0a397256fd MsfAssistant: switch options -> advanced
git-svn-id: file:///home/svn/framework3/trunk@4469 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-25 20:51:12 +00:00
fab fe9ff60607 provides resource file mechanism for configuring various aspects of the operation of a GTK+ console at runtime
git-svn-id: file:///home/svn/framework3/trunk@4467 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-25 17:39:31 +00:00
Matt Miller e8d036cac8 fixed typo in simplified modules
git-svn-id: file:///home/svn/framework3/trunk@4465 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-24 21:42:13 +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
HD Moore 2db1945637 Fix a bone-headed error when adding http evasion, this fixes #31
git-svn-id: file:///home/svn/framework3/trunk@4459 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-22 07:33:00 +00:00
HD Moore 7007ec3349 Work around an off problem with the require() call not always returning true. If the require fails, an exception should be raised, so this should be a safe workaround.
git-svn-id: file:///home/svn/framework3/trunk@4454 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-21 14:42:21 +00:00
HD Moore fe540a3001 Cleanly handle EOFError's from DCERPC services. This fixes #27
git-svn-id: file:///home/svn/framework3/trunk@4453 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-21 03:58:44 +00:00
Matt Miller b70afbd6cf fixes #23, from alex
git-svn-id: file:///home/svn/framework3/trunk@4450 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-21 03:11:47 +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 7ca88cd747 fix to call interact with correct args
git-svn-id: file:///home/svn/framework3/trunk@4446 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-20 05:41:51 +00:00
HD Moore 51d61c161d Sessions can be detached and killed from the console
git-svn-id: file:///home/svn/framework3/trunk@4437 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 22:35:07 +00:00
Matt Miller 06ac34faf1 fixes #9, added MODULEPATH var, and msfencode/msfpayload support it as well
git-svn-id: file:///home/svn/framework3/trunk@4436 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 12:27:17 +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 075b3c1c82 Further progress towards mobile sessions
git-svn-id: file:///home/svn/framework3/trunk@4425 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 05:07:56 +00:00
HD Moore 80c4bcd5ab Session detach support, closer to clean hand-off between session -d / session -i. Make autovnc look for both vncviewer and vncviewer.exe
git-svn-id: file:///home/svn/framework3/trunk@4424 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 04:25:46 +00:00
HD Moore a4b06e1653 fixes a file descriptor leak in the SMB and DCERPC exception translation code
git-svn-id: file:///home/svn/framework3/trunk@4423 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 03:07:40 +00:00
HD Moore 149987b41e The msfwx user interface is now obsolete, further GUI work will be handled by msfgui/msfgtk2
git-svn-id: file:///home/svn/framework3/trunk@4409 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-17 23:54:09 +00:00
HD Moore f916234e1a Option tab completion is now case insensitive
git-svn-id: file:///home/svn/framework3/trunk@4402 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-17 03:52:46 +00:00
HD Moore cb338fc271 Check for hosted databasee (no matching host for a service)
git-svn-id: file:///home/svn/framework3/trunk@4401 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-16 19:14:55 +00:00
Matt Miller 9cda28221f more gracefully handle iconv being missing
git-svn-id: file:///home/svn/framework3/trunk@4400 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-16 18:49:07 +00:00
Matt Miller 96a6131bf0 added module ds cache on a session basis
git-svn-id: file:///home/svn/framework3/trunk@4399 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-16 06:40:55 +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 0b42f16d1f Add a comment about why color support was disabled for now
git-svn-id: file:///home/svn/framework3/trunk@4397 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-16 05:22:36 +00:00
fab 4b99a048a9 - add completion to the module search
- add a better text message when the require gtk+ mismatch



git-svn-id: file:///home/svn/framework3/trunk@4395 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-15 22:09:24 +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
Matt Miller 3416375c72 typo, case sensitive
git-svn-id: file:///home/svn/framework3/trunk@4385 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-15 07:28:52 +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
fab 2473071564 - update console and session tree
git-svn-id: file:///home/svn/framework3/trunk@4383 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 22:51:40 +00:00
fab 12c83bac78 - changle label name for the Job treeview
- add double click on to Session treeview to perform the console session


git-svn-id: file:///home/svn/framework3/trunk@4382 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 19:56:19 +00:00
fab ebf41c00c7 - cleanup code
git-svn-id: file:///home/svn/framework3/trunk@4381 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 18:02:56 +00:00
fab 6b45e0b15c - add focus on the search widget
- correct double-click on the module treeview


git-svn-id: file:///home/svn/framework3/trunk@4380 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 17:04:16 +00:00
fab 22ec733f28 - grab focus to cmd_entry
git-svn-id: file:///home/svn/framework3/trunk@4379 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 16:44:04 +00:00
fab 98fbadd5fe - add signal_connect to Gtk::Entry (hit Enter key to perform a search)
git-svn-id: file:///home/svn/framework3/trunk@4378 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 16:12:26 +00:00
fab dca1bdbd0f - active_focus bogus
git-svn-id: file:///home/svn/framework3/trunk@4377 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 16:05:00 +00:00
fab 817160dacb - expand the treeview after performing a seach in module tree
git-svn-id: file:///home/svn/framework3/trunk@4375 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 15:26:38 +00:00
fab cde840f453 - add color to Gtk::Entry by running state, tooooo fun ;-)
git-svn-id: file:///home/svn/framework3/trunk@4374 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 14:38:15 +00:00
fab 1812154275 - update the module treeview after search performing
git-svn-id: file:///home/svn/framework3/trunk@4373 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 14:07:35 +00:00
fab 08ff6d905f - signal_connect a cancel button to clear the module search and refresh the modules treeview
git-svn-id: file:///home/svn/framework3/trunk@4372 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 09:14:02 +00:00
fab bac18df17c - search engine done !
git-svn-id: file:///home/svn/framework3/trunk@4371 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 08:48:39 +00:00
fab 10a4ada7b9 - prepare the next search engine for the module treeview
git-svn-id: file:///home/svn/framework3/trunk@4370 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-13 00:22:05 +00:00
HD Moore 64ea078c37 git-svn-id: file:///home/svn/framework3/trunk@4368 4d416f70-5f16-0410-b530-b9f4589650da 2007-02-12 05:54:14 +00:00
HD Moore e6671f238f Session create/close log messages
git-svn-id: file:///home/svn/framework3/trunk@4367 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-12 00:27:32 +00:00
HD Moore 12b6c4c839 Update the comments
git-svn-id: file:///home/svn/framework3/trunk@4366 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-12 00:21:52 +00:00
HD Moore 97a87f957f Session kill now works for the GUI
git-svn-id: file:///home/svn/framework3/trunk@4365 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-12 00:20:06 +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
fab a661c6598e - sessions stuff on msfgui, not yet finished and bad implementation
git-svn-id: file:///home/svn/framework3/trunk@4363 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 23:32:01 +00:00
HD Moore 22f9a47099 Killing all jobs is now jobs -K
git-svn-id: file:///home/svn/framework3/trunk@4362 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 23:25:07 +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
fab c545082fc6 - connect the remove_session to the on_close_session (framework_event_manager)
git-svn-id: file:///home/svn/framework3/trunk@4359 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 22:08:24 +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
HD Moore c46c1c2d04 Working meterpreter from inside msfweb
git-svn-id: file:///home/svn/framework3/trunk@4357 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 19:33:01 +00:00
HD Moore 020ec49767 Updates to the msfgui interface
git-svn-id: file:///home/svn/framework3/trunk@4355 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 09:22:06 +00:00
HD Moore 043e338f72 Tnos of updates, overhaul of the session/IO stuff, still quite broken
git-svn-id: file:///home/svn/framework3/trunk@4354 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 08:57:43 +00:00
Matt Miller 4cd2679f2f get rid for prompt and use output for displaying the prompt
git-svn-id: file:///home/svn/framework3/trunk@4352 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 06:59:22 +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
fab d894adbb00 - add Time.now & Process::pid to target treeview
git-svn-id: file:///home/svn/framework3/trunk@4348 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 00:04:05 +00:00
fab bdd4b0353f - the "OneShot" item in module view was changed by an "Execute" item
- "Execute" item now launch the MsfAssistant
- target tree is disabled
- add a double click on the exploit launch MsfAssistant



git-svn-id: file:///home/svn/framework3/trunk@4346 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 22:05:54 +00:00
HD Moore d0f3f574b0 Basic session support for the web console
git-svn-id: file:///home/svn/framework3/trunk@4344 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 18:07:08 +00:00
fab f4fd1051da - cleanup
git-svn-id: file:///home/svn/framework3/trunk@4343 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 17:24:18 +00:00
HD Moore 4d7e93a272 Prevent session interaction using the web console (since its so broken)
git-svn-id: file:///home/svn/framework3/trunk@4342 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 07:29:05 +00:00
HD Moore a310616f18 Updates to the web interface
git-svn-id: file:///home/svn/framework3/trunk@4341 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 06:54:03 +00:00
HD Moore 1bf2db7a56 Command shell now working in the GUI
git-svn-id: file:///home/svn/framework3/trunk@4340 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 05:01:48 +00:00
fab 590fede74c - test the new GtkConsolePipe (currently under devel)
git-svn-id: file:///home/svn/framework3/trunk@4339 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 03:03:17 +00:00
HD Moore d1136c7286 Nevermind, the pipe_input.fd should be used instead of .fd
git-svn-id: file:///home/svn/framework3/trunk@4338 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 02:55:28 +00:00
HD Moore 934f2652b5 Changed input_fd to just fd
git-svn-id: file:///home/svn/framework3/trunk@4337 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 02:44:41 +00:00
HD Moore 3aa56ad827 Fixes a typo
git-svn-id: file:///home/svn/framework3/trunk@4336 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 02:09:26 +00:00
HD Moore c60276c657 Inherit from the real pipe class, including the new input_fd() method
git-svn-id: file:///home/svn/framework3/trunk@4335 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 02:05:58 +00:00
HD Moore b39346079d This adds the input_fd() method, which returns a selectable() socket
git-svn-id: file:///home/svn/framework3/trunk@4334 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-10 02:04:52 +00:00
fab 4a875fa468 - Perform a match IP address for MyOneShot (Gtk::Dialog) and a Gtk::Label warning
git-svn-id: file:///home/svn/framework3/trunk@4333 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-08 21:29:32 +00:00
fab c8dc150cc9 - Emits an activate signal to the Gtk::Entry of MyOneShot class.
git-svn-id: file:///home/svn/framework3/trunk@4332 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-08 20:18:21 +00:00
fab 71c0275f73 - enable search in the module tree. User could hint Ctrl-F and tape the first letters of the searching module, he could be navigate throught results by using the up/down arrows .... Isn't fun, no ?
git-svn-id: file:///home/svn/framework3/trunk@4331 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-07 22:28:55 +00:00
fab 49ea5b2369 - bug in display module view
git-svn-id: file:///home/svn/framework3/trunk@4330 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-07 21:02:24 +00:00
fab 0fcadc33bb - cleanup
git-svn-id: file:///home/svn/framework3/trunk@4329 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-06 21:43:06 +00:00
fab c23760c445 - Gtk::Entry on the console is done, cmd redirects to stdout
git-svn-id: file:///home/svn/framework3/trunk@4328 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-05 22:36:43 +00:00
fab 7be3d1c3de - link MsfAssistant to bidirectionnal_pide
- add Gtk::Entry to console


git-svn-id: file:///home/svn/framework3/trunk@4327 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-05 21:08:35 +00:00
fab a38dc64158 - isolate Gtk::TextBuffer for the bidirectional_pipe buffer, now all session owns his buffer
git-svn-id: file:///home/svn/framework3/trunk@4326 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-04 23:33:27 +00:00
fab 2cbc44c634 - test the bidirectional_pipe for io
git-svn-id: file:///home/svn/framework3/trunk@4325 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-04 22:14:46 +00:00
fab b48d6db741 - cleanup
git-svn-id: file:///home/svn/framework3/trunk@4324 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-04 21:49:40 +00:00
fab 6612c5c9e5 - add comments
- isolate the view class (the view class)
- cleanup the msfgui input driver



git-svn-id: file:///home/svn/framework3/trunk@4323 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-04 21:25:10 +00:00
fab f61e726dbe - change all msfgtk2 to msfgui
- update glade file
- change menu behaviour on module treeview


git-svn-id: file:///home/svn/framework3/trunk@4322 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-04 19:30:49 +00:00
HD Moore aca397df09 Initial import for the msfgui code from Fab
git-svn-id: file:///home/svn/framework3/trunk@4316 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-04 01:55:01 +00:00
HD Moore 2980467f1b Formatting updates
git-svn-id: file:///home/svn/framework3/trunk@4315 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-04 01:54:10 +00:00
Matt Miller a68dfe89bf better errors if meterp file is missing
git-svn-id: file:///home/svn/framework3/trunk@4313 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-03 19:39:11 +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
HD Moore 5e12797485 Updates for msfweb, added vista target to smb/version, patch from diaul to show the selected target
git-svn-id: file:///home/svn/framework3/trunk@4305 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-31 00:08:52 +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 90d03e881b Updates to the web console
git-svn-id: file:///home/svn/framework3/trunk@4294 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-22 06:57:07 +00:00
HD Moore 6df557c8a7 Support for bidirectional pipe on windows uses a hacked up socket_pair()
git-svn-id: file:///home/svn/framework3/trunk@4291 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-21 20:21:58 +00:00
HD Moore 8d06aad5b4 Tab completion has been added to the web console
git-svn-id: file:///home/svn/framework3/trunk@4290 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-20 22:19:32 +00:00
HD Moore 35cc4bfbb2 Add the correct requires
git-svn-id: file:///home/svn/framework3/trunk@4288 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-19 08:47:20 +00:00
HD Moore 4bd5580784 Updates for the web interface
git-svn-id: file:///home/svn/framework3/trunk@4287 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-19 08:46:06 +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
HD Moore 51be740744 Require ruby 1.8.3+ to avoid stupid bugs
git-svn-id: file:///home/svn/framework3/trunk@4277 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-15 20:42:42 +00:00
Matt Miller 97feb5b79d hex-normal is broken?
git-svn-id: file:///home/svn/framework3/trunk@4276 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-15 00:43:17 +00:00
Matt Miller b155c41d28 fix ref counting issue with vncinject
git-svn-id: file:///home/svn/framework3/trunk@4275 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-08 04:44:11 +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 d09046a5b9 Accessing res['header'] is now case insensitive for HTTP responses
Added the Google Appliance exploit



git-svn-id: file:///home/svn/framework3/trunk@4259 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-05 05:22:39 +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 5700acc2fc fix for encoder not implementing commands
git-svn-id: file:///home/svn/framework3/trunk@4251 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-05 02:48:45 +00:00
Matt Miller 7da10dd53e fix opcode compat with new http client interface
git-svn-id: file:///home/svn/framework3/trunk@4244 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-30 07:39:34 +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 7d949bf802 Remove whitespace from base64
git-svn-id: file:///home/svn/framework3/trunk@4238 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-28 19:56:57 +00:00
HD Moore bb79a9a6be Use pack/unpack vs the Base64 library (seems to be broken on OS X)
git-svn-id: file:///home/svn/framework3/trunk@4237 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-28 19:55:35 +00:00
HD Moore 58f75149e0 Explicitly specify the ::Base64 class
git-svn-id: file:///home/svn/framework3/trunk@4236 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-28 19:52:33 +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 23a61e0a49 woops
git-svn-id: file:///home/svn/framework3/trunk@4214 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-17 07:52:05 +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
HD Moore 8a922d0641 Always use IO.read vs IO.readlines.join
git-svn-id: file:///home/svn/framework3/trunk@4211 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-17 07:00:44 +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 40242aca92 Added -I and -X options to db_autopwn
git-svn-id: file:///home/svn/framework3/trunk@4181 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-10 08:21:52 +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 7bc77e8203 Extend option command completion to include all possible values for Enum options
git-svn-id: file:///home/svn/framework3/trunk@4172 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-10 03:16:38 +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 789556f004 Woops, forgot to commit this, thanks MC!
git-svn-id: file:///home/svn/framework3/trunk@4160 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-02 23:56:52 +00:00
HD Moore 3edea24c3d This adds the backupexec registry access module and a supporting library for windows registry constants
git-svn-id: file:///home/svn/framework3/trunk@4159 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-02 19:48:10 +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 8746882bf4 Changed the defaut win32 process back to lsass.exe until we come up with a better solution -- spools just results in nothing happening in many cases.
git-svn-id: file:///home/svn/framework3/trunk@4145 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-16 03:49:56 +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
Matt Miller b306da967d exit thread instead of exit proc
git-svn-id: file:///home/svn/framework3/trunk@4127 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-11 19:18:04 +00:00
Matt Miller 2627f5b7f9 hurray for the next stager
git-svn-id: file:///home/svn/framework3/trunk@4126 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-11 19:17:00 +00:00
Matt Miller 702d6a6544 added recovery stub for kiidleloop
git-svn-id: file:///home/svn/framework3/trunk@4122 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-11 04:38:45 +00:00
HD Moore dddc4a7640 New stager from johnycsh
git-svn-id: file:///home/svn/framework3/trunk@4121 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-11 04:14:57 +00:00
HD Moore 00b2cafec8 md5 was replaced with digest/md5 in 1.9 and 1.8.5
git-svn-id: file:///home/svn/framework3/trunk@4119 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-09 19:54:40 +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
Matt Miller 568f40f308 somehow abad's banner causes a stack overflow in ruby from deb, removing it for now
git-svn-id: file:///home/svn/framework3/trunk@4106 4d416f70-5f16-0410-b530-b9f4589650da
2006-11-06 02:04:52 +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 80781d7b83 Added a new jpegtochat created logo
git-svn-id: file:///home/svn/framework3/trunk@4087 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-29 18:01:34 +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 6a4c32401e added support to list which exploit a session was spawned through
git-svn-id: file:///home/svn/framework3/trunk@4061 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-28 01:50:04 +00:00
HD Moore 38b01597e8 Fix base64
git-svn-id: file:///home/svn/framework3/trunk@4057 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-26 02:42:04 +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 f1fb05690f misc bugfixes in the http subsystem
git-svn-id: file:///home/svn/framework3/trunk@4019 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-11 09:27:39 +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 934230a005 fix for variable ref
git-svn-id: file:///home/svn/framework3/trunk@3917 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-19 20:24:55 +00:00
Matt Miller 00ffcc3835 support for meterpreter scripts
git-svn-id: file:///home/svn/framework3/trunk@3916 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-19 03:15:25 +00:00
HD Moore fa5503d0ea Fix the case of hosts with no services
git-svn-id: file:///home/svn/framework3/trunk@3915 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-18 06:22:43 +00:00
HD Moore d559ad6a4e Postgres driver layer is complete, but not yet tested
git-svn-id: file:///home/svn/framework3/trunk@3909 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-18 00:05:09 +00:00
Matt Miller 9018329f1a added cleanup to meterp
git-svn-id: file:///home/svn/framework3/trunk@3908 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-17 23:12:46 +00:00
HD Moore c525ac455b Updated command set
git-svn-id: file:///home/svn/framework3/trunk@3907 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-17 22:07:52 +00:00
HD Moore c3876b6dd6 Updates for the autopwn stuff...
git-svn-id: file:///home/svn/framework3/trunk@3906 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-17 08:00:37 +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 f5298f5a94 The postgres plugin is updated and now works with autopwn/load/etc
git-svn-id: file:///home/svn/framework3/trunk@3904 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-17 07:17:27 +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 4c5b257a94 Fix a bug that prevents jobs from being cleaned up
git-svn-id: file:///home/svn/framework3/trunk@3900 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-16 20:07:25 +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
Matt Miller 902136a85e fixing up a few things
git-svn-id: file:///home/svn/framework3/trunk@3898 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-16 07:21:41 +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 475df9c08b Added the stderr log sink
git-svn-id: file:///home/svn/framework3/trunk@3895 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-16 05:50:10 +00:00
HD Moore 6b4105db8e Tab completion of RHOST options based the available services and the current RPORT
git-svn-id: file:///home/svn/framework3/trunk@3894 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-16 05:33:50 +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
HD Moore 0b71dc5d04 A few updates to add NT Trans2 secondary requests, fix an authentication issue, and support a new denial of service module
git-svn-id: file:///home/svn/framework3/trunk@3885 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-14 05:41:54 +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
Matt Miller 7a051c8ee1 bidirectional pipe
git-svn-id: file:///home/svn/framework3/trunk@3862 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-10 02:21:23 +00:00
Matt Miller a3f620b224 buffered input
git-svn-id: file:///home/svn/framework3/trunk@3861 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-10 02:21:12 +00:00
Matt Miller 06aca0378e changes to start supporting new msfweb
git-svn-id: file:///home/svn/framework3/trunk@3860 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-10 01:29:05 +00:00
Matt Miller e8d45bbf1b changes to start supporting new msfweb
git-svn-id: file:///home/svn/framework3/trunk@3859 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-10 01:28:59 +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
Matt Miller b0ba01973c fix for calling stat remotely instead of locally
git-svn-id: file:///home/svn/framework3/trunk@3854 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-05 18:34:52 +00:00
HD Moore fb6f80dd5b Bugfix
git-svn-id: file:///home/svn/framework3/trunk@3853 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-02 06:49:06 +00:00
HD Moore be356d7505 Updated to reflect the new license of Rex
git-svn-id: file:///home/svn/framework3/trunk@3850 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-01 15:50:10 +00:00
Matt Miller 860c016887 fix for relative issue
git-svn-id: file:///home/svn/framework3/trunk@3849 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-01 00:57:31 +00:00
Matt Miller 1583f4e276 fix to not attempt to output text if there is no output handle
git-svn-id: file:///home/svn/framework3/trunk@3848 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-29 00:48:33 +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
Spoon M 190922400e fixed up some exception issues in standalone meterp. Should eventually stop catching ::Exception since its too vague
git-svn-id: file:///home/svn/framework3/trunk@3842 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-24 22:54:06 +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
Spoon M 34ec11dfed I have been careless with my sword.
git-svn-id: file:///home/svn/framework3/trunk@3839 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-21 23:08:36 +00:00
Spoon M d42381f3e1 I have been careless with my sword.
git-svn-id: file:///home/svn/framework3/trunk@3838 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-21 23:03:58 +00:00
Spoon M d89ac6478c more meterp decoupling
git-svn-id: file:///home/svn/framework3/trunk@3836 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-21 22:50:27 +00:00
Spoon M 06e9f91b28 Make it so you can require meterpreter without having to require rex.rb, steps towards a standalone meterp
git-svn-id: file:///home/svn/framework3/trunk@3835 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-21 21:35:03 +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 d8b2f95178 auto load stdapi before interact, implement type? interface
git-svn-id: file:///home/svn/framework3/trunk@3833 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-15 04:07:25 +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 d3b9cf1b20 Added rerun command to auxiliary
Fixed range_walker to allow multiple ranges
Version scanner now mostly works



git-svn-id: file:///home/svn/framework3/trunk@3824 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-13 00:08:40 +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 651a1a7965 Bug fix to support NT 4.0
git-svn-id: file:///home/svn/framework3/trunk@3822 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-12 23:07:25 +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
Matt Miller 2c2af2b1bd fix typo
git-svn-id: file:///home/svn/framework3/trunk@3804 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-03 05:02:28 +00:00
HD Moore 25c08bb206 Bug fixes, list of known bugs, final prep for beta-1
git-svn-id: file:///home/svn/framework3/trunk@3803 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-02 06:30:36 +00:00
HD Moore cac9561b61 Bug fix for previous workaround
git-svn-id: file:///home/svn/framework3/trunk@3799 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-01 01:50:26 +00:00
HD Moore 4ef104e869 Readline fix
git-svn-id: file:///home/svn/framework3/trunk@3798 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-31 20:00:20 +00:00
bmc f8897ac164 stdio doesn't support readline
git-svn-id: file:///home/svn/framework3/trunk@3797 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-31 19:59:29 +00:00
HD Moore 8006479e6b Fix for OS X socket bugs
git-svn-id: file:///home/svn/framework3/trunk@3796 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-31 19:22:21 +00:00
Matt Miller 023b63bff8 potential fix for msfpescan issue
git-svn-id: file:///home/svn/framework3/trunk@3793 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-31 13:44:58 +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
HD Moore 377e606929 Added javascript and win32 pe output formats
git-svn-id: file:///home/svn/framework3/trunk@3787 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-31 04:05:20 +00:00
HD Moore e55cff59e1 Fixed Rex::Arch.endian()
Added Rex::Text.to_unescape()
Added two mozilla exploits
Fixed firefox exploit to use new api




git-svn-id: file:///home/svn/framework3/trunk@3784 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-31 02:50:41 +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
HD Moore d0bc17f17a Minor updates
git-svn-id: file:///home/svn/framework3/trunk@3778 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-30 21:31:02 +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
Matt Miller 21f4a10d32 the File.open's were correct, they needed to use the local File class and not Rex::Post::File
git-svn-id: file:///home/svn/framework3/trunk@3775 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-30 17:13:06 +00:00
HD Moore a2592959c3 Readline mode disabledby defualt for interactive sessios
Fixed an issue with exploit.rb directly running a session command after the session command had been renamed



git-svn-id: file:///home/svn/framework3/trunk@3774 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-29 23:01:38 +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 c081d7b2b1 Fixed continuaion across trap error, minor tweaks under readline
git-svn-id: file:///home/svn/framework3/trunk@3772 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-29 20:03:05 +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 eb4b7ad1ad No longer used
git-svn-id: file:///home/svn/framework3/trunk@3764 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-27 20:56:23 +00:00
HD Moore b4a0f34021 Using readline5 solves all hangs
git-svn-id: file:///home/svn/framework3/trunk@3763 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-27 05:35:29 +00:00
HD Moore eeb894b70c Change from stdin to readconsoleinput
git-svn-id: file:///home/svn/framework3/trunk@3762 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-27 05:03:56 +00:00
HD Moore cb933d9b03 Test
git-svn-id: file:///home/svn/framework3/trunk@3761 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-27 04:31:36 +00:00
HD Moore edb1f1a7ba IT WORKS!!!!
git-svn-id: file:///home/svn/framework3/trunk@3759 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-27 04:16:39 +00:00
HD Moore a021982e03 Enabled patched readline hackery
git-svn-id: file:///home/svn/framework3/trunk@3757 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-27 03:39:27 +00:00
HD Moore db8c76f679 Various hacks for win32 mode
git-svn-id: file:///home/svn/framework3/trunk@3756 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-27 00:59:00 +00:00
bmc 5b319613ab * add html encoding
git-svn-id: file:///home/svn/framework3/trunk@3755 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-24 19:25:59 +00:00
HD Moore 1a7ba78dc8 Removed a dumb debugging line that was accidentally comitted
git-svn-id: file:///home/svn/framework3/trunk@3752 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-20 04:43:52 +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
Spoon M f95d4174de BLARGGGG. Actually remove the null terminating byte (instead of returning the same string, bug). Another bug treating all registry keys that are a string as a dword...
git-svn-id: file:///home/svn/framework3/trunk@3749 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-18 20:37:38 +00:00
Spoon M 41890a86f2 use loop do instead of while 1 (ruby warning, literal in condition)
git-svn-id: file:///home/svn/framework3/trunk@3748 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-18 17:34:15 +00:00
Spoon M df32aedf44 added parens to fix precedence/void context bug
git-svn-id: file:///home/svn/framework3/trunk@3747 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-18 17:32:09 +00:00
Spoon M 1af7c1dd23 Change to an assignment, ruby warnings about a void context (which is true)
git-svn-id: file:///home/svn/framework3/trunk@3746 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-18 17:30:43 +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 775183661d Split trans into two routines, one of which sets maxparm/maxdata to zero, which is required to trigger the mailslot bug. Thanks Nico!
git-svn-id: file:///home/svn/framework3/trunk@3741 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-13 03:04:53 +00:00
HD Moore 35568b570a Demo code added for MS06-035, mailslot write added to client.rb
git-svn-id: file:///home/svn/framework3/trunk@3740 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-11 20:02:45 +00:00
bmc 6e6b1bb2a7 * NDR has been moved, so remove the tests for now, removing the code later
git-svn-id: file:///home/svn/framework3/trunk@3734 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-28 13:35:19 +00:00
HD Moore 2b603db2bb Merge from side branch to fix a bug
git-svn-id: file:///home/svn/framework3/trunk@3732 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-27 23:00:49 +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 b2895bec0d Minor sanity checks added
git-svn-id: file:///home/svn/framework3/trunk@3697 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-17 17:36:19 +00:00
HD Moore c6436b501a IPv6 needed this fix as well
git-svn-id: file:///home/svn/incoming/trunk@3673 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-16 03:56:08 +00:00
Matt Miller 3e37b5993f fix unpack in from_sockaddr
git-svn-id: file:///home/svn/incoming/trunk@3672 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-16 03:11:53 +00:00
Matt Miller 4f21fc4709 fix for pack crap
git-svn-id: file:///home/svn/incoming/trunk@3671 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-16 03:03:40 +00:00
bmc 3c2a871399 * fix dotted_ip? to be more strict
git-svn-id: file:///home/svn/incoming/trunk@3670 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 22:41:57 +00:00
bmc e70b6f7cfe * add dotted quad validation tests (to prove the current one is broken :P )
git-svn-id: file:///home/svn/incoming/trunk@3669 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 22:41:31 +00:00
Matt Miller 54540f7eb7 fix regex
git-svn-id: file:///home/svn/incoming/trunk@3668 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 21:17:05 +00:00
Matt Miller e312f588a2 delay issue on win32 fixed by wrapping socket calls
git-svn-id: file:///home/svn/incoming/trunk@3667 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 20:53:20 +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 f4545e50ed fix comment
git-svn-id: file:///home/svn/incoming/trunk@3663 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-14 22:12:36 +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
bmc 9352454791 * add warnings, gonna go away soon
git-svn-id: file:///home/svn/incoming/trunk@3659 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-13 21:26:34 +00:00
bmc 1ec5099398 ndr is really just an encoding mechanism, and its not unique to DCERPC. so... move it here
git-svn-id: file:///home/svn/incoming/trunk@3658 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-13 20:33:01 +00:00
HD Moore 989fb37f33 Woops, forgot to keep it compatible with ipv4 :/
git-svn-id: file:///home/svn/incoming/trunk@3657 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-08 21:09:00 +00:00
HD Moore ebf46cf535 Fixes for IPv6 compatibility
git-svn-id: file:///home/svn/incoming/trunk@3656 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-08 21:02:58 +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
bmc 049b71e236 move username & password to the test suite config thingie
git-svn-id: file:///home/svn/incoming/trunk@3652 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-01 15:30:26 +00:00
bmc ac2d76eb71 add default smb username & password for testing in the test config
git-svn-id: file:///home/svn/incoming/trunk@3651 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-01 15:29:39 +00:00
bmc c9a3258f81 removing dup trans function with a no_response argument to trans
git-svn-id: file:///home/svn/incoming/trunk@3650 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-01 15:18:53 +00:00
bmc 09786d3eaa tiny cleanups
git-svn-id: file:///home/svn/incoming/trunk@3649 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-31 21:49:46 +00:00
bmc 2f33ece43b * cleanup extra whitespaces at the end of the line
* collect = good


git-svn-id: file:///home/svn/incoming/trunk@3648 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-30 17:18:27 +00:00
HD Moore c3e0146443 Cleanups to SMB tests, minor fixes.
git-svn-id: file:///home/svn/incoming/trunk@3646 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-30 16:11:00 +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 71ac31446f SupportWords for a tree connect response are arbitrary new words that increment the WordCount, hopefully this wont break response parsing for the actual payload/bytecount. The current struct2 system can't take abitrary WordCount responses into account yet :-/
git-svn-id: file:///home/svn/incoming/trunk@3635 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-05 13:53:16 +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 44f578bf41 Changed 'boolean' flags to true/false from 0/1 in client.rb
Updated constants.rb to more accurately reflect packet structure in SMB responses
Updated client.rb to match the changes to constants
Updated utils.rb to include smb to unix conversation routines for time fields
Updated utils.rb to create security blobs for both client and server packets


git-svn-id: file:///home/svn/incoming/trunk@3631 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-03 04:43:19 +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
pusscat 5bfe1048e0 change the randbase 0x41 fix to work for shell_reverse_tcp
git-svn-id: file:///home/svn/incoming/trunk@3625 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-27 16:23:02 +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 42bc7496cf All sorts of fun changes to smb/dcerpc, the basics are:
1) Clean up SMB constants, add new ones, define which ones are supported by dialect
2) DCERPC over SMB uses a 'OpenPipe' class, not an 'OpenFile'
3) A new DCERPC option called 'smb_pipeio' allows the user to switch between Read/Write and TransactNamedPipe()


git-svn-id: file:///home/svn/incoming/trunk@3622 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 16:59:44 +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
pusscat 0f142d18e4 Fix to ensure that 0x41 isn't randomly generated to prematurely break our decode loop
git-svn-id: file:///home/svn/incoming/trunk@3620 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 15:50: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
Matt Miller 55c3c1247b support to use proper pointer representation and 64-bit integers in struct
git-svn-id: file:///home/svn/incoming/trunk@3617 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 21:09:36 +00:00
bmc df49cfabb0 * add SSL TCP server support, using runtime generated/signed keys
* add HTTPS support

note, SSL service tests don't work.  Right now, the tests just bail early.  The
client spins forever trying to get data.  When the client & server are in
seperate processes, this isn't a problem.  A threaded test implementation is
closer, as data sent from the client gets to the server just fine.


git-svn-id: file:///home/svn/incoming/trunk@3616 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 18:49:00 +00:00
pusscat 71e3323dbd Adjust verboten ranges
git-svn-id: file:///home/svn/incoming/trunk@3615 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 17:49:04 +00:00
pusscat 25b60466ad Fix ecx count
Fix jle -> jge


git-svn-id: file:///home/svn/incoming/trunk@3614 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 15:42:40 +00:00
pusscat 5b8ceaf72f Make sure that table gets updated
git-svn-id: file:///home/svn/incoming/trunk@3611 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 15:01:25 +00:00
Matt Miller 4c92672cb3 initial work on adding x64 support, not all finished yet
git-svn-id: file:///home/svn/incoming/trunk@3610 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 14:57:42 +00:00
pusscat 0e0a8ee0b3 Move bad block check >.<
git-svn-id: file:///home/svn/incoming/trunk@3609 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 14:38:34 +00:00
HD Moore e439b5a32d Changed default read size for analuze, needs better logic
Changed pattern_offset to work like 2.x - from lin0xx


git-svn-id: file:///home/svn/incoming/trunk@3608 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-21 21:06:31 +00:00
pusscat 4a781e59cd Replace JE with JLE to remove lowercase range instruction
git-svn-id: file:///home/svn/incoming/trunk@3607 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-21 13:28:04 +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
bmc 71fc4bd219 * random states
* random hostnames


git-svn-id: file:///home/svn/incoming/trunk@3605 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-21 03:59:07 +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
pusscat 9c02084f20 More dec -> mod for +/- offset support
git-svn-id: file:///home/svn/incoming/trunk@3603 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-20 15:07:10 +00:00
pusscat 44b14f01cb Fix alpha_uppercase:
dec -> mod (in accordance with +/- offset ability)
    remove 0x37 from mod suffix, which is unnecessary and screwing the fixups by one char


git-svn-id: file:///home/svn/incoming/trunk@3602 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-20 14:35:18 +00:00
HD Moore 589205e5ff Nearly 100% functional
git-svn-id: file:///home/svn/incoming/trunk@3600 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-16 04:41:54 +00:00
HD Moore 17d2ba798b More work on the msfpescan port
git-svn-id: file:///home/svn/incoming/trunk@3599 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-16 01:56:17 +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
Matt Miller be710b65a2 fix poly generation bug
git-svn-id: file:///home/svn/incoming/trunk@3596 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-14 04:09:53 +00:00
Spoon M 4b9033be00 pack bug found during bh eu
git-svn-id: file:///home/svn/incoming/trunk@3594 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-10 00:21:43 +00:00
HD Moore f4736c3eae Minor improvements
git-svn-id: file:///home/svn/incoming/trunk@3593 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-08 06:35:35 +00:00
Matt Miller 243127447b some meterp bugfixes found while creating a blog post :)
git-svn-id: file:///home/svn/incoming/trunk@3592 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-07 03:02:37 +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