contrast-agent 3.12.2 → 3.15.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (306) hide show
  1. checksums.yaml +4 -4
  2. data/.dockerignore +0 -1
  3. data/.gitignore +1 -1
  4. data/.simplecov +1 -1
  5. data/Rakefile +31 -0
  6. data/exe/contrast_service +1 -7
  7. data/ext/build_funchook.rb +0 -2
  8. data/ext/cs__assess_active_record_named/cs__active_record_named.c +8 -7
  9. data/ext/cs__assess_array/cs__assess_array.c +6 -5
  10. data/ext/cs__assess_basic_object/cs__assess_basic_object.c +5 -5
  11. data/ext/cs__assess_fiber_track/cs__assess_fiber_track.c +4 -9
  12. data/ext/cs__assess_fiber_track/cs__assess_fiber_track.h +0 -1
  13. data/ext/cs__assess_hash/cs__assess_hash.c +18 -17
  14. data/ext/cs__assess_hash/cs__assess_hash.h +2 -1
  15. data/ext/cs__assess_kernel/cs__assess_kernel.c +7 -8
  16. data/ext/cs__assess_marshal_module/cs__assess_marshal_module.c +18 -16
  17. data/ext/cs__assess_marshal_module/cs__assess_marshal_module.h +1 -0
  18. data/ext/cs__assess_module/cs__assess_module.c +6 -6
  19. data/ext/cs__assess_regexp/cs__assess_regexp.c +4 -4
  20. data/ext/cs__assess_string/cs__assess_string.c +31 -16
  21. data/ext/cs__assess_string/cs__assess_string.h +6 -1
  22. data/ext/cs__assess_string_interpolation26/cs__assess_string_interpolation26.c +4 -7
  23. data/ext/cs__assess_yield_track/cs__assess_yield_track.c +3 -7
  24. data/ext/cs__assess_yield_track/cs__assess_yield_track.h +0 -1
  25. data/ext/cs__common/cs__common.c +63 -30
  26. data/ext/cs__common/cs__common.h +19 -21
  27. data/ext/cs__common/extconf.rb +0 -14
  28. data/ext/cs__contrast_patch/cs__contrast_patch.c +27 -25
  29. data/ext/cs__contrast_patch/cs__contrast_patch.h +5 -7
  30. data/ext/cs__protect_kernel/cs__protect_kernel.c +11 -12
  31. data/ext/cs__protect_kernel/cs__protect_kernel.h +2 -2
  32. data/ext/extconf_common.rb +0 -28
  33. data/lib/contrast-agent.rb +1 -1
  34. data/lib/contrast.rb +15 -23
  35. data/lib/contrast/agent.rb +51 -39
  36. data/lib/contrast/agent/assess.rb +12 -12
  37. data/lib/contrast/agent/assess/contrast_event.rb +40 -185
  38. data/lib/contrast/agent/assess/events/event_factory.rb +2 -2
  39. data/lib/contrast/agent/assess/events/source_event.rb +5 -9
  40. data/lib/contrast/agent/assess/finalizers/freeze.rb +15 -0
  41. data/lib/contrast/agent/assess/finalizers/hash.rb +97 -0
  42. data/lib/contrast/agent/assess/policy/dynamic_source_factory.rb +2 -2
  43. data/lib/contrast/agent/assess/policy/patcher.rb +6 -6
  44. data/lib/contrast/agent/assess/policy/policy.rb +9 -11
  45. data/lib/contrast/agent/assess/policy/policy_node.rb +5 -99
  46. data/lib/contrast/agent/assess/policy/policy_scanner.rb +2 -3
  47. data/lib/contrast/agent/assess/policy/preshift.rb +13 -7
  48. data/lib/contrast/agent/assess/policy/propagation_method.rb +64 -45
  49. data/lib/contrast/agent/assess/policy/propagation_node.rb +6 -2
  50. data/lib/contrast/agent/assess/policy/propagator.rb +18 -18
  51. data/lib/contrast/agent/assess/policy/propagator/append.rb +8 -5
  52. data/lib/contrast/agent/assess/policy/propagator/base.rb +2 -2
  53. data/lib/contrast/agent/assess/policy/propagator/center.rb +9 -5
  54. data/lib/contrast/agent/assess/policy/propagator/custom.rb +1 -1
  55. data/lib/contrast/agent/assess/policy/propagator/database_write.rb +6 -4
  56. data/lib/contrast/agent/assess/policy/propagator/insert.rb +7 -7
  57. data/lib/contrast/agent/assess/policy/propagator/keep.rb +4 -1
  58. data/lib/contrast/agent/assess/policy/propagator/match_data.rb +18 -9
  59. data/lib/contrast/agent/assess/policy/propagator/next.rb +7 -5
  60. data/lib/contrast/agent/assess/policy/propagator/prepend.rb +13 -5
  61. data/lib/contrast/agent/assess/policy/propagator/remove.rb +14 -15
  62. data/lib/contrast/agent/assess/policy/propagator/replace.rb +5 -2
  63. data/lib/contrast/agent/assess/policy/propagator/reverse.rb +7 -5
  64. data/lib/contrast/agent/assess/policy/propagator/select.rb +19 -11
  65. data/lib/contrast/agent/assess/policy/propagator/splat.rb +14 -8
  66. data/lib/contrast/agent/assess/policy/propagator/split.rb +19 -13
  67. data/lib/contrast/agent/assess/policy/propagator/substitution.rb +36 -26
  68. data/lib/contrast/agent/assess/policy/propagator/trim.rb +17 -15
  69. data/lib/contrast/agent/assess/policy/rewriter_patch.rb +5 -5
  70. data/lib/contrast/agent/assess/policy/source_method.rb +90 -73
  71. data/lib/contrast/agent/assess/policy/source_validation/cross_site_validator.rb +1 -1
  72. data/lib/contrast/agent/assess/policy/source_validation/source_validation.rb +1 -1
  73. data/lib/contrast/agent/assess/policy/trigger/reflected_xss.rb +16 -11
  74. data/lib/contrast/agent/assess/policy/trigger/xpath.rb +2 -2
  75. data/lib/contrast/agent/assess/policy/trigger_method.rb +41 -26
  76. data/lib/contrast/agent/assess/policy/trigger_node.rb +30 -17
  77. data/lib/contrast/agent/assess/policy/trigger_validation/ssrf_validator.rb +2 -1
  78. data/lib/contrast/agent/assess/policy/trigger_validation/trigger_validation.rb +2 -2
  79. data/lib/contrast/agent/assess/properties.rb +15 -383
  80. data/lib/contrast/agent/assess/property/evented.rb +78 -0
  81. data/lib/contrast/agent/assess/property/tagged.rb +339 -0
  82. data/lib/contrast/agent/assess/property/updated.rb +136 -0
  83. data/lib/contrast/agent/assess/rule.rb +2 -2
  84. data/lib/contrast/agent/assess/rule/base.rb +3 -4
  85. data/lib/contrast/agent/assess/rule/provider.rb +3 -3
  86. data/lib/contrast/agent/assess/rule/provider/hardcoded_password.rb +1 -1
  87. data/lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb +4 -22
  88. data/lib/contrast/agent/assess/tag.rb +27 -12
  89. data/lib/contrast/agent/assess/tracker.rb +66 -0
  90. data/lib/contrast/agent/at_exit_hook.rb +4 -2
  91. data/lib/contrast/agent/class_reopener.rb +14 -11
  92. data/lib/contrast/agent/deadzone/policy/deadzone_node.rb +1 -1
  93. data/lib/contrast/agent/deadzone/policy/policy.rb +2 -2
  94. data/lib/contrast/agent/disable_reaction.rb +1 -1
  95. data/lib/contrast/agent/exclusion_matcher.rb +3 -3
  96. data/lib/contrast/agent/inventory/policy/datastores.rb +2 -3
  97. data/lib/contrast/agent/inventory/policy/policy.rb +3 -3
  98. data/lib/contrast/agent/inventory/policy/trigger_node.rb +1 -1
  99. data/lib/contrast/agent/middleware.rb +36 -48
  100. data/lib/contrast/agent/patching/policy/after_load_patch.rb +4 -4
  101. data/lib/contrast/agent/patching/policy/after_load_patcher.rb +6 -5
  102. data/lib/contrast/agent/patching/policy/module_policy.rb +1 -1
  103. data/lib/contrast/agent/patching/policy/patch.rb +16 -16
  104. data/lib/contrast/agent/patching/policy/patcher.rb +43 -44
  105. data/lib/contrast/agent/patching/policy/policy.rb +10 -13
  106. data/lib/contrast/agent/patching/policy/policy_node.rb +3 -3
  107. data/lib/contrast/agent/patching/policy/trigger_node.rb +2 -2
  108. data/lib/contrast/agent/protect/policy/applies_command_injection_rule.rb +3 -3
  109. data/lib/contrast/agent/protect/policy/applies_deserialization_rule.rb +2 -2
  110. data/lib/contrast/agent/protect/policy/applies_no_sqli_rule.rb +2 -2
  111. data/lib/contrast/agent/protect/policy/applies_path_traversal_rule.rb +3 -3
  112. data/lib/contrast/agent/protect/policy/applies_sqli_rule.rb +2 -2
  113. data/lib/contrast/agent/protect/policy/applies_xxe_rule.rb +3 -3
  114. data/lib/contrast/agent/protect/policy/policy.rb +8 -8
  115. data/lib/contrast/agent/protect/policy/rule_applicator.rb +3 -3
  116. data/lib/contrast/agent/protect/policy/trigger_node.rb +1 -1
  117. data/lib/contrast/agent/protect/rule.rb +18 -18
  118. data/lib/contrast/agent/protect/rule/base.rb +21 -32
  119. data/lib/contrast/agent/protect/rule/base_service.rb +2 -2
  120. data/lib/contrast/agent/protect/rule/cmd_injection.rb +5 -5
  121. data/lib/contrast/agent/protect/rule/deserialization.rb +1 -1
  122. data/lib/contrast/agent/protect/rule/http_method_tampering.rb +3 -8
  123. data/lib/contrast/agent/protect/rule/no_sqli.rb +1 -1
  124. data/lib/contrast/agent/protect/rule/path_traversal.rb +4 -5
  125. data/lib/contrast/agent/protect/rule/sqli.rb +2 -2
  126. data/lib/contrast/agent/protect/rule/unsafe_file_upload.rb +1 -1
  127. data/lib/contrast/agent/protect/rule/xss.rb +1 -1
  128. data/lib/contrast/agent/protect/rule/xxe.rb +4 -5
  129. data/lib/contrast/agent/protect/rule/xxe/entity_wrapper.rb +2 -2
  130. data/lib/contrast/agent/railtie.rb +1 -1
  131. data/lib/contrast/agent/reaction_processor.rb +5 -5
  132. data/lib/contrast/agent/request.rb +103 -340
  133. data/lib/contrast/agent/request_context.rb +25 -21
  134. data/lib/contrast/agent/request_handler.rb +1 -1
  135. data/lib/contrast/agent/response.rb +25 -26
  136. data/lib/contrast/agent/rewriter.rb +6 -9
  137. data/lib/contrast/agent/scope.rb +1 -1
  138. data/lib/contrast/agent/service_heartbeat.rb +8 -10
  139. data/lib/contrast/agent/static_analysis.rb +4 -4
  140. data/lib/contrast/agent/thread.rb +1 -1
  141. data/lib/contrast/agent/thread_watcher.rb +49 -0
  142. data/lib/contrast/agent/tracepoint_hook.rb +1 -1
  143. data/lib/contrast/agent/version.rb +1 -1
  144. data/lib/contrast/agent/worker_thread.rb +24 -0
  145. data/lib/contrast/api.rb +4 -6
  146. data/lib/contrast/api/communication.rb +20 -0
  147. data/lib/contrast/api/communication/connection_status.rb +41 -0
  148. data/lib/contrast/api/communication/messaging_queue.rb +76 -0
  149. data/lib/contrast/{utils/service_response_util.rb → api/communication/response_processor.rb} +10 -19
  150. data/lib/contrast/api/communication/service_lifecycle.rb +61 -0
  151. data/lib/contrast/api/communication/socket.rb +45 -0
  152. data/lib/contrast/api/communication/socket_client.rb +76 -0
  153. data/lib/contrast/api/communication/speedracer.rb +111 -0
  154. data/lib/contrast/api/communication/tcp_socket.rb +31 -0
  155. data/lib/contrast/api/communication/unix_socket.rb +27 -0
  156. data/lib/contrast/api/decorators.rb +14 -4
  157. data/lib/contrast/api/decorators/address.rb +61 -0
  158. data/lib/contrast/api/decorators/application_settings.rb +10 -5
  159. data/lib/contrast/api/decorators/application_update.rb +7 -17
  160. data/lib/contrast/api/decorators/http_request.rb +140 -0
  161. data/lib/contrast/api/decorators/input_analysis.rb +3 -2
  162. data/lib/contrast/api/decorators/message.rb +76 -0
  163. data/lib/contrast/api/decorators/rasp_rule_sample.rb +29 -0
  164. data/lib/contrast/api/decorators/route_coverage.rb +58 -0
  165. data/lib/contrast/api/decorators/server_features.rb +3 -2
  166. data/lib/contrast/api/decorators/trace_event.rb +100 -0
  167. data/lib/contrast/api/decorators/trace_event_object.rb +58 -0
  168. data/lib/contrast/api/decorators/trace_event_signature.rb +47 -0
  169. data/lib/contrast/api/decorators/trace_taint_range.rb +52 -0
  170. data/lib/contrast/api/decorators/trace_taint_range_tags.rb +109 -0
  171. data/lib/contrast/api/decorators/user_input.rb +40 -0
  172. data/lib/contrast/common_agent_configuration.rb +2 -2
  173. data/lib/contrast/components/agent.rb +2 -2
  174. data/lib/contrast/components/app_context.rb +12 -17
  175. data/lib/contrast/components/config.rb +8 -23
  176. data/lib/contrast/components/contrast_service.rb +3 -3
  177. data/lib/contrast/components/interface.rb +16 -16
  178. data/lib/contrast/components/logger.rb +1 -1
  179. data/lib/contrast/components/scope.rb +3 -3
  180. data/lib/contrast/components/settings.rb +0 -6
  181. data/lib/contrast/config.rb +18 -18
  182. data/lib/contrast/config/application_configuration.rb +5 -2
  183. data/lib/contrast/config/base_configuration.rb +2 -2
  184. data/lib/contrast/config/protect_rule_configuration.rb +1 -1
  185. data/lib/contrast/config/service_configuration.rb +8 -2
  186. data/lib/contrast/configuration.rb +93 -52
  187. data/lib/contrast/extension/assess.rb +21 -23
  188. data/lib/contrast/extension/assess/array.rb +12 -9
  189. data/lib/contrast/extension/assess/erb.rb +6 -3
  190. data/lib/contrast/extension/assess/eval_trigger.rb +3 -3
  191. data/lib/contrast/extension/assess/exec_trigger.rb +1 -1
  192. data/lib/contrast/extension/assess/fiber.rb +12 -12
  193. data/lib/contrast/extension/assess/hash.rb +5 -4
  194. data/lib/contrast/extension/assess/kernel.rb +19 -11
  195. data/lib/contrast/extension/assess/marshal.rb +63 -0
  196. data/lib/contrast/extension/assess/regexp.rb +8 -7
  197. data/lib/contrast/extension/assess/string.rb +13 -15
  198. data/lib/contrast/extension/inventory.rb +4 -5
  199. data/lib/contrast/extension/kernel.rb +1 -1
  200. data/lib/contrast/extension/module.rb +1 -1
  201. data/lib/contrast/extension/protect.rb +3 -3
  202. data/lib/contrast/extension/protect/kernel.rb +2 -2
  203. data/lib/contrast/extension/protect/psych.rb +2 -2
  204. data/lib/contrast/framework/base_support.rb +0 -23
  205. data/lib/contrast/framework/manager.rb +7 -17
  206. data/lib/contrast/framework/rack/patch/session_cookie.rb +13 -19
  207. data/lib/contrast/framework/rack/patch/support.rb +1 -1
  208. data/lib/contrast/framework/rack/support.rb +2 -2
  209. data/lib/contrast/framework/rails/patch/action_controller_live_buffer.rb +1 -3
  210. data/lib/contrast/framework/rails/patch/assess_configuration.rb +6 -13
  211. data/lib/contrast/framework/rails/patch/rails_application_configuration.rb +1 -1
  212. data/lib/contrast/framework/rails/patch/support.rb +3 -3
  213. data/lib/contrast/framework/rails/rewrite/action_controller_railties_helper_inherited.rb +2 -2
  214. data/lib/contrast/framework/rails/rewrite/active_record_named.rb +2 -2
  215. data/lib/contrast/framework/rails/rewrite/active_record_time_zone_inherited.rb +2 -2
  216. data/lib/contrast/framework/rails/support.rb +58 -37
  217. data/lib/contrast/framework/sinatra/patch/base.rb +2 -2
  218. data/lib/contrast/framework/sinatra/patch/support.rb +1 -1
  219. data/lib/contrast/framework/sinatra/support.rb +13 -24
  220. data/lib/contrast/funchook/funchook.rb +45 -0
  221. data/lib/contrast/logger/application.rb +13 -5
  222. data/lib/contrast/logger/format.rb +64 -0
  223. data/lib/contrast/logger/log.rb +17 -9
  224. data/lib/contrast/logger/request.rb +30 -0
  225. data/lib/contrast/tasks/config.rb +1 -1
  226. data/lib/contrast/tasks/service.rb +2 -2
  227. data/lib/contrast/utils/assess/sampling_util.rb +2 -2
  228. data/lib/contrast/utils/assess/tracking_util.rb +89 -19
  229. data/lib/contrast/utils/boolean_util.rb +1 -1
  230. data/lib/contrast/utils/class_util.rb +2 -2
  231. data/lib/contrast/utils/duck_utils.rb +0 -10
  232. data/lib/contrast/utils/env_configuration_item.rb +2 -1
  233. data/lib/contrast/utils/gemfile_reader.rb +5 -5
  234. data/lib/contrast/utils/hash_digest.rb +13 -3
  235. data/lib/contrast/utils/heap_dump_util.rb +2 -2
  236. data/lib/contrast/utils/invalid_configuration_util.rb +21 -35
  237. data/lib/contrast/utils/inventory_util.rb +6 -11
  238. data/lib/contrast/utils/io_util.rb +1 -1
  239. data/lib/contrast/utils/object_share.rb +0 -1
  240. data/lib/contrast/utils/os.rb +16 -4
  241. data/lib/contrast/utils/ruby_ast_rewriter.rb +1 -1
  242. data/lib/contrast/utils/sha256_builder.rb +2 -2
  243. data/lib/contrast/utils/stack_trace_utils.rb +2 -3
  244. data/lib/contrast/utils/string_utils.rb +11 -6
  245. data/lib/contrast/utils/tag_util.rb +1 -1
  246. data/lib/contrast/utils/thread_tracker.rb +1 -14
  247. data/lib/contrast/utils/timer.rb +1 -17
  248. data/resources/assess/policy.json +0 -10
  249. data/resources/deadzone/policy.json +5 -0
  250. data/ruby-agent.gemspec +24 -23
  251. data/service_executables/VERSION +1 -1
  252. data/service_executables/linux/contrast-service +0 -0
  253. data/service_executables/mac/contrast-service +0 -0
  254. metadata +92 -92
  255. data/funchook/Makefile +0 -29
  256. data/funchook/autom4te.cache/output.0 +0 -4964
  257. data/funchook/autom4te.cache/requests +0 -77
  258. data/funchook/autom4te.cache/traces.0 +0 -361
  259. data/funchook/config.log +0 -651
  260. data/funchook/config.status +0 -1015
  261. data/funchook/configure +0 -4964
  262. data/funchook/src/Makefile +0 -70
  263. data/funchook/src/config.h +0 -101
  264. data/funchook/src/config.h.in +0 -100
  265. data/funchook/src/decoder.o +0 -0
  266. data/funchook/src/distorm.o +0 -0
  267. data/funchook/src/funchook.o +0 -0
  268. data/funchook/src/funchook_io.o +0 -0
  269. data/funchook/src/funchook_syscall.o +0 -0
  270. data/funchook/src/funchook_unix.o +0 -0
  271. data/funchook/src/funchook_x86.o +0 -0
  272. data/funchook/src/instructions.o +0 -0
  273. data/funchook/src/insts.o +0 -0
  274. data/funchook/src/libfunchook.dylib +0 -0
  275. data/funchook/src/mnemonics.o +0 -0
  276. data/funchook/src/operands.o +0 -0
  277. data/funchook/src/os_func.o +0 -0
  278. data/funchook/src/os_func_unix.o +0 -0
  279. data/funchook/src/prefix.o +0 -0
  280. data/funchook/src/printf_base.o +0 -0
  281. data/funchook/src/textdefs.o +0 -0
  282. data/funchook/src/wstring.o +0 -0
  283. data/funchook/test/Makefile +0 -43
  284. data/funchook/test/funchook_test +0 -0
  285. data/funchook/test/libfunchook_test.so +0 -0
  286. data/funchook/test/libfunchook_test.so.dSYM/Contents/Info.plist +0 -20
  287. data/funchook/test/libfunchook_test.so.dSYM/Contents/Resources/DWARF/libfunchook_test.so +0 -0
  288. data/funchook/test/test_main.o +0 -0
  289. data/funchook/test/x86_64_test.o +0 -0
  290. data/lib/contrast/agent/assess/adjusted_span.rb +0 -27
  291. data/lib/contrast/agent/assess/insulator.rb +0 -49
  292. data/lib/contrast/agent/require_state.rb +0 -61
  293. data/lib/contrast/agent/socket_client.rb +0 -134
  294. data/lib/contrast/api/connection_status.rb +0 -49
  295. data/lib/contrast/api/socket.rb +0 -43
  296. data/lib/contrast/api/speedracer.rb +0 -188
  297. data/lib/contrast/api/tcp_socket.rb +0 -29
  298. data/lib/contrast/api/unix_socket.rb +0 -25
  299. data/lib/contrast/extension/assess/assess_extension.rb +0 -148
  300. data/lib/contrast/framework/sinatra/application_helper.rb +0 -51
  301. data/lib/contrast/framework/view_technologies_descriptor.rb +0 -21
  302. data/lib/contrast/internal_exception.rb +0 -8
  303. data/lib/contrast/utils/cache.rb +0 -58
  304. data/lib/contrast/utils/freeze_util.rb +0 -32
  305. data/lib/contrast/utils/service_sender_util.rb +0 -167
  306. data/lib/contrast/utils/sinatra_helper.rb +0 -49
@@ -1,61 +0,0 @@
1
- # Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
- # frozen_string_literal: true
3
-
4
- module Contrast
5
- module Agent
6
- # Thread local way to access the current RequireState. Used as a convenient
7
- # wrapper to ensure specific key is used and that we handle the case when
8
- # we try to enter a previously unset require scope.
9
- # (Note that 'require scopes' track nested requires. This is distinct
10
- # from 'contrast scope', which tracks instrumentation.)
11
- module RequireStates
12
- class << self
13
- KEY = :thread_local_contrast_require_scope
14
-
15
- def enter
16
- scope = current_scope
17
- unless current_scope
18
- scope = RequireState.new
19
- Thread.current[KEY] = scope
20
- end
21
- scope.enter
22
- end
23
-
24
- def exit
25
- current_scope.exit
26
- end
27
-
28
- def current_scope
29
- Thread.current[KEY]
30
- end
31
-
32
- def status
33
- current_scope&.scope.to_s
34
- end
35
-
36
- def in_scope?
37
- scope = current_scope
38
- scope && scope.scope > 1
39
- end
40
- end
41
- end
42
-
43
- # Simple counter class for tracking how deep in nested requires / file
44
- # load operations we currently are.
45
- class RequireState
46
- attr_reader :scope
47
-
48
- def initialize
49
- @scope = 0
50
- end
51
-
52
- def enter
53
- @scope += 1
54
- end
55
-
56
- def exit
57
- @scope -= 1
58
- end
59
- end
60
- end
61
- end
@@ -1,134 +0,0 @@
1
- # Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
- # frozen_string_literal: true
3
-
4
- cs__scoped_require 'socket'
5
- cs__scoped_require 'uri'
6
-
7
- cs__scoped_require 'contrast/api/speedracer'
8
- cs__scoped_require 'contrast/api/tcp_socket'
9
- cs__scoped_require 'contrast/api/unix_socket'
10
- cs__scoped_require 'contrast/api/connection_status'
11
- cs__scoped_require 'contrast/components/interface'
12
-
13
- module Contrast
14
- module Agent
15
- # SocketClient acts as a interface between the agent and the service. It instantiates a
16
- # service proxy and tracks the state of that proxy.
17
- class SocketClient
18
- include Contrast::Components::Interface
19
-
20
- access_component :app_context, :contrast_service, :logging
21
-
22
- attr_reader :speedracer, :status
23
-
24
- def initialize
25
- @status = Contrast::Api::ConnectionStatus.new
26
- @speedracer = Contrast::Api::Speedracer.new(init_connection)
27
- @ensure_running = Mutex.new
28
- end
29
-
30
- def service_unavailable?
31
- speedracer.nil?
32
- end
33
-
34
- def connection_established?
35
- status.connected?
36
- end
37
-
38
- # Attempt to send the passed message to SpeedRacer. If we're using bundled
39
- # service config option, we must first start up the service. Afterwards, we
40
- # must send agent startup messages no matter what the config options are.
41
- #
42
- # @param event [Contrast::Api::Dtm] One of the DTMs valid for the event
43
- # field of Contrast::Api::Dtm::Message
44
- # @return [Array<Contrast::Api::Settings::AgentSettings>] the response from SpeedRacer or nil
45
- # if it failed to send or the service is unavailable.
46
- def send_to_speedracer event
47
- return if service_unavailable?
48
-
49
- @ensure_running.synchronize do
50
- if CONTRAST_SERVICE.use_bundled_service?
51
- return unless start_or_restart
52
- end
53
- build_service_context unless status.startup_messages_sent?
54
- end
55
-
56
- logger.debug_with_time(event.cs__class.name) do
57
- response = speedracer.send_one event
58
- status.success!
59
- response
60
- end
61
- rescue StandardError => e
62
- status.failure!
63
- logger.error('Unable to send message.', e,
64
- event_id: event.__id__,
65
- event_type: event.cs__class.name)
66
- nil
67
- end
68
-
69
- private
70
-
71
- def init_connection
72
- if CONTRAST_SERVICE.use_tcp?
73
- Contrast::Api::TcpSocket.new(CONTRAST_SERVICE.host, CONTRAST_SERVICE.port)
74
- else
75
- Contrast::Api::UnixSocket.new(CONTRAST_SERVICE.socket_path)
76
- end
77
- end
78
-
79
- def restart?
80
- status.was_connected? && status.failed?
81
- end
82
-
83
- # Now that we know we're running with bundled service option, we can tell SpeedRacer that we're
84
- # ready for it to be started up.
85
- #
86
- # @return [Boolean] true if the service is started, false if the service is still offline after
87
- # we've attempted to start it up.
88
- def start_or_restart
89
- if restart?
90
- logger.info('Attempting to restart service.')
91
- return speedracer.start_service
92
- elsif !status.was_connected?
93
- logger.info('Attempting to start service.')
94
- return speedracer.start_service
95
- end
96
-
97
- true
98
- end
99
-
100
- def build_service_context
101
- agent_startup_msg = APP_CONTEXT.build_agent_startup_message
102
- app_startup_msg = APP_CONTEXT.build_app_startup_message
103
-
104
- # 1 initial attempt, + 3 potential retries.
105
- # The agent-service-api REQUIREMENTS.md spec mandates this #.
106
- 4.times do
107
- log_send_event(agent_startup_msg)
108
- next unless (agent_response = speedracer.send_one(agent_startup_msg))
109
-
110
- # Connection was successful
111
- log_send_event(app_startup_msg)
112
- app_response = speedracer.send_one(app_startup_msg)
113
- [agent_response, app_response].each do |msg|
114
- Contrast::Utils::ServiceResponseUtil.process_response msg
115
- end
116
- status.success!
117
- logger.debug('Successfully sent startup messages to service.')
118
- return
119
- end
120
-
121
- logger.error('Could not send agent startup message context')
122
- rescue StandardError => e
123
- logger.error('Could not build service context', e)
124
- raise # re-raise the error to be caught by SocketClient#send_to_speedracer
125
- end
126
-
127
- def log_send_event event
128
- logger.debug('Immediately sending event.',
129
- event_id: event.__id__,
130
- event_type: event.cs__class.name)
131
- end
132
- end
133
- end
134
- end
@@ -1,49 +0,0 @@
1
- # Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
- # frozen_string_literal: true
3
-
4
- module Contrast
5
- module Api
6
- # Keeps track of the state of connections to the service.
7
- class ConnectionStatus
8
- def initialize
9
- @last_success = nil
10
- @last_failure = nil
11
- @startup_messages_sent = false
12
- end
13
-
14
- # Whether we have sent startup message to the service. True after successfully
15
- # sending startup messages to service and reset to false if we lose connection
16
- # to the service.
17
- def startup_messages_sent?
18
- @startup_messages_sent
19
- end
20
-
21
- # A message was successfully sent to the service at some point
22
- def was_connected?
23
- @last_success
24
- end
25
-
26
- # The last message sent was successful
27
- def connected?
28
- @last_success && (@last_failure.nil? || @last_success > @last_failure)
29
- end
30
-
31
- # The last message sent was unsuccessful
32
- def failed?
33
- @last_failure && (@last_success.nil? || @last_failure > @last_success)
34
- end
35
-
36
- # The current state of the service is active with a successful message sent
37
- def success!
38
- @startup_messages_sent = true
39
- @last_success = Time.now.to_f
40
- end
41
-
42
- # The service may be in some sort of error state
43
- def failure!
44
- @startup_messages_sent = false
45
- @last_failure = Time.now.to_f
46
- end
47
- end
48
- end
49
- end
@@ -1,43 +0,0 @@
1
- # Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
- # frozen_string_literal: true
3
-
4
- module Contrast
5
- module Api
6
- # Behavior common to all sockets used
7
- # to communicate with the Contrast Service.
8
- module Socket
9
- SOCKET_MONITOR = Monitor.new
10
-
11
- # Send a message across the socket and read back the response.
12
- # @param marshaled [String] some marshaled form of data to be sent across
13
- # the socket. Typically an encoded form of Contrast::Api::Dtm::Message.
14
- # @return [String] some marshalled form of data returned by the socket.
15
- # Typically an encoded form of Contrast::Api::Settings::AgentSettings.
16
- def send_marshaled marshaled
17
- SOCKET_MONITOR.synchronize do
18
- socket = new_socket
19
-
20
- # write message length
21
- len = marshaled.length
22
- socket.write([len].pack(Contrast::Api::ENCODING_STRING))
23
-
24
- # write the entire message
25
- socket.write(marshaled)
26
- socket.close_write
27
-
28
- # read the response length
29
- len = socket.read(4).unpack1(Contrast::Api::ENCODING_STRING)
30
-
31
- # read expected response to end
32
- socket.read(len)
33
- end
34
- end
35
-
36
- # Override this method to return a socket.
37
- # Should be interface compatible with TCPSocket, UNIXSocket, etc.
38
- def new_socket
39
- raise NotImplementedError, 'This is abstract, override it.'
40
- end
41
- end
42
- end
43
- end
@@ -1,188 +0,0 @@
1
- # Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
2
- # frozen_string_literal: true
3
-
4
- cs__scoped_require 'contrast/utils/object_share'
5
- cs__scoped_require 'contrast/utils/os'
6
- cs__scoped_require 'contrast/components/interface'
7
-
8
- module Contrast
9
- module Api
10
- # This class acts as the interface for the communication between the Agent
11
- # and the Service (SpeedRacer) as well as functions as a way for the Agent
12
- # to manage the bundled Service.
13
- class Speedracer
14
- include Contrast::Components::Interface
15
- access_component :app_context, :contrast_service, :logging
16
-
17
- attr_reader :client_number,
18
- :host,
19
- :port,
20
- :socket,
21
- :connection
22
-
23
- @instance_count = 0
24
- @instance_mutex = Mutex.new
25
-
26
- def self.next_client_number
27
- @instance_mutex.synchronize do
28
- @instance_count += 1
29
- # Rollover things
30
- rescue StandardError
31
- @instance_count = 1
32
- end
33
- end
34
-
35
- def self.read_only_instance_count
36
- @instance_count.dup
37
- end
38
-
39
- def initialize connection
40
- @client_number = Contrast::Api::Speedracer.next_client_number
41
- @messages_total = 0
42
-
43
- @pid = Process.pid.to_i
44
- @ppid = Process.ppid.to_i
45
- @connection = connection
46
- end
47
-
48
- # Allow for the start of a Service, but block so that we only attempt to
49
- # start the service one try at a time in the case multiple threads are
50
- # trying to send messages.
51
- def start_service
52
- zombie_check
53
- service_starter_thread.join(5)
54
- is_service_started = Contrast::Utils::OS.running?
55
- logger.error('The bundled service could not be started. The agent will not function properly.') unless is_service_started
56
- is_service_started
57
- end
58
-
59
- # Wrap the given DTM in a Contrast::Api::Dtm::Message and send it to the
60
- # Service for processing
61
- #
62
- # @param event [Contrast::Api::Dtm] One of the DTMs valid for the event field of
63
- # Contrast::Api::Dtm::Message
64
- def send_one event
65
- msg = build_message(event)
66
- send_message(msg)
67
- end
68
-
69
- private
70
-
71
- # check if there's a zombie service that exists, and wait on it if so.
72
- # currently, this only happens when trying to initialize speedracer
73
- def zombie_check
74
- zombie_pid_list = Contrast::Utils::OS.zombie_pids
75
- zombie_pid_list.each do |pid|
76
- Process.wait(pid.to_i)
77
- end
78
- end
79
-
80
- def determine_startup_options
81
- return { out: :out, err: :err } if CONTRAST_SERVICE.logger_path == 'STDOUT'
82
-
83
- { out: File::NULL, err: File::NULL }
84
- end
85
-
86
- # This is a separate method so we can overwrite it globally in specs
87
- def spawn_service
88
- options = determine_startup_options
89
- spawn 'contrast_service', options
90
- end
91
-
92
- def service_starter_thread
93
- Contrast::Agent::Thread.new do
94
- # Always check to see if it already started
95
- unless Contrast::Utils::OS.running?
96
- # Spawn the service process
97
- spawn_service
98
- # Block until service is running
99
- sleep(0.1) until Contrast::Utils::OS.running?
100
- end
101
- end
102
- end
103
-
104
- # Wrap the given event in a Contrast::Api::Dtm::Message
105
- #
106
- # @param event [Contrast::Api::Dtm] One of the DTMs valid for the event field of
107
- # Contrast::Api::Dtm::Message
108
- # @return Contrast::Api::Dtm::Message
109
- def build_message event
110
- message = base_message
111
- case event
112
- when Contrast::Api::Dtm::ServerActivity
113
- message.server_activity = event
114
- when Contrast::Api::Dtm::AgentStartup
115
- message.agent_startup = event
116
- when Contrast::Api::Dtm::ApplicationCreate
117
- message.application_create = event
118
- when Contrast::Api::Dtm::ApplicationUpdate
119
- message.application_update = event
120
- when Contrast::Api::Dtm::Activity
121
- message.activity = event
122
- when Contrast::Api::Dtm::HttpRequest
123
- message.prefilter = event
124
- when Contrast::Api::Dtm::HttpResponse
125
- message.postfilter = event
126
- when Contrast::Api::Dtm::Poll
127
- message.poll = event
128
- when Contrast::Api::Dtm::ObservedRoute
129
- message.observed_route = event
130
- else
131
- logger.error('Unknown event type received. Unsure how to send.', event_type: event.cs__class.name)
132
- return
133
- end
134
- logger.debug('Wrapping event in message',
135
- msg_id: message.__id__,
136
- p_id: message.pid,
137
- msg_count: message.message_count,
138
- event_id: event.__id__,
139
- event_type: event.cs__class.name)
140
- message
141
- end
142
-
143
- def base_message
144
- msg = Contrast::Api::Dtm::Message.new
145
- msg.app_name = APP_CONTEXT.name
146
- msg.app_path = APP_CONTEXT.path
147
- msg.app_language = Contrast::Utils::ObjectShare::RUBY
148
- msg.client_id = APP_CONTEXT.client_id
149
- msg.client_number = client_number
150
- msg.client_total = Contrast::Api::Speedracer.read_only_instance_count
151
- msg.message_count = (@messages_total += 1)
152
- msg.pid = APP_CONTEXT.pid
153
- msg.ppid = APP_CONTEXT.ppid
154
- msg
155
- end
156
-
157
- def send_message msg
158
- return unless msg
159
-
160
- logger.debug('Sending message.',
161
- msg_id: msg.__id__,
162
- p_id: msg.pid,
163
- msg_count: msg.message_count)
164
- to_service = Contrast::Api::Dtm::Message.encode(msg)
165
- from_service = send_marshaled(to_service)
166
- response = Contrast::Api::Settings::AgentSettings.decode(from_service)
167
- logger.debug('Received response.',
168
- msg_id: msg.__id__,
169
- p_id: msg.pid,
170
- msg_count: msg.message_count,
171
- response_id: response&.__id__)
172
- response
173
- rescue StandardError => e
174
- logger.error('Sending failed for message.',
175
- e,
176
- msg_id: msg.__id__,
177
- p_id: msg.pid,
178
- msg_count: msg.message_count,
179
- response_id: response&.__id__)
180
- raise e # reraise to let SocketClient manage the connection
181
- end
182
-
183
- def send_marshaled marshaled
184
- connection.send_marshaled(marshaled)
185
- end
186
- end
187
- end
188
- end