contrast-agent 3.12.2 → 3.13.0

data/funchook/src/Makefile

@@ -1,70 +0,0 @@
-srcdir = .
-top_srcdir = ..
-top_builddir = ..
-
-DISTORM3_DIR = $(top_srcdir)/distorm
-VPATH = $(DISTORM3_DIR)/src:$(top_srcdir)/include
-
-CC = gcc
-CFLAGS = -g -O2 -Wall -fvisibility=hidden -fPIC -g -I. -I$(top_srcdir)/include -I$(DISTORM3_DIR)/include
-LIBS = 
-LINK_SHARED = $(CC) -shared
-
-#LIBS += -lpsapi
-LDFLAGS += -install_name @rpath/libfunchook.dylib
-
-FUNCHOOK_OBJS = \
-	os_func.o \
-	os_func_unix.o \
-	printf_base.o \
-	funchook.o \
-	funchook_io.o \
-	funchook_x86.o \
-	funchook_unix.o
-
-#FUNCHOOK_OBJS += funchook_syscall.o
-FUNCHOOK_OBJS += funchook_syscall.o
-
-DISTORM3_OBJS = \
-	mnemonics.o \
-	wstring.o \
-	textdefs.o \
-	prefix.o \
-	operands.o \
-	insts.o \
-	instructions.o \
-	distorm.o \
-	decoder.o
-
-HEADERS = \
-	funchook.h \
-	funchook_internal.h \
-	os_func.h
-
-OBJS = $(FUNCHOOK_OBJS) $(DISTORM3_OBJS)
-
-all: libfunchook.dylib
-
-check:
-	cd ../test && $(MAKE) check
-
-libfunchook.dylib: $(OBJS)
-	$(LINK_SHARED) $(LDFLAGS) -o libfunchook.dylib $(OBJS) $(LIBS)
-
-funchook.o: funchook.c $(HEADERS)
-funchook_linux.o: funchook_linux.c $(HEADERS)
-funchook_windows.o: funchook_windows.c $(HEADERS)
-funchook_x86.o: funchook_x86.c $(HEADERS)
-os_func.o: os_func.c os_func.h printf_base.h
-printf_base.o: printf_base.c printf_base.h
-	$(CC) $(CFLAGS) -c -o $@ $< -DPFB_NO_EXTERNAL_FUNC -DPFB_MSVC_FORMAT
-
-# suppress warning: missing braces around initializer [-Wmissing-braces]
-insts.o: insts.c
-	$(CC) $(CFLAGS) -c -o $@ $< -Wno-missing-braces
-
-clean:
-	$(RM) libfunchook.dylib $(OBJS)
-
-Makefile config.h: $(srcdir)/Makefile.in $(srcdir)/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) && ./config.status

data/funchook/src/config.h

@@ -1,101 +0,0 @@
-/* src/config.h.  Generated from config.h.in by configure.  */
-/* src/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_ERRLIST 1
-
-/* Define to 1 if you have the declaration of `sys_nerr', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_NERR 1
-
-/* Define to 1 if you have the declaration of `_sys_errlist', and to 0 if you
-   don't. */
-#define HAVE_DECL__SYS_ERRLIST 0
-
-/* Define to 1 if you have the declaration of `_sys_nerr', and to 0 if you
-   don't. */
-#define HAVE_DECL__SYS_NERR 0
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "funchook"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "funchook 0.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "funchook"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.1"
-
-/* The size of `void*', as computed by sizeof. */
-#define SIZEOF_VOIDP 8
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */

data/funchook/src/config.h.in

@@ -1,100 +0,0 @@
-/* src/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you
-   don't. */
-#undef HAVE_DECL_SYS_ERRLIST
-
-/* Define to 1 if you have the declaration of `sys_nerr', and to 0 if you
-   don't. */
-#undef HAVE_DECL_SYS_NERR
-
-/* Define to 1 if you have the declaration of `_sys_errlist', and to 0 if you
-   don't. */
-#undef HAVE_DECL__SYS_ERRLIST
-
-/* Define to 1 if you have the declaration of `_sys_nerr', and to 0 if you
-   don't. */
-#undef HAVE_DECL__SYS_NERR
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* The size of `void*', as computed by sizeof. */
-#undef SIZEOF_VOIDP
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE

data/funchook/test/Makefile

@@ -1,43 +0,0 @@
-srcdir = .
-top_srcdir = ..
-top_builddir = ..
-
-CC = gcc
-AS = gcc -c
-OBJS = test_main.o x86_64_test.o
-CFLAGS += -O2 -g -I$(srcdir)/../include
-PIC_CFLAGS = -fPIC
-LIBS = -L$(top_builddir)/src -lfunchook -Wl,-rpath,$(top_builddir)/src -L. -lfunchook_test -Wl,-rpath,.
-LINK_SHARED = $(CC) -shared
-EXEEXT = 
-DLLTOOL = $(firstword $(CC:gcc=dlltool))
-SO_OBJS = $(srcdir)/libfunchook_test.c $(srcdir)/libfunchook_test2.c
-#LDFLAGS += -Wl,--out-implib,funchook_test.lib
-#FUNCHOOK_TEST_LIB = funchook_test_exe.lib
-LDFLAGS += -Wl,-undefined,dynamic_lookup
-
-VPATH = ../src
-
-all: funchook_test$(EXEEXT)
-
-test: funchook_test$(EXEEXT)
-	# cmp -s $(top_builddir)/src/funchook.dll funchook.dll || cp $(top_builddir)/src/funchook.dll funchook.dll
-	./funchook_test$(EXEEXT)
-
-funchook_test$(EXEEXT): $(OBJS) libfunchook.dylib libfunchook_test.so
-	$(CC) -o funchook_test$(EXEEXT) $(OBJS) $(LIBS)
-
-libfunchook_test.so: $(SO_OBJS) $(FUNCHOOK_TEST_LIB)
-	$(LINK_SHARED) $(LDFLAGS) $(PIC_CFLAGS) $(CFLAGS) -o libfunchook_test.so $(SO_OBJS) $(FUNCHOOK_TEST_LIB)
-
-clean:
-	$(RM) $(TESTEXE) *.o libfunchook_test.so
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) && ./config.status
-
-funchook_test_exe.lib:
-	echo "LIBRARY funchook_test.exe" > funchook_test_exe.def
-	echo "EXPORTS" >> funchook_test_exe.def
-	echo "get_val_in_exe" >> funchook_test_exe.def
-	$(DLLTOOL) -d funchook_test_exe.def -l funchook_test_exe.lib

data/funchook/test/libfunchook_test.so.dSYM/Contents/Info.plist

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.libfunchook_test.so</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundlePackageType</key>
-		<string>dSYM</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
-		<key>CFBundleVersion</key>
-		<string>1</string>
-	</dict>
-</plist>

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

@@ -1,27 +0,0 @@
-# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
-# frozen_string_literal: true
-
-module Contrast
-  module Agent
-    module Assess
-      # This is just a helper method for doing things in
-      # Assess. It'll hold the start and end indexes of a
-      # range on which we will take an action.
-      #
-      # It is essentially a range, but start and stop can
-      # be set after initialization.
-      #
-      # Note: Unlike ranges, it is assumed that the stop
-      # value is exclusive, not inclusive. [start, end)
-      class AdjustedSpan
-        attr_accessor :stop
-        attr_reader :start
-
-        def initialize start = nil, stop = nil
-          @start = start if start
-          @stop = stop if stop
-        end
-      end
-    end
-  end
-end

data/lib/contrast/agent/socket_client.rb

@@ -1,134 +0,0 @@
-# Copyright (c) 2020 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
-# frozen_string_literal: true
-
-cs__scoped_require 'socket'
-cs__scoped_require 'uri'
-
-cs__scoped_require 'contrast/api/speedracer'
-cs__scoped_require 'contrast/api/tcp_socket'
-cs__scoped_require 'contrast/api/unix_socket'
-cs__scoped_require 'contrast/api/connection_status'
-cs__scoped_require 'contrast/components/interface'
-
-module Contrast
-  module Agent
-    # SocketClient acts as a interface between the agent and the service. It instantiates a
-    # service proxy and tracks the state of that proxy.
-    class SocketClient
-      include Contrast::Components::Interface
-
-      access_component :app_context, :contrast_service, :logging
-
-      attr_reader :speedracer, :status
-
-      def initialize
-        @status = Contrast::Api::ConnectionStatus.new
-        @speedracer = Contrast::Api::Speedracer.new(init_connection)
-        @ensure_running = Mutex.new
-      end
-
-      def service_unavailable?
-        speedracer.nil?
-      end
-
-      def connection_established?
-        status.connected?
-      end
-
-      # Attempt to send the passed message to SpeedRacer. If we're using bundled
-      # service config option, we must first start up the service. Afterwards, we
-      # must send agent startup messages no matter what the config options are.
-      #
-      # @param event [Contrast::Api::Dtm] One of the DTMs valid for the event
-      #   field of Contrast::Api::Dtm::Message
-      # @return [Array<Contrast::Api::Settings::AgentSettings>] the response from SpeedRacer or nil
-      #   if it failed to send or the service is unavailable.
-      def send_to_speedracer event
-        return if service_unavailable?
-
-        @ensure_running.synchronize do
-          if CONTRAST_SERVICE.use_bundled_service?
-            return unless start_or_restart
-          end
-          build_service_context unless status.startup_messages_sent?
-        end
-
-        logger.debug_with_time(event.cs__class.name) do
-          response = speedracer.send_one event
-          status.success!
-          response
-        end
-      rescue StandardError => e
-        status.failure!
-        logger.error('Unable to send message.', e,
-                     event_id: event.__id__,
-                     event_type: event.cs__class.name)
-        nil
-      end
-
-      private
-
-      def init_connection
-        if CONTRAST_SERVICE.use_tcp?
-          Contrast::Api::TcpSocket.new(CONTRAST_SERVICE.host, CONTRAST_SERVICE.port)
-        else
-          Contrast::Api::UnixSocket.new(CONTRAST_SERVICE.socket_path)
-        end
-      end
-
-      def restart?
-        status.was_connected? && status.failed?
-      end
-
-      # Now that we know we're running with bundled service option, we can tell SpeedRacer that we're
-      # ready for it to be started up.
-      #
-      # @return [Boolean] true if the service is started, false if the service is still offline after
-      # we've attempted to start it up.
-      def start_or_restart
-        if restart?
-          logger.info('Attempting to restart service.')
-          return speedracer.start_service
-        elsif !status.was_connected?
-          logger.info('Attempting to start service.')
-          return speedracer.start_service
-        end
-
-        true
-      end
-
-      def build_service_context
-        agent_startup_msg = APP_CONTEXT.build_agent_startup_message
-        app_startup_msg = APP_CONTEXT.build_app_startup_message
-
-        # 1 initial attempt, + 3 potential retries.
-        # The agent-service-api REQUIREMENTS.md spec mandates this #.
-        4.times do
-          log_send_event(agent_startup_msg)
-          next unless (agent_response = speedracer.send_one(agent_startup_msg))
-
-          # Connection was successful
-          log_send_event(app_startup_msg)
-          app_response = speedracer.send_one(app_startup_msg)
-          [agent_response, app_response].each do |msg|
-            Contrast::Utils::ServiceResponseUtil.process_response msg
-          end
-          status.success!
-          logger.debug('Successfully sent startup messages to service.')
-          return
-        end
-
-        logger.error('Could not send agent startup message context')
-      rescue StandardError => e
-        logger.error('Could not build service context', e)
-        raise # re-raise the error to be caught by SocketClient#send_to_speedracer
-      end
-
-      def log_send_event event
-        logger.debug('Immediately sending event.',
-                     event_id: event.__id__,
-                     event_type: event.cs__class.name)
-      end
-    end
-  end
-end