contrast-agent-lib 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76f0689450bbdbd40bf0e1bd049d10d8da3abe9b2dd9a89785163647bde42eb3
-  data.tar.gz: 6f399b41d44bda4bb0d9228962f34fd697dee0c69f30e8edb9a2f9c211691f2c
+  metadata.gz: 3a4fa9582b8283c59e869626e08c9f56858dd74fe882998da0461fc5e96e950f
+  data.tar.gz: f6458f645e1a6ad01271015a2249c552a9c4f716c148391c87a338342cb928d6
 SHA512:
-  metadata.gz: 56b80df5e70ddcf1c43602056ce859be9563f53f3e5888fdb59d0e98f9ed6cb783ef72149e3676efb1715018799637e8291925f4ecbe7c6b72da6b5e7a2420ea
-  data.tar.gz: e44b5c90e33d167beb1e539a1eb78c03d413dbe035afb19866e72259df764fb4bea2796a6c20eba41b562ea285122b20382e7906ed976e6d9d202111b217a9d3
+  metadata.gz: 5a4d3c5fec6bc33ec7979e0f1a6250b2e6e58aa37d39f0e1ddd55e3c8f03241274ded96ae9edc660ccdd70bff2058c963d809ea463572df8eaeb25eb91d15ebe
+  data.tar.gz: 1dea8563ea084bb1dcc5af30aa19d1eca3920bc86961e66ede5ec90d1148541914d6b45dea280cef9dd302440d52d642c4a719ab1c8fa1642f16344fda624360

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright: 2022 Contrast Security, Inc
+Copyright: 2023 Contrast Security, Inc
 Contact: support@contrastsecurity.com
 License: Commercial
 

data/contrast-agent-lib.gemspec

@@ -42,13 +42,15 @@ def self.add_files spec
   spec.files += Dir['scripts/**/*.sh']
   spec.files += %w[LICENSE.txt Gemfile contrast-agent-lib.gemspec .ruby-version]
   # add the binary files created.
-  spec.files += Dir['usage_files/**/*.dylib']
-  spec.files += Dir['usage_files/**/*.so']
+  spec.files += Dir['shared_libraries/**/*.dylib']
+  spec.files += Dir['shared_libraries/**/*.so']
 end
 
 # Add dev dependencies
 def self.add_development_dependencies spec
   spec.add_development_dependency('ffi', '~> 1.15', '>= 1.15.5')
+  spec.add_development_dependency('rspec')
+  spec.add_development_dependency('pry-byebug')
 end
 
 Gem::Specification.new do |spec|

data/lib/consts.rb

@@ -35,6 +35,7 @@ module ContrastAgentLib
         URL_PARAMETER = 11
         MULTIPART_NAME = 12
         XML_VALUE = 13
+        RAW_BODY = 14
     end
 
     module DbType

data/lib/contrast-agent-lib.rb

@@ -6,17 +6,38 @@ require 'utils/os'
 # Load the constants
 require_relative 'consts'
 
+# This module is used to load the dynamic library.
+# It loads the AgentLib constants and the dynamic library file.
 module ContrastAgentLib
-  include ContrastAgentLib::OS
-  LINUX_LIB = File.join(__dir__, '..', 'usage_files/libcontrast_c.so')
-  MAC_LIB = File.join(__dir__, '..', 'usage_files/libcontrast_c.dylib')
-  MAC_M1_LIB = File.join(__dir__, '..', 'usage_files/libcontrast_darwin_arm.dylib')
-  ALPINE_LIB = File.join(__dir__, '..', 'usage_files/libcontrast_c_musl.so')
-  # Since we need two different extensions for each platform we
-  # need to detect the used OS before loading the dynamic library.
-  CONTRAST_C = if ContrastAgentLib::OS.linux?
-                ContrastAgentLib::OS.alpine? ? ALPINE_LIB : LINUX_LIB
-              else
-                ContrastAgentLib::OS.m1_mac? ? MAC_M1_LIB : MAC_LIB
-              end
+  ALPINE_LIB = File.join(__dir__, '..', 'shared_libraries/libcontrast_musl_c.so')
+  ALPINE_AARCH64_LIB = File.join(__dir__, '..', 'shared_libraries/libcontrast_musl_aarch64_c.so')
+
+  LINUX_LIB = File.join(__dir__, '..', 'shared_libraries/libcontrast_c.so')
+  LINUX_AARCH64_LIB = File.join(__dir__, '..', 'shared_libraries/libcontrast_aarch64_c.so')
+
+  MAC_ARM_LIB = File.join(__dir__, '..', 'shared_libraries/libcontrast_darwin_arm.dylib')
+  MAC_LIB = File.join(__dir__, '..', 'shared_libraries/libcontrast_c.dylib')
+
+  class << self
+    # Since we need two different extensions for each platform we
+    # need to detect the used OS before loading the dynamic library.
+    #
+    # Checks for the OS architecture and loads the correct library.
+    # The order of the checks is important, for example if we check
+    # for mac? on m1 macs it will return true for both.
+    #
+    # @return [String] the path to the correct library.
+    def os_dependend_assign
+      if OS.alpine?
+        return OS.aarch64? ? ALPINE_AARCH64_LIB : ALPINE_LIB
+      end
+      if OS.linux?
+        return OS.aarch64? ? LINUX_AARCH64_LIB : LINUX_LIB
+      end
+      return MAC_ARM_LIB if OS.arm_mac?
+      return MAC_LIB if OS.mac?
+    end
+  end
+
+  CONTRAST_C = ContrastAgentLib.os_dependend_assign
 end

data/lib/utils/os.rb

@@ -19,7 +19,7 @@ module ContrastAgentLib
         @_mac
       end
 
-      def m1_mac?
+      def arm_mac?
         mac? && RbConfig::CONFIG['host_cpu'].include?('arm64')
       end
 
@@ -36,6 +36,10 @@ module ContrastAgentLib
 
         false
       end
+
+      def aarch64?
+        @_aarch64 ||= RbConfig::CONFIG['host_cpu'].include?('aarch64')
+      end
     end
   end
 end

data/lib/utils/version.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 module ContrastAgentLib
-    module Version
-        VERSION='1.1.0'
-    end
+  module Version
+    VERSION = '1.1.1'
+  end
 end

data/scripts/comment_gemfile.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+echo [RUBY] commenting Gemfile
+cd spec/dl__init_test
+# Comment the Gemfile:
+gem_path=$(echo ./contrast-agent-lib-*.gem)
+gem_version=$(echo $gem_path | grep -o -E "contrast-agent-lib[0-9]....")
+
+echo "Updating Gemfile for version... $gem_version "
+gem_version_numbers_only=$(echo $gem_version | grep -o -E "[0-9]....")
+sed -E "s/gem 'contrast-agent-lib', version, path: Dir.pwd/gem 'contrast-agent-lib', version#, path: Dir.pwd/g" Gemfile | tee Gemfile
+cd ../../

data/scripts/run_gem_specs.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -Eeuo pipefail
+
+# Build Gem
+echo [RUBY] building gem
+bundle install
+gem build contrast-agent-lib.gemspec
+
+echo [RUBY] moving gem to test folder
+cp contrast-agent-lib-*.gem spec/dl__init_test/
+
+# Run rspec:
+echo [RUBY] running RSpec
+echo pwd
+bundle exec rspec spec/agent_lib_spec.rb
+
+# Run gem spec: 
+echo [RUBY] running Gem Integration tests...
+cd spec/dl__init_test
+bundle install
+bundle exec gem install ./contrast-agent-lib-*.gem

data/scripts/uncomment_gemfile.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Uncomment the Gemfile:
+cd spec/dl__init_test
+sed -E "s/gem 'contrast-agent-lib', version#, path: Dir.pwd$/gem 'contrast-agent-lib', version, path: Dir.pwd/g" Gemfile | tee Gemfile
+cd ../../

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrast-agent-lib
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - teodor.raychev@contrastsecurity.com
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -34,6 +34,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.5
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem including the interface for the Rust Agent Library, which will be
   used within the Ruby-Agent
 email:
@@ -51,10 +79,15 @@ files:
 - lib/utils/os.rb
 - lib/utils/version.rb
 - scripts/build_gem.sh
-- usage_files/libcontrast_c.dylib
-- usage_files/libcontrast_c.so
-- usage_files/libcontrast_c_musl.so
-- usage_files/libcontrast_darwin_arm.dylib
+- scripts/comment_gemfile.sh
+- scripts/run_gem_specs.sh
+- scripts/uncomment_gemfile.sh
+- shared_libraries/libcontrast_aarch64_c.so
+- shared_libraries/libcontrast_c.dylib
+- shared_libraries/libcontrast_c.so
+- shared_libraries/libcontrast_darwin_arm.dylib
+- shared_libraries/libcontrast_musl_aarch64_c.so
+- shared_libraries/libcontrast_musl_c.so
 homepage: https://www.contrastsecurity.com
 licenses:
 - CONTRAST SECURITY (see license file)
@@ -77,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: This is the Ruby Interface for Rust Agent Library