contrast-agent 3.10.0 → 3.12.1

data/ext/cs__contrast_patch/cs__contrast_patch.h

@@ -1,10 +1,5 @@
 #include <ruby.h>
-
-typedef enum {
-  IMPL_ALIAS_INSTANCE,
-  IMPL_ALIAS_SINGLETON,
-  IMPL_PREPEND
-} patch_impl;
+#include "../cs__common/cs__common.h"
 
 /* Calls to Contrast modules */
 /* Contrast::Agent::Patching::Policy::PatchStatus */

data/ext/cs__contrast_patch/extconf.rb

@@ -1,2 +1,5 @@
+# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# frozen_string_literal: true
+
 $TO_MAKE = File.basename(__dir__)
 require_relative '../extconf_common'

data/ext/cs__protect_kernel/cs__protect_kernel.c

@@ -9,12 +9,23 @@ static VALUE contrast_protect_fork(const int argc, const VALUE *argv,
                                    const VALUE self) {
     VALUE ret;
     if (rb_block_given_p()) {
+        /* We call our hook, but it's a little complicated.
+         * We wrap the fork block with our own lambda in 
+         * order to instrument it.  There are no public
+         * methods in the Ruby C API to set the prevailing
+         * block, so we have to use rb_funcall_with_block.
+         * Also, rb_funcall_with_block does a public call,
+         * and our method is private.
+         * So we (as a hack) temporarily set it to public.
+         */
         VALUE wrapper;
         wrapper =
-            rb_funcall_with_block(rb_mKernel, rb_sym_protect_kernel_wrapper, 0,
-                                  NULL, rb_block_proc());
+            rb_funcall_with_block(kernel_protect, rb_sym_protect_kernel_wrapper, 0,
+                                   NULL, rb_block_proc());
+        rb_funcall(rb_mKernel, rb_intern("public"), 1, ID2SYM(rb_sym_protect_kernel_fork));
         ret = rb_funcall_with_block(self, rb_sym_protect_kernel_fork, argc,
                                     argv, wrapper);
+        rb_funcall(rb_mKernel, rb_intern("private"), 1, ID2SYM(rb_sym_protect_kernel_fork));
     } else {
         ret = rb_funcall2(self, rb_sym_protect_kernel_fork, argc, argv);
     }
@@ -22,16 +33,16 @@ static VALUE contrast_protect_fork(const int argc, const VALUE *argv,
 }
 
 void Init_cs__protect_kernel(void) {
+    VALUE core_protect = rb_define_module_under(core_extensions, "Protect");
+    kernel_protect = rb_define_module_under(core_protect, "Kernel");
+    rb_sym_protect_kernel_wrapper = rb_intern("build_wrapper");
 
-    rb_sym_protect_kernel_fork = rb_intern("cs__protect_kernel_fork");
-    rb_sym_protect_kernel_wrapper = rb_intern("cs__protect_build_wrapper");
+    rb_sym_protect_kernel_fork = contrast_register_patch("Kernel",
+                                                         "fork",
+                                                         &contrast_protect_fork);
+
+    rb_sym_protect_kernel_fork = contrast_register_singleton_patch("Kernel",
+                                                                   "fork",
+                                                                   &contrast_protect_fork);
 
-    VALUE singleton = rb_singleton_class(rb_mKernel);
-    contrast_alias_method(rb_mKernel, "cs__protect_kernel_fork", "fork");
-    contrast_alias_method(singleton, "cs__protect_kernel_fork", "fork");
-    rb_define_module_function(rb_mKernel, "fork", contrast_protect_fork, -1);
-    // Kernel#fork, as opposed to Kernel.fork, is private. Restore that.
-    rb_funcall(rb_mKernel, rb_intern("public"), 1,
-               ID2SYM(rb_intern("cs__protect_kernel_fork")));
-    rb_funcall(rb_mKernel, rb_intern("private"), 1, ID2SYM(rb_intern("fork")));
 }

data/ext/cs__protect_kernel/cs__protect_kernel.h

@@ -2,6 +2,7 @@
 
 extern VALUE rb_vm_top_self(void);
 
+static VALUE kernel_protect;
 static VALUE rb_sym_protect_kernel_fork;
 static VALUE rb_sym_protect_kernel_wrapper;
 

data/ext/cs__protect_kernel/extconf.rb

@@ -1,2 +1,5 @@
+# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
+# frozen_string_literal: true
+
 $TO_MAKE = File.basename(__dir__)
 require_relative '../extconf_common'

data/ext/extconf_common.rb

@@ -1,6 +1,7 @@
 # Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
-require 'mkmf'
+# frozen_string_literal: true
 
+require 'mkmf'
 require_relative '../lib/contrast/agent/version'
 
 def name
@@ -8,7 +9,7 @@ def name
 end
 
 def make!
-  create_makefile "#{name}/#{name}"
+  create_makefile "#{ name }/#{ name }"
 end
 
 def ext_path
@@ -18,23 +19,24 @@ def ext_path
 end
 
 def rpath_root
-  if (darwin = !(/darwin/ =~ RUBY_PLATFORM).nil?)
-    "@loader_path"
+  if (/darwin/ =~ RUBY_PLATFORM).nil?
+    '\$${ORIGIN}'
   else
-    "\\$${ORIGIN}"
+    '@loader_path'
   end
 end
 
 def funchook_rpath!
-  options = " -Wl,-rpath,#{rpath_root}/../../shared_libraries"
+  options = " -Wl,-rpath,#{ rpath_root }/../../shared_libraries"
   raise unless try_link('int main() {return 0;}', options)
+
   $LDFLAGS << options
-  $LDFLAGS << " -L#{__dir__}/../shared_libraries"
+  $LDFLAGS << " -L#{ __dir__ }/../shared_libraries"
 
   find_header('funchook.h', ext_path)
   have_header('funchook.h')
 
-  find_library('funchook', 'funchook_create', "../shared_libraries")
+  find_library('funchook', 'funchook_create', '../shared_libraries')
   find_library('funchook', 'funchook_install')
   find_library('funchook', 'funchook_prepare')
   have_library('funchook', 'funchook_create')

data/funchook/autom4te.cache/requests

@@ -14,64 +14,64 @@
                         'configure.ac'
                       ],
                       {
-                        'LT_INIT' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_NLS' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AM_PROG_AR' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
+                        'm4_include' => 1,
                         'AC_CANONICAL_BUILD' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AM_NLS' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_PROG_FC_C_O' => 1,
+                        'LT_INIT' => 1,
+                        'AC_LIBSOURCE' => 1,
                         'm4_pattern_allow' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_SUBST' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AH_OUTPUT' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
                         'LT_SUPPORTED_TAG' => 1,
-                        'AC_INIT' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
+                        'AC_SUBST' => 1,
                         'sinclude' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        '_m4_warn' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
                         'include' => 1,
-                        'm4_include' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_PROG_MOC' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'm4_sinclude' => 1,
+                        'AC_INIT' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AM_PATH_GUILE' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
                         'AC_CANONICAL_SYSTEM' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'm4_pattern_forbid' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
                         'AC_FC_SRCEXT' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'm4_sinclude' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AM_PROG_AR' => 1
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        '_m4_warn' => 1
                       }
                     ], 'Autom4te::Request' )
            );

data/funchook/config.log

@@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 ## Platform. ##
 ## --------- ##
 
-hostname = b28fd605-e326-4651-9c62-dace7786d221-5nfw6
+hostname = a193cfcc-bb72-46e9-914d-bb7806a0d5f9-k7pzb
 uname -m = x86_64
-uname -r = 4.19.95-flatcar
+uname -r = 4.19.107-flatcar
 uname -s = Linux
-uname -v = #1 SMP Sat Feb 8 07:25:12 -00 2020
+uname -v = #1 SMP Thu Mar 26 19:48:36 -00 2020
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
@@ -326,7 +326,7 @@ generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on b28fd605-e326-4651-9c62-dace7786d221-5nfw6
+on a193cfcc-bb72-46e9-914d-bb7806a0d5f9-k7pzb
 
 config.status:822: creating Makefile
 config.status:822: creating src/Makefile

data/lib/contrast.rb

@@ -51,7 +51,7 @@ cs__scoped_require 'contrast/internal_exception'
 
 # shared utils
 cs__scoped_require 'contrast/utils/timer'
-cs__scoped_require 'contrast/utils/random_util'
 cs__scoped_require 'contrast/utils/preflight_util'
 
+cs__scoped_require 'contrast/utils/assess/sampling_util'
 cs__scoped_require 'contrast/agent'

data/lib/contrast/agent.rb

@@ -5,9 +5,22 @@ cs__scoped_require 'English'
 
 # This must precede other Contrast C extensions
 cs__scoped_require 'cs__common/cs__common'
-
-cs__scoped_require 'contrast/extensions/ruby_core/delegator'
-cs__scoped_require 'contrast/extensions/ruby_core/module'
+# This must precede any patching we do as we log patches and we shouldn't cause
+# requires to happen during that process.
+cs__scoped_require 'contrast/components/logger'
+
+# defining instrumentation, this must precede core extensions
+# because they need to register their patches
+cs__scoped_require 'contrast/agent/patching/policy/patcher'
+cs__scoped_require 'contrast/agent/patching/policy/patch'
+
+# core extensions
+cs__scoped_require 'contrast/extension/assess'
+cs__scoped_require 'contrast/extension/delegator'
+cs__scoped_require 'contrast/extension/inventory'
+cs__scoped_require 'contrast/extension/module'
+cs__scoped_require 'contrast/extension/protect'
+cs__scoped_require 'contrast/extension/protect/kernel'
 
 cs__scoped_require 'contrast/utils/object_share'
 cs__scoped_require 'contrast/utils/boolean_util'
@@ -20,20 +33,11 @@ cs__scoped_require 'contrast/common_agent_configuration'
 cs__scoped_require 'contrast/utils/hash_digest'
 cs__scoped_require 'contrast/utils/invalid_configuration_util'
 
-cs__scoped_require 'contrast/utils/cache'
-
 # scoping
 cs__scoped_require 'contrast/agent/scope'
 
 cs__scoped_require 'contrast/utils/thread_tracker'
 
-cs__scoped_require 'contrast/api'
-
-cs__scoped_require 'contrast/utils/resource_loader'
-cs__scoped_require 'contrast/utils/duck_utils'
-cs__scoped_require 'contrast/agent/tracepoint_hook'
-cs__scoped_require 'contrast/agent/at_exit_hook'
-
 # Framework support
 cs__scoped_require 'contrast/framework/manager'
 
@@ -50,16 +54,17 @@ module Contrast
   end
 end
 
-# keep tracker of logger updates
-cs__scoped_require 'contrast/agent/logger_manager'
+cs__scoped_require 'contrast/api'
+
+cs__scoped_require 'contrast/utils/resource_loader'
+cs__scoped_require 'contrast/utils/duck_utils'
+cs__scoped_require 'contrast/agent/tracepoint_hook'
+cs__scoped_require 'contrast/agent/at_exit_hook'
 
 # communication with contrast service
 cs__scoped_require 'contrast/agent/exclusion_matcher'
 cs__scoped_require 'contrast/agent/socket_client'
 
-# config interface
-cs__scoped_require 'contrast/agent/feature_state'
-
 # threads that handle contrast scope
 cs__scoped_require 'contrast/agent/thread'
 
@@ -68,17 +73,6 @@ cs__scoped_require 'contrast/agent/request_context'
 
 cs__scoped_require 'contrast/agent/assess'
 
-# Unconditional early-framework patches.
-# These happen regardless of analysis mode, & should be lightweight.
-cs__scoped_require 'contrast/utils/rack_assess_session_cookie'
-cs__scoped_require 'contrast/utils/rails_assess_configuration'
-# Also: should document the necessity of patching this ASAP.
-# In Rails, session configuration occurs extremely early & only once.
-# If we defer our patching of the rails session configuration too long
-# (i.e., where we normally patch) we will miss the configuration
-# and will never be able to report session misconfiguration rules.
-cs__scoped_require 'contrast/extensions/framework/rails/configuration' if defined?(Rails)
-
 # protect rules
 cs__scoped_require 'contrast/agent/protect/rule'
 
@@ -87,4 +81,13 @@ cs__scoped_require 'contrast/utils/gemfile_reader'
 
 # rack event monitoring
 cs__scoped_require 'contrast/agent/middleware'
-cs__scoped_require 'contrast/agent/railtie' if defined?(Rails) && Rails::VERSION::MAJOR.to_i >= 3
+
+# TODO: RUBY-919
+# Refactor to use Contrast::Framework::Manager
+# Contrast::Framework::Manager.before_load_patches!
+if defined?(::Rails)
+  cs__scoped_require 'contrast/framework/rails/patch/support'
+  cs__scoped_require 'contrast/framework/rails/patch/rails_application_configuration'
+  Contrast::Framework::Rails::Patch::RailsApplicationConfiguration.instrument
+  cs__scoped_require 'contrast/agent/railtie' if ::Rails::VERSION::MAJOR.to_i >= 3
+end

data/lib/contrast/agent/assess.rb

@@ -17,28 +17,18 @@ module Contrast
       # Rules - generic
       cs__scoped_require 'contrast/agent/assess/rule'
       cs__scoped_require 'contrast/agent/assess/rule/base'
-      cs__scoped_require 'contrast/agent/assess/rule/response_scanning_rule'
-      cs__scoped_require 'contrast/agent/assess/rule/watcher'
-      cs__scoped_require 'contrast/agent/assess/rule/response_watcher'
 
       # Dynamic Sources
       cs__scoped_require 'contrast/agent/assess/policy/dynamic_source_factory'
 
-      # Rule: CSRF
-      cs__scoped_require 'contrast/agent/assess/rule/csrf'
-      cs__scoped_require 'contrast/agent/assess/rule/csrf/csrf_applicator'
-      cs__scoped_require 'contrast/agent/assess/rule/csrf/csrf_action'
-      cs__scoped_require 'contrast/agent/assess/rule/csrf/csrf_watcher'
-
       # Rule: REDOS
       cs__scoped_require 'contrast/agent/assess/rule/redos'
 
       # reporting / tracking
       cs__scoped_require 'contrast/agent/assess/insulator'
       cs__scoped_require 'contrast/agent/assess/properties'
-      cs__scoped_require 'contrast/agent/assess/frozen_properties'
       cs__scoped_require 'contrast/agent/assess/tag'
-      cs__scoped_require 'contrast/agent/assess/contrast_event'
+      cs__scoped_require 'contrast/agent/assess/events/event_factory'
     end
   end
 end

data/lib/contrast/agent/assess/adjusted_span.rb

@@ -14,7 +14,9 @@ module Contrast
       # Note: Unlike ranges, it is assumed that the stop
       # value is exclusive, not inclusive. [start, end)
       class AdjustedSpan
-        attr_accessor :start, :stop
+        attr_accessor :stop
+        attr_reader :start
+
         def initialize start = nil, stop = nil
           @start = start if start
           @stop = stop if stop

data/lib/contrast/agent/assess/contrast_event.rb

@@ -1,8 +1,14 @@
 # Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
+cs__scoped_require 'contrast/utils/assess/tracking_util'
 cs__scoped_require 'contrast/utils/class_util'
+cs__scoped_require 'contrast/utils/duck_utils'
+cs__scoped_require 'contrast/utils/object_share'
 cs__scoped_require 'contrast/utils/prevent_serialization'
+cs__scoped_require 'contrast/utils/stack_trace_utils'
+cs__scoped_require 'contrast/utils/string_utils'
+cs__scoped_require 'contrast/utils/timer'
 
 module Contrast
   module Agent
@@ -53,8 +59,7 @@ module Contrast
           end
         end
 
-        attr_accessor :source_name
-        attr_reader :event_id, :source_type, :parent_ids
+        attr_reader :event_id, :parent_ids
 
         # We need this to track the parent id's of events to build up a flow
         # chart of the finding
@@ -69,13 +74,13 @@ module Contrast
           end
         end
 
-        def initialize policy_node, tagged, object, ret, args, invoked = 0, source_type = nil, source_name = nil
-          @caller = caller_locations(get_call_start(policy_node, invoked), 10)
+        def initialize policy_node, tagged, object, ret, args
           @policy_node = policy_node
+          # so long as this event is built in a factory, we know Contrast Code
+          # will be the first three events
+          @caller = caller(3, 20)
           @time = Contrast::Utils::Timer.now_ms
           @thread = Thread.current.object_id
-          @source_type = source_type
-          @source_name = source_name
 
           # These methods rely on the above being set. Don't move them!
           @event_id = Contrast::Agent::Assess::ContrastEvent.next_atomic_id
@@ -86,8 +91,6 @@ module Contrast
         # Parent IDs are the event ids of all the sources of this event which
         # were tracked prior to this event occurring
         def find_parent_ids policy_node, object, ret, args
-          return if policy_node.is_a?(Contrast::Agent::Assess::Policy::SourceNode)
-
           mapped = policy_node.sources.map do |source|
             value_of_source(source, object, ret, args)
           end
@@ -137,6 +140,8 @@ module Contrast
         # one w/ a dup, but good enough for now. Trying not to make this too
         # complicated. - HM 8/8/19
         def save_target_arg target, tagged
+          return if @args.cs__frozen?
+
           if target.is_a?(Integer)
             @args[target] = cs__class.safe_dup(tagged)
             return
@@ -172,27 +177,6 @@ module Contrast
           end
         end
 
-        # each policy_node has a certain number of levels down it calls
-        # before getting here. since we know them, we can skip
-        # right to the part of the stack we care about.
-        #
-        # Note: if our callstack changes, this number has to change
-        def get_call_start policy_node, invoked
-          # TODO: RUBY-440 audit these numbers to get stacktraces to render
-          #   properly
-          base = case policy_node
-                 when Contrast::Agent::Assess::Policy::SourceNode
-                   6
-                 when Contrast::Agent::Assess::Policy::PropagationNode
-                   7
-                 when Contrast::Agent::Assess::Policy::TriggerNode
-                   7
-                 else
-                   2
-                 end
-          base + invoked
-        end
-
         # Convert this event into a DTM that TeamServer can consume
         def to_dtm_event
           event = Contrast::Api::Dtm::TraceEvent.new
@@ -220,20 +204,11 @@ module Contrast
           end
 
           # We delayed doing this as long as possible b/c it's expensive
-          stack = Contrast::Utils::StackTraceUtils.to_dtm_stack(
-              stack_locations: @caller,
-              rasp_element: false)
-          stack.each do |frame|
-            event.stack << frame
-          end
-
-          event.field_name = Contrast::Utils::StringUtils.force_utf8(source_name)
-
-          event_source_dtm = build_event_source_dtm
-          event.event_sources << event_source_dtm if event_source_dtm
+          stack = Contrast::Utils::StackTraceUtils.build_assess_stack_array(@caller)
+          event.stack += stack
 
           event.object_id = event_id.to_i
-          @parent_ids&.each do |id|
+          parent_ids&.each do |id|
             parent = Contrast::Api::Dtm::ParentObjectId.new
             parent.id = id.to_i
             event.parent_object_ids << parent
@@ -245,27 +220,6 @@ module Contrast
           event
         end
 
-        def forced_source_type
-          @_forced_source_type ||= Contrast::Utils::StringUtils.force_utf8(source_type)
-        end
-
-        def forced_source_name
-          @_forced_source_name ||= Contrast::Utils::StringUtils.force_utf8(source_name)
-        end
-
-        # Probably only for source events, but we'll go
-        # with source_type instead. java & .net support source_type
-        # in propagation events, so we'll future proof this
-        def build_event_source_dtm
-          # You can have a source w/o a name, but not w/o a type
-          return unless source_type
-
-          dtm = Contrast::Api::Dtm::TraceEventSource.new
-          dtm.type = forced_source_type
-          dtm.name = forced_source_name
-          dtm
-        end
-
         # We're not going to build the signature string here, b/c we have all
         # the composite pieces of it. Instead, we're going to let TeamServer
         # render this for us.