contrast-agent 4.14.0 → 5.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (422) hide show
  1. checksums.yaml +4 -4
  2. data/.simplecov +2 -3
  3. data/Gemfile +1 -1
  4. data/LICENSE.txt +1 -1
  5. data/Rakefile +1 -1
  6. data/exe/contrast_service +1 -1
  7. data/ext/build_funchook.rb +1 -1
  8. data/ext/cs__assess_array/cs__assess_array.c +1 -1
  9. data/ext/cs__assess_array/extconf.rb +1 -1
  10. data/ext/cs__assess_basic_object/cs__assess_basic_object.c +1 -1
  11. data/ext/cs__assess_basic_object/extconf.rb +1 -1
  12. data/ext/cs__assess_fiber_track/cs__assess_fiber_track.c +1 -1
  13. data/ext/cs__assess_fiber_track/extconf.rb +1 -1
  14. data/ext/cs__assess_hash/cs__assess_hash.c +1 -1
  15. data/ext/cs__assess_hash/extconf.rb +1 -1
  16. data/ext/cs__assess_kernel/cs__assess_kernel.c +8 -5
  17. data/ext/cs__assess_kernel/extconf.rb +1 -1
  18. data/ext/cs__assess_marshal_module/cs__assess_marshal_module.c +1 -1
  19. data/ext/cs__assess_marshal_module/extconf.rb +1 -1
  20. data/ext/cs__assess_module/cs__assess_module.c +49 -39
  21. data/ext/cs__assess_module/extconf.rb +1 -1
  22. data/ext/cs__assess_regexp/cs__assess_regexp.c +1 -1
  23. data/ext/cs__assess_regexp/extconf.rb +1 -1
  24. data/ext/cs__assess_string/cs__assess_string.c +1 -1
  25. data/ext/cs__assess_string/extconf.rb +1 -1
  26. data/ext/cs__assess_string_interpolation26/cs__assess_string_interpolation26.c +1 -1
  27. data/ext/cs__assess_string_interpolation26/extconf.rb +1 -1
  28. data/ext/cs__assess_yield_track/cs__assess_yield_track.c +1 -1
  29. data/ext/cs__assess_yield_track/extconf.rb +1 -1
  30. data/ext/cs__common/cs__common.c +5 -1
  31. data/ext/cs__common/cs__common.h +1 -0
  32. data/ext/cs__common/extconf.rb +1 -1
  33. data/ext/cs__contrast_patch/cs__contrast_patch.c +53 -28
  34. data/ext/cs__contrast_patch/cs__contrast_patch.h +2 -0
  35. data/ext/cs__contrast_patch/extconf.rb +1 -1
  36. data/ext/cs__os_information/cs__os_information.c +1 -1
  37. data/ext/cs__os_information/extconf.rb +1 -1
  38. data/ext/cs__scope/cs__scope.c +747 -0
  39. data/ext/cs__scope/cs__scope.h +88 -0
  40. data/ext/{cs__assess_active_record_named → cs__scope}/extconf.rb +1 -1
  41. data/ext/extconf_common.rb +1 -1
  42. data/lib/contrast/agent/assess/contrast_event.rb +27 -24
  43. data/lib/contrast/agent/assess/contrast_object.rb +5 -2
  44. data/lib/contrast/agent/assess/events/event_data.rb +30 -0
  45. data/lib/contrast/agent/assess/events/event_factory.rb +14 -6
  46. data/lib/contrast/agent/assess/events/source_event.rb +22 -3
  47. data/lib/contrast/agent/assess/finalizers/freeze.rb +1 -1
  48. data/lib/contrast/agent/assess/finalizers/hash.rb +1 -1
  49. data/lib/contrast/agent/assess/policy/dynamic_source_factory.rb +7 -7
  50. data/lib/contrast/agent/assess/policy/patcher.rb +1 -35
  51. data/lib/contrast/agent/assess/policy/policy.rb +1 -1
  52. data/lib/contrast/agent/assess/policy/policy_node.rb +2 -2
  53. data/lib/contrast/agent/assess/policy/policy_scanner.rb +1 -1
  54. data/lib/contrast/agent/assess/policy/preshift.rb +1 -1
  55. data/lib/contrast/agent/assess/policy/propagation_method.rb +55 -28
  56. data/lib/contrast/agent/assess/policy/propagation_node.rb +3 -6
  57. data/lib/contrast/agent/assess/policy/propagator/append.rb +1 -1
  58. data/lib/contrast/agent/assess/policy/propagator/base.rb +1 -1
  59. data/lib/contrast/agent/assess/policy/propagator/center.rb +1 -1
  60. data/lib/contrast/agent/assess/policy/propagator/custom.rb +1 -1
  61. data/lib/contrast/agent/assess/policy/propagator/database_write.rb +6 -2
  62. data/lib/contrast/agent/assess/policy/propagator/insert.rb +5 -2
  63. data/lib/contrast/agent/assess/policy/propagator/keep.rb +1 -1
  64. data/lib/contrast/agent/assess/policy/propagator/match_data.rb +13 -3
  65. data/lib/contrast/agent/assess/policy/propagator/next.rb +1 -1
  66. data/lib/contrast/agent/assess/policy/propagator/prepend.rb +1 -1
  67. data/lib/contrast/agent/assess/policy/propagator/rack_protection.rb +1 -1
  68. data/lib/contrast/agent/assess/policy/propagator/remove.rb +1 -1
  69. data/lib/contrast/agent/assess/policy/propagator/replace.rb +1 -1
  70. data/lib/contrast/agent/assess/policy/propagator/reverse.rb +1 -1
  71. data/lib/contrast/agent/assess/policy/propagator/select.rb +3 -2
  72. data/lib/contrast/agent/assess/policy/propagator/splat.rb +1 -1
  73. data/lib/contrast/agent/assess/policy/propagator/split.rb +27 -25
  74. data/lib/contrast/agent/assess/policy/propagator/substitution.rb +3 -5
  75. data/lib/contrast/agent/assess/policy/propagator/substitution_utils.rb +190 -0
  76. data/lib/contrast/agent/assess/policy/propagator/trim.rb +9 -4
  77. data/lib/contrast/agent/assess/policy/propagator.rb +1 -1
  78. data/lib/contrast/agent/assess/policy/source_method.rb +39 -26
  79. data/lib/contrast/agent/assess/policy/source_node.rb +1 -1
  80. data/lib/contrast/agent/assess/policy/source_validation/cross_site_validator.rb +1 -1
  81. data/lib/contrast/agent/assess/policy/source_validation/source_validation.rb +1 -1
  82. data/lib/contrast/agent/assess/policy/trigger/reflected_xss.rb +7 -2
  83. data/lib/contrast/agent/assess/policy/trigger/xpath.rb +1 -1
  84. data/lib/contrast/agent/assess/policy/trigger_method.rb +41 -25
  85. data/lib/contrast/agent/assess/policy/trigger_node.rb +1 -1
  86. data/lib/contrast/agent/assess/policy/trigger_validation/redos_validator.rb +1 -1
  87. data/lib/contrast/agent/assess/policy/trigger_validation/ssrf_validator.rb +1 -1
  88. data/lib/contrast/agent/assess/policy/trigger_validation/trigger_validation.rb +1 -1
  89. data/lib/contrast/agent/assess/policy/trigger_validation/xss_validator.rb +1 -1
  90. data/lib/contrast/agent/assess/properties.rb +1 -1
  91. data/lib/contrast/agent/assess/property/evented.rb +25 -12
  92. data/lib/contrast/agent/assess/property/tagged.rb +1 -1
  93. data/lib/contrast/agent/assess/property/updated.rb +1 -1
  94. data/lib/contrast/agent/assess/rule/provider/hardcoded_key.rb +1 -19
  95. data/lib/contrast/agent/assess/rule/provider/hardcoded_password.rb +1 -13
  96. data/lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb +7 -59
  97. data/lib/contrast/agent/assess/rule/provider.rb +1 -1
  98. data/lib/contrast/agent/assess/rule/response/auto_complete_rule.rb +69 -0
  99. data/lib/contrast/agent/assess/rule/response/base_rule.rb +130 -0
  100. data/lib/contrast/agent/assess/rule/response/body_rule.rb +109 -0
  101. data/lib/contrast/agent/assess/rule/response/cache_control_header_rule.rb +157 -0
  102. data/lib/contrast/agent/assess/rule/response/click_jacking_header_rule.rb +26 -0
  103. data/lib/contrast/agent/assess/rule/response/csp_header_insecure_rule.rb +100 -0
  104. data/lib/contrast/agent/assess/rule/response/csp_header_missing_rule.rb +26 -0
  105. data/lib/contrast/agent/assess/rule/response/framework/rails_support.rb +29 -0
  106. data/lib/contrast/agent/assess/rule/response/header_rule.rb +70 -0
  107. data/lib/contrast/agent/assess/rule/response/hsts_header_rule.rb +36 -0
  108. data/lib/contrast/agent/assess/rule/response/parameters_pollution_rule.rb +61 -0
  109. data/lib/contrast/agent/assess/rule/response/x_content_type_header_rule.rb +26 -0
  110. data/lib/contrast/agent/assess/rule/response/x_xss_protection_header_rule.rb +36 -0
  111. data/lib/contrast/agent/assess/tag.rb +1 -1
  112. data/lib/contrast/agent/assess/tracker.rb +1 -1
  113. data/lib/contrast/agent/assess.rb +1 -2
  114. data/lib/contrast/agent/at_exit_hook.rb +1 -1
  115. data/lib/contrast/agent/deadzone/policy/deadzone_node.rb +13 -8
  116. data/lib/contrast/agent/deadzone/policy/policy.rb +1 -1
  117. data/lib/contrast/agent/disable_reaction.rb +1 -1
  118. data/lib/contrast/agent/exclusion_matcher.rb +1 -1
  119. data/lib/contrast/agent/inventory/database_config.rb +115 -77
  120. data/lib/contrast/agent/inventory/dependencies.rb +1 -1
  121. data/lib/contrast/agent/inventory/dependency_analysis.rb +1 -1
  122. data/lib/contrast/agent/inventory/dependency_usage_analysis.rb +3 -3
  123. data/lib/contrast/agent/inventory/policy/datastores.rb +1 -1
  124. data/lib/contrast/agent/inventory/policy/policy.rb +1 -1
  125. data/lib/contrast/agent/inventory/policy/trigger_node.rb +1 -1
  126. data/lib/contrast/agent/inventory.rb +1 -1
  127. data/lib/contrast/agent/metric_telemetry_event.rb +1 -1
  128. data/lib/contrast/agent/middleware.rb +4 -2
  129. data/lib/contrast/agent/module_data.rb +1 -1
  130. data/lib/contrast/agent/patching/policy/after_load_patch.rb +1 -1
  131. data/lib/contrast/agent/patching/policy/after_load_patcher.rb +2 -4
  132. data/lib/contrast/agent/patching/policy/method_policy.rb +28 -15
  133. data/lib/contrast/agent/patching/policy/method_policy_extend.rb +12 -10
  134. data/lib/contrast/agent/patching/policy/module_policy.rb +1 -1
  135. data/lib/contrast/agent/patching/policy/patch.rb +3 -7
  136. data/lib/contrast/agent/patching/policy/patch_status.rb +2 -26
  137. data/lib/contrast/agent/patching/policy/patcher.rb +2 -6
  138. data/lib/contrast/agent/patching/policy/policy.rb +1 -1
  139. data/lib/contrast/agent/patching/policy/policy_node.rb +1 -1
  140. data/lib/contrast/agent/patching/policy/trigger_node.rb +1 -1
  141. data/lib/contrast/agent/protect/input_analyzer/input_analyzer.rb +94 -0
  142. data/lib/contrast/agent/protect/policy/applies_command_injection_rule.rb +1 -1
  143. data/lib/contrast/agent/protect/policy/applies_deserialization_rule.rb +1 -1
  144. data/lib/contrast/agent/protect/policy/applies_no_sqli_rule.rb +1 -1
  145. data/lib/contrast/agent/protect/policy/applies_path_traversal_rule.rb +1 -1
  146. data/lib/contrast/agent/protect/policy/applies_sqli_rule.rb +1 -1
  147. data/lib/contrast/agent/protect/policy/applies_xxe_rule.rb +1 -1
  148. data/lib/contrast/agent/protect/policy/policy.rb +1 -1
  149. data/lib/contrast/agent/protect/policy/rule_applicator.rb +1 -1
  150. data/lib/contrast/agent/protect/policy/trigger_node.rb +1 -1
  151. data/lib/contrast/agent/protect/rule/base.rb +29 -2
  152. data/lib/contrast/agent/protect/rule/base_service.rb +11 -2
  153. data/lib/contrast/agent/protect/rule/cmd_injection.rb +3 -1
  154. data/lib/contrast/agent/protect/rule/default_scanner.rb +1 -1
  155. data/lib/contrast/agent/protect/rule/deserialization.rb +7 -1
  156. data/lib/contrast/agent/protect/rule/http_method_tampering.rb +6 -2
  157. data/lib/contrast/agent/protect/rule/no_sqli/mongo_no_sql_scanner.rb +1 -1
  158. data/lib/contrast/agent/protect/rule/no_sqli.rb +2 -1
  159. data/lib/contrast/agent/protect/rule/path_traversal.rb +2 -1
  160. data/lib/contrast/agent/protect/rule/sql_sample_builder.rb +1 -1
  161. data/lib/contrast/agent/protect/rule/sqli/default_sql_scanner.rb +1 -1
  162. data/lib/contrast/agent/protect/rule/sqli/mysql_sql_scanner.rb +1 -1
  163. data/lib/contrast/agent/protect/rule/sqli/postgres_sql_scanner.rb +2 -2
  164. data/lib/contrast/agent/protect/rule/sqli/sqli_input_classification.rb +124 -0
  165. data/lib/contrast/agent/protect/rule/sqli/sqli_worth_watching.rb +121 -0
  166. data/lib/contrast/agent/protect/rule/sqli/sqlite_sql_scanner.rb +1 -1
  167. data/lib/contrast/agent/protect/rule/sqli.rb +34 -1
  168. data/lib/contrast/agent/protect/rule/unsafe_file_upload.rb +1 -1
  169. data/lib/contrast/agent/protect/rule/xss.rb +1 -1
  170. data/lib/contrast/agent/protect/rule/xxe/entity_wrapper.rb +1 -1
  171. data/lib/contrast/agent/protect/rule/xxe.rb +5 -1
  172. data/lib/contrast/agent/protect/rule.rb +1 -1
  173. data/lib/contrast/agent/reaction_processor.rb +1 -1
  174. data/lib/contrast/agent/reporting/input_analysis/input_analysis.rb +44 -0
  175. data/lib/contrast/agent/reporting/input_analysis/input_analysis_result.rb +115 -0
  176. data/lib/contrast/agent/reporting/input_analysis/input_type.rb +44 -0
  177. data/lib/contrast/agent/reporting/input_analysis/score_level.rb +21 -0
  178. data/lib/contrast/agent/reporting/report.rb +8 -1
  179. data/lib/contrast/agent/reporting/reporter.rb +27 -47
  180. data/lib/contrast/agent/reporting/reporting_events/application_inventory.rb +49 -0
  181. data/lib/contrast/agent/reporting/reporting_events/application_update.rb +82 -0
  182. data/lib/contrast/agent/reporting/reporting_events/architecture_component.rb +80 -0
  183. data/lib/contrast/agent/reporting/reporting_events/discovered_route.rb +59 -0
  184. data/lib/contrast/agent/reporting/reporting_events/finding.rb +181 -43
  185. data/lib/contrast/agent/reporting/reporting_events/finding_event.rb +293 -0
  186. data/lib/contrast/agent/reporting/reporting_events/finding_event_object.rb +94 -0
  187. data/lib/contrast/agent/reporting/reporting_events/finding_event_parent_object.rb +39 -0
  188. data/lib/contrast/agent/reporting/reporting_events/finding_event_property.rb +40 -0
  189. data/lib/contrast/agent/reporting/reporting_events/finding_event_signature.rb +110 -0
  190. data/lib/contrast/agent/reporting/reporting_events/finding_event_source.rb +61 -0
  191. data/lib/contrast/agent/reporting/reporting_events/finding_event_stack.rb +71 -0
  192. data/lib/contrast/agent/reporting/reporting_events/finding_event_taint_range.rb +60 -0
  193. data/lib/contrast/agent/reporting/reporting_events/finding_request.rb +94 -0
  194. data/lib/contrast/agent/reporting/reporting_events/library_discovery.rb +93 -0
  195. data/lib/contrast/agent/reporting/reporting_events/library_usage_observation.rb +50 -0
  196. data/lib/contrast/agent/reporting/reporting_events/observed_library_usage.rb +54 -0
  197. data/lib/contrast/agent/reporting/reporting_events/observed_route.rb +66 -0
  198. data/lib/contrast/agent/reporting/reporting_events/poll.rb +29 -0
  199. data/lib/contrast/agent/reporting/reporting_events/preflight.rb +20 -6
  200. data/lib/contrast/agent/reporting/reporting_events/preflight_message.rb +36 -17
  201. data/lib/contrast/agent/reporting/reporting_events/reporting_event.rb +29 -18
  202. data/lib/contrast/agent/reporting/reporting_events/route_coverage.rb +76 -0
  203. data/lib/contrast/agent/reporting/reporting_events/route_discovery.rb +67 -0
  204. data/lib/contrast/agent/reporting/reporting_events/route_discovery_observation.rb +65 -0
  205. data/lib/contrast/agent/reporting/reporting_events/server_activity.rb +52 -0
  206. data/lib/contrast/agent/reporting/reporting_events/trace_event_source.rb +30 -0
  207. data/lib/contrast/agent/reporting/reporting_utilities/audit.rb +32 -15
  208. data/lib/contrast/agent/reporting/reporting_utilities/dtm_message.rb +67 -0
  209. data/lib/contrast/agent/reporting/reporting_utilities/endpoints.rb +164 -0
  210. data/lib/contrast/agent/reporting/reporting_utilities/headers.rb +55 -0
  211. data/lib/contrast/agent/reporting/reporting_utilities/reporter_client.rb +75 -156
  212. data/lib/contrast/agent/reporting/reporting_utilities/reporter_client_utils.rb +162 -0
  213. data/lib/contrast/agent/reporting/reporting_utilities/reporting_storage.rb +1 -1
  214. data/lib/contrast/agent/reporting/reporting_utilities/response.rb +30 -0
  215. data/lib/contrast/agent/reporting/reporting_utilities/response_handler.rb +57 -0
  216. data/lib/contrast/agent/reporting/reporting_utilities/response_handler_utils.rb +208 -0
  217. data/lib/contrast/agent/reporting/settings/application_settings.rb +67 -0
  218. data/lib/contrast/agent/reporting/settings/assess.rb +45 -0
  219. data/lib/contrast/agent/reporting/settings/assess_server_feature.rb +136 -0
  220. data/lib/contrast/agent/reporting/settings/exclusions.rb +123 -0
  221. data/lib/contrast/agent/reporting/settings/protect.rb +89 -0
  222. data/lib/contrast/agent/reporting/settings/protect_server_feature.rb +243 -0
  223. data/lib/contrast/agent/reporting/settings/reaction.rb +30 -0
  224. data/lib/contrast/agent/reporting/settings/server_features.rb +78 -0
  225. data/lib/contrast/agent/request.rb +44 -3
  226. data/lib/contrast/agent/request_context.rb +25 -7
  227. data/lib/contrast/agent/request_context_extend.rb +109 -7
  228. data/lib/contrast/agent/request_handler.rb +41 -5
  229. data/lib/contrast/agent/response.rb +23 -15
  230. data/lib/contrast/agent/rule_set.rb +1 -1
  231. data/lib/contrast/agent/scope.rb +103 -108
  232. data/lib/contrast/agent/service_heartbeat.rb +46 -3
  233. data/lib/contrast/agent/startup_metrics_telemetry_event.rb +34 -7
  234. data/lib/contrast/agent/static_analysis.rb +13 -3
  235. data/lib/contrast/agent/telemetry.rb +1 -1
  236. data/lib/contrast/agent/telemetry_event.rb +1 -1
  237. data/lib/contrast/agent/thread.rb +1 -1
  238. data/lib/contrast/agent/thread_watcher.rb +3 -3
  239. data/lib/contrast/agent/tracepoint_hook.rb +1 -4
  240. data/lib/contrast/agent/version.rb +2 -2
  241. data/lib/contrast/agent/worker_thread.rb +1 -1
  242. data/lib/contrast/agent.rb +4 -4
  243. data/lib/contrast/api/communication/connection_status.rb +1 -1
  244. data/lib/contrast/api/communication/messaging_queue.rb +4 -4
  245. data/lib/contrast/api/communication/response_processor.rb +9 -5
  246. data/lib/contrast/api/communication/service_lifecycle.rb +1 -1
  247. data/lib/contrast/api/communication/socket.rb +1 -1
  248. data/lib/contrast/api/communication/socket_client.rb +4 -1
  249. data/lib/contrast/api/communication/speedracer.rb +1 -1
  250. data/lib/contrast/api/communication/tcp_socket.rb +1 -1
  251. data/lib/contrast/api/communication/unix_socket.rb +1 -1
  252. data/lib/contrast/api/communication.rb +1 -1
  253. data/lib/contrast/api/decorators/address.rb +1 -1
  254. data/lib/contrast/api/decorators/agent_startup.rb +1 -1
  255. data/lib/contrast/api/decorators/application_settings.rb +1 -1
  256. data/lib/contrast/api/decorators/application_startup.rb +1 -1
  257. data/lib/contrast/api/decorators/application_update.rb +1 -1
  258. data/lib/contrast/api/decorators/architecture_component.rb +36 -0
  259. data/lib/contrast/api/decorators/bot_blocker.rb +37 -0
  260. data/lib/contrast/api/decorators/finding.rb +1 -17
  261. data/lib/contrast/api/decorators/http_request.rb +3 -2
  262. data/lib/contrast/api/decorators/input_analysis.rb +1 -1
  263. data/lib/contrast/api/decorators/instrumentation_mode.rb +1 -1
  264. data/lib/contrast/api/decorators/ip_denylist.rb +37 -0
  265. data/lib/contrast/api/decorators/library.rb +1 -1
  266. data/lib/contrast/api/decorators/library_usage_update.rb +1 -1
  267. data/lib/contrast/api/decorators/message.rb +1 -1
  268. data/lib/contrast/api/decorators/rasp_rule_sample.rb +30 -1
  269. data/lib/contrast/api/decorators/route_coverage.rb +1 -1
  270. data/lib/contrast/api/decorators/server_features.rb +1 -1
  271. data/lib/contrast/api/decorators/trace_event.rb +1 -1
  272. data/lib/contrast/api/decorators/trace_event_object.rb +1 -1
  273. data/lib/contrast/api/decorators/trace_event_signature.rb +1 -1
  274. data/lib/contrast/api/decorators/trace_taint_range.rb +1 -1
  275. data/lib/contrast/api/decorators/trace_taint_range_tags.rb +1 -1
  276. data/lib/contrast/api/decorators/user_input.rb +12 -2
  277. data/lib/contrast/api/decorators/virtual_patch.rb +34 -0
  278. data/lib/contrast/api/decorators.rb +2 -1
  279. data/lib/contrast/api.rb +1 -1
  280. data/lib/contrast/components/agent.rb +5 -24
  281. data/lib/contrast/components/api.rb +18 -9
  282. data/lib/contrast/components/app_context.rb +2 -1
  283. data/lib/contrast/components/app_context_extend.rb +1 -1
  284. data/lib/contrast/components/assess.rb +12 -8
  285. data/lib/contrast/components/base.rb +1 -1
  286. data/lib/contrast/components/config.rb +30 -15
  287. data/lib/contrast/components/contrast_service.rb +1 -1
  288. data/lib/contrast/components/heap_dump.rb +1 -1
  289. data/lib/contrast/components/inventory.rb +5 -1
  290. data/lib/contrast/components/logger.rb +6 -1
  291. data/lib/contrast/components/protect.rb +10 -4
  292. data/lib/contrast/components/sampling.rb +1 -1
  293. data/lib/contrast/components/scope.rb +99 -92
  294. data/lib/contrast/components/settings.rb +25 -12
  295. data/lib/contrast/config/agent_configuration.rb +59 -13
  296. data/lib/contrast/config/api_configuration.rb +101 -13
  297. data/lib/contrast/config/api_proxy_configuration.rb +56 -4
  298. data/lib/contrast/config/application_configuration.rb +115 -16
  299. data/lib/contrast/config/assess_configuration.rb +107 -13
  300. data/lib/contrast/config/assess_rules_configuration.rb +45 -4
  301. data/lib/contrast/config/base_configuration.rb +2 -1
  302. data/lib/contrast/config/certification_configuration.rb +75 -4
  303. data/lib/contrast/config/env_variables.rb +1 -1
  304. data/lib/contrast/config/exception_configuration.rb +62 -4
  305. data/lib/contrast/config/heap_dump_configuration.rb +102 -18
  306. data/lib/contrast/config/inventory_configuration.rb +65 -4
  307. data/lib/contrast/config/logger_configuration.rb +47 -4
  308. data/lib/contrast/config/protect_configuration.rb +1 -1
  309. data/lib/contrast/config/protect_rule_configuration.rb +37 -10
  310. data/lib/contrast/config/protect_rules_configuration.rb +121 -18
  311. data/lib/contrast/config/request_audit_configuration.rb +69 -4
  312. data/lib/contrast/config/root_configuration.rb +1 -1
  313. data/lib/contrast/config/ruby_configuration.rb +97 -20
  314. data/lib/contrast/config/sampling_configuration.rb +77 -11
  315. data/lib/contrast/config/server_configuration.rb +57 -12
  316. data/lib/contrast/config/service_configuration.rb +1 -1
  317. data/lib/contrast/config.rb +1 -1
  318. data/lib/contrast/configuration.rb +7 -4
  319. data/lib/contrast/extension/assess/array.rb +4 -2
  320. data/lib/contrast/extension/assess/erb.rb +32 -5
  321. data/lib/contrast/extension/assess/eval_trigger.rb +3 -1
  322. data/lib/contrast/extension/assess/exec_trigger.rb +2 -1
  323. data/lib/contrast/extension/assess/fiber.rb +6 -3
  324. data/lib/contrast/extension/assess/hash.rb +1 -1
  325. data/lib/contrast/extension/assess/kernel.rb +8 -3
  326. data/lib/contrast/extension/assess/marshal.rb +6 -2
  327. data/lib/contrast/extension/assess/regexp.rb +8 -2
  328. data/lib/contrast/extension/assess/string.rb +8 -2
  329. data/lib/contrast/extension/assess.rb +1 -1
  330. data/lib/contrast/extension/delegator.rb +1 -1
  331. data/lib/contrast/extension/extension.rb +2 -4
  332. data/lib/contrast/extension/inventory.rb +1 -1
  333. data/lib/contrast/extension/module.rb +1 -1
  334. data/lib/contrast/extension/protect/psych.rb +1 -1
  335. data/lib/contrast/extension/protect.rb +1 -1
  336. data/lib/contrast/extension/thread.rb +32 -13
  337. data/lib/contrast/framework/base_support.rb +5 -1
  338. data/lib/contrast/framework/grape/support.rb +25 -1
  339. data/lib/contrast/framework/manager.rb +26 -5
  340. data/lib/contrast/framework/manager_extend.rb +1 -1
  341. data/lib/contrast/framework/platform_version.rb +1 -1
  342. data/lib/contrast/framework/rack/patch/session_cookie.rb +1 -1
  343. data/lib/contrast/framework/rack/patch/support.rb +1 -1
  344. data/lib/contrast/framework/rack/support.rb +1 -1
  345. data/lib/contrast/framework/rails/patch/action_controller_live_buffer.rb +1 -1
  346. data/lib/contrast/framework/rails/patch/assess_configuration.rb +1 -1
  347. data/lib/contrast/framework/rails/patch/rails_application_configuration.rb +1 -1
  348. data/lib/contrast/framework/rails/patch/support.rb +1 -1
  349. data/lib/contrast/framework/rails/railtie.rb +1 -1
  350. data/lib/contrast/framework/rails/support.rb +46 -2
  351. data/lib/contrast/framework/sinatra/support.rb +24 -2
  352. data/lib/contrast/funchook/funchook.rb +21 -18
  353. data/lib/contrast/logger/application.rb +1 -1
  354. data/lib/contrast/logger/cef_log.rb +151 -0
  355. data/lib/contrast/logger/format.rb +1 -1
  356. data/lib/contrast/logger/log.rb +1 -1
  357. data/lib/contrast/logger/request.rb +1 -1
  358. data/lib/contrast/logger/time.rb +1 -1
  359. data/lib/contrast/security_exception.rb +1 -1
  360. data/lib/contrast/tasks/config.rb +1 -1
  361. data/lib/contrast/tasks/service.rb +1 -1
  362. data/lib/contrast/utils/assess/propagation_method_utils.rb +1 -1
  363. data/lib/contrast/utils/assess/property/tagged_utils.rb +1 -1
  364. data/lib/contrast/utils/assess/sampling_util.rb +4 -4
  365. data/lib/contrast/utils/assess/source_method_utils.rb +1 -1
  366. data/lib/contrast/utils/assess/split_utils.rb +23 -0
  367. data/lib/contrast/utils/assess/tracking_util.rb +1 -1
  368. data/lib/contrast/utils/assess/trigger_method_utils.rb +3 -2
  369. data/lib/contrast/utils/class_util.rb +1 -1
  370. data/lib/contrast/utils/duck_utils.rb +1 -1
  371. data/lib/contrast/utils/env_configuration_item.rb +2 -2
  372. data/lib/contrast/utils/exclude_key.rb +1 -1
  373. data/lib/contrast/utils/findings.rb +5 -2
  374. data/lib/contrast/utils/hash_digest.rb +44 -6
  375. data/lib/contrast/utils/hash_digest_extend.rb +44 -1
  376. data/lib/contrast/utils/head_dump_utils_extend.rb +1 -1
  377. data/lib/contrast/utils/heap_dump_util.rb +1 -1
  378. data/lib/contrast/utils/invalid_configuration_util.rb +6 -5
  379. data/lib/contrast/utils/io_util.rb +1 -1
  380. data/lib/contrast/utils/job_servers_running.rb +1 -1
  381. data/lib/contrast/utils/log_utils.rb +115 -1
  382. data/lib/contrast/utils/lru_cache.rb +1 -1
  383. data/lib/contrast/utils/metrics_hash.rb +2 -2
  384. data/lib/contrast/utils/middleware_utils.rb +7 -8
  385. data/lib/contrast/utils/net_http_base.rb +26 -16
  386. data/lib/contrast/utils/object_share.rb +1 -6
  387. data/lib/contrast/utils/os.rb +9 -5
  388. data/lib/contrast/utils/patching/policy/patch_utils.rb +62 -102
  389. data/lib/contrast/utils/patching/policy/patcher_utils.rb +1 -1
  390. data/lib/contrast/utils/preflight_util.rb +1 -1
  391. data/lib/contrast/utils/request_utils.rb +9 -1
  392. data/lib/contrast/utils/resource_loader.rb +1 -1
  393. data/lib/contrast/utils/response_utils.rb +1 -1
  394. data/lib/contrast/utils/sha256_builder.rb +1 -1
  395. data/lib/contrast/utils/stack_trace_utils.rb +1 -1
  396. data/lib/contrast/utils/string_utils.rb +69 -67
  397. data/lib/contrast/utils/tag_util.rb +2 -1
  398. data/lib/contrast/utils/telemetry.rb +1 -1
  399. data/lib/contrast/utils/telemetry_client.rb +1 -1
  400. data/lib/contrast/utils/telemetry_identifier.rb +1 -1
  401. data/lib/contrast/utils/thread_tracker.rb +1 -1
  402. data/lib/contrast/utils/timer.rb +1 -1
  403. data/lib/contrast-agent.rb +1 -1
  404. data/lib/contrast.rb +5 -4
  405. data/resources/assess/policy.json +10 -0
  406. data/ruby-agent.gemspec +4 -5
  407. data/service_executables/VERSION +1 -1
  408. data/service_executables/linux/contrast-service +0 -0
  409. data/service_executables/mac/contrast-service +0 -0
  410. metadata +96 -40
  411. data/ext/cs__assess_active_record_named/cs__active_record_named.c +0 -46
  412. data/ext/cs__assess_active_record_named/cs__active_record_named.h +0 -11
  413. data/lib/contrast/agent/assess/policy/rewriter_patch.rb +0 -95
  414. data/lib/contrast/agent/class_reopener.rb +0 -258
  415. data/lib/contrast/agent/rewriter.rb +0 -259
  416. data/lib/contrast/extension/kernel.rb +0 -54
  417. data/lib/contrast/framework/rails/rewrite/action_controller_railties_helper_inherited.rb +0 -37
  418. data/lib/contrast/framework/rails/rewrite/active_record_attribute_methods_read.rb +0 -41
  419. data/lib/contrast/framework/rails/rewrite/active_record_named.rb +0 -75
  420. data/lib/contrast/framework/rails/rewrite/active_record_time_zone_inherited.rb +0 -35
  421. data/lib/contrast/utils/ruby_ast_rewriter.rb +0 -82
  422. data/lib/contrast/utils/substitution_utils.rb +0 -167
@@ -1,6 +1,8 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
+ require 'cs__scope/cs__scope'
5
+
4
6
  module Contrast
5
7
  module Agent
6
8
  # Scope lets us disable Contrast for certain code calls. We need to do this so
@@ -14,75 +16,100 @@ module Contrast
14
16
  #
15
17
  # Instead, we should say "If I'm already doing Contrast things, don't track
16
18
  # this"
19
+ #
20
+ # Scope Exits...
21
+ # by design, can go below zero.
22
+ # every exit/enter pair (regardless of series)
23
+ # should cancel each other out.
24
+ #
25
+ # so we prefer this sequence:
26
+ # scope = 0
27
+ # exit = -1
28
+ # enter = 0
29
+ # enter = 1
30
+ # exit = 0
31
+ # scope = 0
32
+ #
33
+ # over this sequence:
34
+ # scope = 0
35
+ # exit = 0
36
+ # enter = 1
37
+ # enter = 2
38
+ # exit = 1
39
+ # scope = 1
40
+ #
41
+ # This class have been moved to C and it's called from there. Here remains
42
+ # the validation and wrapper methods.
43
+ #
44
+ # Methods defined in C:
45
+ #
46
+ # sets scope instance variables.
47
+ # def initialize end;
48
+ #
49
+ # Check if we are in contrast scope.
50
+ # def in_contrast_scope? end;
51
+ # @return [Boolean] check if we are in contrast scope
52
+ # if the scope is above 0 return true.
53
+ #
54
+ # check if we are in deserialization scope.
55
+ # def in_deserialization_scope? end;
56
+ # @return [Boolean] check if we are in contrast scope
57
+ # if the scope is above 0 return true.
58
+ #
59
+ # check if we are in split scope.
60
+ # def in_split_scope? end;
61
+ # @return [Boolean] check if we are in contrast scope
62
+ # if the scope is above 0 return true.
63
+ #
64
+ # enter contrast scope.
65
+ # def enter_contrast_scope! end;
66
+ # @return @contrast_scope [Integer] contrast scope increased.
67
+ #
68
+ # enter deserialization scope.
69
+ # def enter_deserialization_scope! end;
70
+ # @return @deserialization_scope [Integer] deserialization scope increased.
71
+ #
72
+ # enter split scope.
73
+ # def enter_split_scope! end;
74
+ # @return @split_scope [Integer] split scope increased.
75
+ #
76
+ # check split scope depth.
77
+ # def split_scope_depth end;
78
+ # @return @split_scope [Integer] split scope depth.
79
+ #
80
+ # exit contrast scope.
81
+ # def exit_contrast_scope! end;
82
+ # @return @contrast_scope [Integer] contrast scope decreased.
83
+ #
84
+ # exit deserialization scope.
85
+ # def exit_deserialization_scope! end;
86
+ # @return @deserialization_scope [Integer] deserialization scope decreased.
87
+ #
88
+ # exit split scope.
89
+ # def exit_split_scope! end;
90
+ # @return @split_scope [Integer] split scope decreased.
91
+ #
92
+ # Static methods to be used, the cases are defined by the usage from the above methods
93
+ #
94
+ # check if we are in specific scope.
95
+ # def in_scope? name end;
96
+ # @param name [Symbol] scope symbol representing scope to check.
97
+ # @return [Boolean] check if we are in passed scope.
98
+ #
99
+ # enter specific scope.
100
+ # def enter_scope! name end;
101
+ # @param name [Symbol] scope symbol representing scope to enter.
102
+ # @return scope [Integer] entered scope value increased.
103
+ #
104
+ # exit specific scope.
105
+ # def exit_cope! name end;
106
+ # @param name [Symbol] scope symbol representing scope to exit.
107
+ # @return scope [Integer] entered scope value decreased.
17
108
  class Scope
18
109
  SCOPE_LIST = %i[contrast deserialization split].cs__freeze
19
110
 
20
- def initialize
21
- @contrast_scope = 0
22
- @deserialization_scope = 0
23
- @split_scope = 0
24
- end
25
-
26
- def in_contrast_scope?
27
- @contrast_scope.positive?
28
- end
29
-
30
- def in_deserialization_scope?
31
- @deserialization_scope.positive?
32
- end
33
-
34
- def in_split_scope?
35
- @split_scope.positive?
36
- end
37
-
38
- def enter_contrast_scope!
39
- @contrast_scope += 1
40
- end
41
-
42
- def enter_deserialization_scope!
43
- @deserialization_scope += 1
44
- end
45
-
46
- def enter_split_scope!
47
- @split_scope += 1
48
- end
49
-
50
- def split_scope_depth
51
- @split_scope
52
- end
53
-
54
- # Scope Exits...
55
- # by design, can go below zero.
56
- # every exit/enter pair (regardless of series)
57
- # should cancel each other out.
58
- #
59
- # so we prefer this sequence:
60
- # scope = 0
61
- # exit = -1
62
- # enter = 0
63
- # enter = 1
64
- # exit = 0
65
- # scope = 0
66
- #
67
- # over this sequence:
68
- # scope = 0
69
- # exit = 0
70
- # enter = 1
71
- # enter = 2
72
- # exit = 1
73
- # scope = 1
74
- def exit_contrast_scope!
75
- @contrast_scope -= 1
76
- end
77
-
78
- def exit_deserialization_scope!
79
- @deserialization_scope -= 1
80
- end
81
-
82
- def exit_split_scope!
83
- @split_scope -= 1
84
- end
85
-
111
+ # Wraps block to be executed in contrast scope.
112
+ # On completion exits scope.
86
113
  def with_contrast_scope
87
114
  enter_contrast_scope!
88
115
  yield
@@ -90,6 +117,8 @@ module Contrast
90
117
  exit_contrast_scope!
91
118
  end
92
119
 
120
+ # Wraps block to be executed in deserialization scope.
121
+ # On completion exits scope.
93
122
  def with_deserialization_scope
94
123
  enter_deserialization_scope!
95
124
  yield
@@ -97,6 +126,8 @@ module Contrast
97
126
  exit_deserialization_scope!
98
127
  end
99
128
 
129
+ # Wraps block to be executed in split scope.
130
+ # On completion exits scope.
100
131
  def with_split_scope
101
132
  enter_split_scope!
102
133
  yield
@@ -104,48 +135,12 @@ module Contrast
104
135
  exit_split_scope!
105
136
  end
106
137
 
107
- # Static methods to be used, the cases are defined by the usage from the above methods
108
- # if more methods are added - please extend the case statements as they are no longed dynamic
109
- def in_scope? name
110
- case name
111
- when :contrast
112
- in_contrast_scope?
113
- when :deserialization
114
- in_deserialization_scope?
115
- when :split
116
- in_split_scope?
117
- else
118
- raise NoMethodError, "Scope '#{ name.inspect }' is not registered as a scope."
119
- end
120
- end
121
-
122
- def enter_scope! name
123
- case name
124
- when :contrast
125
- enter_contrast_scope!
126
- when :deserialization
127
- enter_deserialization_scope!
128
- when :split
129
- enter_split_scope!
130
- else
131
- raise NoMethodError, "Scope '#{ name.inspect }' is not registered as a scope."
132
- end
133
- end
134
-
135
- def exit_scope! name
136
- case name
137
- when :contrast
138
- exit_contrast_scope!
139
- when :deserialization
140
- exit_deserialization_scope!
141
- when :split
142
- exit_split_scope!
143
- else
144
- raise NoMethodError, "Scope '#{ name.inspect }' is not registered as a scope."
145
- end
146
- end
147
-
148
138
  class << self
139
+ # Validates scope. To be valid the scope must be one of:
140
+ # :contrast, :split, :deserialization
141
+ #
142
+ # @param scope_sym [Symbol] scope to check.
143
+ # @return [Boolean] true | false
149
144
  def valid_scope? scope_sym
150
145
  Contrast::Agent::Scope::SCOPE_LIST.include? scope_sym
151
146
  end
@@ -1,8 +1,9 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/components/logger'
5
5
  require 'contrast/agent/worker_thread'
6
+ require 'contrast/agent/reporting/report'
6
7
 
7
8
  module Contrast
8
9
  module Agent
@@ -14,13 +15,35 @@ module Contrast
14
15
  # Spec recommends 30 seconds, we're going with 15.
15
16
  REFRESH_INTERVAL_SEC = 15
16
17
 
18
+ # check if we can report to TS
19
+ #
20
+ # @return[Boolean] true if bypass is enabled, or false if bypass disabled
21
+ def enabled?
22
+ @_enabled = Contrast::CONTRAST_SERVICE.use_agent_communication? if @_enabled.nil?
23
+ @_enabled
24
+ end
25
+
26
+ def client
27
+ @_client ||= Contrast::Agent::Reporting::ReporterClient.new
28
+ end
29
+
30
+ def connection
31
+ @_connection ||= client.initialize_connection
32
+ end
33
+
17
34
  def start_thread!
18
35
  return if running?
19
36
 
37
+ report_from_reporter = check_report_provider
38
+
20
39
  @_thread = Contrast::Agent::Thread.new do
21
40
  logger.info('Starting heartbeat thread.')
22
41
  loop do
23
- Contrast::Agent.messaging_queue.send_event_eventually(poll_message)
42
+ if report_from_reporter
43
+ client.send_event(poll_message, connection)
44
+ else
45
+ Contrast::Agent.messaging_queue.send_event_eventually(poll_message)
46
+ end
24
47
 
25
48
  sleep REFRESH_INTERVAL_SEC
26
49
  end
@@ -28,7 +51,27 @@ module Contrast
28
51
  end
29
52
 
30
53
  def poll_message
31
- @_poll_message ||= Contrast::Api::Dtm::Poll.new
54
+ @_poll_message ||= if enabled? && client
55
+ Contrast::Agent::Reporting::Poll.new
56
+ else
57
+ Contrast::Api::Dtm::Poll.new
58
+ end
59
+ end
60
+
61
+ def check_report_provider
62
+ return false unless enabled?
63
+ return false unless client && connection
64
+
65
+ client.startup!(connection)
66
+ true
67
+ end
68
+
69
+ def send_event provider
70
+ if provider
71
+ client.send_event(poll_message, connection)
72
+ return
73
+ end
74
+ Contrast::Agent.messaging_queue.send_event_eventually(poll_message)
32
75
  end
33
76
  end
34
77
  end
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/utils/metrics_hash'
@@ -44,9 +44,14 @@ module Contrast
44
44
  FALLBACK_TENANTS = [SAAS_CUSTOM, SAAS_CUSTOM_JP].cs__freeze
45
45
  # Fallback for Custom, most likely self-hosted, Environments
46
46
  EOP = 'EOP'
47
+ REJECTED_VALUES = [:EMPTY_VALUE, 'NEEDS_TO_BE_SET', Contrast::Utils::ObjectShare::EMPTY_STRING].cs__freeze
47
48
 
48
49
  def initialize
49
50
  super
51
+ @settings = []
52
+ add_config_keys ::Contrast::CONFIG.root, 'root'
53
+ @settings << ENV.keys.select { |v| v.starts_with?('CONTRAST') }
54
+ @settings.flatten
50
55
  add_tags
51
56
  end
52
57
 
@@ -55,14 +60,25 @@ module Contrast
55
60
  end
56
61
 
57
62
  def add_tags
58
- @tags['teamserver'] = teamserver_type
59
- @tags['agent_version'] = VERSION
60
- @tags['ruby_version'] = RUBY_VERSION
61
- @tags['os_type'] = sys_info['os_type'] == 'Darwin' ? 'MacOS' : 'Linux'
62
- @tags['os_arch'] = sys_info['os_arch']
63
- @tags['os_version'] = sys_info['os_version']
63
+ add_system_tags
64
64
  @tags['app_framework_and_version'] = APP_AND_SERVER_DATA[:application_info].to_s
65
65
  @tags['server_framework_and_version'] = APP_AND_SERVER_DATA[:server_info].to_s
66
+ @tags['ASSESS'] = Contrast::ASSESS.enabled?.to_s
67
+ @tags['PROTECT'] = Contrast::PROTECT.enabled?.to_s
68
+ @tags['settings'] = @settings.join(',')
69
+ end
70
+
71
+ def add_config_keys config, nested_key
72
+ config.configuration_map.reject! { |_k, v| REJECTED_VALUES.include?(v) }
73
+
74
+ config.configuration_map.each do |k, v|
75
+ unless v.cs__class <= Contrast::Config::BaseConfiguration
76
+ @settings << "#{ nested_key }.#{ k }"
77
+ next
78
+ end
79
+
80
+ add_config_keys v, "#{ nested_key }.#{ k }"
81
+ end
66
82
  end
67
83
 
68
84
  def sys_info
@@ -89,6 +105,17 @@ module Contrast
89
105
  end
90
106
  end
91
107
  end
108
+
109
+ # Here we attach the key-value pairs of the system
110
+ #
111
+ def add_system_tags
112
+ @tags['teamserver'] = teamserver_type
113
+ @tags['agent_version'] = VERSION
114
+ @tags['ruby_version'] = RUBY_VERSION
115
+ @tags['os_type'] = sys_info['os_type'] == 'Darwin' ? 'MacOS' : 'Linux'
116
+ @tags['os_arch'] = sys_info['os_arch']
117
+ @tags['os_version'] = sys_info['os_version']
118
+ end
92
119
  end
93
120
  end
94
121
  end
@@ -1,8 +1,9 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/components/logger'
5
5
  require 'contrast/components/scope'
6
+ require 'contrast/agent/reporting/reporting_events/application_update'
6
7
  require 'contrast/api/decorators/application_update'
7
8
 
8
9
  module Contrast
@@ -23,7 +24,6 @@ module Contrast
23
24
  end
24
25
  end
25
26
 
26
- # TODO: RUBY-1354
27
27
  # TODO: RUBY-1356
28
28
  def send_inventory_message
29
29
  return unless ::Contrast::INVENTORY.enabled?
@@ -31,7 +31,17 @@ module Contrast
31
31
  app_update_msg = Contrast::Api::Dtm::ApplicationUpdate.build
32
32
 
33
33
  Contrast::Agent::Inventory::DatabaseConfig.append_db_config(app_update_msg)
34
- Contrast::Agent.messaging_queue.send_event_eventually(app_update_msg)
34
+ # TODO: RUBY-1438 -- remove and build ReportingEvent directly
35
+ if Contrast::Agent.reporter
36
+ report = Contrast::Agent::Reporting::DtmMessage.dtm_to_event(app_update_msg)
37
+ Contrast::Agent.reporter.send_event(report)
38
+
39
+ # This is being reported separately because we extract the data from the same message
40
+ inventory_report = Contrast::Agent::Reporting::ApplicationInventory.convert(app_update_msg)
41
+ Contrast::Agent.reporter.send_event(inventory_report)
42
+ else
43
+ Contrast::Agent.messaging_queue.send_event_eventually(app_update_msg)
44
+ end
35
45
  end
36
46
 
37
47
  private
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/config/env_variables'
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/utils/metrics_hash'
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/components/scope'
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/components/logger'
@@ -59,7 +59,7 @@ module Contrast
59
59
  messaging_queue.stop!
60
60
  heapdump_util.stop!
61
61
  telemetry_queue&.stop!
62
- reporter_queue&.stop!
62
+ reporter&.stop!
63
63
  end
64
64
 
65
65
  def heartbeat_thread_init
@@ -108,7 +108,7 @@ module Contrast
108
108
  end
109
109
 
110
110
  # @return [Contrast::Agent::Reporter]
111
- def reporter_queue
111
+ def reporter
112
112
  return if @reporter.nil?
113
113
 
114
114
  @reporter
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/components/logger'
@@ -46,9 +46,6 @@ module Contrast
46
46
  Contrast::Agent.framework_manager.register_late_framework(loaded_module)
47
47
  Contrast::Agent::Inventory::DependencyUsageAnalysis.instance.associate_file(path) if path
48
48
  Contrast::Agent::Patching::Policy::Patcher.patch_specific_module(loaded_module)
49
- if RUBY_VERSION < '2.6.0' # TODO: RUBY-714 remove guard w/ EOL of 2.5
50
- Contrast::Agent::Assess::Policy::RewriterPatch.rewrite_interpolation(loaded_module)
51
- end
52
49
  Contrast::Agent::Assess::Policy::PolicyScanner.scan(tracepoint_event)
53
50
  rescue StandardError => e
54
51
  logger.error('Unable to complete TracePoint analysis', e, module: loaded_module, path: path)
@@ -1,8 +1,8 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  module Contrast
5
5
  module Agent
6
- VERSION = '4.14.0'
6
+ VERSION = '5.2.0'
7
7
  end
8
8
  end
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  module Contrast
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'English'
@@ -76,10 +76,10 @@ module Contrast
76
76
  end
77
77
 
78
78
  # @return [nil, Contrast::Agent::Reporter]
79
- def self.reporter_queue
80
- return unless thread_watcher.reporter_queue
79
+ def self.reporter
80
+ return unless thread_watcher.reporter
81
81
 
82
- thread_watcher.reporter_queue
82
+ thread_watcher.reporter
83
83
  end
84
84
 
85
85
  def self.thread_watcher
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  module Contrast
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/components/logger'
@@ -16,7 +16,7 @@ module Contrast
16
16
 
17
17
  def initialize
18
18
  @speedracer = Contrast::Api::Communication::Speedracer.new
19
- @audit = Contrast::Agent::Reporting::Audit.new if ::Contrast::API.request_audit_enable
19
+ @audit = Contrast::Agent::Reporting::Audit.new if ::Contrast::API.request_audit_enable?
20
20
  super
21
21
  end
22
22
 
@@ -34,7 +34,7 @@ module Contrast
34
34
  return
35
35
  end
36
36
  response_data = speedracer.return_response(event)
37
- return response_data unless ::Contrast::API.request_audit_enable
37
+ return response_data unless ::Contrast::API.request_audit_enable?
38
38
 
39
39
  @audit&.audit_event(event, response_data)
40
40
  response_data
@@ -63,7 +63,7 @@ module Contrast
63
63
  end
64
64
  logger.debug('Enqueued event for sending', event_type: event.cs__class)
65
65
  queue << event if event
66
- return unless ::Contrast::API.request_audit_enable
66
+ return unless ::Contrast::API.request_audit_enable?
67
67
 
68
68
  @audit&.audit_event(event)
69
69
  end
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/agent/reaction_processor'
@@ -8,8 +8,12 @@ module Contrast
8
8
  module Api
9
9
  module Communication
10
10
  # Handles processing deferred messages sent to SpeedRacer.
11
+ #
12
+ # @attr_reader last_app_update_ms [Integer] the time, in ms, that application settings last changed
13
+ # @attr_reader last_server_update_ms [Integer] the time, in ms, that server settings last changed
11
14
  class ResponseProcessor
12
15
  include Contrast::Components::Logger::InstanceMethods
16
+ attr_reader :last_app_update_ms, :last_server_update_ms
13
17
 
14
18
  # Use the given response to update the Agent's server features and application settings, allowing it to reflect
15
19
  # the latest options configured by the user in TeamServer
@@ -44,7 +48,7 @@ module Contrast
44
48
  logger.trace('Agent: Received updated server features')
45
49
 
46
50
  ::Contrast::SETTINGS.update_from_server_features(server_features)
47
-
51
+ @last_server_update_ms = Contrast::Utils::Timer.now_ms
48
52
  server_features
49
53
  end
50
54
 
@@ -60,15 +64,15 @@ module Contrast
60
64
  logger.debug('Agent: Received updated application settings')
61
65
 
62
66
  ::Contrast::SETTINGS.update_from_application_settings(app_settings)
63
-
67
+ @last_app_update_ms = Contrast::Utils::Timer.now_ms
64
68
  app_settings
65
69
  end
66
70
 
67
71
  # This can't go in the Settings component because protect and assess depend on settings
68
72
  # I don't think it should go into contrast_service because that only handles connection specific data.
69
73
  #
70
- # @param server_features [Contrast::Api::Settings::AgentSettings]
71
- # @param app_settings [Contrast::Api::Settings::ApplicationSettings]
74
+ # @param server_features [Contrast::Api::Settings::AgentSettings, Array]
75
+ # @param app_settings [Contrast::Api::Settings::ApplicationSettings, Array]
72
76
  def update_features server_features, app_settings
73
77
  return unless !!(server_features || app_settings)
74
78
  return unless ::Contrast::AGENT.enabled?
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/components/logger'
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  module Contrast
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'socket'
@@ -105,6 +105,9 @@ module Contrast
105
105
  to_service = Contrast::Api::Dtm::Message.encode(msg)
106
106
  from_service = send_marshaled(to_service)
107
107
  response = Contrast::Api::Settings::AgentSettings.decode(from_service)
108
+ logger.debug('RESPONSE FROM TS')
109
+ logger.debug(from_service)
110
+ logger.debug('RESPONSE FROM TS')
108
111
  logger.debug('Received response.', msg_id: msg.__id__, p_id: msg.pid, msg_count: msg.message_count,
109
112
  response_id: response&.__id__)
110
113
  response
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/components/logger'
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/api/communication/socket'
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2021 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
1
+ # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require 'contrast/api/communication/socket'