contrast-agent 3.14.0 → 4.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ext/cs__assess_marshal_module/cs__assess_marshal_module.c +18 -15
- data/ext/cs__assess_marshal_module/cs__assess_marshal_module.h +1 -0
- data/ext/cs__assess_string/cs__assess_string.c +24 -25
- data/ext/cs__assess_string/cs__assess_string.h +3 -1
- data/ext/cs__common/cs__common.c +4 -2
- data/ext/cs__common/cs__common.h +1 -1
- data/lib/contrast.rb +1 -1
- data/lib/contrast/agent.rb +4 -12
- data/lib/contrast/agent/assess.rb +1 -0
- data/lib/contrast/agent/assess/contrast_event.rb +143 -79
- data/lib/contrast/agent/assess/events/source_event.rb +1 -1
- data/lib/contrast/agent/assess/finalizers/freeze.rb +3 -1
- data/lib/contrast/agent/assess/finalizers/hash.rb +45 -1
- data/lib/contrast/agent/assess/policy/dynamic_source_factory.rb +10 -3
- data/lib/contrast/agent/assess/policy/patcher.rb +1 -1
- data/lib/contrast/agent/assess/policy/policy.rb +0 -2
- data/lib/contrast/agent/assess/policy/policy_node.rb +15 -10
- data/lib/contrast/agent/assess/policy/policy_scanner.rb +19 -3
- data/lib/contrast/agent/assess/policy/preshift.rb +7 -11
- data/lib/contrast/agent/assess/policy/propagation_method.rb +50 -33
- data/lib/contrast/agent/assess/policy/propagator/append.rb +8 -5
- data/lib/contrast/agent/assess/policy/propagator/base.rb +1 -1
- data/lib/contrast/agent/assess/policy/propagator/center.rb +9 -5
- data/lib/contrast/agent/assess/policy/propagator/database_write.rb +5 -3
- data/lib/contrast/agent/assess/policy/propagator/insert.rb +7 -4
- data/lib/contrast/agent/assess/policy/propagator/keep.rb +4 -1
- data/lib/contrast/agent/assess/policy/propagator/match_data.rb +4 -7
- data/lib/contrast/agent/assess/policy/propagator/next.rb +7 -5
- data/lib/contrast/agent/assess/policy/propagator/prepend.rb +8 -5
- data/lib/contrast/agent/assess/policy/propagator/remove.rb +8 -4
- data/lib/contrast/agent/assess/policy/propagator/replace.rb +5 -2
- data/lib/contrast/agent/assess/policy/propagator/reverse.rb +7 -5
- data/lib/contrast/agent/assess/policy/propagator/select.rb +13 -7
- data/lib/contrast/agent/assess/policy/propagator/splat.rb +10 -9
- data/lib/contrast/agent/assess/policy/propagator/split.rb +24 -19
- data/lib/contrast/agent/assess/policy/propagator/substitution.rb +47 -31
- data/lib/contrast/agent/assess/policy/propagator/trim.rb +11 -5
- data/lib/contrast/agent/assess/policy/source_method.rb +85 -58
- data/lib/contrast/agent/assess/policy/trigger/reflected_xss.rb +16 -12
- data/lib/contrast/agent/assess/policy/trigger/xpath.rb +1 -1
- data/lib/contrast/agent/assess/policy/trigger_method.rb +76 -28
- data/lib/contrast/agent/assess/policy/trigger_node.rb +38 -43
- data/lib/contrast/agent/assess/policy/trigger_validation/ssrf_validator.rb +2 -1
- data/lib/contrast/agent/assess/properties.rb +2 -0
- data/lib/contrast/agent/assess/property/evented.rb +5 -18
- data/lib/contrast/agent/assess/property/tagged.rb +9 -3
- data/lib/contrast/agent/assess/property/updated.rb +131 -0
- data/lib/contrast/agent/assess/rule/provider/hardcoded_key.rb +58 -5
- data/lib/contrast/agent/assess/rule/provider/hardcoded_password.rb +23 -8
- data/lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb +83 -14
- data/lib/contrast/agent/assess/tag.rb +1 -1
- data/lib/contrast/agent/assess/tracker.rb +66 -0
- data/lib/contrast/agent/at_exit_hook.rb +5 -5
- data/lib/contrast/agent/class_reopener.rb +7 -5
- data/lib/contrast/agent/inventory.rb +15 -0
- data/lib/contrast/agent/inventory/dependencies.rb +50 -0
- data/lib/contrast/agent/inventory/dependency_analysis.rb +37 -0
- data/lib/contrast/agent/inventory/dependency_usage_analysis.rb +104 -0
- data/lib/contrast/agent/inventory/gemfile_digest_cache.rb +38 -0
- data/lib/contrast/agent/middleware.rb +1 -3
- data/lib/contrast/agent/patching/policy/after_load_patch.rb +5 -5
- data/lib/contrast/agent/patching/policy/after_load_patcher.rb +20 -20
- data/lib/contrast/agent/patching/policy/module_policy.rb +10 -10
- data/lib/contrast/agent/patching/policy/patch.rb +6 -0
- data/lib/contrast/agent/patching/policy/patcher.rb +13 -22
- data/lib/contrast/agent/patching/policy/policy.rb +17 -6
- data/lib/contrast/agent/protect/policy/applies_command_injection_rule.rb +3 -5
- data/lib/contrast/agent/protect/policy/applies_path_traversal_rule.rb +4 -3
- data/lib/contrast/agent/protect/policy/applies_xxe_rule.rb +1 -1
- data/lib/contrast/agent/protect/rule/cmd_injection.rb +9 -25
- data/lib/contrast/agent/protect/rule/no_sqli/mongo_no_sql_scanner.rb +1 -0
- data/lib/contrast/agent/request.rb +34 -34
- data/lib/contrast/agent/request_handler.rb +1 -1
- data/lib/contrast/agent/response.rb +17 -6
- data/lib/contrast/agent/rewriter.rb +1 -3
- data/lib/contrast/agent/scope.rb +59 -53
- data/lib/contrast/agent/static_analysis.rb +7 -7
- data/lib/contrast/agent/tracepoint_hook.rb +1 -1
- data/lib/contrast/agent/version.rb +1 -1
- data/lib/contrast/api/communication/messaging_queue.rb +1 -4
- data/lib/contrast/api/communication/socket_client.rb +36 -1
- data/lib/contrast/api/decorators.rb +3 -0
- data/lib/contrast/api/decorators/address.rb +13 -14
- data/lib/contrast/api/decorators/application_update.rb +2 -4
- data/lib/contrast/api/decorators/library.rb +53 -0
- data/lib/contrast/api/decorators/library_usage_update.rb +30 -0
- data/lib/contrast/api/decorators/message.rb +1 -0
- data/lib/contrast/api/decorators/trace_event.rb +25 -23
- data/lib/contrast/common_agent_configuration.rb +2 -1
- data/lib/contrast/components/agent.rb +6 -5
- data/lib/contrast/components/app_context.rb +49 -38
- data/lib/contrast/components/config.rb +30 -48
- data/lib/contrast/components/contrast_service.rb +9 -9
- data/lib/contrast/components/interface.rb +25 -3
- data/lib/contrast/components/inventory.rb +6 -1
- data/lib/contrast/components/scope.rb +49 -6
- data/lib/contrast/components/settings.rb +23 -23
- data/lib/contrast/config/application_configuration.rb +5 -2
- data/lib/contrast/config/inventory_configuration.rb +2 -2
- data/lib/contrast/config/service_configuration.rb +8 -0
- data/lib/contrast/configuration.rb +88 -47
- data/lib/contrast/extension/assess.rb +0 -2
- data/lib/contrast/extension/assess/array.rb +15 -8
- data/lib/contrast/extension/assess/erb.rb +11 -3
- data/lib/contrast/extension/assess/eval_trigger.rb +6 -6
- data/lib/contrast/extension/assess/exec_trigger.rb +1 -4
- data/lib/contrast/extension/assess/fiber.rb +12 -12
- data/lib/contrast/extension/assess/hash.rb +5 -6
- data/lib/contrast/extension/assess/kernel.rb +28 -23
- data/lib/contrast/extension/assess/marshal.rb +11 -6
- data/lib/contrast/extension/assess/regexp.rb +8 -7
- data/lib/contrast/extension/assess/string.rb +21 -21
- data/lib/contrast/extension/protect/kernel.rb +3 -3
- data/lib/contrast/framework/base_support.rb +1 -1
- data/lib/contrast/framework/manager.rb +3 -3
- data/lib/contrast/framework/rack/patch/session_cookie.rb +22 -28
- data/lib/contrast/framework/rails/patch/action_controller_live_buffer.rb +13 -13
- data/lib/contrast/framework/rails/patch/assess_configuration.rb +5 -11
- data/lib/contrast/framework/rails/patch/rails_application_configuration.rb +10 -10
- data/lib/contrast/framework/rails/patch/support.rb +1 -1
- data/lib/contrast/framework/rails/rewrite/action_controller_railties_helper_inherited.rb +11 -11
- data/lib/contrast/framework/rails/rewrite/active_record_attribute_methods_read.rb +12 -12
- data/lib/contrast/framework/rails/rewrite/active_record_named.rb +3 -3
- data/lib/contrast/framework/rails/rewrite/active_record_time_zone_inherited.rb +12 -12
- data/lib/contrast/framework/rails/support.rb +5 -0
- data/lib/contrast/framework/sinatra/patch/base.rb +11 -11
- data/lib/contrast/framework/sinatra/support.rb +4 -4
- data/lib/contrast/logger/application.rb +11 -3
- data/lib/contrast/logger/log.rb +7 -2
- data/lib/contrast/utils/assess/tracking_util.rb +48 -3
- data/lib/contrast/utils/duck_utils.rb +0 -10
- data/lib/contrast/utils/env_configuration_item.rb +2 -1
- data/lib/contrast/utils/invalid_configuration_util.rb +20 -21
- data/lib/contrast/utils/inventory_util.rb +0 -7
- data/lib/contrast/utils/sha256_builder.rb +0 -12
- data/lib/contrast/utils/string_utils.rb +10 -5
- data/resources/assess/policy.json +31 -22
- data/ruby-agent.gemspec +21 -18
- data/service_executables/VERSION +1 -1
- data/service_executables/linux/contrast-service +0 -0
- data/service_executables/mac/contrast-service +0 -0
- metadata +71 -30
- data/lib/contrast/agent/assess/finalizers/finalize.rb +0 -21
- data/lib/contrast/extension/assess/assess_extension.rb +0 -145
- data/lib/contrast/utils/boolean_util.rb +0 -30
- data/lib/contrast/utils/freeze_util.rb +0 -32
- data/lib/contrast/utils/gemfile_reader.rb +0 -193
@@ -1,193 +0,0 @@
|
|
1
|
-
# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
|
2
|
-
# frozen_string_literal: true
|
3
|
-
|
4
|
-
require 'set'
|
5
|
-
require 'contrast/utils/sha256_builder'
|
6
|
-
require 'contrast/utils/string_utils'
|
7
|
-
require 'contrast/components/interface'
|
8
|
-
require 'contrast/api'
|
9
|
-
|
10
|
-
module Contrast
|
11
|
-
module Utils
|
12
|
-
# GemfileReader has methods for extracting information from gem specs
|
13
|
-
# it also has a cache of library file digests to the lines of code found.
|
14
|
-
class GemfileReader
|
15
|
-
include Singleton
|
16
|
-
include Contrast::Components::Interface
|
17
|
-
|
18
|
-
access_component :config, :logging
|
19
|
-
|
20
|
-
CONTRAST_AGENT = 'contrast-agent'
|
21
|
-
|
22
|
-
def initialize
|
23
|
-
# Map of a Gem's Spec Digest to all loaded files from that Gem
|
24
|
-
@spec_to_files = {}
|
25
|
-
end
|
26
|
-
|
27
|
-
# the #clone is necessary here, as a require in another thread could
|
28
|
-
# potentially result in adding a key to the loaded_specs hash during
|
29
|
-
# iteration. (as in RUBY-330)
|
30
|
-
def loaded_specs
|
31
|
-
Gem.loaded_specs.clone
|
32
|
-
end
|
33
|
-
|
34
|
-
# indicates if there's been an update to library information, allowing us
|
35
|
-
# to only serialize this information on change.
|
36
|
-
def updated?
|
37
|
-
@updated
|
38
|
-
end
|
39
|
-
|
40
|
-
def updated!
|
41
|
-
@updated = true
|
42
|
-
end
|
43
|
-
|
44
|
-
# Once we're Contrasted, we intercept require calls to do inventory.
|
45
|
-
# In order to catch up, we do a one-time manual catchup, & inventory
|
46
|
-
# all the already-loaded gems.
|
47
|
-
def map_loaded_classes
|
48
|
-
loaded_specs.each do |name, spec|
|
49
|
-
# Don't count Contrast gems
|
50
|
-
next if contrast_gems.include? name
|
51
|
-
|
52
|
-
# Get a digest of the Gem file itself
|
53
|
-
next unless (digest = Contrast::Utils::Sha256Builder.build_from_spec(spec))
|
54
|
-
|
55
|
-
paths = get_by_digest(digest)
|
56
|
-
path = spec.full_gem_path
|
57
|
-
$LOADED_FEATURES.each do |line|
|
58
|
-
next unless line.cs__is_a?(String)
|
59
|
-
next unless line.start_with?(path)
|
60
|
-
|
61
|
-
logger.trace('Recording loaded gem for inventory analysis', line: line)
|
62
|
-
updated!
|
63
|
-
paths << adjust_lib(line)
|
64
|
-
end
|
65
|
-
end
|
66
|
-
end
|
67
|
-
|
68
|
-
def map_class path
|
69
|
-
path = adjust_lib(path)
|
70
|
-
|
71
|
-
return unless (spec = Gem::Specification.find_by_path(path))
|
72
|
-
return unless (digest = Contrast::Utils::Sha256Builder.build_from_spec(spec))
|
73
|
-
|
74
|
-
updated!
|
75
|
-
get_by_digest(digest) << path
|
76
|
-
end
|
77
|
-
|
78
|
-
def library_pb_list
|
79
|
-
loaded_specs.each_with_object([]) do |(name, spec), arr|
|
80
|
-
next if contrast_gems.include? name
|
81
|
-
next unless spec
|
82
|
-
next unless (digest = Contrast::Utils::Sha256Builder.build_from_spec(spec))
|
83
|
-
|
84
|
-
arr << build_library_pb(digest, spec)
|
85
|
-
end
|
86
|
-
end
|
87
|
-
|
88
|
-
def generate_library_usage activity = nil
|
89
|
-
return unless updated?
|
90
|
-
|
91
|
-
@spec_to_files.each_pair do |digest, files|
|
92
|
-
usage = Contrast::Api::Dtm::LibraryUsageUpdate.new
|
93
|
-
usage.hash_code = Contrast::Utils::StringUtils.force_utf8(digest)
|
94
|
-
activity.library_usages[usage.hash_code] = usage if activity
|
95
|
-
# TODO: RUBY-882 once TS switches to take filenames, remove the count setter and
|
96
|
-
# send the class names in usage.class_names
|
97
|
-
usage.count = files.size
|
98
|
-
end
|
99
|
-
# TODO: RUBY-882 once TS switches to take filenames, clear this and remove the
|
100
|
-
# @updated variable
|
101
|
-
|
102
|
-
# @spec_to_files.clear
|
103
|
-
@updated = false
|
104
|
-
end
|
105
|
-
|
106
|
-
private
|
107
|
-
|
108
|
-
# marker for the lib dir in an absolute file path. purposefully includes
|
109
|
-
# the trailing '/'
|
110
|
-
LIB = '/lib/'
|
111
|
-
|
112
|
-
# Kernel#load uses the absolute path, but Gems / Specs use the path after
|
113
|
-
# `/lib`. This method accounts for that and trims out the `/lib/` section
|
114
|
-
# and starts with the first `/` after and the trailing file extension, if
|
115
|
-
# present.
|
116
|
-
#
|
117
|
-
# @param path [String] the path to parse
|
118
|
-
# @return [String] the relative path of the file, after the lib directory
|
119
|
-
def adjust_lib path
|
120
|
-
idx = path.index(LIB)
|
121
|
-
path = path[(idx + 4)..-1] if idx
|
122
|
-
idx = path.rindex(Contrast::Utils::ObjectShare::PERIOD)
|
123
|
-
path = path[0..idx] if idx
|
124
|
-
path
|
125
|
-
end
|
126
|
-
|
127
|
-
def get_by_digest digest
|
128
|
-
@spec_to_files[digest] = Set.new unless @spec_to_files.key?(digest)
|
129
|
-
@spec_to_files[digest]
|
130
|
-
end
|
131
|
-
|
132
|
-
def build_library_pb digest, spec
|
133
|
-
lib = Contrast::Api::Dtm::Library.new
|
134
|
-
lib.file_path = Contrast::Utils::StringUtils.force_utf8(spec.name)
|
135
|
-
lib.hash_code = Contrast::Utils::StringUtils.force_utf8(digest)
|
136
|
-
lib.version = Contrast::Utils::StringUtils.force_utf8(spec.version)
|
137
|
-
lib.manifest = Contrast::Utils::StringUtils.force_utf8(build_manifest(spec))
|
138
|
-
lib.external_ms = date_to_ms(spec.date)
|
139
|
-
lib.internal_ms = lib.external_ms
|
140
|
-
lib.url = Contrast::Utils::StringUtils.force_utf8(spec.homepage)
|
141
|
-
# Library tags are appended in the ApplicationUpdate delegator
|
142
|
-
update_class_counts(lib, digest, spec)
|
143
|
-
lib
|
144
|
-
end
|
145
|
-
|
146
|
-
def date_to_ms date
|
147
|
-
(date.to_f * 1000.0).to_i
|
148
|
-
end
|
149
|
-
|
150
|
-
def update_class_counts lib, digest, spec
|
151
|
-
# Updating the class counts
|
152
|
-
path = spec.full_gem_path.to_s
|
153
|
-
lib.class_count = all_files(path).length
|
154
|
-
lib.used_class_count = @spec_to_files.key?(digest) ? get_by_digest(digest).size : 0
|
155
|
-
lib
|
156
|
-
end
|
157
|
-
|
158
|
-
def build_manifest spec
|
159
|
-
Contrast::Utils::StringUtils.force_utf8(spec.to_yaml.to_s) if defined?(YAML)
|
160
|
-
rescue StandardError
|
161
|
-
nil
|
162
|
-
end
|
163
|
-
|
164
|
-
# These are all the code files that are located in the Gem directory loaded
|
165
|
-
# by the current environment; this includes more than Ruby files
|
166
|
-
def all_files path
|
167
|
-
Contrast::Utils::Sha256Builder.instance.files(path)
|
168
|
-
end
|
169
|
-
|
170
|
-
# Go through all dependents, given as a pair from the DependencyList: `dependency`
|
171
|
-
# is the dependency itself, filled with all its specs. `dependents` is the array of reverse
|
172
|
-
# dependencies for the aforementioned dependency. If the dependency is also in contrast_dep_set,
|
173
|
-
# then contrast depends on it. If its array of dependents is 1, then contrast is the
|
174
|
-
# only dependency in that list. Since only contrast depends on it, we should ignore it.
|
175
|
-
def contrast_gems
|
176
|
-
@_contrast_gems ||= find_contrast_gems
|
177
|
-
end
|
178
|
-
|
179
|
-
def find_contrast_gems
|
180
|
-
ignore = Set.new([CONTRAST_AGENT])
|
181
|
-
contrast_specs = Gem::DependencyList.from_specs.specs.find do |dependency|
|
182
|
-
dependency.name == CONTRAST_AGENT
|
183
|
-
end
|
184
|
-
contrast_dep_set = contrast_specs.dependencies.map(&:name).to_set
|
185
|
-
|
186
|
-
Gem::DependencyList.from_specs.spec_predecessors.each_pair do |dependency, dependents|
|
187
|
-
ignore.add(dependency.name) if contrast_dep_set.include?(dependency.name) && dependents.length == 1
|
188
|
-
end
|
189
|
-
ignore
|
190
|
-
end
|
191
|
-
end
|
192
|
-
end
|
193
|
-
end
|