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,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/env_configuration_item'
@@ -80,27 +80,42 @@ module Contrast
80
80
  API_KEY = "Invalid configuration. Missing a required connection value 'api_key' is not set."
81
81
  API_SERVICE_KEY = "Invalid configuration. Missing a required connection value 'service_tag' is not set."
82
82
  API_USERNAME = "Invalid configuration. Missing a required connection value 'user_name' is not set."
83
+ # The config has information about how to construct the logger. If the config is invalid, and you want to know
84
+ # about it, then you have a circular dependency if you try to log it, so we use basic proto_logger to do this
85
+ # job.
83
86
  def validate
84
- # The config has information about how to construct the logger.
85
- # If the config is invalid, and you want to know about it, then
86
- # you have a circular dependency if you try to log it,
87
- # so we use basic proto_logger to do this job.
88
- if !session_id.empty? && !session_metadata.empty?
87
+ return false unless valid_session_metadata?
88
+
89
+ valid_api?
90
+ end
91
+
92
+ # The use can set either the application's session id or session metadata or neither, but never both.
93
+ #
94
+ # @return [boolean]
95
+ def valid_session_metadata?
96
+ if !session_id&.empty? && !session_metadata&.empty?
89
97
  proto_logger.error(SESSION_VARIABLES)
90
98
  return false
91
99
  end
92
- if bypass
93
- msg = []
94
- msg << API_URL unless api_url
95
- msg << API_KEY unless api_key
96
- msg << API_SERVICE_KEY unless api_service_key
97
- msg << API_USERNAME unless api_username
98
- msg.any? { |m| proto_logger.error(m) }
99
- return false unless msg.empty?
100
- end
101
100
  true
102
101
  end
103
102
 
103
+ # If the agent is to use the bypass to communicate with TeamServer directly, than it must have the
104
+ # configuration values required for that connection.
105
+ #
106
+ # @return [boolean]
107
+ def valid_api?
108
+ return true unless bypass
109
+
110
+ msg = []
111
+ msg << API_URL unless api_url
112
+ msg << API_KEY unless api_key
113
+ msg << API_SERVICE_KEY unless api_service_key
114
+ msg << API_USERNAME unless api_username
115
+ msg.any? { |m| proto_logger.error(m) }
116
+ msg.empty?
117
+ end
118
+
104
119
  def env_overrides
105
120
  # For env variables resembling CONTRAST__WHATEVER__NESTED_VALUE
106
121
  # override raw.whatever.nested_value
@@ -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 'monitor'
@@ -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/base'
@@ -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
@@ -21,6 +21,10 @@ module Contrast
21
21
  @_analyze_libraries = !false?(::Contrast::CONFIG.root.inventory.analyze_libraries) if @_analyze_libraries.nil?
22
22
  @_analyze_libraries
23
23
  end
24
+
25
+ def tags
26
+ ::Contrast::CONFIG.root.inventory&.tags
27
+ end
24
28
  end
25
29
  end
26
30
  end
@@ -1,7 +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
  require 'contrast/logger/log'
5
+ require 'contrast/logger/cef_log'
5
6
  require 'contrast/components/base'
6
7
 
7
8
  module Contrast
@@ -12,6 +13,10 @@ module Contrast
12
13
  Contrast::Logger::Log.instance.logger
13
14
  end
14
15
 
16
+ def cef_logger
17
+ @_cef_logger ||= Contrast::Logger::CEFLog.instance.tap(&:build_logger)
18
+ end
19
+
15
20
  def add_trace_perf_logging_for sym, custom_message = nil
16
21
  logger.add_trace_perf_logging(self, sym, custom_message)
17
22
  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/components/base'
@@ -28,7 +28,8 @@ module Contrast
28
28
  end
29
29
 
30
30
  def rule_mode rule_id
31
- ::Contrast::CONFIG.root.protect.rules[rule_id]&.applicable_mode ||
31
+ str = rule_id.tr('-', '_')
32
+ ::Contrast::CONFIG.root.protect.rules[str]&.applicable_mode ||
32
33
  ::Contrast::SETTINGS.application_state.modes_by_id[rule_id] ||
33
34
  Contrast::Api::Settings::ProtectionRule::Mode::NO_ACTION
34
35
  end
@@ -47,19 +48,24 @@ module Contrast
47
48
 
48
49
  def report_custom_code_sysfile_access?
49
50
  if @_report_custom_code_sysfile_access.nil?
50
- ctrl = rule_config[Contrast::Agent::Protect::Rule::PathTraversal::NAME]
51
+ name_changed = Contrast::Agent::Protect::Rule::PathTraversal::NAME.tr('-', '_')
52
+ ctrl = rule_config[name_changed]
51
53
  @_report_custom_code_sysfile_access = true?(ctrl.detect_custom_code_accessing_system_files)
52
54
  end
53
55
  @_report_custom_code_sysfile_access
54
56
  end
55
57
 
56
58
  def forcibly_disabled?
57
- @_forcibly_disabled ||= false?(::Contrast::CONFIG.root.protect.enable)
59
+ return @_forcibly_disabled unless @_forcibly_disabled.nil?
60
+
61
+ @_forcibly_disabled = false?(::Contrast::CONFIG.root.protect.enable)
58
62
  end
59
63
 
60
64
  private
61
65
 
62
66
  def forcibly_enabled?
67
+ return @_forcibly_enabled unless @_forcibly_enabled.nil?
68
+
63
69
  @_forcibly_enabled ||= true?(::Contrast::CONFIG.root.protect.enable)
64
70
  end
65
71
  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/components/base'
@@ -1,9 +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 'fiber'
5
- require 'monitor'
6
5
  require 'contrast/agent/scope'
6
+ require 'cs__scope/cs__scope'
7
7
 
8
8
  # This is the Scope component.
9
9
  #
@@ -12,85 +12,99 @@ require 'contrast/agent/scope'
12
12
  # execution context for which we need to special case?".
13
13
  module Contrast
14
14
  module Components
15
- module Scope # :nodoc:
16
- MONITOR = Monitor.new
17
- EXECUTION_CONTEXT = {} # rubocop:disable Style/MutableConstant
18
-
19
- class Interface # :nodoc:
20
- def initialize
21
- # This is probably redundant with #scope_for_current_ec's nil check.
22
- EXECUTION_CONTEXT[Fiber.current] = Contrast::Agent::Scope.new
23
- end
24
-
25
- # This returns the scope governing the current execution context. Use this sparingly, preferring the instance
26
- # & class methods to access and query scope, rather than interacting with the scope object directly.
27
- def scope_for_current_ec
28
- MONITOR.synchronize do
29
- return EXECUTION_CONTEXT[Fiber.current] ||= Contrast::Agent::Scope.new
30
- end
31
- end
32
- end
33
-
34
- module InstanceMethods # :nodoc:
35
- # For each instance method on a scope, define a forwarder to the scope on the current execution context's scope.
36
- def scope_for_current_ec
37
- MONITOR.synchronize do
38
- return EXECUTION_CONTEXT[Fiber.current] ||= Contrast::Agent::Scope.new
39
- end
40
- end
41
-
42
- def enter_contrast_scope!
43
- scope_for_current_ec.enter_contrast_scope!
44
- end
45
-
46
- def enter_deserialization_scope!
47
- scope_for_current_ec.enter_deserialization_scope!
48
- end
49
-
50
- def enter_split_scope!
51
- scope_for_current_ec.enter_split_scope!
52
- end
53
-
54
- def enter_scope! name
55
- scope_for_current_ec.enter_scope! name
56
- end
57
-
58
- def exit_contrast_scope!
59
- scope_for_current_ec.exit_contrast_scope!
60
- end
61
-
62
- def exit_deserialization_scope!
63
- scope_for_current_ec.exit_deserialization_scope!
64
- end
65
-
66
- def exit_split_scope!
67
- scope_for_current_ec.exit_split_scope!
68
- end
69
-
70
- def exit_scope! name
71
- scope_for_current_ec.exit_scope! name
72
- end
73
-
74
- def in_contrast_scope?
75
- scope_for_current_ec.in_contrast_scope?
76
- end
77
-
78
- def in_deserialization_scope?
79
- scope_for_current_ec.in_deserialization_scope?
80
- end
81
-
82
- def in_split_scope?
83
- scope_for_current_ec.in_split_scope?
84
- end
85
-
86
- def split_scope_depth
87
- scope_for_current_ec.split_scope_depth
88
- end
89
-
90
- def in_scope? name
91
- scope_for_current_ec.in_scope? name
92
- end
93
-
15
+ # Constants defined in C:
16
+ #
17
+ # MONITOR = Mutex.new This was replaced from Monitor to Mutex.
18
+ # EXECUTION_CONTEXT = {} Hash containing all of the current ecs as keys pointing to their scope instances.
19
+ # EC_KEYS = [] set while we get the current ec, and used for sweeping the dead fibers in C.
20
+ #
21
+ # Methods defined in C:
22
+ #
23
+ # class Interface
24
+ # initializes the scope for the current fiber context.
25
+ # def initialize end;
26
+ #
27
+ # This returns the scope governing the current execution context. Use this sparingly, preferring the instance
28
+ # & class methods to access and query scope, rather than interacting with the scope object directly.
29
+ # def scope_for_current_ec end;
30
+ # end
31
+ #
32
+ # module Scope
33
+ # Singleton method for cleaning the dead fibers and unused scope instances, scope GC.
34
+ # def self.sweep_dead_ecs end;
35
+ # end
36
+ module Scope
37
+ # Methods defined in C:
38
+ #
39
+ # For each instance method on a scope, define a forwarder to the scope on the
40
+ # current execution context's scope.
41
+ # def scope_for_current_ec end;
42
+ #
43
+ # all the methods bellow are used as forwarders to be executed in the current ec.
44
+ # exp: in_contrast_scope? => scope_for_current_ec.enter_contrast_scope!
45
+ #
46
+ # Check if we are in contrast scope.
47
+ # def in_contrast_scope? end;
48
+ # @return [Boolean] check if we are in contrast scope
49
+ # if the scope is above 0 return true.
50
+ #
51
+ # check if we are in deserialization scope.
52
+ # def in_deserialization_scope? end;
53
+ # @return [Boolean] check if we are in contrast scope
54
+ # if the scope is above 0 return true.
55
+ #
56
+ # check if we are in split scope.
57
+ # def in_split_scope? end;
58
+ # @return [Boolean] check if we are in contrast scope
59
+ # if the scope is above 0 return true.
60
+ #
61
+ # enter contrast scope.
62
+ # def enter_contrast_scope! end;
63
+ # @return @contrast_scope [Integer] contrast scope increased.
64
+ #
65
+ # enter deserialization scope.
66
+ # def enter_deserialization_scope! end;
67
+ # @return @deserialization_scope [Integer] deserialization scope increased.
68
+ #
69
+ # enter split scope.
70
+ # def enter_split_scope! end;
71
+ # @return @split_scope [Integer] split scope increased.
72
+ #
73
+ # check split scope depth.
74
+ # def split_scope_depth end;
75
+ # @return @split_scope [Integer] split scope depth.
76
+ #
77
+ # exit contrast scope.
78
+ # def exit_contrast_scope! end;
79
+ # @return @contrast_scope [Integer] contrast scope decreased.
80
+ #
81
+ # exit deserialization scope.
82
+ # def exit_deserialization_scope! end;
83
+ # @return @deserialization_scope [Integer] deserialization scope decreased.
84
+ #
85
+ # exit split scope.
86
+ # def exit_split_scope! end;
87
+ # @return @split_scope [Integer] split scope decreased.
88
+ #
89
+ # Static methods to be used, the cases are defined by the usage from the above methods
90
+ #
91
+ # check if are in specific scope.
92
+ # def in_scope? name end;
93
+ # @param name [Symbol] scope symbol representing scope to check.
94
+ # @return [Boolean] check if we are in passed scope.
95
+ #
96
+ # enter specific scope.
97
+ # def enter_scope! name end;
98
+ # @param name [Symbol] scope symbol representing scope to enter.
99
+ # @return scope [Integer] entered scope value increased.
100
+ #
101
+ # exit specific scope.
102
+ # def exit_cope! name end;
103
+ # @param name [Symbol] scope symbol representing scope to exit.
104
+ # @return scope [Integer] entered scope value decreased.
105
+ module InstanceMethods
106
+ # Forwarder to execute block in contrast scope under current
107
+ # method execution context. On completion exits scope.
94
108
  def with_contrast_scope
95
109
  scope_for_current_ec.enter_contrast_scope!
96
110
  yield
@@ -98,6 +112,8 @@ module Contrast
98
112
  scope_for_current_ec.exit_contrast_scope!
99
113
  end
100
114
 
115
+ # Forwarder to execute block in deserialization scope under current
116
+ # method execution context. On completion exits scope.
101
117
  def with_deserialization_scope
102
118
  scope_for_current_ec.enter_deserialization_scope!
103
119
  yield
@@ -105,6 +121,8 @@ module Contrast
105
121
  scope_for_current_ec.exit_deserialization_scope!
106
122
  end
107
123
 
124
+ # Forwarder to execute block in split scope under current
125
+ # method execution context. On completion exits scope.
108
126
  def with_split_scope
109
127
  scope_for_current_ec.enter_split_scope!
110
128
  yield
@@ -113,17 +131,6 @@ module Contrast
113
131
  end
114
132
  end
115
133
 
116
- def self.sweep_dead_ecs
117
- # TODO: RUBY-534, #sweep_dead_ecs compensates for a lack of weak tables. when we can use WeakRef, we should
118
- # investigate removing this call and instead use the WeakRef for the Execution Context's Keys or using our
119
- # Finalizers Hash for Fibers
120
- MONITOR.synchronize do
121
- EXECUTION_CONTEXT.delete_if do |ec, _scope|
122
- !ec.alive?
123
- end
124
- end
125
- end
126
-
127
134
  ClassMethods = InstanceMethods
128
135
  end
129
136
  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/api/settings.pb'
@@ -36,19 +36,32 @@ module Contrast
36
36
  @application_state.exclusion_matchers.select(&:code?)
37
37
  end
38
38
 
39
- # @param server_features [Contrast::Api::Settings::ServerFeatures]
40
- def update_from_server_features server_features
41
- @protect_state.enabled = server_features.protect_enabled?
42
- @assess_state.enabled = server_features.assess_enabled?
43
- @assess_state.sampling_settings = server_features.assess.sampling
39
+ # @param features [Contrast::Api::Settings::ServerFeatures, Contrast::Agent::Reporting::Response]
40
+ def update_from_server_features features
41
+ if features&.class == Contrast::Agent::Reporting::Response
42
+ @protect_state.enabled = features.server_features.protect.enabled?
43
+ @assess_state.enabled = features.server_features.assess.enabled?
44
+ @assess_state.sampling_settings = features.server_features.assess.sampling
45
+ else
46
+ @protect_state.enabled = features.protect_enabled?
47
+ @assess_state.enabled = features.assess_enabled?
48
+ @assess_state.sampling_settings = features.assess.sampling
49
+ end
44
50
  end
45
51
 
46
- # @param application_settings [Contrast::Api::Settings::ApplicationSettings]
47
- def update_from_application_settings application_settings
48
- new_vals = application_settings.application_state_translation
49
- @application_state.modes_by_id = new_vals[:modes_by_id]
50
- @application_state.exclusion_matchers = new_vals[:exclusion_matchers]
51
- @assess_state.disabled_assess_rules = new_vals[:disabled_assess_rules]
52
+ # @param features [Contrast::Api::Settings::ApplicationSettings, Contrast::Agent::Reporting::Response]
53
+ def update_from_application_settings features
54
+ if features&.class == Contrast::Agent::Reporting::Response
55
+ @application_state.modes_by_id = features.application_settings.protect.protection_rules_to_settings_hash
56
+ # TODO: RUBY-1438 this needs to be translated
57
+ # @application_state.exclusion_matchers = new_vals[:exclusion_matchers]
58
+ @assess_state.disabled_assess_rules = features.application_settings.assess.disabled_rules
59
+ else
60
+ new_vals = features.application_state_translation
61
+ @application_state.modes_by_id = new_vals[:modes_by_id]
62
+ @application_state.exclusion_matchers = new_vals[:exclusion_matchers]
63
+ @assess_state.disabled_assess_rules = new_vals[:disabled_assess_rules]
64
+ end
52
65
  end
53
66
 
54
67
  # Wipe state to zero.
@@ -1,23 +1,69 @@
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 'contrast/config/service_configuration'
5
+ require 'contrast/config/logger_configuration'
6
+ require 'contrast/config/ruby_configuration'
7
+ require 'contrast/config/heap_dump_configuration'
8
+ require 'contrast/config/api_configuration'
9
+
4
10
  module Contrast
5
11
  module Config
6
12
  # Common Configuration settings. Those in this section pertain to the
7
13
  # core functionality of the Agent.
8
14
  class AgentConfiguration < BaseConfiguration
9
- KEYS = {
10
- enable: EMPTY_VALUE,
11
- start_bundled_service: true,
12
- omit_body: EMPTY_VALUE,
13
- service: Contrast::Config::ServiceConfiguration,
14
- logger: Contrast::Config::LoggerConfiguration,
15
- ruby: Contrast::Config::RubyConfiguration,
16
- heap_dump: Contrast::Config::HeapDumpConfiguration
17
- }.cs__freeze
18
-
19
- def initialize hsh
20
- super(hsh, KEYS)
15
+ attr_accessor :enable, :omit_body, :start_bundled_service, :api
16
+ attr_writer :ruby, :service, :logger, :heap_dump
17
+
18
+ def initialize hsh = {}
19
+ @enable = traverse_config(hsh, :enable)
20
+ @start_bundled_service = traverse_config(hsh, :start_bundled_service)
21
+ @omit_body = traverse_config(hsh, :omit_body)
22
+ @service = Contrast::Config::ServiceConfiguration.new(traverse_config(hsh, :service))
23
+ @logger = Contrast::Config::LoggerConfiguration.new(traverse_config(hsh, :logger))
24
+ @ruby = Contrast::Config::RubyConfiguration.new(traverse_config(hsh, :ruby))
25
+ @heap_dump = Contrast::Config::HeapDumpConfiguration.new(traverse_config(hsh, :heap_dump))
26
+ @configuration_map = {}
27
+ build_configuration_map
28
+ end
29
+
30
+ def service
31
+ @service ||= Contrast::Config::ServiceConfiguration.new({})
32
+ end
33
+
34
+ def logger
35
+ @logger ||= Contrast::Config::LoggerConfiguration.new({})
36
+ end
37
+
38
+ def ruby
39
+ @ruby ||= Contrast::Config::RubyConfiguration.new({})
40
+ end
41
+
42
+ def heap_dump
43
+ @heap_dump ||= Contrast::Config::HeapDumpConfiguration.new({})
44
+ end
45
+
46
+ # Traverse the given entity to build out the configuration graph.
47
+ #
48
+ # The values will be either a hash, indicating internal nodes to
49
+ # traverse, or a value to set or the EMPTY_VALUE symbol, indicating a
50
+ # leaf node.
51
+ #
52
+ # The spec_key are the Contrast defined keys based on the instance variables of
53
+ # a given configuration.
54
+ def traverse_config values, spec_key
55
+ internal_nodes = values.cs__respond_to?(:has_key?)
56
+ val = internal_nodes ? value_from_key_config(spec_key, values) : nil
57
+ val == EMPTY_VALUE ? nil : val
58
+ end
59
+
60
+ def build_configuration_map
61
+ instance_variables.each do |key|
62
+ str_key = key.to_s.tr('@', '')
63
+ next if str_key == 'configuration_map'
64
+
65
+ @configuration_map[str_key] = send(str_key.to_sym)
66
+ end
21
67
  end
22
68
  end
23
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/config/api_proxy_configuration'
@@ -9,18 +9,106 @@ module Contrast
9
9
  module Config
10
10
  # Api keys configuration
11
11
  class ApiConfiguration < BaseConfiguration
12
- URL = 'https://app.contrastsecurity.com/contrast'
13
- KEYS = {
14
- api_key: EMPTY_VALUE,
15
- url: URL,
16
- user_name: EMPTY_VALUE,
17
- service_key: EMPTY_VALUE,
18
- proxy: Contrast::Config::ApiProxyConfiguration,
19
- request_audit: Contrast::Config::RequestAuditConfiguration,
20
- certificate: Contrast::Config::CertificationConfiguration
21
- }.cs__freeze
22
- def initialize hsh
23
- super(hsh, KEYS)
12
+ # @return [String]
13
+ attr_reader :api_key
14
+ # @return [String]
15
+ attr_reader :user_name
16
+ # @return [String]
17
+ attr_reader :service_key
18
+
19
+ DEFAULT_URL = 'https://app.contrastsecurity.com/Contrast'
20
+
21
+ def initialize hsh = {}
22
+ @api_key = traverse_config(hsh, :api_key)
23
+ @url = traverse_config(hsh, :url)
24
+ @user_name = traverse_config(hsh, :user_name)
25
+ @service_key = traverse_config(hsh, :service_key)
26
+ @proxy = Contrast::Config::ApiProxyConfiguration.new(traverse_config(hsh, :proxy))
27
+ @request_audit = Contrast::Config::RequestAuditConfiguration.new(traverse_config(hsh, :request_audit))
28
+ @certificate = Contrast::Config::CertificationConfiguration.new(traverse_config(hsh, :certificate))
29
+ @configuration_map = {}
30
+ build_configuration_map
31
+ end
32
+
33
+ def url
34
+ @url.nil? ? DEFAULT_URL : @url
35
+ end
36
+
37
+ # @return [Contrast::Config::ApiProxyConfiguration]
38
+ def proxy
39
+ @proxy ||= Contrast::Config::ApiProxyConfiguration.new
40
+ end
41
+
42
+ # @return [Contrast::Config::RequestAuditConfiguration]
43
+ def request_audit
44
+ @request_audit ||= Contrast::Config::RequestAuditConfiguration.new
45
+ end
46
+
47
+ # @return [Contrast::Config::CertificationConfiguration]
48
+ def certificate
49
+ @certificate ||= Contrast::Config::CertificationConfiguration.new
50
+ end
51
+
52
+ def api_key= value
53
+ self['api_key'] = value
54
+ end
55
+
56
+ def url= value
57
+ self['url'] = value
58
+ end
59
+
60
+ def user_name= value
61
+ self['user_name'] = value
62
+ end
63
+
64
+ def service_key= value
65
+ self['service_key'] = value
66
+ end
67
+
68
+ def proxy= value
69
+ self['proxy'] = value
70
+ end
71
+
72
+ def request_audit= value
73
+ self['request_audit'] = value
74
+ end
75
+
76
+ def certificate= value
77
+ self['certificate'] = value
78
+ end
79
+
80
+ # TODO: RUBY-1493 MOVE TO BASE CONFIG
81
+
82
+ def []= key, value
83
+ instance_variable_set("@#{ key }".to_sym, value)
84
+ @configuration_map[key] = value
85
+ end
86
+
87
+ def [] key
88
+ send(key.to_sym)
89
+ end
90
+
91
+ # Traverse the given entity to build out the configuration graph.
92
+ #
93
+ # The values will be either a hash, indicating internal nodes to
94
+ # traverse, or a value to set or the EMPTY_VALUE symbol, indicating a
95
+ # leaf node.
96
+ #
97
+ # The spec_key are the Contrast defined keys based on the instance variables of
98
+ # a given configuration.
99
+ def traverse_config values, spec_key
100
+ internal_nodes = values.cs__respond_to?(:has_key?)
101
+ val = internal_nodes ? value_from_key_config(spec_key, values) : nil
102
+ val == EMPTY_VALUE ? nil : val
103
+ end
104
+
105
+ def build_configuration_map
106
+ instance_variables.each do |key|
107
+ str_key = key.to_s.tr('@', '')
108
+ next if str_key == 'configuration_map'
109
+
110
+ @configuration_map[str_key] = send(str_key.to_sym)
111
+ end
24
112
  end
25
113
  end
26
114
  end