contrast-agent 3.12.1 → 3.12.2

data/funchook/config.status

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
 # Generated by configure.
 # Run this file to recreate the current configuration.
 # Compiler output produced by configure, useful for debugging
@@ -8,7 +8,7 @@ debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
 
-SHELL=${CONFIG_SHELL-/bin/bash}
+SHELL=${CONFIG_SHELL-/bin/sh}
 export SHELL
 ## -------------------- ##
 ## M4sh Initialization. ##
@@ -433,7 +433,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/opt/atlassian/pipelines/agent/build/funchook'
+ac_pwd='/Users/donaldpropst/Projects/ruby-agent/funchook'
 srcdir='.'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -512,10 +512,10 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/bash './configure'  $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/sh './configure'  $ac_configure_extra_args --no-create --no-recursion
   shift
-  $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
-  CONFIG_SHELL='/bin/bash'
+  $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
+  CONFIG_SHELL='/bin/sh'
   export CONFIG_SHELL
   exec "$@"
 fi
@@ -604,24 +604,24 @@ echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 cat >>"$ac_tmp/subs1.awk" <<\_ACAWK &&
 S["LTLIBOBJS"]=""
 S["LIBOBJS"]=""
-S["IF_OSX"]="#"
-S["IF_LINUX"]=""
+S["IF_OSX"]=""
+S["IF_LINUX"]="#"
 S["IF_WIN32"]="#"
 S["PIC_CFLAGS"]="-fPIC"
 S["LINK_SHARED"]="$(CC) -shared"
-S["LIBFUNCHOOK_SO"]="libfunchook.so"
+S["LIBFUNCHOOK_SO"]="libfunchook.dylib"
 S["FUNCHOOK_OS"]="unix"
 S["FUNCHOOK_CPU"]="x86_64"
-S["host_os"]="linux-gnu"
-S["host_vendor"]="unknown"
+S["host_os"]="darwin18.6.0"
+S["host_vendor"]="apple"
 S["host_cpu"]="x86_64"
-S["host"]="x86_64-unknown-linux-gnu"
-S["build_os"]="linux-gnu"
-S["build_vendor"]="unknown"
+S["host"]="x86_64-apple-darwin18.6.0"
+S["build_os"]="darwin18.6.0"
+S["build_vendor"]="apple"
 S["build_cpu"]="x86_64"
-S["build"]="x86_64-unknown-linux-gnu"
-S["EGREP"]="/bin/grep -E"
-S["GREP"]="/bin/grep"
+S["build"]="x86_64-apple-darwin18.6.0"
+S["EGREP"]="/usr/bin/grep -E"
+S["GREP"]="/usr/bin/grep"
 S["CPP"]="gcc -E"
 S["OBJEXT"]="o"
 S["EXEEXT"]=""
@@ -633,10 +633,10 @@ S["CC"]="gcc"
 S["target_alias"]=""
 S["host_alias"]=""
 S["build_alias"]=""
-S["LIBS"]="-ldl"
+S["LIBS"]=""
 S["ECHO_T"]=""
-S["ECHO_N"]="-n"
-S["ECHO_C"]=""
+S["ECHO_N"]=""
+S["ECHO_C"]="\\c"
 S["DEFS"]="-DHAVE_CONFIG_H"
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
@@ -649,7 +649,6 @@ S["infodir"]="${datarootdir}/info"
 S["docdir"]="${datarootdir}/doc/${PACKAGE_TARNAME}"
 S["oldincludedir"]="/usr/include"
 S["includedir"]="${prefix}/include"
-S["runstatedir"]="${localstatedir}/run"
 S["localstatedir"]="${prefix}/var"
 S["sharedstatedir"]="${prefix}/com"
 S["sysconfdir"]="${prefix}/etc"
@@ -668,7 +667,7 @@ S["PACKAGE_VERSION"]="0.1"
 S["PACKAGE_TARNAME"]="funchook"
 S["PACKAGE_NAME"]="funchook"
 S["PATH_SEPARATOR"]=":"
-S["SHELL"]="/bin/bash"
+S["SHELL"]="/bin/sh"
 _ACAWK
 cat >>"$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -732,8 +731,8 @@ D["_GNU_SOURCE"]=" 1"
 D["_POSIX_PTHREAD_SEMANTICS"]=" 1"
 D["_TANDEM_SOURCE"]=" 1"
 D["SIZEOF_VOIDP"]=" 8"
-D["HAVE_DECL__SYS_NERR"]=" 1"
-D["HAVE_DECL__SYS_ERRLIST"]=" 1"
+D["HAVE_DECL__SYS_NERR"]=" 0"
+D["HAVE_DECL__SYS_ERRLIST"]=" 0"
 D["HAVE_DECL_SYS_NERR"]=" 1"
 D["HAVE_DECL_SYS_ERRLIST"]=" 1"
   for (key in D) D_is_set[key] = 1

data/funchook/configure

@@ -665,7 +665,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -736,7 +735,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -989,15 +987,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1135,7 +1124,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1288,7 +1277,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]

data/funchook/src/Makefile

@@ -7,11 +7,11 @@ 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 = -ldl
+LIBS = 
 LINK_SHARED = $(CC) -shared
 
 #LIBS += -lpsapi
-#LDFLAGS += -install_name @rpath/libfunchook.dylib
+LDFLAGS += -install_name @rpath/libfunchook.dylib
 
 FUNCHOOK_OBJS = \
 	os_func.o \
@@ -22,8 +22,8 @@ FUNCHOOK_OBJS = \
 	funchook_x86.o \
 	funchook_unix.o
 
-FUNCHOOK_OBJS += funchook_syscall.o
 #FUNCHOOK_OBJS += funchook_syscall.o
+FUNCHOOK_OBJS += funchook_syscall.o
 
 DISTORM3_OBJS = \
 	mnemonics.o \
@@ -43,13 +43,13 @@ HEADERS = \
 
 OBJS = $(FUNCHOOK_OBJS) $(DISTORM3_OBJS)
 
-all: libfunchook.so
+all: libfunchook.dylib
 
 check:
 	cd ../test && $(MAKE) check
 
-libfunchook.so: $(OBJS)
-	$(LINK_SHARED) $(LDFLAGS) -o libfunchook.so $(OBJS) $(LIBS)
+libfunchook.dylib: $(OBJS)
+	$(LINK_SHARED) $(LDFLAGS) -o libfunchook.dylib $(OBJS) $(LIBS)
 
 funchook.o: funchook.c $(HEADERS)
 funchook_linux.o: funchook_linux.c $(HEADERS)
@@ -64,7 +64,7 @@ insts.o: insts.c
 	$(CC) $(CFLAGS) -c -o $@ $< -Wno-missing-braces
 
 clean:
-	$(RM) libfunchook.so $(OBJS)
+	$(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

@@ -11,11 +11,11 @@
 
 /* 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 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 1
+#define HAVE_DECL__SYS_NERR 0
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1

data/funchook/test/Makefile

@@ -14,7 +14,7 @@ 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
+LDFLAGS += -Wl,-undefined,dynamic_lookup
 
 VPATH = ../src
 
@@ -24,7 +24,7 @@ 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.so libfunchook_test.so
+funchook_test$(EXEEXT): $(OBJS) libfunchook.dylib libfunchook_test.so
 	$(CC) -o funchook_test$(EXEEXT) $(OBJS) $(LIBS)
 
 libfunchook_test.so: $(SO_OBJS) $(FUNCHOOK_TEST_LIB)

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

@@ -0,0 +1,20 @@
+<?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/policy/trigger_method.rb

@@ -230,7 +230,7 @@ module Contrast
               else
                 logger.warn('Trigger source is of unknown type. Unable to inspect.',
                             node_id: trigger_node.id,
-                            source_id: target.__id__,
+                            source_id: source.__id__,
                             source_type: source.cs__class.to_s)
                 logger.trace(source.to_s[0..99])
               end

data/lib/contrast/agent/version.rb

@@ -3,6 +3,6 @@
 
 module Contrast
   module Agent
-    VERSION = '3.12.1'
+    VERSION = '3.12.2'
   end
 end

data/lib/contrast/utils/class_util.rb

@@ -56,7 +56,9 @@ module Contrast
         # @return [String] the human readable form of the String, as defined by
         #   https://bitbucket.org/contrastsecurity/assess-specifications/src/master/vulnerability/capture-snapshot.md
         def to_contrast_string object
-          if object.cs__is_a?(String)
+          # Only treat object like a string if it actually is a string
+          # some subclasses of String override string methods we depend on
+          if object.cs__class == String
             cached = to_cached_string(object)
             return cached if cached
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrast-agent
 version: !ruby/object:Gem::Version
-  version: 3.12.1
+  version: 3.12.2
 platform: ruby
 authors:
 - galen.palmer@contrastsecurity.com
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -462,20 +462,20 @@ executables:
 - contrast_service
 extensions:
 - ext/cs__common/extconf.rb
-- ext/cs__assess_active_record_named/extconf.rb
-- ext/cs__assess_basic_object/extconf.rb
-- ext/cs__assess_string/extconf.rb
-- ext/cs__assess_string_interpolation26/extconf.rb
-- ext/cs__assess_array/extconf.rb
-- ext/cs__protect_kernel/extconf.rb
+- ext/cs__assess_module/extconf.rb
 - ext/cs__assess_yield_track/extconf.rb
-- ext/cs__assess_kernel/extconf.rb
 - ext/cs__assess_hash/extconf.rb
-- ext/cs__assess_module/extconf.rb
-- ext/cs__contrast_patch/extconf.rb
+- ext/cs__protect_kernel/extconf.rb
 - ext/cs__assess_regexp/extconf.rb
+- ext/cs__assess_string_interpolation26/extconf.rb
+- ext/cs__assess_kernel/extconf.rb
+- ext/cs__assess_array/extconf.rb
 - ext/cs__assess_fiber_track/extconf.rb
 - ext/cs__assess_marshal_module/extconf.rb
+- ext/cs__assess_string/extconf.rb
+- ext/cs__contrast_patch/extconf.rb
+- ext/cs__assess_basic_object/extconf.rb
+- ext/cs__assess_active_record_named/extconf.rb
 extra_rdoc_files: []
 files:
 - ".clang-format"
@@ -664,7 +664,7 @@ files:
 - funchook/src/funchook_x86.o
 - funchook/src/instructions.o
 - funchook/src/insts.o
-- funchook/src/libfunchook.so
+- funchook/src/libfunchook.dylib
 - funchook/src/mnemonics.o
 - funchook/src/operands.o
 - funchook/src/os_func.c
@@ -684,6 +684,8 @@ files:
 - funchook/test/funchook_test
 - funchook/test/libfunchook_test.c
 - funchook/test/libfunchook_test.so
+- funchook/test/libfunchook_test.so.dSYM/Contents/Info.plist
+- funchook/test/libfunchook_test.so.dSYM/Contents/Resources/DWARF/libfunchook_test.so
 - funchook/test/libfunchook_test2.c
 - funchook/test/suffix.list
 - funchook/test/test_main.c
@@ -958,7 +960,7 @@ files:
 - service_executables/mac/contrast-service
 - shared_libraries/.gitkeep
 - shared_libraries/funchook.h
-- shared_libraries/libfunchook.so
+- shared_libraries/libfunchook.dylib
 homepage: https://www.contrastsecurity.com
 licenses:
 - CONTRAST SECURITY (see license file)
@@ -986,7 +988,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Contrast Security's agent for rack-based applications.