metasploit_data_models 0.19.8-java → 0.20.0-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/models/mdm/host.rb +2 -0
- data/app/models/mdm/workspace.rb +5 -5
- data/app/models/metasploit_data_models/ip_address/v4/cidr.rb +3 -1
- data/app/models/metasploit_data_models/ip_address/v4/range.rb +3 -1
- data/app/models/metasploit_data_models/ip_address/v4/segment/nmap/list.rb +3 -2
- data/lib/metasploit_data_models.rb +2 -12
- data/lib/metasploit_data_models/ip_address/cidr.rb +3 -1
- data/lib/metasploit_data_models/match.rb +2 -0
- data/lib/metasploit_data_models/match/child.rb +2 -1
- data/lib/metasploit_data_models/match/parent.rb +3 -1
- data/lib/metasploit_data_models/version.rb +2 -2
- data/metasploit_data_models.gemspec +7 -6
- metadata +21 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5fc220361fb5e5d7c996dc87506e820880df0594
|
4
|
+
data.tar.gz: 16a6e9459cabf6691144f0031546cbb9c6230c35
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 552e546b0c9c1e700d7d5114a923bd8dc9f8f13d1b0d7f4cc5244a28bab88fddff04bc26a6c35f5e36484737a4d6870b54815e64c624d7bdaf411da1c1dde123
|
7
|
+
data.tar.gz: c1111f5db27af76f27de419a2fc5b9e28634b459dee581052fde894453dcacc70eefe239897e1850c8b1e49b01a35df328adf0d122a52dcdbe531e271998baff
|
data/app/models/mdm/host.rb
CHANGED
@@ -1,5 +1,7 @@
|
|
1
1
|
# A system with an {#address IP address} on the network that has been discovered in some way.
|
2
2
|
class Mdm::Host < ActiveRecord::Base
|
3
|
+
require 'mdm/host/operating_system_normalization'
|
4
|
+
|
3
5
|
include Mdm::Host::OperatingSystemNormalization
|
4
6
|
include Metasploit::Model::Search
|
5
7
|
|
data/app/models/mdm/workspace.rb
CHANGED
@@ -156,11 +156,11 @@ class Mdm::Workspace < ActiveRecord::Base
|
|
156
156
|
|
157
157
|
def unique_web_forms
|
158
158
|
query = <<-EOQ
|
159
|
-
SELECT DISTINCT web_forms.web_site_id, web_forms.path, web_forms.method, web_forms.query
|
160
|
-
FROM hosts, services, web_sites, web_forms
|
161
|
-
WHERE hosts.workspace_id = #{id} AND
|
162
|
-
services.host_id = hosts.id AND
|
163
|
-
web_sites.service_id = services.id AND
|
159
|
+
SELECT DISTINCT web_forms.web_site_id, web_forms.path, web_forms.method, web_forms.query
|
160
|
+
FROM hosts, services, web_sites, web_forms
|
161
|
+
WHERE hosts.workspace_id = #{id} AND
|
162
|
+
services.host_id = hosts.id AND
|
163
|
+
web_sites.service_id = services.id AND
|
164
164
|
web_forms.web_site_id = web_sites.id
|
165
165
|
EOQ
|
166
166
|
Mdm::WebForm.find_by_sql(query)
|
@@ -1,3 +1,5 @@
|
|
1
|
+
require 'metasploit_data_models/ip_address/cidr'
|
2
|
+
|
1
3
|
# An IPv4 CIDR (Classless InterDomain Routing) block composed of a
|
2
4
|
# {MetasploitDataModels::IPAddress::V4::Single IPv4} {MetasploitDataModels::IPAddress::CIDR#address address} and
|
3
5
|
# {MetasploitDataModels::IPAddress::CIDR#prefix_length prefix_length} written in the form `'a.b.c.d/prefix_length'`.
|
@@ -11,4 +13,4 @@ class MetasploitDataModels::IPAddress::V4::CIDR < Metasploit::Model::Base
|
|
11
13
|
#
|
12
14
|
|
13
15
|
cidr address_class: MetasploitDataModels::IPAddress::V4::Single
|
14
|
-
end
|
16
|
+
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
require 'metasploit_data_models/ip_address/range'
|
2
|
+
|
1
3
|
# A range of complete IPv4 addresses, separated by a `-`.
|
2
4
|
class MetasploitDataModels::IPAddress::V4::Range < Metasploit::Model::Base
|
3
5
|
extend MetasploitDataModels::Match::Child
|
@@ -9,4 +11,4 @@ class MetasploitDataModels::IPAddress::V4::Range < Metasploit::Model::Base
|
|
9
11
|
#
|
10
12
|
|
11
13
|
extremes class_name: 'MetasploitDataModels::IPAddress::V4::Single'
|
12
|
-
end
|
14
|
+
end
|
@@ -1,8 +1,9 @@
|
|
1
|
+
require 'metasploit_data_models/match/parent'
|
2
|
+
|
1
3
|
# A comma separated list of {MetasploitDataModels::IPAddress::V4::Segment::Single segment numbers} and
|
2
4
|
# {MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range range of segment numbers} making up one segment of
|
3
5
|
# {MetasploitDataModels::IPAddress::V4::Nmap}.
|
4
6
|
class MetasploitDataModels::IPAddress::V4::Segment::Nmap::List < Metasploit::Model::Base
|
5
|
-
extend ActiveSupport::Autoload
|
6
7
|
|
7
8
|
include MetasploitDataModels::Match::Parent
|
8
9
|
|
@@ -123,4 +124,4 @@ class MetasploitDataModels::IPAddress::V4::Segment::Nmap::List < Metasploit::Mod
|
|
123
124
|
errors.add(:value, :array)
|
124
125
|
end
|
125
126
|
end
|
126
|
-
end
|
127
|
+
end
|
@@ -24,13 +24,9 @@ require 'arel-helpers'
|
|
24
24
|
require 'mdm'
|
25
25
|
require 'mdm/module'
|
26
26
|
require 'metasploit_data_models/base64_serializer'
|
27
|
-
require 'metasploit_data_models/
|
27
|
+
require 'metasploit_data_models/engine'
|
28
28
|
require 'metasploit_data_models/serialized_prefs'
|
29
|
-
|
30
|
-
# Only include the Rails engine when using Rails.
|
31
|
-
if defined? Rails
|
32
|
-
require 'metasploit_data_models/engine'
|
33
|
-
end
|
29
|
+
require 'metasploit_data_models/version'
|
34
30
|
|
35
31
|
module MetasploitDataModels
|
36
32
|
def self.root
|
@@ -44,9 +40,3 @@ module MetasploitDataModels
|
|
44
40
|
end
|
45
41
|
end
|
46
42
|
|
47
|
-
lib_pathname = MetasploitDataModels.root.join('lib')
|
48
|
-
# has to work under 1.8.7, so can't use to_path
|
49
|
-
lib_path = lib_pathname.to_s
|
50
|
-
# Add path to gem's lib so that concerns for models are loaded correctly if models are reloaded
|
51
|
-
ActiveSupport::Dependencies.autoload_paths << lib_path
|
52
|
-
ActiveSupport::Dependencies.autoload_once_paths << lib_path
|
@@ -1,3 +1,5 @@
|
|
1
|
+
require 'metasploit_data_models/match/child'
|
2
|
+
|
1
3
|
# Common behavior for Class-InterDomain Routing (`<address>/<prefix-length>`) notation under
|
2
4
|
# {MetasploitDataModels::IPAddress},
|
3
5
|
module MetasploitDataModels::IPAddress::CIDR
|
@@ -171,4 +173,4 @@ module MetasploitDataModels::IPAddress::CIDR
|
|
171
173
|
errors.add(:address, :invalid)
|
172
174
|
end
|
173
175
|
end
|
174
|
-
end
|
176
|
+
end
|
@@ -1,3 +1,4 @@
|
|
1
|
+
require 'metasploit_data_models/match'
|
1
2
|
# Adds a {#match match class method} to the extending class. The extending class must define `MATCH_REGEXP`.
|
2
3
|
#
|
3
4
|
# @example Define `match` class method
|
@@ -45,4 +46,4 @@ module MetasploitDataModels::Match::Child
|
|
45
46
|
def regexp
|
46
47
|
self::REGEXP
|
47
48
|
end
|
48
|
-
end
|
49
|
+
end
|
@@ -4,9 +4,9 @@ module MetasploitDataModels
|
|
4
4
|
# The major version number.
|
5
5
|
MAJOR = 0
|
6
6
|
# The minor version number, scoped to the {MAJOR} version number.
|
7
|
-
MINOR =
|
7
|
+
MINOR = 20
|
8
8
|
# The patch number, scoped to the {MINOR} version number.
|
9
|
-
PATCH =
|
9
|
+
PATCH = 0
|
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.
|
@@ -39,26 +39,27 @@ Gem::Specification.new do |s|
|
|
39
39
|
# @see MSP-2971
|
40
40
|
s.add_runtime_dependency 'activerecord', '>= 3.2.13', '< 4.0.0'
|
41
41
|
s.add_runtime_dependency 'activesupport'
|
42
|
-
s.add_runtime_dependency 'metasploit-concern', '~> 0.1
|
43
|
-
s.add_runtime_dependency 'metasploit-model', '~> 0.
|
44
|
-
|
42
|
+
s.add_runtime_dependency 'metasploit-concern', '~> 0.2.1'
|
43
|
+
s.add_runtime_dependency 'metasploit-model', '~> 0.27.0'
|
44
|
+
s.add_runtime_dependency 'railties', '< 4.0.0'
|
45
|
+
|
45
46
|
# arel-helpers: Useful tools to help construct database queries with ActiveRecord and Arel.
|
46
47
|
s.add_runtime_dependency 'arel-helpers'
|
47
|
-
|
48
|
+
|
48
49
|
if RUBY_PLATFORM =~ /java/
|
49
50
|
# markdown formatting for yard
|
50
51
|
s.add_development_dependency 'kramdown'
|
51
52
|
|
52
53
|
s.add_runtime_dependency 'jdbc-postgres'
|
53
54
|
s.add_runtime_dependency 'activerecord-jdbcpostgresql-adapter'
|
54
|
-
|
55
|
+
|
55
56
|
s.platform = Gem::Platform::JAVA
|
56
57
|
else
|
57
58
|
# markdown formatting for yard
|
58
59
|
s.add_development_dependency 'redcarpet'
|
59
60
|
|
60
61
|
s.add_runtime_dependency 'pg'
|
61
|
-
|
62
|
+
|
62
63
|
s.platform = Gem::Platform::RUBY
|
63
64
|
end
|
64
65
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metasploit_data_models
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.20.0
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Samuel Huckins
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2014-09-
|
14
|
+
date: 2014-09-17 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: rake
|
@@ -95,12 +95,12 @@ dependencies:
|
|
95
95
|
requirements:
|
96
96
|
- - ~>
|
97
97
|
- !ruby/object:Gem::Version
|
98
|
-
version: 0.1
|
98
|
+
version: 0.2.1
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
101
|
- - ~>
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: 0.1
|
103
|
+
version: 0.2.1
|
104
104
|
prerelease: false
|
105
105
|
type: :runtime
|
106
106
|
- !ruby/object:Gem::Dependency
|
@@ -109,12 +109,26 @@ dependencies:
|
|
109
109
|
requirements:
|
110
110
|
- - ~>
|
111
111
|
- !ruby/object:Gem::Version
|
112
|
-
version: 0.
|
112
|
+
version: 0.27.0
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
115
|
- - ~>
|
116
116
|
- !ruby/object:Gem::Version
|
117
|
-
version: 0.
|
117
|
+
version: 0.27.0
|
118
|
+
prerelease: false
|
119
|
+
type: :runtime
|
120
|
+
- !ruby/object:Gem::Dependency
|
121
|
+
name: railties
|
122
|
+
version_requirements: !ruby/object:Gem::Requirement
|
123
|
+
requirements:
|
124
|
+
- - <
|
125
|
+
- !ruby/object:Gem::Version
|
126
|
+
version: 4.0.0
|
127
|
+
requirement: !ruby/object:Gem::Requirement
|
128
|
+
requirements:
|
129
|
+
- - <
|
130
|
+
- !ruby/object:Gem::Version
|
131
|
+
version: 4.0.0
|
118
132
|
prerelease: false
|
119
133
|
type: :runtime
|
120
134
|
- !ruby/object:Gem::Dependency
|
@@ -388,6 +402,7 @@ files:
|
|
388
402
|
- lib/metasploit_data_models/ip_address.rb
|
389
403
|
- lib/metasploit_data_models/ip_address/cidr.rb
|
390
404
|
- lib/metasploit_data_models/ip_address/range.rb
|
405
|
+
- lib/metasploit_data_models/match.rb
|
391
406
|
- lib/metasploit_data_models/match/child.rb
|
392
407
|
- lib/metasploit_data_models/match/parent.rb
|
393
408
|
- lib/metasploit_data_models/search.rb
|