metasploit_data_models 0.21.2 → 0.21.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +15 -7
  2. data/app/models/mdm/nexpose_console.rb +6 -0
  3. data/lib/metasploit_data_models/version.rb +1 -1
  4. data/spec/app/models/mdm/nexpose_console_spec.rb +10 -0
  5. metadata +151 -93
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
- ---
2
- SHA1:
3
- metadata.gz: 15c5359342859529a92c9de84f0b738c4215b608
4
- data.tar.gz: c3f15f859b26d08e5d896b8fe6c20f63321d34de
5
- SHA512:
6
- metadata.gz: f70b1dd90ea808deddaea527292ad9e758789d07113e7ec9f589c74b9c2ea65036200fc32d3a64364afa821d9e2e3cd16a2f764b94d0e89506efe8aca26908ee
7
- data.tar.gz: 8f4ee06224963c5149da0280c07b48dc904aef51d44d3764cee0d534e232c36fbb243ebfb2ead68796ddc1156d6d47483eb386198c402458ec8cdde05d3e885a
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ZTM5OGIzNmU1YjA2NDZjMDVjZTUyYjFmNDM0NzMwMGNkZjg0OTNjYw==
5
+ data.tar.gz: !binary |-
6
+ Mjg5MGZlNTczYjViYjg4ZGU5Y2E3ZDA2MjZlNzAwZTk5ZmNmNjA2ZA==
7
+ SHA512:
8
+ metadata.gz: !binary |-
9
+ MTYyMTJhY2YwYzQyNTBjNDAwNGM4NmNlZjUxODY4YzI2NDU4MzNjOWY1Mjk3
10
+ ZjI3Y2E2NWM5YTM5NzkwMmEwYTIxYmExYjBkNmU3NTFhYjc4ZDM2NDUwNmI3
11
+ NGI1OGMzN2ZjZDQyYTQwZDdjZWI1MTcwNzk0YWY3MGVlZTIwZjE=
12
+ data.tar.gz: !binary |-
13
+ YzEwZGJkNDVhMWEzMzBjMDRkMWM0MTFiMGJkZjc0M2FkNjU0MjgxNWY0MzQz
14
+ NjQ3YzJmMmY3NmFhMzg0ZjIyNjY1MTQ2MzZlYzYxOWE1ZjgzYWY2YTc4Mzhj
15
+ NmUxMzlkMzViYjU4OWY1MDM0OTY3OTBmYzIxODU4MWNlN2YzZmY=
data/app/models/mdm/nexpose_console.rb CHANGED
@@ -12,6 +12,8 @@ class Mdm::NexposeConsole < ActiveRecord::Base
12
12
  foreign_key: :nx_console_id,
13
13
  inverse_of: :nexpose_console
14
14
 
15
+ before_save :strip_protocol
16
+
15
17
  #
16
18
  # Serializations
17
19
  #
@@ -28,6 +30,10 @@ class Mdm::NexposeConsole < ActiveRecord::Base
28
30
  validates :port, :numericality => { :only_integer => true }, :inclusion => {:in => 1..65535}
29
31
  validates :username, :presence => true
30
32
 
33
+ def strip_protocol
34
+ self.address.gsub!(/^http(s)*:\/\//i,'')
35
+ end
36
+
31
37
  Metasploit::Concern.run(self)
32
38
  end
33
39
 
data/lib/metasploit_data_models/version.rb CHANGED
@@ -6,7 +6,7 @@ module MetasploitDataModels
6
6
  # The minor version number, scoped to the {MAJOR} version number.
7
7
  MINOR = 21
8
8
  # The patch number, scoped to the {MINOR} version number.
9
- PATCH = 2
9
+ PATCH = 3
10
10
 
11
11
  # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the `PRERELEASE` in the
12
12
  # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.
data/spec/app/models/mdm/nexpose_console_spec.rb CHANGED
@@ -121,4 +121,14 @@ describe Mdm::NexposeConsole do
121
121
 
122
122
  end
123
123
 
124
+ context 'callbacks' do
125
+ describe '#strip_protocol' do
126
+ it 'should strip protocol handlers from the front of the address' do
127
+ nexpose_console = FactoryGirl.create(:mdm_nexpose_console, :address => 'https://foo.bar.com')
128
+ expect(nexpose_console.address).to eq 'foo.bar.com'
129
+ end
130
+
131
+ end
132
+ end
133
+
124
134
  end
metadata CHANGED
@@ -1,9 +1,9 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: metasploit_data_models
3
- version: !ruby/object:Gem::Version
4
- version: 0.21.2
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.21.3
5
5
  platform: ruby
6
- authors:
6
+ authors:
7
7
  - Samuel Huckins
8
8
  - Luke Imhoff
9
9
  - David 'thelightcosine' Maloney
@@ -11,136 +11,194 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
-
15
- date: 2014-11-14 00:00:00 Z
16
- dependencies:
17
- - !ruby/object:Gem::Dependency
14
+ date: 2014-12-20 00:00:00.000000000 Z
15
+ dependencies:
16
+ - !ruby/object:Gem::Dependency
18
17
  name: rake
19
- requirement: &id001 !ruby/object:Gem::Requirement
20
- requirements:
21
- - &id003
22
- - ">="
23
- - !ruby/object:Gem::Version
24
- version: "0"
18
+ requirement: !ruby/object:Gem::Requirement
19
+ requirements:
20
+ - - ! '>='
21
+ - !ruby/object:Gem::Version
22
+ version: '0'
25
23
  type: :development
26
24
  prerelease: false
27
- version_requirements: *id001
28
- - !ruby/object:Gem::Dependency
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
30
+ - !ruby/object:Gem::Dependency
29
31
  name: yard
30
- requirement: &id002 !ruby/object:Gem::Requirement
31
- requirements:
32
+ requirement: !ruby/object:Gem::Requirement
33
+ requirements:
32
34
  - - <
33
- - !ruby/object:Gem::Version
35
+ - !ruby/object:Gem::Version
34
36
  version: 0.8.7.4
35
37
  type: :development
36
38
  prerelease: false
37
- version_requirements: *id002
38
- - !ruby/object:Gem::Dependency
39
+ version_requirements: !ruby/object:Gem::Requirement
40
+ requirements:
41
+ - - <
42
+ - !ruby/object:Gem::Version
43
+ version: 0.8.7.4
44
+ - !ruby/object:Gem::Dependency
39
45
  name: pry
40
- requirement: &id004 !ruby/object:Gem::Requirement
41
- requirements:
42
- - *id003
46
+ requirement: !ruby/object:Gem::Requirement
47
+ requirements:
48
+ - - ! '>='
49
+ - !ruby/object:Gem::Version
50
+ version: '0'
43
51
  type: :development
44
52
  prerelease: false
45
- version_requirements: *id004
46
- - !ruby/object:Gem::Dependency
53
+ version_requirements: !ruby/object:Gem::Requirement
54
+ requirements:
55
+ - - ! '>='
56
+ - !ruby/object:Gem::Version
57
+ version: '0'
58
+ - !ruby/object:Gem::Dependency
47
59
  name: activerecord
48
- requirement: &id005 !ruby/object:Gem::Requirement
49
- requirements:
50
- - - ">="
51
- - !ruby/object:Gem::Version
60
+ requirement: !ruby/object:Gem::Requirement
61
+ requirements:
62
+ - - ! '>='
63
+ - !ruby/object:Gem::Version
52
64
  version: 3.2.13
53
65
  - - <
54
- - !ruby/object:Gem::Version
66
+ - !ruby/object:Gem::Version
55
67
  version: 4.0.0
56
68
  type: :runtime
57
69
  prerelease: false
58
- version_requirements: *id005
59
- - !ruby/object:Gem::Dependency
70
+ version_requirements: !ruby/object:Gem::Requirement
71
+ requirements:
72
+ - - ! '>='
73
+ - !ruby/object:Gem::Version
74
+ version: 3.2.13
75
+ - - <
76
+ - !ruby/object:Gem::Version
77
+ version: 4.0.0
78
+ - !ruby/object:Gem::Dependency
60
79
  name: activesupport
61
- requirement: &id006 !ruby/object:Gem::Requirement
62
- requirements:
63
- - *id003
80
+ requirement: !ruby/object:Gem::Requirement
81
+ requirements:
82
+ - - ! '>='
83
+ - !ruby/object:Gem::Version
84
+ version: '0'
64
85
  type: :runtime
65
86
  prerelease: false
66
- version_requirements: *id006
67
- - !ruby/object:Gem::Dependency
87
+ version_requirements: !ruby/object:Gem::Requirement
88
+ requirements:
89
+ - - ! '>='
90
+ - !ruby/object:Gem::Version
91
+ version: '0'
92
+ - !ruby/object:Gem::Dependency
68
93
  name: recog
69
- requirement: &id007 !ruby/object:Gem::Requirement
70
- requirements:
94
+ requirement: !ruby/object:Gem::Requirement
95
+ requirements:
71
96
  - - ~>
72
- - !ruby/object:Gem::Version
73
- version: "1.0"
97
+ - !ruby/object:Gem::Version
98
+ version: '1.0'
74
99
  type: :runtime
75
100
  prerelease: false
76
- version_requirements: *id007
77
- - !ruby/object:Gem::Dependency
101
+ version_requirements: !ruby/object:Gem::Requirement
102
+ requirements:
103
+ - - ~>
104
+ - !ruby/object:Gem::Version
105
+ version: '1.0'
106
+ - !ruby/object:Gem::Dependency
78
107
  name: metasploit-concern
79
- requirement: &id008 !ruby/object:Gem::Requirement
80
- requirements:
108
+ requirement: !ruby/object:Gem::Requirement
109
+ requirements:
81
110
  - - ~>
82
- - !ruby/object:Gem::Version
111
+ - !ruby/object:Gem::Version
83
112
  version: 0.3.0
84
113
  type: :runtime
85
114
  prerelease: false
86
- version_requirements: *id008
87
- - !ruby/object:Gem::Dependency
115
+ version_requirements: !ruby/object:Gem::Requirement
116
+ requirements:
117
+ - - ~>
118
+ - !ruby/object:Gem::Version
119
+ version: 0.3.0
120
+ - !ruby/object:Gem::Dependency
88
121
  name: metasploit-model
89
- requirement: &id009 !ruby/object:Gem::Requirement
90
- requirements:
122
+ requirement: !ruby/object:Gem::Requirement
123
+ requirements:
91
124
  - - ~>
92
- - !ruby/object:Gem::Version
125
+ - !ruby/object:Gem::Version
93
126
  version: 0.28.0
94
127
  type: :runtime
95
128
  prerelease: false
96
- version_requirements: *id009
97
- - !ruby/object:Gem::Dependency
129
+ version_requirements: !ruby/object:Gem::Requirement
130
+ requirements:
131
+ - - ~>
132
+ - !ruby/object:Gem::Version
133
+ version: 0.28.0
134
+ - !ruby/object:Gem::Dependency
98
135
  name: railties
99
- requirement: &id010 !ruby/object:Gem::Requirement
100
- requirements:
136
+ requirement: !ruby/object:Gem::Requirement
137
+ requirements:
101
138
  - - <
102
- - !ruby/object:Gem::Version
139
+ - !ruby/object:Gem::Version
103
140
  version: 4.0.0
104
141
  type: :runtime
105
142
  prerelease: false
106
- version_requirements: *id010
107
- - !ruby/object:Gem::Dependency
143
+ version_requirements: !ruby/object:Gem::Requirement
144
+ requirements:
145
+ - - <
146
+ - !ruby/object:Gem::Version
147
+ version: 4.0.0
148
+ - !ruby/object:Gem::Dependency
108
149
  name: arel-helpers
109
- requirement: &id011 !ruby/object:Gem::Requirement
110
- requirements:
111
- - *id003
150
+ requirement: !ruby/object:Gem::Requirement
151
+ requirements:
152
+ - - ! '>='
153
+ - !ruby/object:Gem::Version
154
+ version: '0'
112
155
  type: :runtime
113
156
  prerelease: false
114
- version_requirements: *id011
115
- - !ruby/object:Gem::Dependency
157
+ version_requirements: !ruby/object:Gem::Requirement
158
+ requirements:
159
+ - - ! '>='
160
+ - !ruby/object:Gem::Version
161
+ version: '0'
162
+ - !ruby/object:Gem::Dependency
116
163
  name: redcarpet
117
- requirement: &id012 !ruby/object:Gem::Requirement
118
- requirements:
119
- - *id003
164
+ requirement: !ruby/object:Gem::Requirement
165
+ requirements:
166
+ - - ! '>='
167
+ - !ruby/object:Gem::Version
168
+ version: '0'
120
169
  type: :development
121
170
  prerelease: false
122
- version_requirements: *id012
123
- - !ruby/object:Gem::Dependency
171
+ version_requirements: !ruby/object:Gem::Requirement
172
+ requirements:
173
+ - - ! '>='
174
+ - !ruby/object:Gem::Version
175
+ version: '0'
176
+ - !ruby/object:Gem::Dependency
124
177
  name: pg
125
- requirement: &id013 !ruby/object:Gem::Requirement
126
- requirements:
127
- - *id003
178
+ requirement: !ruby/object:Gem::Requirement
179
+ requirements:
180
+ - - ! '>='
181
+ - !ruby/object:Gem::Version
182
+ version: '0'
128
183
  type: :runtime
129
184
  prerelease: false
130
- version_requirements: *id013
131
- description: Implements minimal ActiveRecord models and database helper code used in both the Metasploit Framework (MSF) and Metasploit commercial editions.
132
- email:
185
+ version_requirements: !ruby/object:Gem::Requirement
186
+ requirements:
187
+ - - ! '>='
188
+ - !ruby/object:Gem::Version
189
+ version: '0'
190
+ description: Implements minimal ActiveRecord models and database helper code used
191
+ in both the Metasploit Framework (MSF) and Metasploit commercial editions.
192
+ email:
133
193
  - shuckins@rapid7.com
134
194
  - luke_imhoff@rapid7.com
135
195
  - dmaloney@rapid7.com
136
196
  - trevor_rosen@rapid7.com
137
- executables:
197
+ executables:
138
198
  - mdm_console
139
199
  extensions: []
140
-
141
200
  extra_rdoc_files: []
142
-
143
- files:
201
+ files:
144
202
  - .coveralls.yml
145
203
  - .gitignore
146
204
  - .rspec
@@ -524,30 +582,30 @@ files:
524
582
  - spec/support/shared/examples/metasploit_data_models/search/visitor/relation/visit/matching_record/with_metasploit_model_search_operator_deprecated_authority.rb
525
583
  - spec/support/shared/examples/metasploit_data_models/search/visitor/where/visit/with_equality.rb
526
584
  - spec/support/shared/examples/metasploit_data_models/search/visitor/where/visit/with_metasploit_model_search_group_base.rb
527
- homepage: ""
585
+ homepage: ''
528
586
  licenses: []
529
-
530
587
  metadata: {}
531
-
532
588
  post_install_message:
533
589
  rdoc_options: []
534
-
535
- require_paths:
590
+ require_paths:
536
591
  - lib
537
- required_ruby_version: !ruby/object:Gem::Requirement
538
- requirements:
539
- - *id003
540
- required_rubygems_version: !ruby/object:Gem::Requirement
541
- requirements:
542
- - *id003
592
+ required_ruby_version: !ruby/object:Gem::Requirement
593
+ requirements:
594
+ - - ! '>='
595
+ - !ruby/object:Gem::Version
596
+ version: '0'
597
+ required_rubygems_version: !ruby/object:Gem::Requirement
598
+ requirements:
599
+ - - ! '>='
600
+ - !ruby/object:Gem::Version
601
+ version: '0'
543
602
  requirements: []
544
-
545
603
  rubyforge_project:
546
- rubygems_version: 2.2.2
604
+ rubygems_version: 2.4.4
547
605
  signing_key:
548
606
  specification_version: 4
549
607
  summary: Database code for MSF and Metasploit Pro
550
- test_files:
608
+ test_files:
551
609
  - spec/app/models/mdm/api_key_spec.rb
552
610
  - spec/app/models/mdm/client_spec.rb
553
611
  - spec/app/models/mdm/cred_spec.rb