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
Luke Imhoff
eede74be1e
Extract 'Msf::Framework#threads cleaner'
...
MSP-11147
Extract from 'Msf::Simple::Framework' the `after(:each)` that kills and joins
threads from `framework.threads` into 'Msf::Framework#threads cleaner`.
2014-11-11 11:49:48 -06:00
darkbushido
2d7c517e2f
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
2014-11-04 15:34:25 -06:00
Luke Imhoff
45fea32c77
Use 'Metasploit::Simple::Framework#modules loading' in 'payloads can be instantiated'
...
MSP-11130
Use `expect_to_load_module_ancestor` and `load_and_create_module` in
favor of the custom code in 'payloads can be instantiated'.
2014-11-04 13:06:52 -06:00
Luke Imhoff
c115ad3c36
Use `load_and_create_module` in modules_spec
...
MSP-11130
Reuse 'Msf::Simple::Framework#modules loading' context in 'all modules
with module type can be instantiated' instead of using the similar code.
2014-11-04 12:59:59 -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
ff0391cdc7
Fix derive_module_ancestor_names
...
MSP-11130
Wrap :reference_name in an Array since :ancestor_reference_names is
expected to be an Array.
2014-11-04 09:40:55 -06:00
Tod Beardsley
0b39c2ed85
Land #4084 , prep for Ruby 2.1
2014-11-03 13:43:50 -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
Luke Imhoff
0296d1784d
Derive ancestor reference names from reference name
...
MSP-11130
For 'Msf::Simple::Framework#modules loading''s load_and_create_modules,
don't require `:ancestor_reference_names` when the `:module_type` is not
payload as the one ancestor reference name will be the same as
`:reference_name`.
2014-11-03 10:59:01 -06:00
Luke Imhoff
d97bc52d8a
Complete documentation for 'Msf::Simple::Framework::Modules loading'
...
MSP-11130
2014-11-03 09:47:29 -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
c2bd75b587
Clean up leaked constants
...
MSP-11130
2014-10-29 15:50:47 -05:00
darkbushido
001e98ab1d
porting the IPAddr support over
...
I lost some of the changes I had made to db.rb and had to dig them up
the changes made to mdm fixes the last failing specs.
2014-10-29 15:21:16 -05:00
Luke Imhoff
7e2897277b
Rename shared example file to match name
...
MSP-11130
2014-10-29 12:54:29 -05:00
Luke Imhoff
892aeaf727
Metasploit::Framework::Spec::Constants cleaner
...
MSP-11130
Shared context will calls `Metasploit::Framework::Spec::Constants.clean
after each example.
2014-10-29 11:31:17 -05:00
Joe Vennix
c6bbc5bccf
Merge branch 'landing-4055' into upstream-master
2014-10-28 11:18:20 -05:00
Luke Imhoff
dae114a7f3
Document how to derive reference_name from ancestors
...
MSP-11145
2014-10-27 15:59:12 -05:00
Luke Imhoff
1df82ea273
Fix typo in file name
...
MSP-11145
2014-10-27 11:34:26 -05: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
34f29f218c
really resolve merge conflicts
2014-10-23 21:51:33 -05:00
Luke Imhoff
48d6880f1d
Add docs for untested payload testing
...
MSP-11145
Add docs to rake task, shared examples, and share contexts for how to
use all 3 together.
2014-10-23 11:17:05 -05:00
Luke Imhoff
a7317cb86c
Extract 'untested payloads' shared context
...
MSP-11145
Detects if payloads are untested when using the 'payload can be
instantiated' shared examples.
2014-10-23 09:55:14 -05:00
Luke Imhoff
6c3c830efb
Extract 'payload can be instantiated' shared example
...
MSP-11145
Extracted so that pro can use it.
2014-10-23 09:35:52 -05:00
Luke Imhoff
88839e841a
Extract 'all modules with module type can be instantiated' shared example
...
MSP-11145
Extracted so it can be used by pro.
2014-10-23 09:31:44 -05: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
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
32faa0bc62
Land 3796, specs for Rex::Encoder::Alpha2 encoders
2014-10-17 13:15:00 -05:00
Luke Imhoff
575717681c
Extract Msf::Module::Privileged shared examples
...
MSP-11126
2014-10-17 11:48:36 -05:00
Luke Imhoff
45302b9403
Extract Msf::Module::UUID shared examples
...
MSP-11126
2014-10-17 11:34:35 -05:00
Luke Imhoff
d86eda5f1d
Extract Msf::Module::Author shared examples
...
MSP-11126
2014-10-17 11:20:23 -05:00
Luke Imhoff
13923a8ca5
Fully-qualify Msf::DBImportError
...
MSP-11152
Constant was unqualified in some of the reorganized Msf::DBManager code
because that code was take advantage of the old nested lexical scope
that included `Msf`.
2014-10-17 09:29:01 -05:00
Luke Imhoff
839657abec
Extract Msf::Module::Network shared examples
...
MSP-11126
2014-10-16 15:54:35 -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
e418f98d45
arch -> Msf::Module::Arch
...
MSP-11126
2014-10-16 13:21:11 -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
3bce8e418d
unserialize_object -> Msf::DBManager::Import::MetasploitFramework shared examples
...
MSP-11124
2014-10-15 14:03:55 -05:00
Luke Imhoff
1aca55bc2a
nils_for_nulls -> Msf::DBManager::Import::MetasploitFramework shared examples
...
MSP-11124
2014-10-15 14:00:42 -05:00
Luke Imhoff
27c5cf8887
Move helpers to Msf::DBManager::Import::Libpcap shared examples
...
MSP-11124
2014-10-15 13:57:27 -05:00
Luke Imhoff
5d59224520
Extract Msf::DBManager::Import::Report shared examples
...
MSP-11124
2014-10-15 13:53:09 -05:00
Luke Imhoff
505ca5fcc0
Extract Msf::DBManager::Import::Wapiti shared examples
...
MSP-11124
2014-10-15 13:47:22 -05:00
Luke Imhoff
6e0c7f0aaf
Extract Msf::DBManager::Import::Spiceworks shared examples
...
MSP-11124
2014-10-15 13:40:03 -05:00
Luke Imhoff
92a6c79200
Extract Msf::DBManager::Import::Retina shared examples
...
MSP-11124
2014-10-15 13:24:40 -05:00
Luke Imhoff
ac6a8387a5
Extract Msf::DBManager::Import::Outpost24 shared examples
...
MSP-11124
2014-10-15 13:21:21 -05:00
Luke Imhoff
0418027c90
Extract Msf::DBManager::Import::OpenVAS
...
MSP-11124
2014-10-15 13:13:57 -05:00
Luke Imhoff
aa4c104df5
Extract Msf::DBManager::Import::Nmap shared examples
...
MSP-11124
2014-10-15 13:08:05 -05:00
Luke Imhoff
926c5adb49
Extract Msf::DBManager::Import::Nikto shared examples
...
MSP-11124
2014-10-15 12:57:24 -05:00
Luke Imhoff
3049301c96
Extract Msf::DBManager::Import::Nexpose::Simple shared examples
...
MSP-11124
2014-10-15 12:44:24 -05:00
Luke Imhoff
b49dd166fd
Extract Msf::DBManager::Import::Nexpose::Raw shared examples
...
MSP-11124
2014-10-15 12:38:35 -05:00
Luke Imhoff
3638b0a91b
Extract Msf::DBManager::Import::Netsparker shared examples
...
MSP-11124
2014-10-15 11:49:01 -05:00
Luke Imhoff
cceec8eb53
Extract Msf::DBManager::Import::Nessus::XML::V* shared examples
...
MSP-11124
2014-10-15 11:37:24 -05:00
Luke Imhoff
cee782ab8b
Extract Msf::DBManager::Import::Nessus::XML shared examples
...
MSP-11124
2014-10-15 11:30:23 -05:00
Luke Imhoff
71af8fd9c2
Extract Msf::DBManager::Import::Nessus::NBE shared examples
...
MSP-11124
2014-10-15 11:23:52 -05:00
Luke Imhoff
4c9b29de95
Extract Msf::DBManager::Import::MetasploitFramework::Credential shared examples
...
MSP-11124
2014-10-15 11:15:13 -05:00
Luke Imhoff
7d101be0f5
Extract Msf::DBManager::Import::MetasploitFramework::Zip shared examples
...
MSP-11124
2014-10-15 11:02:27 -05:00
Luke Imhoff
65885c8cc8
MsfXml -> MetasploitFramework::XML
...
MSP-11124
2014-10-15 10:25:42 -05:00
Luke Imhoff
102e9d8972
import_msf_file -> Msf::DBManager::Import::MsfXml shared examples
...
MSP-11124
2014-10-15 10:04:21 -05:00
Luke Imhoff
c7d16810ad
Extract Msf::DBManager::Import::MBSA shared examples
...
MSP-11124
2014-10-15 09:58:24 -05:00
Luke Imhoff
1edad5e0b7
Extract Msf::DBManager::Import::Libpcap shared examples
...
MSP-11124
2014-10-15 09:49:58 -05:00
Luke Imhoff
8b8befeee1
Extract Msf::DBManager::Import::IPList shared examples
...
MSP-11124
2014-10-15 09:43:49 -05:00
Luke Imhoff
66b1dcc42d
Extract Msf::DBManager::Import::FusionVM shared examples
...
MSP-11124
2014-10-15 09:38:44 -05:00
Luke Imhoff
0bfc496824
Extract Msf::DBManager::Import::Foundstone shared examples
...
MSP-11124
2014-10-15 09:31:17 -05:00
Luke Imhoff
56c8bad6c5
Extract Msf::DBManager::Import::CI shared examples
...
MSP-11124
2014-10-15 09:24:46 -05:00
Luke Imhoff
85f35bd29b
Extract Msf::DBManager::Import::Burp shared examples
...
MSP-11124
2014-10-15 09:18:22 -05:00
Luke Imhoff
33e1213010
Extract Msf::DBManager::Import::Appscan shared examples
...
MSP-11124
2014-10-15 09:14:12 -05:00
Luke Imhoff
6a1f718c3a
Extract Msf::DBManager::Import::Amap shared examples
...
MSP-11124
2014-10-15 09:08:50 -05:00
Luke Imhoff
d85ee2ee0a
Extract Msf::DBManager::Import::IP360::V3 shared examples
...
MSP-11124
2014-10-14 16:17:34 -05:00
Luke Imhoff
7e05900428
Extract Msf::DBManager::Import::IP360::ASPL shared examples
...
MSP-11124
2014-10-14 16:02:44 -05:00
Luke Imhoff
c28f1fce3a
Extract Msf::DBManager::Import::Acunetix shared examples
...
MSP-11124
2014-10-14 15:45:07 -05:00
Luke Imhoff
55ca928fee
Extract Msf::DBManager::Import::Qualys::Scan shared examples
...
MSP-11124
2014-10-14 15:31:01 -05:00
Luke Imhoff
dd5ae26174
Extract Msf::DBManager::Import::Qualys::Asset shared examples
...
MSP-11124
2014-10-13 16:09:41 -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
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
eb190a5a78
Avoid explicit use of subject on shared examples
2014-10-13 10:43:53 -05:00
Luke Imhoff
4aab5129b0
Extract Msf::DBManager::HostDetail shared examples
...
MSP-11124
2014-10-13 10:27:55 -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
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
f5ea81cd97
Test for #match_values
...
MSP-11124
2014-10-09 09:20:27 -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
Samuel Huckins
0dfd8e25b8
Land #3846 , Rex::ImageSource specs
2014-10-02 12:33:56 -05:00
sinn3r
9e5826c4eb
Land #3844 - Add the JSObfu mixin to Firefox exploits
2014-09-29 11:15:14 -05:00
jvazquez-r7
45011ae87f
Add shared examples
2014-09-22 12:15:04 -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
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
jvazquez-r7
0e1ba8fb5e
Use non aphanumeric badchar
2014-09-15 15:59:18 -05:00
jvazquez-r7
36e5dcd149
Fix shared examples
2014-09-15 15:56:19 -05:00
jvazquez-r7
4064fb60ef
Refactor specs for Rex::Encoder::Alpha2::Generic
2014-09-15 15:43:31 -05:00
jvazquez-r7
3f5fdaebb4
Add specs for Rex::Encoder::NDR
2014-09-15 13:49:18 -05:00
James Lee
f68628c487
Add minimal specs for rex/proto/http/packet/header
2014-09-12 14:30:27 -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
d7af3a628d
Avoid its on Msf::ModuleManager::Cache shared examples specs
2014-09-02 12:02:26 -05:00
jvazquez-r7
b37e1a5421
Solve conflicts
2014-08-26 17:51:37 -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
jvazquez-r7
41420a97d5
Solve conflicts
2014-08-26 09:04:05 -05:00
jvazquez-r7
60ecf4e8c4
Use be_truthy instead of be_true
2014-08-25 23:58:08 -05:00
jvazquez-r7
dd1c015e4e
Use be_falsey
2014-08-25 17:34:55 -05:00
Brandon Turner
91bb0b6e10
Metasploit Framework 4.9.3-2014072301
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJT0CeVAAoJEJMMBVMNnmqO/7AP/0CBRHjtgiR9VnFKSQ+iWTQV
iPNMBevn0mpSRq/gpoKCeFBZ6b+YQYrOLXDKVk62VV9LCslkr/P8LW8ul+m+JtB0
mM6V5esUXM1XhgGEyTnTLRx6BR/WQU1RHlb56ae3nZjQlwCuH/5zEmcy5toZxpsY
6HO46zE0GGBoLr/VgyYlfT08bfoQ+ICyJN0H5ixoovCc3iW0K1MNqLMfdani8zBJ
gYJaMysV7XtepumWWQMSC+b/EuertdXXzWDy2bwe0Q3cQXNXzrkPAvtMqucWG+gy
783OLKCPtVoEZiX87xAptkwmVCRdNGPclaWH7YRZDAh1tqBfRQUg72V/TIrOHCP1
/lYO7yp5pBQg+1UNnpH+xI2YePFfYdHpYDNT5FSQGOnQjJg30ll4SqCm7cVmo2h5
BRSYXkPCsQeXGaFarxGERNb8e+qN/WzSrHzY45tQw8mDuhg94tlf3VtDag3FXxhj
zCxd6bu+tdboVm7FERS85T46kxzmeIycZ4p+Sf7d8gXitl2RKbBdKFNDi1gzeK1T
yN7bDl4sL7qtDgZLXjFrnyC8vXyAqIrAgmFr2JywMBRm6TiCGQvgnrs+sScU3RFU
W2tblGbKQq+CwDeC59uQPqxRkm72SMUrKX9448VEQ+9XbKE3TMQ5Q4qCxmnw31Op
aJ0QgKJz8thZgafZc89I
=e1z9
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCgAGBQJT4pb8AAoJEA+Ckxyj7hsHn+8P/3FlEYCmoqQ/JzsVtmP3Yi4Q
gBRva+crY831mCCQXFrPJBvWfmy5HOzVh+Zh7zWF0GQ1WuuMppHfR5ARFVwmiDs3
qwndhXwziDzBnznf0JKSgT5eJsH23s/ots1lyWymKJvPuT6hn6MRAHUawgnNmYR9
ttnawmHvCM9Iha2oz3nmkLcNd+83bdBfEWi5l8AQ7jJxwMC2/8VPpMscVVwXqPzd
CoQugAYZW5VeaEiGio5+19Ix9EPkIDvs6wnfGBtfPfeaOIDZV4XOFoIFUtEeZd5o
olvEpYvdqscy4Qujzn4C++3wX3bUxkIbHTJHgrKmlD83dI7Cu1JH716G+yfLoJo0
pQBWTGeWYKEh6leK/9J5Bo1/tOJ/ylbcbvH0Y0tmdu4icHar6uYe1QBrCB9xIdh1
F+xo4guYnVo616DXJQSwjIye83b5dBxACrfA3bqCnFVFgTM5jXGV1cqiBgs9Dl++
tIDPgUJkCe/bIdQ7PntlGRzxKihHahlxhCa++YaGKqSq7gXie8Rl4qgloIrbfNZ/
z3XsoOLNdbMGO7ip88Zjwq4Khj5WZu7ijfCtXO7GU1UJZL1tJ2yK2ic7ZDLc251Y
8EGMSTG53+6yvZYFtWMZeQzjwD2cpuF04dOmHOKi6KGJJ7KRPhn6gpsbc6U1mbH9
AjGcfOzhhcsY+WAQ7OG+
=Pjob
-----END PGP SIGNATURE-----
Merge tag '2014072301' into staging/electro-release
Conflicts:
Gemfile.lock
modules/post/windows/gather/credentials/gpp.rb
This removes the active flag in the gpp.rb module. According to Lance,
the active flag is no longer used.
2014-08-06 15:58:12 -05:00
darkbushido
ad6eed01a2
.to_credential now assigns a parent
...
Metasploit::Credential::Core#to_credential will set the parent to the original core objext
Metasploit::Framework::Credential#to_credential also sets the parent to itself.
2014-07-31 14:52:27 -05:00
David Maloney
939e585658
refactor all loginscanners
...
loginscanners now use LoginStatus constants
for the result statuses
2014-07-15 13:17:56 -05:00
David Maloney
846679bef9
change Result status
...
result bojects now use Login::status constants
for their status
2014-07-15 11:39:38 -05:00
James Lee
4b16985eb8
Stop trying more creds for a user after success
...
This is more like the behavior of the old AuthBrute mixin, where a
scanner module was expected to return :next_user in the block given to
each_user_pass when it successfully authenticated.
The advantage is a reduced number of attempts that are very unlikely to
be successful since we already know the password. However, note that
since we don't compare realms, this will cause a false negative in the
rare case where the same username exists with different realms on the
same service.
MSP-10686
2014-07-10 17:48:58 -05:00
David Maloney
8833429987
make shared example usage more readable
...
this seems less obtuse
2014-07-10 12:58:13 -05:00
David Maloney
7dc58d060e
make only one each method
...
made the one true enumerator of credentials
for the login_scanner.
also covered the wierd http case where it can have a realm key
but no default realm.
2014-07-10 12:35:09 -05:00
David Maloney
25ee278097
strip vestigial realms
...
in the cases where we don't want a realm we should be
stripping it from the credential so we can build accurate results
2014-07-09 17:46:56 -05:00
David Maloney
c7b37743ef
working realm coercion
...
LoginScanners will now figure out
the right thing to do about Realms
based on attributes of the Scanner itself
2014-07-09 15:56:39 -05:00
David Maloney
24fced822e
coerce realm_key when it exists
...
if the cred has a realm and the loginscanner
has a realm_key, make the credential use the
scanner's realm key
2014-07-09 14:58:20 -05:00
David Maloney
766b50b5e0
REALM_KEY not _TYPE
...
arg typos
2014-07-09 14:01:41 -05:00