Commit Graph

862 Commits (bfc23d2886874893f63c267bd867c442de6d9792)

Author SHA1 Message Date
HD Moore ec94968d82 Add support for context-map files to msfpescan (http://sourceforge.net/projects/smem-map/)
git-svn-id: file:///home/svn/framework3/trunk@5154 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-18 16:55:23 +00:00
HD Moore 21d971139b New HTTP NTLM code from Kurt Grutzmacher <grutz@jingojango.net>
git-svn-id: file:///home/svn/framework3/trunk@5143 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-12 01:24:57 +00:00
HD Moore 6f79e14c91 Fixes #157. Patches from egypt@nmt.edu
git-svn-id: file:///home/svn/framework3/trunk@5137 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-05 19:23:45 +00:00
HD Moore ffc5c0a57d Use a class variable instead of a global to cache unicode code pages.
git-svn-id: file:///home/svn/framework3/trunk@5126 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-29 06:47:16 +00:00
HD Moore 1527d92154 Correct offset typos in the new iphone modules. Add EXE output support for OS X PPC, Linux x86, and make the OS X ARM smaller.
git-svn-id: file:///home/svn/framework3/trunk@5119 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-25 01:50:05 +00:00
HD Moore cbec13de60 Add "X" mode for iPhone payloads
git-svn-id: file:///home/svn/framework3/trunk@5117 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 17:54:51 +00:00
HD Moore 621849beaf One more bad exception to fix
git-svn-id: file:///home/svn/framework3/trunk@5114 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 04:58:26 +00:00
HD Moore 7498562eb5 Add proxy support to HTTP mixin using modules. Fix socks proxy support.
git-svn-id: file:///home/svn/framework3/trunk@5113 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 04:44:44 +00:00
HD Moore acc4fd966a Add ARMLE/ARMBE
git-svn-id: file:///home/svn/framework3/trunk@5112 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-24 03:16:50 +00:00
HD Moore 8c844f96b0 Fixes #60. Adds a new block_command() method to the console, which allows a UI to disable certain commands at runtime.
git-svn-id: file:///home/svn/framework3/trunk@5109 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-22 20:20:10 +00:00
HD Moore f832df480a Fixes #8. Resets the tab completion routine after session interaction.
git-svn-id: file:///home/svn/framework3/trunk@5108 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-22 19:53:39 +00:00
HD Moore 7cc30f0fa8 Support pattern_create() lengths larger than the maximum set size
git-svn-id: file:///home/svn/framework3/trunk@5104 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-13 16:11:33 +00:00
HD Moore 6f23487daa Fixes #117. No longer treat connection: close as a stop-processing case
git-svn-id: file:///home/svn/framework3/trunk@5090 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-09 22:27:27 +00:00
HD Moore 00beaa7049 Fixes #136. Detects a nil str parameter
git-svn-id: file:///home/svn/framework3/trunk@5088 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-09 22:10:38 +00:00
HD Moore 448714ab7b Adds rand_text_numeric
git-svn-id: file:///home/svn/framework3/trunk@5085 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-05 13:39:45 +00:00
Matt Miller 3f903a4e24 fix from spoonm
git-svn-id: file:///home/svn/framework3/trunk@5077 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-11 07:09:13 +00:00
Matt Miller 89d0e200f6 fix portfwd command not functioning properly
git-svn-id: file:///home/svn/framework3/trunk@5075 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-10 23:54:26 +00:00
Matt Miller b698d99209 catch IOError that may be raised when closing a socket that is already closed, fixes #61
git-svn-id: file:///home/svn/framework3/trunk@5074 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-10 23:09:00 +00:00
HD Moore bff51b5578 Typo fix
git-svn-id: file:///home/svn/framework3/trunk@5067 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-30 05:21:02 +00:00
HD Moore b4fab66d40 Fixes #128. Applying a one-line typo fix from antoine. Thanks!
git-svn-id: file:///home/svn/framework3/trunk@5052 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 13:43:52 +00:00
HD Moore 1f2791494b General cleanups, bug fixes, removal of debugging statements.
git-svn-id: file:///home/svn/framework3/trunk@5051 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 02:17:32 +00:00
HD Moore 2fd4bf1579 Adds support for array arguments to Rex::Arch.endian(). This solves a problem where some exploits choose the wrong unescape method.
git-svn-id: file:///home/svn/framework3/trunk@5050 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 01:23:17 +00:00
HD Moore 24aac8b5ae Fixes #127. Applying patch from Alex that solves ASN.1 encoding issues.
git-svn-id: file:///home/svn/framework3/trunk@5049 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 01:13:25 +00:00
HD Moore 240ad73d6a Added --rip mode to msfpescan :)
git-svn-id: file:///home/svn/framework3/trunk@5041 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-09 18:17:04 +00:00
HD Moore 37c0376d73 Add file names to the resource output
git-svn-id: file:///home/svn/framework3/trunk@5040 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-09 05:06:01 +00:00
HD Moore 9aa34702dd Fix a typo which prevented the set() method from working correctly.
git-svn-id: file:///home/svn/framework3/trunk@5036 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-07 03:12:42 +00:00
HD Moore 1f0cd480e5 This commit adds --info support to msfpescan
git-svn-id: file:///home/svn/framework3/trunk@5034 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-06 05:14:05 +00:00
HD Moore d0b15d3d72 Lots of SMB fun, all preparation for Black Hat talk :-) More to come...
git-svn-id: file:///home/svn/framework3/trunk@5015 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 04:20:50 +00:00
HD Moore ddfe651bc8 This adds support for smb_pipeio=trans
git-svn-id: file:///home/svn/framework3/trunk@4915 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-15 16:48:15 +00:00
HD Moore 58a804e510 Small bug fix to allow pipeio on Novell
git-svn-id: file:///home/svn/framework3/trunk@4914 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-15 15:44:39 +00:00
bmc 5e23a54296 * uhwtfms_half - half-width encoding ( http://www.kb.cert.org/vuls/id/739224 )
git-svn-id: file:///home/svn/framework3/trunk@4910 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-14 20:49:35 +00:00
HD Moore e8c5c53e4b This adds pass-the-hash support from grutz.
git-svn-id: file:///home/svn/framework3/trunk@4890 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-09 12:39:29 +00:00
HD Moore 793048c879 This patch adds support for java byte array output (useful for sticking shellcode into java applets).
git-svn-id: file:///home/svn/framework3/trunk@4880 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-07 04:42:11 +00:00
HD Moore ebb84d5b32 Check for typos next time =P
git-svn-id: file:///home/svn/framework3/trunk@4879 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-06 22:33:21 +00:00
bmc 21e37f1b0c * older IIS allowed you to encode multiple times. Expose the ability to encode as many times as you wish. 1 is default
git-svn-id: file:///home/svn/framework3/trunk@4867 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-04 15:17:25 +00:00
HD Moore 65cfd287e5 Improvements to the SSL socket support in Rex, fixes #102, and a HTTP client response parsing bug
git-svn-id: file:///home/svn/framework3/trunk@4851 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-03 20:01:29 +00:00
HD Moore 288d82c8f6 cidr_crack() now detects v6 addresses better
git-svn-id: file:///home/svn/framework3/trunk@4828 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-01 04:54:18 +00:00
HD Moore 664363d7bd One more fix for IPv6 support, this should fix things up for OS X
git-svn-id: file:///home/svn/framework3/trunk@4827 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-01 04:50:16 +00:00
HD Moore a36a740cf0 Minor fix for IPv6 support
git-svn-id: file:///home/svn/framework3/trunk@4826 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-01 04:47:53 +00:00
HD Moore bf56c136ee Catch even more generic errors
git-svn-id: file:///home/svn/framework3/trunk@4816 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-30 00:13:26 +00:00
HD Moore abb0ac92d9 This adds a secondary check to see if the OS actually supports IPv6 sockets
git-svn-id: file:///home/svn/framework3/trunk@4815 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-30 00:11:49 +00:00
HD Moore 83a8ece022 This patch adds IPv6 support to most feartures of the framework. The major missing component is IPv6-enabled payloads.
git-svn-id: file:///home/svn/framework3/trunk@4814 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-29 23:43:39 +00:00
bmc c79649ebc3 add chunked encoding evasion back into the client API (not in the mixin yet)
git-svn-id: file:///home/svn/framework3/trunk@4790 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-26 21:08:22 +00:00
HD Moore 4d1c274387 Merging all of the auxilliary/scanner related features
git-svn-id: file:///home/svn/framework3/trunk@4749 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-24 06:27:39 +00:00
HD Moore affc5fb958 fixes #85 (basic auth to http)
git-svn-id: file:///home/svn/framework3/trunk@4744 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-23 22:48:22 +00:00
Matt Miller 1e1cc94831 req_string rather than req
git-svn-id: file:///home/svn/framework3/trunk@4732 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-22 07:50:07 +00:00
Matt Miller 130b303bfa shikata changes from vlad902, improvements to poly code
git-svn-id: file:///home/svn/framework3/trunk@4722 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-21 02:10:43 +00:00
Matt Miller ae4a4c378a fixes #77
git-svn-id: file:///home/svn/framework3/trunk@4664 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-12 17:23:18 +00:00
HD Moore 2ec5cea6df Adds to_hex_dump
git-svn-id: file:///home/svn/framework3/trunk@4662 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-11 22:23:32 +00:00
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 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 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
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 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 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
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 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
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 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
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
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
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
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
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 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
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
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
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
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
HD Moore 8a797e6bcc Support for killing sessions from the UI and killing all running jobs with jobs -a
git-svn-id: file:///home/svn/framework3/trunk@4361 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 23:24:25 +00:00
HD Moore 4d205cdcd8 Consistency fixes for the print_* routines
git-svn-id: file:///home/svn/framework3/trunk@4358 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 19:40:33 +00:00
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
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
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 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
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 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 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 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
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
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
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
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
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
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 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 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 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 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 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 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 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
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 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
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 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 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 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 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 7a0c8d2c8d Cleanup
git-svn-id: file:///home/svn/framework3/trunk@3846 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-28 00:24:34 +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
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 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 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 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
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 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 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 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
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 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
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