pact_broker 2.93.0 → 2.93.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3be3c5c9c91694873befa3ac15ff196bbcf49b75f250fc22485079ee1630699
-  data.tar.gz: 00aa9e23a79856cf4db4353191d1fd33ae3acf93a991f0074949ad1ccaefc4d3
+  metadata.gz: dd8313de32ee72fbd7202e9279130983eeccf2d5bc9c6ae589a5ed9700854cbd
+  data.tar.gz: 8f7d311c9cbec69ca70f4a2420409e6c4747fcb0d1ae0f9af4d04baaf10aa43a
 SHA512:
-  metadata.gz: 568d1158ee7c4bf41731e26f849f30b5831ccf8d141399a549deabf679a32a1b7f0766bbe385fb604453b69476deff7788afdc5f276902fa09f065fcdb1e459f
-  data.tar.gz: da3b98bed787330c0730b2cf5e270dbee54fcea4106b0866f2fff0b9a7c6b00e31a57a8f2264ac057e24f706a9a96591890b052979fa73f362a15f4ad6e8d5c9
+  metadata.gz: baaf854e49a5d623279b2481933fb9e033289efba9b4d9350703d9dc9737dac367b6076938f8f309426480f0745d9fe181c8f7f296f8727e17584de498ea631e
+  data.tar.gz: ea459192ee83bce3c4fe1c307ad8f2ab3c0ed2734f40162cef0ae95033b81d0e3e7bc12d2765af52ae4a06a95ddfed8dfdca7b0c421e923aaa2ba4a172552bcf

data/CHANGELOG.md

@@ -1,3 +1,40 @@
+<a name="v2.93.4"></a>
+### v2.93.4 (2022-02-21)
+
+#### Bug Fixes
+
+* **matrix page**
+  * set correct base URL for links when a path is specified in the base URL	 ([8305456b](/../../commit/8305456b))
+
+* handle DateTimes that come back from Sqlite as Strings	 ([1312a049](/../../commit/1312a049))
+
+<a name="v2.93.3"></a>
+### v2.93.3 (2022-02-02)
+
+#### Bug Fixes
+
+* ensure webhook_certificates setting is honoured in webhook	 ([7933a526](/../../commit/7933a526))
+* ensure disable_ssl_verification setting is honoured in webhook	 ([08bc758c](/../../commit/08bc758c))
+* ensure webhook_certificates setting is honoured in webhook	 ([8a720cdb](/../../commit/8a720cdb))
+* ensure disable_ssl_verification setting is honoured in webhook	 ([0728b3d7](/../../commit/0728b3d7))
+
+* **hal-browser**
+  * fixing vulnerability by upgrading HAL browser dependencies	 ([a6b06f66](/../../commit/a6b06f66))
+
+<a name="v2.93.2"></a>
+### v2.93.2 (2021-12-23)
+
+#### Bug Fixes
+
+* Improve SortContent performance on large contracts (#538)	 ([1914c01f](/../../commit/1914c01f))
+
+<a name="v2.93.1"></a>
+### v2.93.1 (2021-12-21)
+
+#### Bug Fixes
+
+* optimise query for calculating the latest overall pacts	 ([f44aaa70](/../../commit/f44aaa70))
+
 <a name="v2.93.0"></a>
 ### v2.93.0 (2021-12-07)
 

data/db/migrations/migration_helper.rb

@@ -23,7 +23,7 @@ module PactBroker
     end
 
     def postgres?
-      adapter == "postgres"
+      adapter =~ /postgres/
     end
 
     def adapter

data/lib/db.rb

@@ -71,7 +71,7 @@ module DB
   end
 
   def self.postgres?
-    !!(PACT_BROKER_DB.adapter_scheme.to_s == "postgres")
+    !!(PACT_BROKER_DB.adapter_scheme.to_s =~ /postgres/)
   end
 
   PACT_BROKER_DB ||= connection_for_env ENV.fetch("RACK_ENV")

data/lib/pact_broker/api/decorators/format_date_time.rb

@@ -2,8 +2,16 @@ module PactBroker
   module Api
     module Decorators
       module FormatDateTime
+        # Keep this in sync with Sequel.datetime_class.
+        # Needs to be upgraded from DateTime to Time as Time is deprecated
+        DATE_TIME_CLASS = DateTime
+
         def self.call(date_time)
-          date_time.to_time.utc.to_datetime.xmlschema if date_time
+          if date_time.is_a?(String)
+            DATE_TIME_CLASS.strptime(date_time).to_time.utc.to_datetime.xmlschema
+          elsif date_time
+            date_time.to_time.utc.to_datetime.xmlschema if date_time
+          end
         end
 
         def format_date_time(date_time)

data/lib/pact_broker/badges/service.rb

@@ -132,7 +132,7 @@ module PactBroker
         with_cache uri do
           request = Net::HTTP::Get.new(uri)
           options = {read_timeout: 3, open_timeout: 1, ssl_timeout: 1, continue_timeout: 1}
-          options.merge! PactBroker::BuildHttpOptions.call(uri)
+          options.merge! PactBroker::BuildHttpOptions.call(uri, disable_ssl_verification: PactBroker.configuration.disable_ssl_verification)
 
           Net::HTTP.start(uri.hostname, uri.port, :ENV, options) do |http|
             http.request request

data/lib/pact_broker/build_http_options.rb

@@ -4,14 +4,14 @@ module PactBroker
   class BuildHttpOptions
     extend PactBroker::Services
 
-    def self.call  uri
+    def self.call uri, disable_ssl_verification: false, cert_store: nil
       uri = URI(uri)
       options = {}
-      
+
       if uri.scheme == "https"
         options[:use_ssl] = true
-        options[:cert_store] = cert_store
-        if disable_ssl_verification?
+        options[:cert_store] = cert_store if cert_store
+        if disable_ssl_verification
           options[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
         else
           options[:verify_mode] = OpenSSL::SSL::VERIFY_PEER
@@ -19,14 +19,6 @@ module PactBroker
       end
       options
     end
-    
-    def self.disable_ssl_verification?
-      PactBroker.configuration.disable_ssl_verification
-    end
-    
-    def self.cert_store
-      certificate_service.cert_store
-    end    
   end
 end
 

data/lib/pact_broker/certificates/service.rb

@@ -15,7 +15,7 @@ module PactBroker
         cert_store.set_default_paths
         find_all_certificates.each do | certificate |
           begin
-            logger.debug("Loading certificate #{certificate.subject} in to cert store")
+            logger.debug("Loading certificate for subject #{certificate.subject} and issuer #{certificate.issuer} in to cert store")
             cert_store.add_cert(certificate)
           rescue StandardError => e
             logger.warn("Error adding certificate object #{certificate} to store", e)
@@ -42,7 +42,7 @@ module PactBroker
       end
 
       def certificates_from_config
-        PactBroker.configuration.webhook_certificates.select{| c| c[:content] || c[:path] }.collect do | certificate_config, i |
+        PactBroker.configuration.webhook_certificates.select{| c| c[:content] || c[:path] }.collect.with_index do | certificate_config, i |
           load_certificate_config(certificate_config, i)
         end.flatten.compact
       end
@@ -54,7 +54,7 @@ module PactBroker
             begin
               OpenSSL::X509::Certificate.new(c)
             rescue StandardError => e
-              logger.warn("Error creating certificate object from webhook_certificate at index #{i} with description #{certificate_config[:description]}", e)
+              logger.warn("Error creating certificate object from webhook_certificates at index #{i} with description #{certificate_config[:description]}", e)
               nil
             end
           end

data/lib/pact_broker/config/runtime_configuration_database_methods.rb

@@ -72,7 +72,7 @@ module PactBroker
           end
 
           def postgres?
-            database_credentials[:adapter] == "postgres"
+            database_credentials[:adapter] =~ /postgres/
           end
           private :postgres?
 

data/lib/pact_broker/domain/webhook.rb

@@ -50,7 +50,7 @@ module PactBroker
       def execute pact, verification, event_context, options
         logger.info "Executing #{self} event_context=#{event_context}"
         template_params = template_parameters(pact, verification, event_context, options)
-        webhook_request = request.build(template_params, options.fetch(:user_agent))
+        webhook_request = request.build(template_params, options.slice(:user_agent, :disable_ssl_verification, :cert_store))
         http_response, error = execute_request(webhook_request)
         success = success?(http_response, options)
         http_request = webhook_request.http_request

data/lib/pact_broker/domain/webhook_request.rb

@@ -18,7 +18,7 @@ module PactBroker
 
       HEADERS_TO_REDACT = [/authorization/i, /token/i]
 
-      attr_accessor :method, :url, :headers, :body, :username, :password, :uuid, :user_agent
+      attr_accessor :method, :url, :headers, :body, :username, :password, :uuid, :user_agent, :disable_ssl_verification, :cert_store
 
       # Reform gets confused by the :method method, as :method is a standard
       # Ruby method.
@@ -47,7 +47,7 @@ module PactBroker
       end
 
       def execute
-        options = PactBroker::BuildHttpOptions.call(uri).merge(read_timeout: 15, open_timeout: 15)
+        options = PactBroker::BuildHttpOptions.call(uri, disable_ssl_verification: disable_ssl_verification, cert_store: cert_store).merge(read_timeout: 15, open_timeout: 15)
         req = http_request
         Net::HTTP.start(uri.hostname, uri.port, :ENV, options) do |http|
           http.request req

data/lib/pact_broker/metrics/service.rb

@@ -18,7 +18,7 @@ module PactBroker
             withMainBranchSetCount: PactBroker::Domain::Pacticipant.with_main_branch_set.count
           },
           integrations: {
-            count: PactBroker::Integrations::Integration.count
+            count: PactBroker::Pacts::PactPublication.select(:consumer_id, :provider_id).distinct.count
           },
           pactPublications: {
             count: PactBroker::Pacts::PactPublication.count,

data/lib/pact_broker/pacts/pact_publication_dataset_module.rb

@@ -90,16 +90,18 @@ module PactBroker
       def overall_latest
         self_join = {
           Sequel[:pact_publications][:consumer_id] => Sequel[:pp2][:consumer_id],
-          Sequel[:pact_publications][:provider_id] => Sequel[:pp2][:provider_id]
+          Sequel[:pact_publications][:provider_id] => Sequel[:pp2][:provider_id],
+          Sequel[:pact_publications][:consumer_version_order] => Sequel[:pp2][:max_consumer_version_order]
         }
 
         base_query = self
         base_query = base_query.select_all_qualified if no_columns_selected?
 
-        base_query.left_join(base_query.select(:consumer_id, :provider_id, :consumer_version_order), self_join, { table_alias: :pp2 } ) do
-          Sequel[:pp2][:consumer_version_order] > Sequel[:pact_publications][:consumer_version_order]
-        end
-        .where(Sequel[:pp2][:consumer_version_order] => nil)
+        base_query.join(
+          base_query.select_group(:consumer_id, :provider_id).select_append{ max(:consumer_version_order).as(:max_consumer_version_order) },
+          self_join,
+          table_alias: :pp2
+        )
         .remove_overridden_revisions_from_complete_query
       end
 

data/lib/pact_broker/pacts/selector.rb

@@ -283,8 +283,6 @@ module PactBroker
 
       # rubocop: disable Metrics/CyclomaticComplexity
       def <=> other
-        # elsif consumer || other.consumer
-        #   consumer_comparison(other)
         if overall_latest? || other.overall_latest?
           overall_latest_comparison(other)
         elsif latest_for_branch? || other.latest_for_branch?
@@ -297,6 +295,8 @@ module PactBroker
           currently_deployed_comparison(other)
         elsif currently_supported? || other.currently_supported?
           currently_supported_comparison(other)
+        elsif consumer || other.consumer
+          consumer_comparison(other)
         else
           0
         end
@@ -358,8 +358,8 @@ module PactBroker
       end
 
       def consumer_comparison(other)
-        if consumer == other.consumer
-          0
+        if consumer && other.consumer
+          consumer <=> other.consumer
         else
           consumer ? -1 : 1
         end

data/lib/pact_broker/pacts/service.rb

@@ -43,7 +43,7 @@ module PactBroker
       end
 
       def delete params
-        logger.info "Deleting pact version with params #{params}"
+        logger.info "Deleting pact version", payload: params
         pacts = pact_repository.find_all_revisions(params[:consumer_name], params[:consumer_version_number], params[:provider_name])
         webhook_service.delete_all_webhook_related_objects_by_pact_publication_ids(pacts.collect(&:id))
         pact_repository.delete(params)
@@ -156,7 +156,7 @@ module PactBroker
 
       # Overwriting an existing pact with the same consumer/provider/consumer version number
       def create_pact_revision params, existing_pact
-        logger.info "Updating existing pact publication", payload: params.reject{ |k, _v| k == :json_content }
+        logger.info "Updating existing pact publication", payload: params.without(:json_content)
         logger.debug "Content #{params[:json_content]}"
         pact_version_sha = generate_sha(params[:json_content])
         json_content = add_interaction_ids(params[:json_content])
@@ -185,7 +185,7 @@ module PactBroker
 
       # When no publication for the given consumer/provider/consumer version number exists
       def create_pact params, version, provider
-        logger.info "Creating new pact publication with params #{params.reject{ |k, _v| k == :json_content}}"
+        logger.info "Creating new pact publication", payload: params.without(:json_content)
         logger.debug "Content #{params[:json_content]}"
         pact_version_sha = generate_sha(params[:json_content])
         json_content = add_interaction_ids(params[:json_content])

data/lib/pact_broker/pacts/sort_content.rb

@@ -34,7 +34,7 @@ module PactBroker
         # You never can tell what people will do...
         if probably_array.is_a?(Array)
           array_with_ordered_hashes = order_hash_keys(probably_array)
-          array_with_ordered_hashes.sort{ |a, b| a.to_json <=> b.to_json }
+          array_with_ordered_hashes.sort_by(&:to_json)
         else
           probably_array
         end

data/lib/pact_broker/repositories/helpers.rb

@@ -36,7 +36,7 @@ module PactBroker
       end
 
       def postgres?
-        Sequel::Model.db.adapter_scheme.to_s == "postgres"
+        Sequel::Model.db.adapter_scheme.to_s =~ /postgres/
       end
 
       def select_all_qualified

data/lib/pact_broker/ui/controllers/matrix.rb

@@ -32,7 +32,7 @@ module PactBroker
               errors = matrix_service.validate_selectors(selectors, options)
               if errors.empty?
                 lines = matrix_service.find(selectors, options)
-                locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines)
+                locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url)
                 locals[:badge_url] = matrix_badge_url(selectors, lines, base_url)
               else
                 locals[:errors] = errors

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.93.0"
+  VERSION = "2.93.4"
 end

data/lib/pact_broker/webhooks/execution_configuration.rb

@@ -41,6 +41,14 @@ module PactBroker
         with_updated_attribute(user_agent: value)
       end
 
+      def with_disable_ssl_verification(value)
+        with_updated_attribute(disable_ssl_verification: value)
+      end
+
+      def with_cert_store(value)
+        with_updated_attribute(cert_store: value)
+      end
+
       def webhook_context
         self[:webhook_context]
       end

data/lib/pact_broker/webhooks/execution_configuration_creator.rb

@@ -1,15 +1,20 @@
 require "pact_broker/configuration"
+require "pact_broker/services"
 require "pact_broker/webhooks/execution_configuration"
 
 module PactBroker
   module Webhooks
     class ExecutionConfigurationCreator
+      extend PactBroker::Services
+
       def self.call(resource)
         PactBroker::Webhooks::ExecutionConfiguration.new
           .with_show_response(PactBroker.configuration.show_webhook_response?)
           .with_retry_schedule(PactBroker.configuration.webhook_retry_schedule)
           .with_http_success_codes(PactBroker.configuration.webhook_http_code_success)
           .with_user_agent(PactBroker.configuration.user_agent)
+          .with_disable_ssl_verification(PactBroker.configuration.disable_ssl_verification)
+          .with_cert_store(certificate_service.cert_store)
           .with_webhook_context(base_url: resource.base_url)
       end
     end

data/lib/pact_broker/webhooks/webhook_request_template.rb

@@ -27,7 +27,7 @@ module PactBroker
         @headers = Rack::Utils::HeaderHash.new(attributes[:headers] || {})
       end
 
-      def build(template_params, user_agent)
+      def build(template_params, user_agent: nil, disable_ssl_verification: false, cert_store: nil)
         attributes = {
           method: http_method,
           url: build_url(template_params),
@@ -36,7 +36,9 @@ module PactBroker
           password: build_string(password, template_params),
           uuid: uuid,
           body: build_body(template_params),
-          user_agent: user_agent
+          user_agent: user_agent,
+          disable_ssl_verification: disable_ssl_verification,
+          cert_store: cert_store
         }
         PactBroker::Domain::WebhookRequest.new(attributes)
       end

data/lib/sequel/plugins/upsert.rb

@@ -101,7 +101,7 @@ module Sequel
         end
 
         def postgres?
-          model.db.adapter_scheme.to_s == "postgres"
+          model.db.adapter_scheme.to_s =~ /postgres/
         end
 
         def values_to_update