jvazquez-r7
094361ff86
Require spec_helper on specs
2014-12-09 19:39:11 -06:00
jvazquez-r7
0a6e42968b
Add inital support for padata
2014-12-09 19:28:40 -06:00
jvazquez-r7
2557780e7c
Add initial support to decode kdc requests
2014-12-09 18:48:08 -06:00
jvazquez-r7
82549315ff
Mark KdcRequestBody encode as unsupported atm
2014-12-09 17:05:20 -06:00
jvazquez-r7
24715bf78d
Require spec_helper
2014-12-09 16:52:37 -06:00
jvazquez-r7
b84840a596
Add support to decode TGS_REQ body
2014-12-09 16:51:34 -06:00
jvazquez-r7
f236438290
Add initial support for EncryptedData
2014-12-09 16:40:44 -06:00
jvazquez-r7
a7c1d12124
Mv KdcRequestBody spec to the correct folder
2014-12-09 16:04:17 -06:00
jvazquez-r7
c5865c6fec
Add initial design draft
2014-12-09 15:53:29 -06:00
jvazquez-r7
564da4446e
Add print friendly to_s
2014-12-07 17:52:09 -06:00
jvazquez-r7
21742b6469
Test #3729
2014-12-06 21:20:52 -06:00
jvazquez-r7
8f403f3eea
Update documentation
2014-12-05 20:11:45 -06:00
jvazquez-r7
03740df931
Support serialization
2014-12-05 19:55:52 -06:00
jvazquez-r7
ca164cd99f
Support the stream attribute
2014-12-05 16:52:59 -06:00
jvazquez-r7
1653101da4
Add support for Arrays of Objects
2014-12-04 20:31:38 -06:00
jvazquez-r7
4b8bdad44b
Refactor contents serialization
2014-12-04 18:28:25 -06:00
jvazquez-r7
6d623456a4
Add specs for java array streams
2014-12-04 00:07:56 -06:00
jvazquez-r7
08fe467452
Add Stream specs
2014-12-03 19:31:46 -06:00
jvazquez-r7
6cb6252914
Add YARD documentation for NewObject
2014-12-03 17:34:12 -06:00
jvazquez-r7
d0fcbf2cdb
Add support for simple Objects really
2014-12-03 17:22:23 -06:00
jvazquez-r7
0560cc2fe9
Fix typos
2014-12-03 14:59:38 -06:00
jvazquez-r7
268157d42f
Add support for Java Enums
2014-12-03 14:50:03 -06:00
jvazquez-r7
6deb88af6b
Add support for arrays
2014-12-03 13:55:12 -06:00
jvazquez-r7
b9023e8fcc
Split ClassDescription into ClassDesc and NewClassDesc
2014-12-03 00:38:27 -06:00
jvazquez-r7
41c4db2b3b
Delete ClassDescription spec
2014-12-03 00:07:40 -06:00
jvazquez-r7
1f535a41ca
Move types to the Serialization module
2014-12-02 20:02:42 -06:00
jvazquez-r7
2c070c450b
Add support for ClassDescription
2014-12-02 17:31:53 -06:00
jvazquez-r7
e9e584e107
Raise exceptions when unserialization isn't possible
2014-12-02 15:31:31 -06:00
Trevor Rosen
2a033861dc
Just use constants directly
...
MSP-11673
2014-12-02 13:12:53 -06:00
Trevor Rosen
784e138b14
Extend replicants via arbitrary Ruby code
...
MSP-11673
* Implements a #register_extensions method on Msf::Module
* Any registered Ruby modules will extend the cloned module returned by #replicant
2014-12-02 12:18:30 -06:00
jvazquez-r7
622a18bc22
Add support for annotations
2014-12-02 11:42:41 -06:00
jvazquez-r7
a68540cfa2
Add support for Data Block Long
2014-12-02 10:49:15 -06:00
jvazquez-r7
9c5d7e66d4
Add block data support
2014-12-02 10:46:29 -06:00
Matt Buck
0249e0a800
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
db/schema.rb
metasploit-framework-db.gemspec
2014-12-02 09:47:47 -06:00
jvazquez-r7
8923b87def
Don't redefine the static decode method
2014-12-02 09:02:24 -06:00
William Vu
bd3d63a155
Land #4270 , Msf::Author cleanup and improvements
2014-12-02 01:26:42 -06:00
jvazquez-r7
ef2bf5b935
Add support for long-utf
2014-12-01 19:50:33 -06:00
jvazquez-r7
5f11c70d7f
Add initial support for Java serialization
2014-12-01 19:07:45 -06:00
Meatballs
3e0f909707
Remove debug file writes
2014-11-27 21:34:00 +00:00
Meatballs
94fa6a309c
Fix strip_whitespace speccing
2014-11-27 21:30:08 +00:00
Joe Vennix
99b87c2e97
Fix nonsensical spec.
2014-11-26 13:57:44 -06:00
Joe Vennix
2bd7a67413
Restructure parts of Author, fix some doc bugs.
2014-11-26 13:54:23 -06:00
Trevor Rosen
31184c67b4
Land #4223 , specs for DB console command output
...
Wrap specs around current behavior of the DB command dispatcher,
in order to make upcoming refactor painless.
MSP-11622 #land
2014-11-25 13:30:08 -06:00
Jon Hart
bedf7ed44b
Doc cleanup
2014-11-24 14:34:20 -08:00
Jon Hart
0ed356f71c
Move Kademlia stuff to a more OO model, etc, per reviews
...
All of the work is done in rex. The msf mixin just prevents the
desire to call rex directly from the module
2014-11-24 14:03:43 -08:00
Jon Hart
e255db9429
Partial commit
2014-11-20 13:49:36 -08:00
Jon Hart
94e5ba13a4
YARD and spec cleanup
2014-11-20 13:28:01 -08:00
Jon Hart
b6b288ae3a
Minor style/test cleanup
2014-11-20 13:28:01 -08:00
Jon Hart
f5aa3ecb57
Add proper peer decoding
2014-11-20 13:28:01 -08:00
Jon Hart
ab49d01a1b
Add beginnings of Kademlia gather module and protocol support
2014-11-20 13:28:00 -08:00
Jon Hart
d94ca2b89a
Add doc for Rex::Proto::Steam
2014-11-18 11:46:28 -08:00
Jon Hart
6330c428d7
Address some of @jvazquez-r7's spec feedback
2014-11-18 11:06:32 -08:00
Luke Imhoff
a2085199f5
Spec methods Msf::Ui::Console::CommandDispatcher::Db responds to
...
MSP-11622
2014-11-17 13:22:13 -06:00
Luke Imhoff
47f7119f58
Order spec
...
MSP-11622
Sort specs by describe/context name so it is easier to see if a method
has no specs.
2014-11-17 12:58:04 -06:00
Luke Imhoff
024b449b55
Merge branch 'master' into feature/MSP-11605/lazy-thread-creation
...
MSP-11605
2014-11-17 08:50:33 -06:00
William Vu
a521d469ed
Land #4194 , Quake protocol support
2014-11-15 17:44:19 -06:00
Trevor Rosen
3b558624f3
Merge branch 'landing/4129' into upstream-master
...
Landing #4129
* Detect leaked constants in spec runs
2014-11-14 12:55:56 -06:00
Luke Imhoff
43511e648a
Merge branch 'chore/MSP-11614/remove-msf-db-manager-sink' into feature/MSP-11605/lazy-thread-creation
...
MSP-11605
Conflicts:
spec/lib/msf/core/task_manager_spec.rb
2014-11-14 11:59:12 -06:00
Luke Imhoff
14fa1dba0b
Merge branch 'master' into feature/MSP-11605/lazy-thread-creation
...
MSP-11605
2014-11-14 11:58:16 -06:00
Luke Imhoff
5e6400a506
Remove Msf::TaskManager
...
MSP-11614
`Msf::TaskManager` was only used for `Msf::DBManager#sink`, which was
removed because it was unused, so `Msf::TaskManager` can also be
removed.
2014-11-14 11:15:05 -06:00
Luke Imhoff
55a8f6f339
Remove Msf::DBManager::Sink
...
MSP-11614
`Msf::DBManager::Sink` contains code for a `sink` that is a meant to
serialize database events, but it's unneeded because all database events
go directly through ActiveRecord, which handles threading.
2014-11-14 10:51:51 -06:00
Luke Imhoff
0c6b820f7d
Remove unnecessary thread cleaning from Msf::Framework spec
...
MSP-11605
2014-11-14 09:11:35 -06:00
David Maloney
ccc5bbd745
this spec needs to use the username factory
...
:metasploit-credential_public factory will randomly
return either a Username or BlankUsername and thus is
not appropriate for when you want tos et an explicit Username.
The :metasploit_credential_username factory should be used for this
instead
MSP-11609
2014-11-13 10:58:03 -06:00
Jon Hart
ebf6fe4e56
Minor style cleanup
2014-11-12 16:44:43 -08:00
Jon Hart
07a1653e57
Add gather module for Quake servers
2014-11-12 13:32:56 -08:00
Luke Imhoff
cca82f4b36
Failing spec for Msf::Framework.new threads
...
MSP-11605
`Msf::Framework.new` creates 8 threads (change from 1 thread to 9 threads), but
it shouldn't create any threads.
2014-11-12 13:41:30 -06:00
Luke Imhoff
69043d51e0
Merge branch 'master' into feature/MSP-11147/thread-leak-detection
...
MSP-11147
2014-11-12 12:34:25 -06:00
Luke Imhoff
3ff87c89fe
Clean up Msf::Framework spec thread-leaks
...
MSP-11147
2014-11-12 12:20:23 -06:00
Luke Imhoff
22cbc5ca02
Use named subject instead of subject
...
MSP-11147
2014-11-12 12:18:08 -06:00
Luke Imhoff
1fd8fe57df
Merge staging/great-backport to master
...
Conflicts:
spec/lib/msf/core/module_spec.rb
2014-11-12 11:08:18 -06:00
Matt Buck
02ec1fb234
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile
Gemfile.lock
2014-11-12 10:13:34 -06:00
Jon Hart
5b1b7c22bb
Minor test/style cleanup
2014-11-11 10:18:56 -08:00
Jon Hart
51e84ce548
Add unit tests, complete extraction/cleanup
2014-11-11 10:18:49 -08:00
Luke Imhoff
cf0ecd0367
Fix thread leaks in TaskManager spec
...
MSP-11147
2014-11-11 12:02:14 -06:00
jvazquez-r7
468b4a399a
Fix Rex::MIME::Message specs
2014-11-05 11:43:55 -06:00
darkbushido
2d7c517e2f
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
2014-11-04 15:34:25 -06:00
jvazquez-r7
eb8d4b6772
Force LITTLE_ENDIAN by default
2014-11-04 10:39:42 -06:00
Luke Imhoff
b0f1b2a1f7
Merge branch 'master' into feature/MSP-11130/metasploit-framework-spec-constants
...
MSP-11130
Conflicts:
Rakefile
2014-11-04 10:10:12 -06:00
Luke Imhoff
0c769e2fd7
Fix constant leaks in Msf::Util::EXE spec
...
MSP-11130
Remove global $framework as it loads modules prior to suite run and they
are not cleaned up.
2014-11-04 09:48:55 -06:00
Luke Imhoff
78ea93044b
Fix Msf::PayloadGenerator spec constant leaks
...
MSP-11130
Remove the constant PAYLOAD_FRAMEWORK as it leads to a
Msf::Simple::Framework instance that is not cleaned up and loads modules
prior to the beginning of the suite run.
2014-11-04 09:48:02 -06:00
jvazquez-r7
3b1042b903
Add specs for Rex::OLE::DirEntry#from_s
2014-11-03 17:09:37 -06:00
jvazquez-r7
d023c9243f
Add specs for Rex::OLE::DirEntry
2014-11-03 15:31:12 -06:00
Tod Beardsley
0b39c2ed85
Land #4084 , prep for Ruby 2.1
2014-11-03 13:43:50 -06:00
jvazquez-r7
e56220e5b7
Add specs for Rex::OLE::MiniFAT
2014-11-03 11:34:23 -06:00
Luke Imhoff
9ea1240cbb
Default modules_path
...
MSP-11130
Default `:modules_path` to use the `#modules_path` left for
'Msf::Simple::Framework#modules#loading''s `#load_and_create_module`.
2014-11-03 11:06:49 -06:00
jvazquez-r7
cf18225c27
Finish Rex::OLE::DIFAT specs
2014-11-03 09:23:26 -06:00
Luke Imhoff
f0001eb9e6
Extract 'Msf::Simple::Framework#modules loading'
...
MSP-11130
'Msf::Simple::Framework#modules loading' defines
`#load_and_create_module`, which takes the :ancestor_reference_names,
:modules_path, :module_type, and :reference_name of the module whose
ancestors to load and the reference name to create. A default modules
path, the first 'modules' path for the Rails application is available in
in the `#modules_path` let.
2014-11-03 08:59:06 -06:00
Luke Imhoff
8b4767449f
Fix constant leaks in Msf::EncodedPayload spec
...
MSP-11130
Switch to using 'Msf::Simple::Framework' shared context and explicit
module loading instead of loading all moduels to just test with one.
2014-10-30 14:56:47 -05:00
Luke Imhoff
c2bd75b587
Clean up leaked constants
...
MSP-11130
2014-10-29 15:50:47 -05:00
jvazquez-r7
35e385f634
Add first specs version for Rex::OLE::DIFAT
2014-10-28 16:45:21 -05:00
darkbushido
979394946a
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
lib/msf/core/db.rb
2014-10-28 15:34:37 -05:00
jvazquez-r7
526251fc16
Add specs for Rex::OLE::Header
2014-10-28 14:52:28 -05:00
sinn3r
e31c9f579d
Land #3987 - Buffalo Linkstation NAS Login Scanner
2014-10-28 01:45:57 -05:00
James Lee
77d4623c44
Fix respond_to specs for protected methods
2014-10-27 19:39:32 -05:00
Jon Hart
b8c9ef96ca
Land #4003 , @nstarke's Login Scanner for WD MyBook Live NAS
2014-10-27 09:57:43 -07:00
James Lee
7081026ae6
Fix some specs broken by 2.x's new rules
...
* default utf-8 everywhere broke tests in lib/rex/text_spec that dealt
with binary data
* new protected rules
2014-10-27 10:28:24 -05:00
Joshua Smith
0d449cb88d
resolves merge conflict between #4071 / #4072
2014-10-24 13:11:35 -05:00
Joshua Smith
e583cce7f2
changes be_false to be_falsey in exe_spec
2014-10-24 11:11:44 -05:00
Joe Vennix
813a2f8c1c
Oops, false not true.
2014-10-24 10:48:58 -05:00
Joe Vennix
028fb3279f
Add spec for ensuring is_eicar_corrupted? is false.
2014-10-24 10:48:58 -05:00
Trevor Rosen
75333702a2
Merge branch 'land/4028' into upstream-master
...
Land #4028
2014-10-23 12:36:35 -05:00
sinn3r
42cd288bc0
Land #4057 - Bring back TCP::max_send_size and TCP::send_delay options
...
Fix #3967
2014-10-22 16:23:15 -05:00
Jon Hart
7b33ff1363
Land #3767 , @jvazquez-r7's specs for Rex::Encoder::XDR
2014-10-22 09:22:53 -07:00
James Lee
bb119b840a
Move Tcp specs into their own shared example
...
All the Tcp options formerly in RexSocket got moved, this just brings
the specs in line with the new reality.
2014-10-22 09:16:14 -05:00
sinn3r
49b088d112
Use be_a
2014-10-21 17:15:54 -05:00
sinn3r
9de1c95b22
It's Connection timed out
2014-10-21 16:53:47 -05:00
sinn3r
d1881108cf
Fix db2 rspec
2014-10-21 16:35:20 -05:00
sinn3r
b5d536d165
Fix mysql rspec
2014-10-21 16:34:10 -05:00
nstarke
70b13819d9
Adding Login Scanner for MyBook Live
...
This is a LoginScanner auxiliary module for Western
Digital MyBook Live NAS devices as well as the spec
for testing.
2014-10-21 00:50:40 +00:00
Jon Hart
82de2eb1f3
Fix Rex::Encoder::XDR.decode_int! to properly handle short data
2014-10-20 11:30:13 -07:00
Luke Imhoff
080ea3e56a
Merge branch 'staging/great-backport' into feature/MSP-11126/msf-module-reorg
...
MSP-11126
2014-10-17 14:28:13 -05:00
Luke Imhoff
ae45c1b9d3
Msf::Module::Rank -> Msf::Module::Ranking
...
MSP-11126
So that mixin module won't appear as Rank constant that Msf::Module
subclasses are supposed to define.
2014-10-17 13:39:53 -05:00
Joshua Smith
19e8a50573
Land 3847, specs for Rex::Oui
2014-10-17 13:22:51 -05:00
Joshua Smith
32faa0bc62
Land 3796, specs for Rex::Encoder::Alpha2 encoders
2014-10-17 13:15:00 -05:00
Luke Imhoff
7ffd07c44d
Remove protected method from specs examples
...
MSP-11126
2014-10-17 11:49:01 -05:00
Luke Imhoff
575717681c
Extract Msf::Module::Privileged shared examples
...
MSP-11126
2014-10-17 11:48:36 -05:00
Luke Imhoff
172afd180a
Extract Msf::Module::Privileged
...
MSP-11126
2014-10-17 11:45:03 -05:00
Luke Imhoff
45302b9403
Extract Msf::Module::UUID shared examples
...
MSP-11126
2014-10-17 11:34:35 -05:00
Luke Imhoff
cbae9be5b5
Extract Msf::Module::UUID
...
MSP-11126
2014-10-17 11:31:56 -05:00
Luke Imhoff
d86eda5f1d
Extract Msf::Module::Author shared examples
...
MSP-11126
2014-10-17 11:20:23 -05:00
Luke Imhoff
a59e635913
Extract Msf::Module::Author
...
MSP-11126
2014-10-17 11:17:12 -05:00
Luke Imhoff
e822920298
Msf::Module::Author -> Msf::Author
...
MSP-11126
`Msf::Module::Author` was already aliased to `Msf::Author`. This just
moved `Msf::Module::Author` to that alias to free up
`Msf::Module::Author` so it can be used for a concern for
`Msf::Module`'s author methods.
2014-10-17 08:59:54 -05:00
Luke Imhoff
ebc62cf9c9
Spec Msf::Module::Author
...
MSP-11126
Bare minimum of methods to assist with moves.
2014-10-16 16:03:28 -05:00
Luke Imhoff
839657abec
Extract Msf::Module::Network shared examples
...
MSP-11126
2014-10-16 15:54:35 -05:00
Luke Imhoff
ee9623c11e
Remove class method examples moved to shared examples
...
MSP-11126
2014-10-16 15:41:28 -05:00
Luke Imhoff
244e4a9954
Extract Msf::Module::Search shared examples
...
MSP-11126
2014-10-16 15:40:19 -05:00
Luke Imhoff
be945d26fc
Extract Msf::Module::FullName shared examples
...
MSP-11126
2014-10-16 15:33:13 -05:00
Luke Imhoff
c501e1e58a
Extract Msf::Module::Rank shared examples
...
MSP-11126
2014-10-16 14:41:59 -05:00
Luke Imhoff
925cd63171
Extrat Msf::Module::Type shared examples
...
MSP-11126
2014-10-16 14:28:43 -05:00
Luke Imhoff
28af6a490b
Extract Msf::Module::Arch shared examples
...
MSP-11126
2014-10-16 13:16:57 -05:00
Luke Imhoff
a2dc3b754f
Extract Msf::Module::ModuleInfo shared examples
...
MSP-11126
2014-10-16 13:10:15 -05:00
Luke Imhoff
f8ada87e86
Extract Msf::Module::Options shared examples
...
MSP-11126
2014-10-16 11:24:03 -05:00
Luke Imhoff
c50cb2eb8a
Extract Msf::Module::UI::*::Verbose and shared examples
...
MSP-11126
2014-10-16 10:05:45 -05:00
Luke Imhoff
a3afb92ee2
Extract Msf::Module::UI::Line shared examples
...
MSP-11126
2014-10-16 09:51:23 -05:00
Luke Imhoff
96864b3892
Extract Msf::Module::UI::Message shared examples
...
MSP-11126
2014-10-16 09:45:17 -05:00
Luke Imhoff
4d9f7db15a
Extract Msf::Module::Compatibility
...
MSP-11126
2014-10-16 09:29:31 -05:00
Luke Imhoff
9b10a3f1dc
Extract Msf::Module::DataStore shared examples
...
MSP-11126
2014-10-16 09:14:44 -05:00
Luke Imhoff
6a194b3a88
Extract Msf::Module::ModuleStore shared examples
...
MSP-11126
2014-10-16 09:03:12 -05:00
Luke Imhoff
98a56d594a
Spec Msf::Target
...
MSP-11496
2014-10-15 15:18:28 -05:00
Luke Imhoff
6bf5e996cf
Spec Msf::Platform
...
MSP-11496
2014-10-15 15:15:33 -05:00
Luke Imhoff
c2c311f087
Spec Msf::SiteReference
...
MSP-11496
2014-10-15 15:13:20 -05:00
Luke Imhoff
26958f5aaa
Spec Msf::Reference
...
MSP-11496
2014-10-15 15:08:12 -05:00
Luke Imhoff
714e9435e5
Spec Msf::Author
...
MSP-11496
2014-10-15 15:07:22 -05:00
Luke Imhoff
43e5abdef4
Spec Msf::Module::UpdateableOptions
...
MSP-11496
2014-10-15 14:59:44 -05:00
Luke Imhoff
23395911d1
Spec Msf::Module::Failure
...
MSP-11496
2014-10-15 14:50:49 -05:00
Luke Imhoff
fd2b7126d6
Msf::Module method specs
...
MSP-11496
Use respond_to matcher to check that methods aren't dropped during
reorganization.
2014-10-15 14:40:07 -05:00
Luke Imhoff
9456506e3d
Merge branch 'master' into feature/MSP-11124/msf-dbmanager-reorg
...
MSP-11124
2014-10-15 14:08:55 -05:00
Matt Buck
25d1caabb5
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile
Gemfile.lock
metasploit-framework.gemspec
2014-10-14 15:20:15 -05:00
jvazquez-r7
2f20998eaa
Force Rex::OLE::Util to work on LITTLE_ENDIAN
2014-10-13 16:01:43 -05:00
Luke Imhoff
a7d1577494
ImportMsfXml -> Import::MsfXml
...
MSP-11124
2014-10-13 15:46:13 -05:00
Luke Imhoff
acdf6e7dbf
Move missed Msf::DBManager::Connection examples
...
MSP-11124
2014-10-13 15:06:46 -05:00
Luke Imhoff
92aaecf94b
Move add_rails_engine_migrations_paths to Msf::DBManager::Migration
...
MSP-11124
2014-10-13 15:02:20 -05:00
Luke Imhoff
66ce59725b
Extract Msf::DBManager::Adapter shared examples
...
MSP-11124
2014-10-13 14:53:40 -05:00
Luke Imhoff
2b4150ac46
Extract Msf::DBManager::Connection shared examples
...
MSP-11124
2014-10-13 14:47:22 -05:00
jvazquez-r7
51f1309cc3
Add specs for Rex::OLE::CLSID
2014-10-13 14:28:58 -05:00
jvazquez-r7
8b9c8da4ac
Add specs for Rex::OLE::Util
2014-10-13 13:41:43 -05:00
Luke Imhoff
43a4858fe3
Extract Msf::DBManager::Web shared examples
...
MSP-11124
2014-10-13 12:01:49 -05:00
Luke Imhoff
3a2f8b7684
Extract Msf::DBManager::VulnAttempt shared examples
...
MSP-11124
2014-10-13 11:34:12 -05:00
Luke Imhoff
adfeef2aa9
Extract Msf::DBManager::Route shared examples
...
MSP-11124
2014-10-13 11:28:19 -05:00
Luke Imhoff
e1ae403292
Extract Msf::DBManager::SessionEvent shared examples
...
MSP-11124
2014-10-13 11:15:07 -05:00
Luke Imhoff
98142def08
Extract Msf::DBManager::HostTag shared examples
...
MSP-11124
2014-10-13 11:03:21 -05:00
Luke Imhoff
6fb263d989
Extract Msf::DBManager::Session shared examples
...
MSP-11124
2014-10-13 10:52:39 -05:00
jvazquez-r7
e4a7025157
Avoid explicit use of subject
2014-10-13 10:41:12 -05:00
Luke Imhoff
4aab5129b0
Extract Msf::DBManager::HostDetail shared examples
...
MSP-11124
2014-10-13 10:27:55 -05:00
jvazquez-r7
10d50e77eb
Avoid explicit use of subject
2014-10-13 10:21:31 -05:00
Luke Imhoff
8026352433
Extract Msf::DBManager::Ref shared examples
...
MSP-11124
2014-10-13 10:12:09 -05:00
Luke Imhoff
7a5b3c9ee7
Move report_artifact example to Msf::DBManager::Report
...
MSP-11124
2014-10-13 10:01:08 -05:00
Luke Imhoff
a970d76a2a
Extract Msf::DBManager::VulnDetail shared examples
...
MSP-11124
2014-10-13 09:58:59 -05:00
Luke Imhoff
97b3198923
Extract Msf::DBManager::ExploitAttempt shared examples
...
MSP-11124
2014-10-13 09:43:40 -05:00
Luke Imhoff
b007fba79f
Extract Msf::DBManager::Task shared examples
...
MSP-11124
2014-10-13 09:32:42 -05:00
Luke Imhoff
66845508d9
Extract Msf::DBManager::Report shared examples
...
MSP-11124
2014-10-13 09:24:27 -05:00
Luke Imhoff
e82a46cc47
Extract Msf::DBManager::Event shared examples
...
MSP-11124
2014-10-13 09:12:49 -05:00
Luke Imhoff
0e93b55397
Extract Msf::DBManager::Client shared examples
...
MSP-11124
2014-10-13 08:40:34 -05:00
nstarke
472985a8a8
Adding Buffalo Linkstation NAS Login Scanner
...
I have added a login scanner for the Buffalo Linkstation
NAS. I have been testing against version 1.68 of the
firmware. Also included are some specs for this module.
2014-10-10 03:16:48 +00:00
Luke Imhoff
b05a466e0a
Extract Msf::DBManager::Vuln shared examples
...
MSP-11124
2014-10-09 15:51:39 -05:00
Luke Imhoff
e403e54896
Extract Msf::DBManager::Note shared examples
...
MSP-11124
2014-10-09 15:39:55 -05:00
Luke Imhoff
e42d60801d
Extract Msf::DBManager::Loot shared examples
...
MSP-11124
2014-10-09 15:21:43 -05:00
Luke Imhoff
2c6753a2e0
Extract Msf::DBManager::Import shared examples
...
MSP-11124
2014-10-09 15:07:17 -05:00
Luke Imhoff
45f5fe36f1
Extract Msf::DBManager::ExploitedHost shared examples
...
MSP-11124
2014-10-09 12:58:30 -05:00
Luke Imhoff
3ec93dea43
Extract Msf::DBManager::Cred shared examples
...
MSP-11124
2014-10-09 11:44:15 -05:00
Luke Imhoff
96b4491d8e
Extract Msf::DBManager::Service shared examples
...
MSP-11124
2014-10-09 11:35:07 -05:00
Luke Imhoff
e7800697eb
Extract Msf::DBManager::Host shared examples
...
MSP-11124
2014-10-09 11:16:04 -05:00
Luke Imhoff
148ad8b050
Extract Msf::DBManager::WMAP shared examples
...
MSP-11124
2014-10-09 10:49:26 -05:00
Luke Imhoff
e723aa7eb3
Extract Msf::DBManager::IPAddress shared examples
...
MSP-11124
2014-10-09 09:40:11 -05:00
Luke Imhoff
37c38ad27b
Extract Msf::DBManager::ModuleCache shared examples
...
MSP-11124
2014-10-09 09:14:45 -05:00
Luke Imhoff
70d4f672e2
Extract Msf::DBManager::Workspace examples to shared example
...
MSP-11124
2014-10-08 15:54:29 -05:00
Luke Imhoff
a64036f6cf
Move Msf::DBManager#sync to Msf::DBManager::Sink
...
MSP-11124
The comment on `#sync` says it's related to `sink`, so move it into its
Module.
2014-10-08 15:38:56 -05:00
Luke Imhoff
37e0b9ffe0
Extract Msf::DBManagerSink examples to shared example
...
MSP-11124
2014-10-08 15:30:20 -05:00
Luke Imhoff
a0a19e5ce8
Spec classes, constants and methods from lib/msf/db.rb
...
MSP-11466
Method specces only check that the method is defined as they only need
to catch deleted methods during the reorganization.
2014-10-08 11:07:15 -05:00
Luke Imhoff
6a54f0ac4c
Spec methods from db_manager.rb
...
MSP-11466
2014-10-08 10:53:14 -05:00
Luke Imhoff
c09335985b
Sort specs
...
MSP-11466
2014-10-08 10:52:21 -05:00
nstarke
b8c2643d56
Converting Module to LoginScanner w/ Specs
...
The previous commits for this Jenkins CI module relied on an
obsolete pattern. Consequently, it was necessary to write
this module as a LoginScanner and incorporate the appropriate
specs so that the tests will run properly.
2014-10-06 21:14:10 -05:00
jvazquez-r7
3aadaf672e
Fix @lsanchez-r7's feedback, single expectation per test and avoid explicit use of subject
2014-10-06 16:08:20 -05:00
Samuel Huckins
0dfd8e25b8
Land #3846 , Rex::ImageSource specs
2014-10-02 12:33:56 -05:00
Vincent Herbulot
041d44ecc6
Spec modification to allow previous commit
...
The spec was requiring the WAR to be at /deploy but this path was a
typo introduce while refactoring. The initial correct path is
/deploy/management
2014-10-01 18:30:53 +02:00
Vincent Herbulot
a48d6053ab
Added spec for jboss/deployment_file_repository
2014-10-01 11:57:01 +02:00
us3r777
47507e1ff1
Slight modifications to pass msftidy
2014-09-29 23:59:12 +02:00
us3r777
f9b6519e49
Added spec to new methods in Jboss mixin
2014-09-29 23:45:40 +02:00
darkbushido
701291e029
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
2014-09-29 15:48:12 -05:00
darkbushido
6289ecfc59
fixing a connection pool spec
2014-09-29 14:39:40 -05:00
sinn3r
9e5826c4eb
Land #3844 - Add the JSObfu mixin to Firefox exploits
2014-09-29 11:15:14 -05:00
Joe Vennix
2b02174999
Yank Android->jsobfu integration. Not really needed currently.
2014-09-25 16:00:37 -05:00
jvazquez-r7
e4f71d79ac
Fix grammar
2014-09-24 15:17:09 -05:00
sinn3r
35f788a1a4
Land #3848 - Add specs for Rex::Arch
2014-09-23 13:03:40 -05:00
jvazquez-r7
0dfc2d3f87
Add specs for Rex::ExtTime
2014-09-22 14:55:14 -05:00
jvazquez-r7
db587afac8
Add specs for Rex::Arch
2014-09-22 14:10:55 -05:00
jvazquez-r7
701d6470c9
Add specs for Rex::Oui
2014-09-22 13:28:07 -05:00
jvazquez-r7
a677749f5b
Add specs for #read_asciiz and fix bugs there
2014-09-22 12:14:21 -05:00
jvazquez-r7
f804d42ddc
Add specs for Memory#index
2014-09-22 11:43:18 -05:00
jvazquez-r7
b121764003
Add specs for Memory#subsource
2014-09-22 11:30:30 -05:00
jvazquez-r7
3500e1ce7c
Add specs for Memory#close
2014-09-22 11:18:21 -05:00
jvazquez-r7
a612caf1ae
Finish examples for Memory#read
2014-09-22 11:17:09 -05:00
jvazquez-r7
df7ee55962
Add first specs for Rex::ImageSource::Memory#read
2014-09-22 11:06:34 -05:00
jvazquez-r7
77122895db
Add specs for Rex::ImageSource::Memory#initialize
2014-09-22 11:02:24 -05:00
jvazquez-r7
a249eb1026
Add specs for Disk#subsource and Disk#close
2014-09-22 10:50:11 -05:00
jvazquez-r7
23bf36bc75
Start specs for Disk#subsource
2014-09-22 10:37:56 -05:00
jvazquez-r7
3f1eea55a6
Add specs for Disk#read and Disk#index
2014-09-22 10:35:54 -05:00
Luke Imhoff
f61afe2598
Merge branch 'master' into bug/MSP-11368/boot-profiling
...
MSP-11368
2014-09-22 10:00:07 -05:00
jvazquez-r7
46e4235e79
Add spec templates
2014-09-22 09:16:21 -05:00
Joe Vennix
ec88957ff4
Whitespace tweaks.
2014-09-21 23:57:58 -05:00
Joe Vennix
d9e6f2896f
Add the JSObfu mixin to a lot of places.
2014-09-21 23:45:59 -05:00
sinn3r
2e96026725
avoid saying 'should'
2014-09-21 00:56:13 -05:00
sinn3r
e1cfc74c32
Move jsobfu to a mixin
2014-09-21 00:39:04 -05:00
sinn3r
9191af6241
Update js_obfuscate
2014-09-20 23:38:35 -05:00
sinn3r
cd70014446
Fix os detection rspec
...
no more window
2014-09-20 21:29:13 -05:00
sinn3r
2d828a2144
Update rspec
2014-09-20 18:09:22 -05:00
sinn3r
135bed254d
Update BrowserExploitServer for JSObfu
2014-09-20 17:59:36 -05:00
sinn3r
d52236fe05
Land #3835 - JSObfu to a gem
2014-09-20 01:38:45 -05:00
Joe Vennix
8e1b00ce95
Adds JSObfu.disabled for spec stubbing, fixes BES specs.
2014-09-19 20:42:05 -05:00
Joe Vennix
df999db547
Add spec to ensure gem loads without error.
2014-09-19 19:49:01 -05:00
Luke Imhoff
b863978028
Remove fastlib
...
MSP-11368
MSP-11143
Remove fastlib as it slows down the code loading process. From the
previous commit, the mean loading for
`METASPLOIT_FRAMEWORK_PROFILE=true msfconsole -q -x exit` was
27.9530±0.3485 seconds (N=10). The mean after removal of fastlib
was 17.9820±0.6497 seconds (N=10). This means an average 35.67%
reduction in boot time.
2014-09-18 15:24:21 -05:00
Luke Imhoff
44588cc014
Add detected_arch to expected hosts columns in spec
...
MSP-11359
2014-09-18 12:34:34 -05:00
James Lee
3e42fcbbab
Land #3794 , NDR encoding specs
...
MSP-11370 #land
2014-09-16 16:23:22 -05:00
sinn3r
169d04020d
Land #3571 - Add Wordpress XML-RPC Login Scanner (with LoginScanner)
2014-09-16 14:51:24 -05:00
jvazquez-r7
ca4c4f55bd
Add specs for Rex::Encoder::Alpha2::UnicodeMixed
2014-09-15 17:05:08 -05:00
jvazquez-r7
ee45056827
Add specs for Rex::Encoder::Alpha2::UnicodeUpper
2014-09-15 16:57:26 -05:00
jvazquez-r7
3dc53cd013
Add specs for Rex::Encoder::Alpha2::AlphaMixed
2014-09-15 16:43:40 -05:00
jvazquez-r7
e8dce6ac59
Add specs for Rex::Encoder::Alpha2::AlphaUpper
2014-09-15 16:35:54 -05:00
jvazquez-r7
2e126b6a68
Include it_behaves_like
2014-09-15 15:46:53 -05:00
jvazquez-r7
4064fb60ef
Refactor specs for Rex::Encoder::Alpha2::Generic
2014-09-15 15:43:31 -05:00
jvazquez-r7
2728318358
Add specs for Rex::Encoder::Alpha2::Generic
2014-09-15 15:26:13 -05:00
jvazquez-r7
3f5fdaebb4
Add specs for Rex::Encoder::NDR
2014-09-15 13:49:18 -05:00
jvazquez-r7
7d4c4c3658
Land #3699 , @dmaloney-r7's ipboard login refactor
2014-09-15 08:29:42 -05:00
HD Moore
6bd3675f03
Land #3680 , add specs for Rex::MIME
2014-09-13 00:34:39 -05:00
HD Moore
6a2a85d2c4
Land #3789 , adds specs for Rex::Proto::Http::Packet::Header
...
orts
2014-09-13 00:21:43 -05:00
jvazquez-r7
9e21cc8ad4
Add specs for invalid IPBoard application
2014-09-12 16:14:10 -05:00
jvazquez-r7
917a7ffa1e
Add specs for valid IPBoard application
2014-09-12 16:08:03 -05:00
Cucumber
b80519dc16
Lands #3779 , specs
...
MSP-11343
Merge specs that I missed during last merge.
2014-09-12 14:49:26 -05:00
James Lee
f68628c487
Add minimal specs for rex/proto/http/packet/header
2014-09-12 14:30:27 -05:00
sinn3r
12e3cb3c6a
Land #3764 - Add specs for Rex::Encoder::NonAlpha
2014-09-12 12:09:55 -05:00
sinn3r
54c353a15e
Land #3788 - Adds a spec to ensure HttpServer runs Concern hooks.
2014-09-12 12:05:55 -05:00
Joe Vennix
a617556f29
Add a helpful comment.
2014-09-12 10:55:08 -05:00
Joe Vennix
0194674542
Oops. Don't duplicate spec block.
2014-09-12 10:54:30 -05:00
Joe Vennix
46f256a6bd
Adds a spec to ensure HttpServer runs Concern hooks.
2014-09-12 10:52:57 -05:00
jvazquez-r7
25a09ea227
Fix valid requests specs
2014-09-12 10:30:17 -05:00
jvazquez-r7
0d054d8354
Update with master changes
2014-09-12 09:52:32 -05:00
jvazquez-r7
183ba3422d
Add specs for logins
2014-09-12 09:50:32 -05:00
James Lee
0ab36453b9
Add another header spec
2014-09-11 12:20:54 -05:00
James Lee
a8e3ff0c0f
Add specs to verify server header matching
2014-09-11 11:42:38 -05:00
James Lee
8aa06b8605
Better api for check_setup
2014-09-10 23:43:54 -05:00
sinn3r
1b4ceec4f9
Land #3743 - Add specs for Rex::Arch::X86
2014-09-09 17:24:08 -05:00
sinn3r
e82348f157
Land #3762 - Add specs for Rex::Arch::Sparc
2014-09-09 16:10:26 -05:00
jvazquez-r7
962c66b3bb
Fix some descriptions
2014-09-08 18:17:24 -05:00
jvazquez-r7
8370bf0f2a
Finish XDR specs
2014-09-08 18:05:09 -05:00
jvazquez-r7
44724d1141
Add specs for .decode_varray
2014-09-08 17:12:04 -05:00
jvazquez-r7
8af13592c2
Add first specs for Rex::Encoder::XDR
2014-09-08 16:25:53 -05:00
David Maloney
cd3cdc5384
Merge branch 'master' into feature/ipboard-login-refactor
2014-09-08 14:48:37 -05:00
jvazquez-r7
f521cc598d
Delete .encode specs, anyone uses the method, plus looks wrong
2014-09-08 14:42:43 -05:00
jvazquez-r7
9a74e60db3
Add specs for .encode
2014-09-08 14:32:33 -05:00
jvazquez-r7
11ca383d4f
Add specs for .encode_byte
2014-09-08 14:24:03 -05:00
jvazquez-r7
3535a6a21d
Add first specs for .gen_decoder and .encode_byte
2014-09-08 14:07:21 -05:00
jvazquez-r7
4c15954be5
Add specs for Rex::Arch::Sparc
2014-09-08 11:59:52 -05:00
William Vu
ae5a8f449c
Land #3691 , gdbserver hax
2014-09-08 11:48:39 -05:00
us3r777
cc5b852517
Fixed spec for lib/msf/http/jboss
...
Revert commit abdd72e8c6
.
Added some spec for lib/msf/http/jboss/deployment_file_repository_scripts
2014-09-08 17:42:04 +02:00
jvazquez-r7
10bb77af9f
Land #3716 , @wchen-r7's Glassfish LoginScanner update
2014-09-07 21:54:34 -05:00
jvazquez-r7
6cdfd322f2
change should to expect
2014-09-07 21:35:33 -05:00
jvazquez-r7
e6f7b35d0d
Use context to describe #attempt_login
2014-09-07 21:26:01 -05:00
jvazquez-r7
f266ca99f5
Use allow_any_instance_of as with rspec 3
2014-09-07 21:18:22 -05:00
jvazquez-r7
768b50974f
Redo try_glassfish_3 specs
2014-09-07 21:04:43 -05:00
jvazquez-r7
07238ef7b3
Redo try_glassfish_2 specs
2014-09-07 20:47:54 -05:00
jvazquez-r7
9a42e7635a
Use expect instead of should on try_login
2014-09-07 20:01:44 -05:00
jvazquez-r7
06207afb12
Use expect instead of should
2014-09-07 19:37:24 -05:00
jvazquez-r7
424d1ec47f
Add example to describe how send_request handles a JSESSIONID cookie
2014-09-07 19:33:56 -05:00
sinn3r
ff6cce8bd1
3rd person
2014-09-06 01:56:39 -05:00
sinn3r
419b2136b1
remove the "instance methods" context
2014-09-06 01:42:48 -05:00
sinn3r
c8ccb5e848
In 3rd person
2014-09-06 01:39:32 -05:00
sinn3r
0dcf481d76
This one is good to go
2014-09-04 14:13:33 -05:00
sinn3r
e1694ec3e5
LoginScanner update for hp_sys_mgmt_login
...
Work in progress
2014-09-03 16:23:57 -05:00
sinn3r
954475c0bf
Add rspec and update about secure admin
2014-09-02 20:35:25 -05:00
jvazquez-r7
15f19468a1
Do last cleanup
2014-09-02 18:57:10 -05:00
jvazquez-r7
3ad0542b2a
Fix some specs
2014-09-02 18:50:37 -05:00
jvazquez-r7
a1823b6c1e
Add more specs for Rex::Arch::X86
2014-09-02 18:17:14 -05:00
jvazquez-r7
16111aa2f7
Use RSpec::Mocks::Double
2014-09-02 13:25:05 -05:00
jvazquez-r7
fdb66d978b
Fix remainings be_truthy and be_falsey conditionals
2014-09-02 13:22:21 -05:00
jvazquez-r7
9cec62d52b
Merge branch 'specs_its' into fix_deprecation_warnings
2014-09-02 13:14:21 -05:00
jvazquez-r7
15e564ddf3
Merge branch 'collection_owner' into fix_deprecation_warnings
2014-09-02 13:14:09 -05:00
jvazquez-r7
824ff7fc72
Merge branch 'specs_skip' into fix_deprecation_warnings
2014-09-02 13:13:09 -05:00
jvazquez-r7
e0c6f5032f
Avoid its in Msf::DBManager specs
2014-09-02 12:46:50 -05:00
jvazquez-r7
bf0d30cf03
Fix rspec-collection_matchers deprecation warning in Rex::Socket::RangeWalker
2014-09-02 11:08:26 -05:00
jvazquez-r7
5a0b6ece6e
Use is_expected
2014-09-02 10:27:53 -05:00
jvazquez-r7
764af20567
Fix rspec-collection_matchers deprecation warnings in Rex::Socket
2014-09-02 10:21:52 -05:00
us3r777
abdd72e8c6
Refactor spec to match lib/msf/jboss
...
Moved bean_hsell_scripts_spec to scripts_spec. Fixed a typo.
2014-08-31 19:13:40 +02:00
David Maloney
928aeffcba
add wordpress_rpc loginscanner and specs
2014-08-29 13:06:12 -05:00
Samuel Huckins
fa77caa819
Merge branch 'bug/MSP-11153/database-config-overrides'
...
MSP-11153 #land
2014-08-28 17:12:37 -05:00
Luke Imhoff
5ab8fcd026
Remove realpath call from expected user_configurations_pathname
...
MSP-11153
realpath is not used in the actual code anymore because it doesn't work
for non-existent paths.
2014-08-28 11:51:25 -05:00
Luke Imhoff
951ce15b44
Move database.yml selection to Metasploit::Framework::Database
...
MSP-11153
Test the following paths in order and only return them if the path
exists:
1. MSF_DATABASE_CONFIG environment variable
2. ~/.msf4/database.yml
3. <project>/config/database.yml
2014-08-27 12:01:43 -05:00
Tom Sellers
4a1b037af0
Remaining files..
2014-08-26 18:15:58 -05:00
jvazquez-r7
b37e1a5421
Solve conflicts
2014-08-26 17:51:37 -05:00
jvazquez-r7
0d9d722525
skip examples pending of pivotaltracker 38730815
2014-08-26 16:49:13 -05:00
Joshua Smith
49adde2095
Land 3702, prefer be_falsey and cleanup specs
2014-08-26 15:24:41 -05:00
Joshua Smith
1fa26e2afb
cleans up a bunch of spec msftidy issues
2014-08-26 15:24:08 -05:00
jvazquez-r7
042b8a3672
Switch from pending to skip in specs
2014-08-26 15:17:00 -05:00
HD Moore
ba1f7c3bf6
Land #3687 , reworks the nat-pmp portscanner
2014-08-26 14:34:46 -05:00
HD Moore
4e19d9ade1
Land #3545 , fix up sip scanners, msftidy, db services cmd
2014-08-26 14:07:21 -05:00
Jon Hart
5ad090e833
Add unit test for and correct parsing of NAT-PMP port map responses
2014-08-26 10:49:53 -07:00
Jon Hart
b0347906e3
Correct NATPMP external address resposne epoch and result parsing
2014-08-26 10:49:52 -07:00
Jon Hart
337cd02dd7
Change Auxiliary::DRDoS' prove_drdos to prove_amplification
2014-08-26 07:48:44 -07:00
jvazquez-r7
41420a97d5
Solve conflicts
2014-08-26 09:04:05 -05:00
jvazquez-r7
57afaf6580
undo be_false case
2014-08-25 23:58:08 -05:00
jvazquez-r7
60ecf4e8c4
Use be_truthy instead of be_true
2014-08-25 23:58:08 -05:00
jvazquez-r7
aa47746290
Undo incorrect be_true switch
2014-08-25 18:23:55 -05:00
jvazquez-r7
c372f5164b
And switch more cases to be_falsey
2014-08-25 17:50:38 -05:00
jvazquez-r7
a1e1cef418
More use of be_falsey
2014-08-25 17:38:50 -05:00
jvazquez-r7
dd1c015e4e
Use be_falsey
2014-08-25 17:34:55 -05:00
jvazquez-r7
9a14b64051
First version of Rex::Arch::X86 specs
2014-08-25 16:44:28 -05:00
Jon Hart
6185721a61
Address @hmoore-r7's feedback regarding binary encoding
2014-08-25 13:11:22 -07:00
Jon Hart
e3753e3649
Refactor SIP response parsing for future improvements
2014-08-25 13:11:21 -07:00
Jon Hart
02e41c27e7
Split SIP response parsing out on its own, add unit tests.
...
Passes rspec but fails in framework. WIP.
2014-08-25 13:11:20 -07:00
David Maloney
32b1a5ea23
add ipboard loginscanner
...
add loginscanner class for IPBoard with specs
this should replicate the functionality originally written
by Chris Truncer, but move it into a testable, reusable class
2014-08-25 13:58:30 -05:00
William Vu
1ee83ff57e
Land #3696 , pile of NTP DRDoS 0days
...
Dr. DoS in da house?
2014-08-25 11:47:28 -05:00
Joe Vennix
a27754c5c1
Tweak specs a bit.
2014-08-24 02:41:37 -05:00
Joe Vennix
120f416f9c
Add spec for Msf::EncodedPayload.create.
2014-08-24 02:36:09 -05:00
Joe Vennix
6313b29b7a
Add #arch method to Msf::EncodedPayload.
...
This allows exploits with few one automatic target to support many
different architectures.
2014-08-24 02:22:15 -05:00
jvazquez-r7
8945f04ffd
Add specs for Msf::HTTP::JBoss::BeanShell
2014-08-22 16:13:38 -05:00
jvazquez-r7
f57dd9a224
Add specs for #generate_bsh
2014-08-22 15:39:58 -05:00
jvazquez-r7
2b3058869f
Add Msf::HTTP::JBoss::BeanShellScripts specs
2014-08-22 15:36:29 -05:00
jvazquez-r7
7ee5423310
Add specs for Msf::HTTP::JBoss::Base
2014-08-22 15:11:27 -05:00
jvazquez-r7
38e6576990
Update
2014-08-22 13:22:57 -05:00
jvazquez-r7
da0950df24
Land #3674 , @todb-r7's patch for RangeWalker spec
2014-08-22 11:57:14 -05:00
Joe Vennix
95fbb8f1b7
Land PR #3672 , dmaloney-r7's login scanner credential rework.
2014-08-22 11:15:32 -05:00
Brandon Turner
05f0d09828
Merge branch staging/electro-release into master
...
On August 15, shuckins-r7 merged the Metasploit 4.10.0 branch
(staging/electro-release) into master. Rather than merging with
history, he squashed all history into two commits (see
149c3ecc63
and
82760bf5b3
).
We want to preserve history (for things like git blame, git log, etc.).
So on August 22, we reverted the commits above (see
19ba7772f3
).
This merge commit merges the staging/electro-release branch
(62b81d6814
) into master
(48f0743d1b
). It ensures that any changes
committed to master since the original squashed merge are retained.
As a side effect, you may see this merge commit in history/blame for the
time period between August 15 and August 22.
2014-08-22 10:50:38 -05:00
Brandon Turner
19ba7772f3
Revert "Various merge resolutions from master <- staging"
...
This reverts commit 149c3ecc63
.
Conflicts:
lib/metasploit/framework/command/base.rb
lib/metasploit/framework/common_engine.rb
lib/metasploit/framework/require.rb
lib/msf/core/modules/namespace.rb
modules/auxiliary/analyze/jtr_postgres_fast.rb
modules/auxiliary/scanner/smb/smb_login.rb
msfconsole
2014-08-22 10:17:44 -05:00
jvazquez-r7
fd05e634e8
Move once more let into describe
2014-08-21 10:41:37 -05:00
jvazquez-r7
b0a4ea6750
Move let helpers to describe groups
2014-08-21 10:39:16 -05:00
jvazquez-r7
6301d79162
Describe setters just expecting how assignement to properties should happen
2014-08-21 10:34:52 -05:00
jvazquez-r7
54395e38a0
Use a part subject to describe #add_part
2014-08-21 10:29:44 -05:00
jvazquez-r7
9dcc95fb04
Fix Rex::MIME::Message#initialize boundaries parsing
2014-08-20 10:22:38 -05:00
jvazquez-r7
e8a6307df1
Fix Rex::MIME::Header#parse
2014-08-20 09:42:44 -05:00
jvazquez-r7
e5fc0a007f
Add some Message specs
2014-08-20 09:31:49 -05:00
jvazquez-r7
e4b586a96d
Add specs for add_part_inline_attachment
2014-08-20 08:32:58 -05:00