diffend 0.2.29 → 0.2.34

data/lib/diffend/plugin.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+%w[
+  bundler
+].each(&method(:require))
+
+%w[
+  version
+  logger
+  latest_version
+  errors
+  build_bundler_definition
+  commands
+  config
+  configs/fetcher
+  configs/validator
+  handle_errors/messages
+  handle_errors/build_exception_payload
+  handle_errors/display_to_stdout
+  handle_errors/report
+  request_object
+  request
+  local_context/diffend
+  local_context/host
+  local_context/packages
+  local_context/platform
+  local_context
+  request_verdict
+  execute
+  track
+].each { |file| require "diffend/#{file}" }
+
+module Diffend
+  module Plugin
+    class << self
+      # Registers the plugin and add before install all hook
+      def register
+        ::Bundler::Plugin.add_hook('before-install-all') do |_|
+          execute
+        end
+      end
+
+      # Execute diffend plugin
+      def execute
+        return unless enabled?
+
+        config = Diffend::Config.new(severity: Diffend::Logger::INFO)
+
+        Diffend::LatestVersion.call(config)
+
+        Diffend::Execute.call(config)
+      rescue Diffend::Errors::HandledException
+        # config will not be initialized when configuration file is missing
+        return if config&.ignore_errors?
+
+        exit 255
+      rescue StandardError => e
+        Diffend::HandleErrors::Report.call(
+          exception: e,
+          config: config,
+          message: :unhandled_exception,
+          report: true,
+          raise_exception: false
+        )
+
+        return if config.ignore_errors?
+
+        exit 255
+      end
+
+      # Checks if plugin is enabled
+      #
+      # @return [Boolean] true if enabled, false otherwise
+      def enabled?
+        ::Bundler
+          .default_gemfile
+          .read
+          .split("\n")
+          .reject(&:empty?)
+          .map(&:strip)
+          .select { |line| line.start_with?('plugin') }
+          .any? { |line| line.include?('diffend') }
+      end
+    end
+  end
+end

data/lib/diffend/request.rb

@@ -14,7 +14,8 @@ module Diffend
       Errno::ECONNRESET,
       Errno::ENETUNREACH,
       Errno::EHOSTUNREACH,
-      Errno::ECONNREFUSED
+      Errno::ECONNREFUSED,
+      SocketError
     ].freeze
     # Message displayed when timeout occured and we will retry
     TIMEOUT_MESSAGE = 'We experienced a connection issue, retrying...'
@@ -67,7 +68,7 @@ module Diffend
       rescue Diffend::Errors::RequestServerError => e
         retry_count += 1
 
-        retry if handle_retry(SERVER_ERROR_MESSAGE, retry_count)
+        retry if handle_retry(request_object.config, SERVER_ERROR_MESSAGE, retry_count)
 
         Diffend::HandleErrors::Report.call(
           exception: e,
@@ -78,7 +79,7 @@ module Diffend
       rescue *CONNECTION_EXCEPTIONS => e
         retry_count += 1
 
-        retry if handle_retry(CONNECTION_MESSAGE, retry_count)
+        retry if handle_retry(request_object.config, CONNECTION_MESSAGE, retry_count)
 
         Diffend::HandleErrors::Report.call(
           exception: e,
@@ -89,7 +90,7 @@ module Diffend
       rescue *TIMEOUT_EXCEPTIONS => e
         retry_count += 1
 
-        retry if handle_retry(TIMEOUT_MESSAGE, retry_count)
+        retry if handle_retry(request_object.config, TIMEOUT_MESSAGE, retry_count)
 
         Diffend::HandleErrors::Report.call(
           exception: e,
@@ -101,12 +102,13 @@ module Diffend
 
       # Handle retry
       #
+      # @param config [Diffend::Config]
       # @param message [String] message we want to display
       # @param retry_count [Integer]
-      def handle_retry(message, retry_count)
+      def handle_retry(config, message, retry_count)
         return false if retry_count == RETRIES
 
-        Bundler.ui.error(message)
+        config.logger.warn(message)
         sleep(exponential_backoff(retry_count))
 
         retry_count < RETRIES
@@ -123,8 +125,8 @@ module Diffend
           uri.port,
           use_ssl: uri.scheme == 'https',
           verify_mode: OpenSSL::SSL::VERIFY_NONE,
-          open_timeout: 5,
-          read_timeout: 5
+          open_timeout: 15,
+          read_timeout: 15
         ) { |http| yield(http, uri) }
       end
 
@@ -132,7 +134,7 @@ module Diffend
       #
       # @param uri [URI::HTTPS]
       # @param request_method [Symbol]
-      # @param config [OpenStruct] Diffend config
+      # @param config [Diffend::Config]
       # @param payload [Hash] with versions to check
       #
       # @return [Net::HTTP::Post, Net::HTTP::Put]
@@ -160,9 +162,8 @@ module Diffend
       # Assigns basic authorization if provided in the config
       #
       # @param request [Net::HTTP::Post] prepared http post
-      # @param config [OpenStruct] Diffend config
+      # @param config [Diffend::Config]
       def assign_auth(request, config)
-        return unless config
         return unless config.shareable_id
         return unless config.shareable_key
 

data/lib/diffend/request_verdict.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Diffend
+  # Module responsible for fetching diffend verdict on local context
+  module RequestVerdict
+    # Exceptions that we handle when there is a resolve issue
+    RESOLVE_EXCEPTIONS = [
+      Bundler::GemNotFound,
+      Bundler::VersionConflict,
+      Bundler::GitError
+    ].freeze
+
+    class << self
+      # @param config [Diffend::Config]
+      # @param definition [Bundler::Definition] definition for your source
+      def call(config, definition)
+        payload = Diffend::LocalContext.call(config, definition)
+
+        response = Diffend::Request.call(
+          build_request_object(config, payload)
+        )
+
+        JSON.parse(response.body)
+      rescue *RESOLVE_EXCEPTIONS
+        raise ::Diffend::Errors::DependenciesResolveException
+      rescue StandardError => e
+        Diffend::HandleErrors::Report.call(
+          exception: e,
+          payload: payload || {},
+          config: config,
+          message: :unhandled_exception,
+          report: true
+        )
+      end
+
+      # @param config [Diffend::Config]
+      # @param payload [Hash]
+      #
+      # @return [Diffend::RequestObject]
+      def build_request_object(config, payload)
+        Diffend::RequestObject.new(
+          config: config,
+          url: config.commands_url,
+          payload: payload,
+          request_method: :post
+        )
+      end
+    end
+  end
+end

data/lib/diffend/track.rb

@@ -9,14 +9,16 @@ module Diffend
     RETRY_SLEEP = 15
 
     # Initialize tracking
-    def initialize
+    #
+    # @param config [Diffend::Config]
+    def initialize(config)
       @mutex = Mutex.new
-      @config = fetch_config
+      @config = config
     end
 
     # Start tracking
     def start
-      response = exec_request
+      response = Diffend::Execute.call(@config)
 
       perform(response['id'])
     rescue Diffend::Errors::HandledException
@@ -40,27 +42,12 @@ module Diffend
     # @param request_id [String]
     def perform(request_id)
       loop do
-        @mutex.synchronize do
-          track_request(request_id)
-        end
+        @mutex.synchronize { track_request(request_id) }
 
         sleep(TRACK_SLEEP)
       end
     end
 
-    # Perform an exec request
-    def exec_request
-      Diffend::Voting.call(
-        Diffend::Commands::EXEC,
-        @config,
-        Diffend::BuildBundlerDefinition.call(
-          Diffend::Commands::EXEC,
-          Bundler.default_gemfile,
-          Bundler.default_lockfile
-        )
-      )
-    end
-
     # Perform a track request
     #
     # @param request_id [String]
@@ -76,29 +63,10 @@ module Diffend
     def build_request_object(request_id)
       Diffend::RequestObject.new(
         config: @config,
-        url: track_url(@config.project_id, request_id),
+        url: @config.track_url(request_id),
         payload: { id: request_id }.freeze,
         request_method: :put
       ).freeze
     end
-
-    # Fetch diffend config file
-    #
-    # @return [OpenStruct, nil] configuration object
-    #
-    # @raise [Errors::MissingConfigurationFile] when no config file
-    def fetch_config
-      Config::Fetcher.call(
-        File.expand_path('..', Bundler.bin_path)
-      )
-    end
-
-    # @param project_id [String] diffend project_id
-    # @param request_id [String]
-    #
-    # @return [String]
-    def track_url(project_id, request_id)
-      "https://my.diffend.io/api/projects/#{project_id}/bundle/#{request_id}/track"
-    end
   end
 end

data/lib/diffend/version.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Diffend
+  # Current version
+  VERSION = '0.2.34'
+end

data/plugins.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require 'diffend'
+require 'diffend/plugin'
 
-Diffend.register
+Diffend::Plugin.register

data/scripts/generate_payload_for_file.rb

@@ -3,7 +3,6 @@
 require 'byebug'
 require 'diffend'
 
-
 command = 'install'
 project_id = nil
 
@@ -12,4 +11,4 @@ lockfile = ARGV[1]
 
 definition = Diffend::BuildBundlerDefinition.call(command, gemfile lockfile)
 
-pp Diffend::Voting::Versions::Remote.payload(command, project_id, definition)
+pp Diffend::LocalContext.call(command, project_id, definition)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffend
 version: !ruby/object:Gem::Version
-  version: 0.2.29
+  version: 0.2.34
 platform: ruby
 authors:
 - Tomasz Pajor
@@ -34,7 +34,7 @@ cert_chain:
   9MmF6uCQa1EjK2p8tYT0MnbHrFkoehxdX4VO9y99GAkhZyJNKPYPtyAUFV27sT2V
   LfCJRk4ifKIN/FUCwDSn8Cz0m6oH265q0p6wdzI6qrWOjP8tGOMBTA==
   -----END CERTIFICATE-----
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,25 +90,34 @@ files:
 - bin/rspec
 - certs/mensfeld.pem
 - certs/tomaszpajor.pem
+- config/diffend.yml
 - diffend.gemspec
 - lib/diffend.rb
 - lib/diffend/build_bundler_definition.rb
 - lib/diffend/commands.rb
-- lib/diffend/config/fetcher.rb
-- lib/diffend/config/file_finder.rb
-- lib/diffend/config/validator.rb
+- lib/diffend/config.rb
+- lib/diffend/configs/fetcher.rb
+- lib/diffend/configs/validator.rb
 - lib/diffend/errors.rb
+- lib/diffend/execute.rb
 - lib/diffend/handle_errors/build_exception_payload.rb
 - lib/diffend/handle_errors/display_to_stdout.rb
 - lib/diffend/handle_errors/messages.rb
 - lib/diffend/handle_errors/report.rb
+- lib/diffend/latest_version.rb
+- lib/diffend/local_context.rb
+- lib/diffend/local_context/diffend.rb
+- lib/diffend/local_context/host.rb
+- lib/diffend/local_context/packages.rb
+- lib/diffend/local_context/platform.rb
+- lib/diffend/logger.rb
 - lib/diffend/monitor.rb
+- lib/diffend/plugin.rb
 - lib/diffend/request.rb
 - lib/diffend/request_object.rb
+- lib/diffend/request_verdict.rb
 - lib/diffend/track.rb
-- lib/diffend/voting.rb
-- lib/diffend/voting/versions/local.rb
-- lib/diffend/voting/versions/remote.rb
+- lib/diffend/version.rb
 - plugins.rb
 - scripts/generate_payload_for_file.rb
 homepage: https://diffend.io
@@ -130,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: OSS supply chain security and management platform.
+summary: OSS supply chain security and management platform
 test_files: []

data/lib/diffend/config/fetcher.rb

@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-require 'yaml'
-
-module Diffend
-  # Module for all the components related to setting up the config
-  module Config
-    # Class responsible for fetching the config from .diffend.yml
-    module Fetcher
-      # All the errors for missing keys in the configuration file
-      MISSING_KEY_ERRORS = [
-        Errors::ProjectIdMissingInConfigurationFile,
-        Errors::ShareableIdMissingInConfigurationFile,
-        Errors::ShareableKeyMissingInConfigurationFile,
-        Errors::BuildPathMissingInConfigurationFile
-      ].freeze
-
-      class << self
-        # @param build_path [String] path of the current build
-        #
-        # @return [OpenStruct] open struct with config details
-        #
-        # @example
-        #   details = Fetcher.new.call('./')
-        #   details.build_path #=> './'
-        def call(build_path)
-          build(build_path)
-        rescue Errors::MissingConfigurationFile
-          Bundler.ui.error(build_missing_error_message(build_path))
-
-          raise Diffend::Errors::HandledException
-        rescue Errors::EmptyConfigurationFile
-          Bundler.ui.error(build_empty_error_message(build_path))
-
-          raise Diffend::Errors::HandledException
-        rescue Errors::MalformedConfigurationFile
-          Bundler.ui.error(build_malformed_error_message(build_path))
-
-          raise Diffend::Errors::HandledException
-        rescue *MISSING_KEY_ERRORS => e
-          Bundler.ui.error(build_missing_key_error_message(e))
-
-          raise Diffend::Errors::HandledException
-        end
-
-        private
-
-        # @param build_path [String] path of the current build
-        #
-        # @return [OpenStruct] open struct with config details
-        def build(build_path)
-          content = ERB.new(
-            File.read(
-              FileFinder.call(build_path)
-            )
-          ).result
-
-          raise Errors::EmptyConfigurationFile if content.empty?
-
-          OpenStruct.new(parse_file(content).merge(build_path: build_path))
-            .tap(&Validator.method(:call))
-        end
-
-        def parse_file(content)
-          YAML.safe_load(content)
-        rescue Psych::SyntaxError
-          raise Errors::MalformedConfigurationFile
-        end
-
-        # @param build_path [String] path of the current build
-        #
-        # @return [String] missing configuration file message
-        def build_missing_error_message(build_path)
-          <<~MSG
-            \nWe were unable to locate Diffend configuration file.\n
-            Please make sure that .diffend.yml is present in #{build_path} folder.\n
-          MSG
-        end
-
-        # @return [String] empty configuration file message
-        def build_empty_error_message
-          <<~MSG
-            \nYour Diffend configuration file is empty.\n
-            Please re-setup.\n
-          MSG
-        end
-
-        # @return [String] malformed configuration file message
-        def build_malformed_error_message
-          <<~MSG
-            \nYour Diffend configuration file is malformed.\n
-            Please re-setup.\n
-          MSG
-        end
-
-        # @return [String] malformed configuration file message
-        def build_missing_key_error_message(exception)
-          missing_key = missing_key_from_exception(exception)
-
-          <<~MSG
-            \nYour Diffend configuration file is missing #{missing_key} key.\n
-            Please re-setup.\n
-          MSG
-        end
-
-        def missing_key_from_exception(exception)
-          case exception
-          when Errors::ProjectIdMissingInConfigurationFile then 'project_id'
-          when Errors::ShareableIdMissingInConfigurationFile then 'shareable_id'
-          when Errors::ShareableKeyMissingInConfigurationFile then 'shareable_key'
-          when Errors::BuildPathMissingInConfigurationFile then 'build_path'
-          end
-        end
-      end
-    end
-  end
-end