contrast-agent 3.12.2 → 3.13.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (167) 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/ext/build_funchook.rb +0 -2
  7. data/ext/cs__assess_fiber_track/cs__assess_fiber_track.c +2 -8
  8. data/ext/cs__assess_fiber_track/cs__assess_fiber_track.h +0 -1
  9. data/ext/cs__assess_string_interpolation26/cs__assess_string_interpolation26.c +1 -6
  10. data/ext/cs__assess_yield_track/cs__assess_yield_track.c +1 -5
  11. data/ext/cs__assess_yield_track/cs__assess_yield_track.h +0 -1
  12. data/ext/cs__common/cs__common.c +24 -0
  13. data/ext/cs__common/cs__common.h +3 -0
  14. data/ext/cs__common/extconf.rb +0 -14
  15. data/ext/extconf_common.rb +0 -28
  16. data/lib/contrast.rb +3 -1
  17. data/lib/contrast/agent.rb +14 -2
  18. data/lib/contrast/agent/assess/contrast_event.rb +28 -167
  19. data/lib/contrast/agent/assess/events/source_event.rb +3 -7
  20. data/lib/contrast/agent/assess/policy/dynamic_source_factory.rb +1 -1
  21. data/lib/contrast/agent/assess/policy/policy_node.rb +4 -98
  22. data/lib/contrast/agent/assess/policy/propagation_method.rb +1 -2
  23. data/lib/contrast/agent/assess/policy/propagation_node.rb +5 -1
  24. data/lib/contrast/agent/assess/policy/propagator/base.rb +1 -1
  25. data/lib/contrast/agent/assess/policy/propagator/insert.rb +1 -4
  26. data/lib/contrast/agent/assess/policy/propagator/match_data.rb +9 -1
  27. data/lib/contrast/agent/assess/policy/propagator/remove.rb +6 -11
  28. data/lib/contrast/agent/assess/policy/propagator/select.rb +4 -4
  29. data/lib/contrast/agent/assess/policy/propagator/split.rb +2 -2
  30. data/lib/contrast/agent/assess/policy/propagator/substitution.rb +4 -4
  31. data/lib/contrast/agent/assess/policy/propagator/trim.rb +6 -10
  32. data/lib/contrast/agent/assess/policy/source_method.rb +1 -2
  33. data/lib/contrast/agent/assess/policy/trigger_method.rb +1 -9
  34. data/lib/contrast/agent/assess/policy/trigger_node.rb +16 -4
  35. data/lib/contrast/agent/assess/properties.rb +4 -382
  36. data/lib/contrast/agent/assess/property/evented.rb +78 -0
  37. data/lib/contrast/agent/assess/property/tagged.rb +339 -0
  38. data/lib/contrast/agent/assess/rule/provider/hardcoded_value_rule.rb +2 -20
  39. data/lib/contrast/agent/assess/tag.rb +27 -12
  40. data/lib/contrast/agent/at_exit_hook.rb +3 -1
  41. data/lib/contrast/agent/exclusion_matcher.rb +2 -2
  42. data/lib/contrast/agent/inventory/policy/datastores.rb +0 -1
  43. data/lib/contrast/agent/middleware.rb +2 -14
  44. data/lib/contrast/agent/patching/policy/patch.rb +1 -1
  45. data/lib/contrast/agent/patching/policy/policy.rb +3 -3
  46. data/lib/contrast/agent/patching/policy/policy_node.rb +2 -2
  47. data/lib/contrast/agent/protect/policy/rule_applicator.rb +2 -2
  48. data/lib/contrast/agent/protect/rule/base.rb +19 -31
  49. data/lib/contrast/agent/protect/rule/base_service.rb +1 -1
  50. data/lib/contrast/agent/protect/rule/http_method_tampering.rb +2 -7
  51. data/lib/contrast/agent/protect/rule/xxe.rb +1 -0
  52. data/lib/contrast/agent/reaction_processor.rb +3 -3
  53. data/lib/contrast/agent/request.rb +92 -331
  54. data/lib/contrast/agent/request_context.rb +15 -15
  55. data/lib/contrast/agent/request_handler.rb +1 -1
  56. data/lib/contrast/agent/response.rb +2 -14
  57. data/lib/contrast/agent/scope.rb +1 -1
  58. data/lib/contrast/agent/service_heartbeat.rb +7 -9
  59. data/lib/contrast/agent/static_analysis.rb +1 -1
  60. data/lib/contrast/agent/thread_watcher.rb +49 -0
  61. data/lib/contrast/agent/version.rb +1 -1
  62. data/lib/contrast/agent/worker_thread.rb +24 -0
  63. data/lib/contrast/api.rb +3 -5
  64. data/lib/contrast/api/communication.rb +20 -0
  65. data/lib/contrast/api/communication/connection_status.rb +41 -0
  66. data/lib/contrast/api/communication/messaging_queue.rb +79 -0
  67. data/lib/contrast/{utils/service_response_util.rb → api/communication/response_processor.rb} +9 -18
  68. data/lib/contrast/api/communication/service_lifecycle.rb +61 -0
  69. data/lib/contrast/api/communication/socket.rb +45 -0
  70. data/lib/contrast/api/communication/socket_client.rb +76 -0
  71. data/lib/contrast/api/communication/speedracer.rb +111 -0
  72. data/lib/contrast/api/communication/tcp_socket.rb +31 -0
  73. data/lib/contrast/api/communication/unix_socket.rb +27 -0
  74. data/lib/contrast/api/decorators.rb +10 -0
  75. data/lib/contrast/api/decorators/address.rb +60 -0
  76. data/lib/contrast/api/decorators/application_settings.rb +7 -3
  77. data/lib/contrast/api/decorators/application_update.rb +0 -9
  78. data/lib/contrast/api/decorators/http_request.rb +139 -0
  79. data/lib/contrast/api/decorators/message.rb +75 -0
  80. data/lib/contrast/api/decorators/rasp_rule_sample.rb +28 -0
  81. data/lib/contrast/api/decorators/route_coverage.rb +57 -0
  82. data/lib/contrast/api/decorators/trace_event.rb +99 -0
  83. data/lib/contrast/api/decorators/trace_event_object.rb +57 -0
  84. data/lib/contrast/api/decorators/trace_event_signature.rb +46 -0
  85. data/lib/contrast/api/decorators/trace_taint_range.rb +51 -0
  86. data/lib/contrast/api/decorators/trace_taint_range_tags.rb +109 -0
  87. data/lib/contrast/api/decorators/user_input.rb +40 -0
  88. data/lib/contrast/components/app_context.rb +0 -7
  89. data/lib/contrast/components/config.rb +4 -9
  90. data/lib/contrast/components/interface.rb +1 -1
  91. data/lib/contrast/components/settings.rb +0 -6
  92. data/lib/contrast/extension/assess.rb +0 -1
  93. data/lib/contrast/extension/assess/assess_extension.rb +1 -2
  94. data/lib/contrast/extension/assess/fiber.rb +1 -1
  95. data/lib/contrast/extension/assess/string.rb +1 -1
  96. data/lib/contrast/extension/inventory.rb +0 -1
  97. data/lib/contrast/framework/base_support.rb +0 -23
  98. data/lib/contrast/framework/manager.rb +0 -9
  99. data/lib/contrast/framework/rails/patch/action_controller_live_buffer.rb +1 -3
  100. data/lib/contrast/framework/rails/patch/assess_configuration.rb +3 -4
  101. data/lib/contrast/framework/rails/support.rb +3 -32
  102. data/lib/contrast/framework/sinatra/patch/base.rb +1 -1
  103. data/lib/contrast/framework/sinatra/support.rb +11 -22
  104. data/lib/contrast/funchook/funchook.rb +45 -0
  105. data/lib/contrast/logger/application.rb +1 -1
  106. data/lib/contrast/logger/format.rb +51 -0
  107. data/lib/contrast/logger/log.rb +8 -2
  108. data/lib/contrast/utils/assess/tracking_util.rb +45 -20
  109. data/lib/contrast/utils/hash_digest.rb +11 -2
  110. data/lib/contrast/utils/invalid_configuration_util.rb +1 -17
  111. data/lib/contrast/utils/inventory_util.rb +2 -7
  112. data/lib/contrast/utils/object_share.rb +0 -1
  113. data/lib/contrast/utils/os.rb +16 -4
  114. data/lib/contrast/utils/stack_trace_utils.rb +0 -1
  115. data/lib/contrast/utils/tag_util.rb +1 -1
  116. data/lib/contrast/utils/thread_tracker.rb +1 -14
  117. data/lib/contrast/utils/timer.rb +1 -17
  118. data/ruby-agent.gemspec +4 -4
  119. metadata +48 -72
  120. data/funchook/Makefile +0 -29
  121. data/funchook/autom4te.cache/output.0 +0 -4964
  122. data/funchook/autom4te.cache/requests +0 -77
  123. data/funchook/autom4te.cache/traces.0 +0 -361
  124. data/funchook/config.log +0 -651
  125. data/funchook/config.status +0 -1015
  126. data/funchook/configure +0 -4964
  127. data/funchook/src/Makefile +0 -70
  128. data/funchook/src/config.h +0 -101
  129. data/funchook/src/config.h.in +0 -100
  130. data/funchook/src/decoder.o +0 -0
  131. data/funchook/src/distorm.o +0 -0
  132. data/funchook/src/funchook.o +0 -0
  133. data/funchook/src/funchook_io.o +0 -0
  134. data/funchook/src/funchook_syscall.o +0 -0
  135. data/funchook/src/funchook_unix.o +0 -0
  136. data/funchook/src/funchook_x86.o +0 -0
  137. data/funchook/src/instructions.o +0 -0
  138. data/funchook/src/insts.o +0 -0
  139. data/funchook/src/libfunchook.dylib +0 -0
  140. data/funchook/src/mnemonics.o +0 -0
  141. data/funchook/src/operands.o +0 -0
  142. data/funchook/src/os_func.o +0 -0
  143. data/funchook/src/os_func_unix.o +0 -0
  144. data/funchook/src/prefix.o +0 -0
  145. data/funchook/src/printf_base.o +0 -0
  146. data/funchook/src/textdefs.o +0 -0
  147. data/funchook/src/wstring.o +0 -0
  148. data/funchook/test/Makefile +0 -43
  149. data/funchook/test/funchook_test +0 -0
  150. data/funchook/test/libfunchook_test.so +0 -0
  151. data/funchook/test/libfunchook_test.so.dSYM/Contents/Info.plist +0 -20
  152. data/funchook/test/libfunchook_test.so.dSYM/Contents/Resources/DWARF/libfunchook_test.so +0 -0
  153. data/funchook/test/test_main.o +0 -0
  154. data/funchook/test/x86_64_test.o +0 -0
  155. data/lib/contrast/agent/assess/adjusted_span.rb +0 -27
  156. data/lib/contrast/agent/socket_client.rb +0 -134
  157. data/lib/contrast/api/connection_status.rb +0 -49
  158. data/lib/contrast/api/socket.rb +0 -43
  159. data/lib/contrast/api/speedracer.rb +0 -188
  160. data/lib/contrast/api/tcp_socket.rb +0 -29
  161. data/lib/contrast/api/unix_socket.rb +0 -25
  162. data/lib/contrast/framework/sinatra/application_helper.rb +0 -51
  163. data/lib/contrast/framework/view_technologies_descriptor.rb +0 -21
  164. data/lib/contrast/internal_exception.rb +0 -8
  165. data/lib/contrast/utils/cache.rb +0 -58
  166. data/lib/contrast/utils/service_sender_util.rb +0 -167
  167. data/lib/contrast/utils/sinatra_helper.rb +0 -49
@@ -0,0 +1,61 @@
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
+ module Communication
7
+ # Handles local service startup
8
+ module ServiceLifecycle
9
+ include Contrast::Components::Interface
10
+ access_component :logging, :contrast_service
11
+
12
+ def attempt_local_service_startup
13
+ zombie_check
14
+ service_starter_thread.join(5)
15
+ is_service_started = Contrast::Utils::OS.running?
16
+ if is_service_started
17
+ logger.info('The bundled service was successfully started.')
18
+ else
19
+ logger.error('The bundled service could not be started. The agent will not function properly.')
20
+ end
21
+ is_service_started
22
+ end
23
+
24
+ # check if there's a zombie service that exists, and wait on it if so.
25
+ # currently, this only happens when trying to initialize speedracer
26
+ def zombie_check
27
+ zombie_pid_list = Contrast::Utils::OS.zombie_pids
28
+ zombie_pid_list.each do |pid|
29
+ Process.wait(pid.to_i)
30
+ end
31
+ end
32
+
33
+ def determine_startup_options
34
+ return { out: :out, err: :out } if CONTRAST_SERVICE.logger_path == 'STDOUT'
35
+ return { out: :err, err: :err } if CONTRAST_SERVICE.logger_path == 'STDERR'
36
+
37
+ { out: File::NULL, err: File::NULL }
38
+ end
39
+
40
+ # This is a separate method so we can overwrite it globally in specs
41
+ def spawn_service
42
+ options = determine_startup_options
43
+ logger.debug('Spawning service')
44
+ spawn 'contrast_service', options
45
+ end
46
+
47
+ def service_starter_thread
48
+ Contrast::Agent::Thread.new do
49
+ # Always check to see if it already started
50
+ unless Contrast::Utils::OS.running?
51
+ # Spawn the service process
52
+ spawn_service
53
+ # Block until service is running
54
+ sleep(0.1) until Contrast::Utils::OS.running?
55
+ end
56
+ end
57
+ end
58
+ end
59
+ end
60
+ end
61
+ end
@@ -0,0 +1,45 @@
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
+ module Communication
7
+ # Behavior common to all sockets used
8
+ # to communicate with the Contrast Service.
9
+ module Socket
10
+ SOCKET_MONITOR = Monitor.new
11
+
12
+ # Send a message across the socket and read back the response.
13
+ # @param marshaled [String] some marshaled form of data to be sent across
14
+ # the socket. Typically an encoded form of Contrast::Api::Dtm::Message.
15
+ # @return [String] some marshalled form of data returned by the socket.
16
+ # Typically an encoded form of Contrast::Api::Settings::AgentSettings.
17
+ def send_marshaled marshaled
18
+ SOCKET_MONITOR.synchronize do
19
+ socket = new_socket
20
+
21
+ # write message length
22
+ len = marshaled.length
23
+ socket.write([len].pack(Contrast::Api::ENCODING_STRING))
24
+
25
+ # write the entire message
26
+ socket.write(marshaled)
27
+ socket.close_write
28
+
29
+ # read the response length
30
+ len = socket.read(4).unpack1(Contrast::Api::ENCODING_STRING)
31
+
32
+ # read expected response to end
33
+ socket.read(len)
34
+ end
35
+ end
36
+
37
+ # Override this method to return a socket.
38
+ # Should be interface compatible with TCPSocket, UNIXSocket, etc.
39
+ def new_socket
40
+ raise NoMethodError, 'This is abstract, override it.'
41
+ end
42
+ end
43
+ end
44
+ end
45
+ end
@@ -0,0 +1,76 @@
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/communication/tcp_socket'
8
+ cs__scoped_require 'contrast/api/communication/unix_socket'
9
+ cs__scoped_require 'contrast/components/interface'
10
+
11
+ module Contrast
12
+ module Api
13
+ module Communication
14
+ # SocketClient acts as a interface between the agent and the service. It instantiates a
15
+ # service proxy and tracks the state of that proxy.
16
+ class SocketClient
17
+ include Contrast::Components::Interface
18
+ access_component :contrast_service, :logging
19
+
20
+ def initialize
21
+ @socket = init_connection
22
+ end
23
+
24
+ # Wrap the given DTM in a Contrast::Api::Dtm::Message and send it to the
25
+ # Service for processing
26
+ #
27
+ # @param event [Contrast::Api::Dtm] One of the DTMs valid for the event field of
28
+ # Contrast::Api::Dtm::Message
29
+ def send_one event
30
+ msg = Contrast::Api::Dtm::Message.build(event)
31
+ send_message(msg)
32
+ end
33
+
34
+ private
35
+
36
+ def init_connection
37
+ if CONTRAST_SERVICE.use_tcp?
38
+ Contrast::Api::Communication::TcpSocket.new(CONTRAST_SERVICE.host, CONTRAST_SERVICE.port)
39
+ else
40
+ Contrast::Api::Communication::UnixSocket.new(CONTRAST_SERVICE.socket_path)
41
+ end
42
+ end
43
+
44
+ def send_message msg
45
+ return unless msg
46
+
47
+ logger.debug('Sending message.',
48
+ msg_id: msg.__id__,
49
+ p_id: msg.pid,
50
+ msg_count: msg.message_count)
51
+ to_service = Contrast::Api::Dtm::Message.encode(msg)
52
+ from_service = send_marshaled(to_service)
53
+ response = Contrast::Api::Settings::AgentSettings.decode(from_service)
54
+ logger.debug('Received response.',
55
+ msg_id: msg.__id__,
56
+ p_id: msg.pid,
57
+ msg_count: msg.message_count,
58
+ response_id: response&.__id__)
59
+ response
60
+ rescue StandardError => e
61
+ logger.error('Sending failed for message.',
62
+ e,
63
+ msg_id: msg.__id__,
64
+ p_id: msg.pid,
65
+ msg_count: msg.message_count,
66
+ response_id: response&.__id__)
67
+ raise e # reraise to let Speedracer manage the connection
68
+ end
69
+
70
+ def send_marshaled marshaled
71
+ @socket.send_marshaled(marshaled)
72
+ end
73
+ end
74
+ end
75
+ end
76
+ end
@@ -0,0 +1,111 @@
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/components/interface'
5
+
6
+ module Contrast
7
+ module Api
8
+ module Communication
9
+ # Wraps all connection data to speedracer
10
+ class Speedracer
11
+ include Contrast::Api::Communication::ServiceLifecycle
12
+ include Contrast::Components::Interface
13
+ access_component :contrast_service, :logging, :app_context
14
+
15
+ attr_reader :status, :response_processor, :socket_client, :ensure_running
16
+
17
+ def initialize
18
+ @status = Contrast::Api::Communication::ConnectionStatus.new
19
+ @socket_client = Contrast::Api::Communication::SocketClient.new
20
+ @response_processor = Contrast::Api::Communication::ResponseProcessor.new
21
+ @ensure_running = Mutex.new
22
+ end
23
+
24
+ def ensure_startup!
25
+ return if status.connected?
26
+
27
+ ensure_running.synchronize do
28
+ if CONTRAST_SERVICE.use_bundled_service?
29
+ logger.info('Attempting to start local service')
30
+ unless attempt_local_service_startup
31
+ logger.error('Failed to start local service')
32
+ return
33
+ end
34
+ end
35
+ unless status.startup_messages_sent?
36
+ startup_responses = send_initialization_messages
37
+ return false unless startup_responses
38
+
39
+ startup_responses.each { |response| response_processor.process(response) }
40
+ end
41
+ end
42
+ end
43
+
44
+ def return_response event
45
+ send_to_speedracer(event) do |response|
46
+ return response
47
+ end
48
+ end
49
+
50
+ def process_internally event
51
+ send_to_speedracer(event) do |response|
52
+ response_processor.process(response)
53
+ end
54
+ end
55
+
56
+ private
57
+
58
+ def send_to_speedracer event
59
+ ensure_startup!
60
+
61
+ logger.debug_with_time(event.cs__class.name) do
62
+ response = socket_client.send_one event
63
+ status.success!
64
+ yield response
65
+ end
66
+ rescue StandardError => e
67
+ status.failure!
68
+ logger.error('Unable to send message.', e,
69
+ event_id: event.__id__,
70
+ event_type: event.cs__class.name)
71
+ nil
72
+ end
73
+
74
+ def send_initialization_messages
75
+ agent_startup_msg = APP_CONTEXT.build_agent_startup_message
76
+ app_startup_msg = APP_CONTEXT.build_app_startup_message
77
+
78
+ logger.debug('Preparing to send startup messages')
79
+ # 1 initial attempt, + 3 potential retries.
80
+ # The agent-service-api REQUIREMENTS.md spec mandates this #.
81
+ 4.times do
82
+ log_send_event(agent_startup_msg)
83
+ next unless (agent_response = socket_client.send_one(agent_startup_msg))
84
+
85
+ # Connection was successful
86
+ log_send_event(app_startup_msg)
87
+ app_response = socket_client.send_one(app_startup_msg)
88
+
89
+ status.success!
90
+ logger.debug('Successfully sent startup messages to service.')
91
+ return [agent_response, app_response]
92
+ end
93
+
94
+ status.failure!
95
+ logger.error('Could not send agent startup message context')
96
+ nil
97
+ rescue StandardError => e
98
+ logger.error('Could not build service context', e)
99
+ status.failure!
100
+ nil
101
+ end
102
+
103
+ def log_send_event event
104
+ logger.debug('Immediately sending event.',
105
+ event_id: event.__id__,
106
+ event_type: event.cs__class.name)
107
+ end
108
+ end
109
+ end
110
+ end
111
+ end
@@ -0,0 +1,31 @@
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/api/communication/socket'
5
+
6
+ module Contrast
7
+ module Api
8
+ module Communication
9
+ # This class allows us to create a TCP Socket to communicate to the Service
10
+ # (Speed Racer). Either it or the Unix Socket will be used, as determined
11
+ # by the configuration options set for Service communication.
12
+ class TcpSocket
13
+ include Contrast::Api::Communication::Socket
14
+
15
+ attr_reader :host, :port
16
+
17
+ # Create the socket
18
+ # @param host [String] socket target hostname or IP address
19
+ # @param port [String,Integer] socket target port
20
+ def initialize host, port
21
+ @host = host.to_s
22
+ @port = port.to_i
23
+ end
24
+
25
+ def new_socket
26
+ ::TCPSocket.new(host, port)
27
+ end
28
+ end
29
+ end
30
+ end
31
+ end
@@ -0,0 +1,27 @@
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/api/communication/socket'
5
+
6
+ module Contrast
7
+ module Api
8
+ module Communication
9
+ # Implements a UNIX domain socket to connect to the Contrast Service.
10
+ class UnixSocket
11
+ include Contrast::Api::Communication::Socket
12
+
13
+ attr_reader :path
14
+
15
+ # Create the socket
16
+ # @param path [String] file path to a UNIX domain socket
17
+ def initialize path
18
+ @path = path
19
+ end
20
+
21
+ def new_socket
22
+ ::UNIXSocket.new(path)
23
+ end
24
+ end
25
+ end
26
+ end
27
+ end
@@ -8,7 +8,17 @@ module Contrast
8
8
  end
9
9
  end
10
10
  end
11
+ cs__scoped_require 'contrast/api/decorators/message'
11
12
  cs__scoped_require 'contrast/api/decorators/application_update'
12
13
  cs__scoped_require 'contrast/api/decorators/input_analysis'
13
14
  cs__scoped_require 'contrast/api/decorators/application_settings'
14
15
  cs__scoped_require 'contrast/api/decorators/server_features'
16
+ cs__scoped_require 'contrast/api/decorators/route_coverage'
17
+ cs__scoped_require 'contrast/api/decorators/trace_event_object'
18
+ cs__scoped_require 'contrast/api/decorators/trace_event_signature'
19
+ cs__scoped_require 'contrast/api/decorators/trace_taint_range'
20
+ cs__scoped_require 'contrast/api/decorators/trace_event'
21
+ cs__scoped_require 'contrast/api/decorators/rasp_rule_sample'
22
+ cs__scoped_require 'contrast/api/decorators/user_input'
23
+ cs__scoped_require 'contrast/api/decorators/address'
24
+ cs__scoped_require 'contrast/api/decorators/http_request'
@@ -0,0 +1,60 @@
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/api/dtm.pb'
5
+ cs__scoped_require 'contrast/components/interface'
6
+ cs__scoped_require 'contrast/utils/string_utils'
7
+ cs__scoped_require 'contrast/utils/timer'
8
+
9
+ module Contrast
10
+ module Api
11
+ module Decorators
12
+ # Used to decorate the Address protobuf model so it can own some of the
13
+ # data massaging required for Request dtm
14
+ module Address
15
+ def self.included klass
16
+ klass.extend(ClassMethods)
17
+ end
18
+
19
+ # Used to add class methods to the ApplicationUpdate class on inclusion of the decorator
20
+ module ClassMethods
21
+ include Contrast::Components::Interface
22
+ access_component :logging
23
+
24
+ # receiver is memoized because it is the address/host/port of the server, once we
25
+ # resolve this for the first time, it shouldn't change
26
+ #
27
+ # @return [Contrast::Api::Dtm::Address] the address of this server
28
+ def build_receiver
29
+ @_build_receiver ||= begin
30
+ address = new
31
+ address.host = 'localhost'
32
+ address.ip = '127.0.0.1'
33
+ begin
34
+ Timeout.timeout(1) do
35
+ address.host = Contrast::Utils::StringUtils.force_utf8(Socket.gethostname)
36
+ address.ip = Contrast::Utils::StringUtils.force_utf8(Resolv.getaddress(address.host))
37
+ end
38
+ rescue StandardError => e
39
+ logger.warn('Unable to resolve host or ip', e, address: address)
40
+ end
41
+ address
42
+ end
43
+ end
44
+
45
+ # Parse out the sender of the Request and return it as an Address
46
+ #
47
+ # @return [Contrast::Api::Dtm::Address] the address from which the
48
+ # request originated
49
+ def build_sender request
50
+ sender = new
51
+ sender.ip = Contrast::Utils::StringUtils.force_utf8(request.ip)
52
+ sender
53
+ end
54
+ end
55
+ end
56
+ end
57
+ end
58
+ end
59
+
60
+ Contrast::Api::Dtm::Address.include(Contrast::Api::Decorators::Address)
@@ -8,7 +8,12 @@ module Contrast
8
8
  module Decorators
9
9
  # Used to decorate the ApplicationSettings protobuf model to handle setting translation
10
10
  module ApplicationSettings
11
- MODE_ALLOWLIST = %i[NO_ACTION BLOCK_AT_PERIMETER MONITOR BLOCK].cs__freeze
11
+ MODE_ALLOWLIST = [
12
+ Contrast::Api::Settings::ProtectionRule::Mode::NO_ACTION,
13
+ Contrast::Api::Settings::ProtectionRule::Mode::BLOCK,
14
+ Contrast::Api::Settings::ProtectionRule::Mode::MONITOR,
15
+ Contrast::Api::Settings::ProtectionRule::Mode::BLOCK_AT_PERIMETER
16
+ ].cs__freeze
12
17
  # Convert protobuf exlcusions into Agent exclusions
13
18
  def translated_exclusions
14
19
  exclusions.map { |exc| Contrast::Agent::ExclusionMatcher.new(exc) }
@@ -25,8 +30,7 @@ module Contrast
25
30
  {
26
31
  modes_by_id: translated_protection_mode_by_id,
27
32
  exclusion_matchers: translated_exclusions,
28
- disabled_assess_rules: disabled_assess_rules,
29
- session_id: Contrast::Utils::StringUtils.force_utf8(session_id)
33
+ disabled_assess_rules: disabled_assess_rules
30
34
  }
31
35
  end
32
36
  end