 James Lee
|
7837e64b85
|
remove cruft leftover from the dawn of time
git-svn-id: file:///home/svn/framework3/trunk@12586 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-11 22:55:25 +00:00 |
|
|
HD Moore
|
a95186df6a
|
Revert previous patch and handle via override instead
git-svn-id: file:///home/svn/framework3/trunk@12585 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-11 22:18:16 +00:00 |
|
|
HD Moore
|
ea2da5f9ce
|
Applies a patch to fix autoload + active_support conflicts: https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/2283-unnecessary-exception-raised-in-asdependenciesload_missing_constant
git-svn-id: file:///home/svn/framework3/trunk@12583 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-11 17:39:40 +00:00 |
|
|
Tod Beardsley
|
3e6d526eca
|
Fixes #4391. Sorry! Ruby incompatability on method defs where if you set one option, you need to set them all (doesn't affect current 1.9 Rubies).
git-svn-id: file:///home/svn/framework3/trunk@12580 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-10 21:27:17 +00:00 |
|
|
James Lee
|
69d09113b5
|
use Metasm to parse elf templates and set appropriate header flags for marking .text as rwx, fixes #4384
git-svn-id: file:///home/svn/framework3/trunk@12579 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-10 21:06:19 +00:00 |
|
|
Joshua Drake
|
cd5dbe7d58
|
See #4371, fix rex/file autoloads
git-svn-id: file:///home/svn/framework3/trunk@12577 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-10 20:15:16 +00:00 |
|
|
Tod Beardsley
|
50b26cb2d6
|
Adds another Qualys formatted XML importer for ASSET_DATA_REPORT files.
git-svn-id: file:///home/svn/framework3/trunk@12575 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-10 19:10:02 +00:00 |
|
|
Joshua Drake
|
cdeb44747f
|
huh? missing something important heh
git-svn-id: file:///home/svn/framework3/trunk@12574 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-10 18:33:38 +00:00 |
|
|
Joshua Drake
|
af45f0166f
|
re-unbreak omelet code
git-svn-id: file:///home/svn/framework3/trunk@12572 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-09 22:42:41 +00:00 |
|
|
David Rude
|
2de7f9eb30
|
fixes a stack trace in converting a char to hex in ruby 1.9.x
git-svn-id: file:///home/svn/framework3/trunk@12571 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-09 20:48:40 +00:00 |
|
|
James Lee
|
2e1d25dad7
|
store some state so we can associate scripts with the right port/host. fixes #4378
git-svn-id: file:///home/svn/framework3/trunk@12569 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-09 18:10:56 +00:00 |
|
|
Tod Beardsley
|
ce90282884
|
See #4378 -- this should limit the nmap parser to script tags that are associated only with ports. egyp7 may have a better way with dealing with this though, so not calling it fixed yet.
git-svn-id: file:///home/svn/framework3/trunk@12568 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-09 17:24:43 +00:00 |
|
|
amaloteaux
|
cb72073cd8
|
pcaprub: add a respond_to? in the capture mixin to ensure latest version
git-svn-id: file:///home/svn/framework3/trunk@12565 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-08 04:43:24 +00:00 |
|
|
amaloteaux
|
5d8db916d7
|
pcap_replay: small fix on th delay
git-svn-id: file:///home/svn/framework3/trunk@12563 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-08 01:44:09 +00:00 |
|
|
Matt Weeks
|
490471e129
|
Include necessary require.
git-svn-id: file:///home/svn/framework3/trunk@12558 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-07 02:16:09 +00:00 |
|
|
Joshua Drake
|
cd4c38333d
|
See #4371, Fixes logging error with LogLevel set in config
git-svn-id: file:///home/svn/framework3/trunk@12556 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-06 19:10:02 +00:00 |
|
|
Joshua Drake
|
a2cf5c01b9
|
See #4371, oops, forgot to commit rex.rb!
git-svn-id: file:///home/svn/framework3/trunk@12555 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-06 18:55:41 +00:00 |
|
|
Joshua Drake
|
05f107f466
|
Fixes #4371, Converts many uses of require to autoload
git-svn-id: file:///home/svn/framework3/trunk@12554 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-06 18:47:10 +00:00 |
|
|
Joshua Drake
|
57b530ccf6
|
fix up test require path
git-svn-id: file:///home/svn/framework3/trunk@12553 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-06 18:41:38 +00:00 |
|
|
Joshua Drake
|
d638586d1f
|
fix up test require path
git-svn-id: file:///home/svn/framework3/trunk@12552 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-06 18:39:19 +00:00 |
|
|
Joshua Drake
|
3e59f77871
|
add require, get test running
git-svn-id: file:///home/svn/framework3/trunk@12551 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-06 18:17:41 +00:00 |
|
|
Joshua Drake
|
719576b7b9
|
fix a small bug in omelet hunter, test is now runnable
git-svn-id: file:///home/svn/framework3/trunk@12550 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-06 18:14:10 +00:00 |
|
|
Joshua Drake
|
849c2d682c
|
remove crufty require
git-svn-id: file:///home/svn/framework3/trunk@12549 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-06 18:12:38 +00:00 |
|
|
James Lee
|
c3d66f276f
|
return the proper thing in add_route() and remove_route(), make sure each comm responds to :routes before trying to delete them. fixes several unit test failures.
git-svn-id: file:///home/svn/framework3/trunk@12548 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-06 17:30:25 +00:00 |
|
|
Joshua Drake
|
6e4049cb2c
|
add some error messages to this test
git-svn-id: file:///home/svn/framework3/trunk@12547 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-06 17:22:09 +00:00 |
|
|
James Lee
|
47ef020c61
|
back to development. 3.8 here we come
git-svn-id: file:///home/svn/framework3/trunk@12541 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-04 23:12:43 +00:00 |
|
|
James Lee
|
27c1e757e1
|
add post count to the banner
git-svn-id: file:///home/svn/framework3/trunk@12537 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-04 08:50:38 +00:00 |
|
|
HD Moore
|
decf71c4af
|
Exceptions trying to determine DB status should simply return false
git-svn-id: file:///home/svn/framework3/trunk@12536 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-04 02:44:14 +00:00 |
|
|
James Lee
|
9c712f1481
|
cosmetic
git-svn-id: file:///home/svn/framework3/trunk@12534 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 18:25:55 +00:00 |
|
|
HD Moore
|
09f861736a
|
Lets try this without breaking msfpayload
git-svn-id: file:///home/svn/framework3/trunk@12533 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 15:07:27 +00:00 |
|
|
Tod Beardsley
|
98831c3285
|
Clean up an SNMP rescue clause that makes Windows Ruby builds sad.
git-svn-id: file:///home/svn/framework3/trunk@12530 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 07:51:09 +00:00 |
|
|
HD Moore
|
4c84181c44
|
This adds a migrated flag to the framework.db object, to prevent a race condition between session_manager startup and db availability while the schema loads. This also makes the session_manager code try again (up to a max count) when it encounters an exception
git-svn-id: file:///home/svn/framework3/trunk@12529 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 07:09:34 +00:00 |
|
|
James Lee
|
e621828cac
|
check for a nil return value from write(), fixes #4329
git-svn-id: file:///home/svn/framework3/trunk@12528 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 06:55:15 +00:00 |
|
|
HD Moore
|
8d7e8620b2
|
Map write to syswrite for BufferSock
git-svn-id: file:///home/svn/framework3/trunk@12525 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 05:25:41 +00:00 |
|
|
HD Moore
|
93b0c5beb3
|
Check for the database first
git-svn-id: file:///home/svn/framework3/trunk@12523 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 04:49:18 +00:00 |
|
|
James Lee
|
73ba020547
|
release!
git-svn-id: file:///home/svn/framework3/trunk@12521 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 04:40:41 +00:00 |
|
|
James Lee
|
2192532a0c
|
don't read from the rsock as that's already taken care of by monitor_rsock in StreamAbstraction. fixes EVERYTHING. also fixes #4321
git-svn-id: file:///home/svn/framework3/trunk@12520 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 04:12:41 +00:00 |
|
|
HD Moore
|
1c86441f12
|
This removes the abortive_close code for stream sockets, it was leading to inconsistencies in how dead sessions were cleaned up
git-svn-id: file:///home/svn/framework3/trunk@12519 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 03:59:02 +00:00 |
|
|
HD Moore
|
fdc19b5e4a
|
Add the second required argument to write()
git-svn-id: file:///home/svn/framework3/trunk@12518 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 03:09:20 +00:00 |
|
|
HD Moore
|
23c355ba2c
|
Just use :mac not :host_mac
git-svn-id: file:///home/svn/framework3/trunk@12517 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 03:03:38 +00:00 |
|
|
HD Moore
|
b93e134195
|
Use shell_write vs ring.put
git-svn-id: file:///home/svn/framework3/trunk@12516 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 23:07:02 +00:00 |
|
|
HD Moore
|
d98f8dfd89
|
Make it clear that all Rex::IO::Stream implementations must accept a second parameter called opts for the read, write, and put methods
git-svn-id: file:///home/svn/framework3/trunk@12515 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 21:39:09 +00:00 |
|
|
James Lee
|
8fd84e3c3d
|
fix cmd/unix/reverse by adding proper read() and write() methods to TcpReverseDoubleSessionChannel
git-svn-id: file:///home/svn/framework3/trunk@12514 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 20:42:53 +00:00 |
|
|
James Lee
|
259bf9695a
|
don't kill a session when the user ctrl-C's during a command run by sessions -c or a script/postmod
git-svn-id: file:///home/svn/framework3/trunk@12513 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 20:40:19 +00:00 |
|
|
HD Moore
|
366bc8979d
|
Only try to report to the database if the database driver is active. Fixes #4306
git-svn-id: file:///home/svn/framework3/trunk@12512 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 20:29:01 +00:00 |
|
|
HD Moore
|
c668534105
|
This normalizes openssl non-blocking support across both 1.8.x/1.9.1 and 1.9.2+
git-svn-id: file:///home/svn/framework3/trunk@12509 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 17:25:26 +00:00 |
|
|
HD Moore
|
eb78aac8dd
|
Only try to catch the non-blocking exceptions if they are defined
git-svn-id: file:///home/svn/framework3/trunk@12508 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 16:30:45 +00:00 |
|
|
HD Moore
|
d402ebf6fb
|
Fix #3498 by showing post module options in the info output
git-svn-id: file:///home/svn/framework3/trunk@12506 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 16:06:37 +00:00 |
|
|
James Lee
|
e81d3440b8
|
don't try to store session events for sessions without a db_record. fixes #4301
git-svn-id: file:///home/svn/framework3/trunk@12505 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 06:45:21 +00:00 |
|
|
HD Moore
|
732a1f3993
|
Skip empty vulnerability names
git-svn-id: file:///home/svn/framework3/trunk@12503 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 05:20:07 +00:00 |
|