pact_broker 2.104.0 → 2.106.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2a928f323706d303796168aed1ec181dbf44be8156fc54010357a26771cffd2
-  data.tar.gz: b6e9ab38c908cd2263e51e16816f1b4ad8950151cf033ce5009c33022bd1ca59
+  metadata.gz: 8cbd7d902684d2fc82497cc897310eabd8b9d9fdf1e8fd8073202349d659d82a
+  data.tar.gz: 3eaa5717c1bd08a4eda4bde312d120f18a95c7ed7a2297a603e351fed1bac93a
 SHA512:
-  metadata.gz: 9e43a6235c4a0a1cfdb8dacd8b83eca7f11e76c1ec40510207b7a904b72d2d1895878fdbbc1e249454c1b3fa5a814bb764bf747ae76b0f0f0f180da096f1d056
-  data.tar.gz: 77c95170acc6e136e177d27baaa65f2f668b5085789ebfafde5552983d83a3c42e25b21ee558faf19263d364ae9526350424d32312fb3a6db5d9dcb38e7521a4
+  metadata.gz: 98abd64cec0b9ba9496de89d32aaf3598d4a7058e6e72e328fd9e8049d9ef9d2429dc0a9275b4e138c8b3a8dcde14ccb554b3b537fd00ae0ac6b06bd5a8b0e47
+  data.tar.gz: 2ad84a36e17e170bed9f617e3f5b93bd9fff140dbf47c36490cf2df46e2222677cca04aab6542f0808492f20494766a76fa69b765cd4ddb9ed1557b6741f830b

data/CHANGELOG.md

@@ -1,3 +1,53 @@
+<a name="v2.106.0"></a>
+### v2.106.0 (2023-01-31)
+
+#### Features
+
+* add consumer_version_id index to latest_pact_publication_ids_for_consumer_versions	 ([b75ca5ee](/../../commit/b75ca5ee))
+* improve the performance of the incremental clean queries	 ([c3a07c79](/../../commit/c3a07c79))
+* add index to provider_version_id column in latest_verification_id_for_pact_version_and_provider_version	 ([0e1c43dd](/../../commit/0e1c43dd))
+* Pacticipant pagination (#585)	 ([f1a9be20](/../../commit/f1a9be20))
+* do not allow JSON request bodies that are not Objects or Arrays	 ([3d917286](/../../commit/3d917286))
+* add index for verification_id in pact_version_provider_tag_successful_verifications table	 ([b82a773a](/../../commit/b82a773a))
+* monkey patch Webmachine render_error method to support problem+json (#584)	 ([508f7ce2](/../../commit/508f7ce2))
+* support problem+json for error messages (#583)	 ([92957ebb](/../../commit/92957ebb))
+* add index to provider_version_id column in verifications table	 ([aac33725](/../../commit/aac33725))
+
+* **clean**
+  * log automatically added selectors	 ([135c1c0e](/../../commit/135c1c0e))
+
+#### Bug Fixes
+
+* check that request body does not contain any invalid UTF-8 characters before JSON parsing	 ([0a08d644](/../../commit/0a08d644))
+
+* **versions**
+  * add missing next and previous relations to paginated response	 ([3b46847e](/../../commit/3b46847e))
+  * eager load associations for versions endpoint	 ([2a57dc42](/../../commit/2a57dc42))
+
+* **ui**
+  * no space after `tag:` (#581)	 ([1b9ebdfe](/../../commit/1b9ebdfe))
+
+* **webhooks**
+  * correctly validate HTTP method when the given method is not a valid class name	 ([6da5a4f3](/../../commit/6da5a4f3))
+
+<a name="v2.105.0"></a>
+### v2.105.0 (2022-10-19)
+
+#### Features
+
+* update wording of version description for version in environment	 ([d122fa68](/../../commit/d122fa68))
+
+* **webhooks**
+  * allow auth headers to be logged for debugging purposes (#575)	 ([102b1930](/../../commit/102b1930))
+
+#### Bug Fixes
+
+* add validation to ensure an environment or to tag is specified for the /can-i-deploy endpoint	 ([e9d772eb](/../../commit/e9d772eb))
+* implement pending logic for provider branches	 ([7cdf1a7c](/../../commit/7cdf1a7c))
+
+* **wip pacts**
+  * fix performance issue encountered when removing explicitly specified pacts from the list of potential WIP pacts (#573)	 ([757f0301](/../../commit/757f0301))
+
 <a name="v2.104.0"></a>
 ### v2.104.0 (2022-09-17)
 
@@ -922,7 +972,7 @@
   * log schema versions and migration info on startup	 ([b385e535](/../../commit/b385e535))
   * allow options to be passed to Sequel migrate via the MigrationTask	 ([143613e7](/../../commit/143613e7))
 
-* allow Pactflow messages in logs to be hidden by setting PACT_BROKER_HIDE_PACTFLOW_MESSAGES=true	 ([a7550105](/../../commit/a7550105))
+* allow PactFlow messages in logs to be hidden by setting PACT_BROKER_HIDE_PACTFLOW_MESSAGES=true	 ([a7550105](/../../commit/a7550105))
 
 * **can-i-deploy**
   * experimental - add a warning message if there are interactions missing verification test results.	 ([f7ab8cc5](/../../commit/f7ab8cc5))

data/README.md

@@ -10,7 +10,7 @@ The Pact Broker is an application for sharing of consumer driven contracts and v
 <a href="https://pactflow.io/?utm_source=github&utm_campaign=pact_broker_intro"><img src="docs/images/Pactflow logo - black small.png"></a>
 <br/>
 
-You can try out a Pact Broker for free at <a href="https://pactflow.io/?utm_source=github&utm_campaign=pact_broker_intro"/>pactflow.io</a>. Built by a group of core Pact maintainers, Pactflow is a fork of the OSS Pact Broker with extra goodies like an improved UI, field level verification results and federated login.
+You can try out a Pact Broker for free at <a href="https://pactflow.io/?utm_source=github&utm_campaign=pact_broker_intro"/>pactflow.io</a>. Built by a group of core Pact maintainers, PactFlow is a fork of the OSS Pact Broker with extra goodies like an improved UI, field level verification results and federated login.
 
 **Why do I need a Pact Broker?**
 

data/db/migrations/20221130_add_provider_version_id_index_to_verifications.rb

@@ -0,0 +1,28 @@
+require_relative "migration_helper"
+
+include PactBroker::MigrationHelper
+
+Sequel.migration do
+  up do
+    # MySQL automatically creates indexes for foreign keys then complains if you
+    # re-create it with a different name and try to drop it.
+
+    # https://stackoverflow.com/a/52274628/832671 - "When there is only one index that can be used
+    # for the foreign key, it can't be dropped. If you really wan't to drop it, you either have to drop
+    # the foreign key constraint or to create another index for it first."
+    if !mysql?
+      alter_table(:verifications) do
+        add_index([:provider_version_id], name: "verifications_provider_version_id_index")
+      end
+    end
+
+  end
+
+  down do
+    if !mysql?
+      alter_table(:verifications) do
+        drop_index([:provider_version_id], name: "verifications_provider_version_id_index")
+      end
+    end
+  end
+end

data/db/migrations/20221208_add_index_to_pact_version_provider_tag_successful_verifications.rb

@@ -0,0 +1,21 @@
+require_relative "migration_helper"
+
+include PactBroker::MigrationHelper
+
+Sequel.migration do
+  up do
+    if !mysql?
+      alter_table(:pact_version_provider_tag_successful_verifications) do
+        add_index([:verification_id], name: "pact_ver_prov_tag_success_verif_verif_id_ndx")
+      end
+    end
+  end
+
+  down do
+    if !mysql?
+      alter_table(:pact_version_provider_tag_successful_verifications) do
+        drop_index([:verification_id], name: "pact_ver_prov_tag_success_verif_verif_id_ndx")
+      end
+    end
+  end
+end

data/db/migrations/20221215_add_prov_ver_id_ndx_to_latest_verifi_id_for_pact_ver_and_prov_ver.rb

@@ -0,0 +1,21 @@
+require_relative "migration_helper"
+
+include PactBroker::MigrationHelper
+
+Sequel.migration do
+  up do
+    if !mysql?
+      alter_table(:latest_verification_id_for_pact_version_and_provider_version) do
+        add_index([:provider_version_id], name: "latest_verif_id_for_pact_ver_and_prov_ver_prov_ver_id_ndx")
+      end
+    end
+  end
+
+  down do
+    if !mysql?
+      alter_table(:latest_verification_id_for_pact_version_and_provider_version) do
+        drop_index([:provider_version_id], name: "latest_verif_id_for_pact_ver_and_prov_ver_prov_ver_id_ndx")
+      end
+    end
+  end
+end

data/db/migrations/20230131_add_cons_ver_id_ndx_to_latest_pp_id_for_cons_ver.rb

@@ -0,0 +1,17 @@
+require_relative "migration_helper"
+
+include PactBroker::MigrationHelper
+
+Sequel.migration do
+  up do
+    alter_table(:latest_pact_publication_ids_for_consumer_versions) do
+      add_index([:consumer_version_id], name: "latest_pp_ids_for_cons_ver_con_ver_id_ndx")
+    end
+  end
+
+  down do
+    alter_table(:latest_pact_publication_ids_for_consumer_versions) do
+      drop_index([:consumer_version_id], name: "latest_pp_ids_for_cons_ver_con_ver_id_ndx")
+    end
+  end
+end

data/docs/CONFIGURATION.md

@@ -67,7 +67,7 @@ Ensure the application [`log_level`](#log_level) is set to `debug` when this set
 
 ### hide_pactflow_messages
 
-Set to `true` to hide the messages in the logs about Pactflow
+Set to `true` to hide the messages in the logs about PactFlow
 
 **Environment variable name:** `PACT_BROKER_HIDE_PACTFLOW_MESSAGES`<br/>
 **YAML configuration key name:** `hide_pactflow_messages`<br/>

data/docs/api/PAGINATION.md

@@ -0,0 +1,43 @@
+# Pagination
+
+Pagination of results is available for some endpoints used by the Pact Broker. These paginated responses can be used to programmatically load smaller subsections of the api results, in turn enabling improved performance and easier client side management of the data.
+
+For endpoints that support pagination a paginated response can be retrieved using the following query parameters:
+
+* `pageNumber=1`
+* `pageSize=100`
+
+eg.
+
+```
+https://pact-broker/pacticipants?pageSize=100&pageNumber=1
+```
+
+Including one or both of these in the api call will result in a paginated response. Where only one parameter is included the other will use the default value specified above.
+
+To retrieve the next or previous page of the paginated response use the URL provided in the response body under the `_links` section, labeled `next` or `previous`.
+The first page will not have a previous link, while the last page will not have a next link.
+
+The recommended approach to iterate the full list of resources is to fetch the first page, then call the `href` of the `next` relation until there is no `next` relation returned.
+
+```
+"_links": {
+  "next": {
+    "href": "http://pact-broker/pacticipants?pageSize=100&pageNumber=2",
+    "title": "Next page"
+  }
+}
+
+```
+
+## Paginated endpoints
+
+The following endpoints in the Pact Broker support pagination via the above query parameters:
+
+### [Pacticipants](https://docs.pact.io/pact_broker/api/pacticipants)
+
+Ordered Alphabetically by the Pacticipant name.
+
+### [Pacticipant Versions](https://docs.pact.io/pact_broker/overview#pacticipant-versions)
+
+Ordered by date in reverse (most recent Pacticipant Version will be first).

data/lib/pact_broker/api/contracts/publish_contracts_schema.rb

@@ -2,6 +2,7 @@ require "dry-validation"
 require "pact_broker/api/contracts/dry_validation_workarounds"
 require "pact_broker/api/contracts/dry_validation_predicates"
 require "pact_broker/messages"
+require "pact_broker/api/contracts/utf_8_validation"
 
 module PactBroker
   module Api
@@ -11,6 +12,10 @@ module PactBroker
         using PactBroker::HashRefinements
         extend PactBroker::Messages
 
+        class << self
+          include PactBroker::Api::Contracts::UTF8Validation
+        end
+
         SCHEMA = Dry::Validation.Schema do
           configure do
             predicates(DryValidationPredicates)
@@ -83,6 +88,14 @@ module PactBroker
           if contract[:decodedContent].nil?
             add_contract_error(:content, message("errors.base64?", scope: nil), i, errors)
           end
+
+          if contract[:decodedContent]
+            char_number, fragment = fragment_before_invalid_utf_8_char(contract[:decodedContent])
+            if char_number
+              error_message = message("errors.non_utf_8_char_in_contract", char_number: char_number, fragment: fragment)
+              add_contract_error(:content, error_message, i, errors)
+            end
+          end
         end
 
         def self.validate_content_matches_content_type(contract, i, errors)
@@ -91,7 +104,6 @@ module PactBroker
           end
         end
 
-
         def self.add_contract_error(field, message, i, errors)
           errors[:contracts] ||= {}
           errors[:contracts][i] ||= {}

data/lib/pact_broker/api/contracts/utf_8_validation.rb

@@ -0,0 +1,17 @@
+module PactBroker
+  module Api
+    module Contracts
+      module UTF8Validation
+        def fragment_before_invalid_utf_8_char(string)
+          string.force_encoding("UTF-8").each_char.with_index do | char, index |
+            if !char.valid_encoding?
+              fragment = index < 100 ? string[0...index] : string[index-100...index]
+              return index + 1, fragment
+            end
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/contracts/webhook_contract.rb

@@ -130,6 +130,8 @@ module PactBroker
 
               def valid_method?(http_method)
                 Net::HTTP.const_defined?(http_method.capitalize)
+              rescue StandardError
+                false
               end
 
               def valid_url?(url)

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

@@ -0,0 +1,36 @@
+# Formats a message string into application/problem+json format.
+
+module PactBroker
+  module Api
+    module Decorators
+      class CustomErrorProblemJSONDecorator
+
+        # @option title [String]
+        # @option type [String]
+        # @option detail [String]
+        # @option status [Integer] HTTP status code
+        def initialize(title:, type:, detail:, status: )
+          @title = title
+          @type = type
+          @detail = detail
+          @status = status
+        end
+
+        # @return [Hash]
+        def to_hash(decorator_options = {})
+          {
+            "title" => @title,
+            "type" => "#{decorator_options.dig(:user_options, :base_url)}/problem/#{@type}",
+            "detail" => @detail,
+            "status" => @status
+          }
+        end
+
+        # @return [String] JSON
+        def to_json(decorator_options = {})
+          to_hash(decorator_options).to_json
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 require "roar/json/hal"
 require "pact_broker/api/pact_broker_urls"
 require_relative "embedded_version_decorator"
+require_relative "pagination_links"
 require "pact_broker/domain/pacticipant"
 require "pact_broker/api/decorators/pacticipant_decorator"
 
@@ -11,6 +12,8 @@ module PactBroker
 
         collection :entries, :as => :pacticipants, :class => PactBroker::Domain::Pacticipant, :extend => PactBroker::Api::Decorators::PacticipantDecorator, embedded: true
 
+        include PaginationLinks
+
         link :self do | options |
           pacticipants_url options[:base_url]
         end

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

@@ -8,6 +8,17 @@ module PactBroker
         include Roar::JSON::HAL
         include Roar::JSON::HAL::Links
 
+        property :page, getter: lambda { |context|
+          if context[:represented].respond_to?(:current_page)
+            {
+              number: context[:represented].current_page,
+              size: context[:represented].page_size,
+              totalElements: context[:represented].pagination_record_count,
+              totalPages: context[:represented].page_count,
+            }
+          end
+        }
+
         link :next do | context |
           if represented.respond_to?(:current_page) &&
               represented.respond_to?(:page_count) &&

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

@@ -0,0 +1,34 @@
+# Formats a message string into application/problem+json format.
+
+module PactBroker
+  module Api
+    module Decorators
+      class RuntimeErrorProblemJSONDecorator
+
+        # @param message [String]
+        def initialize(message)
+          @message = message
+        end
+
+        # @return [Hash]
+        def to_hash(decorator_options = {})
+          {
+            "title" => "Server error",
+            "type" => "#{decorator_options.dig(:user_options, :base_url)}/problems/server_error",
+            "detail" => message,
+            "status" => 500
+          }
+        end
+
+        # @return [String] JSON
+        def to_json(decorator_options = {})
+          to_hash(decorator_options).to_json
+        end
+
+        private
+
+        attr_reader :message
+      end
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+# Formats a nested Hash of errors as it comes out of the Dry Validation library
+# into application/problem+json format.
+require "pact_broker/string_refinements"
+
+module PactBroker
+  module Api
+    module Decorators
+      class ValidationErrorsProblemJSONDecorator
+        using PactBroker::StringRefinements
+
+
+        # @param errors [Hash]
+        def initialize(errors)
+          @errors = errors
+        end
+
+        # @return [Hash]
+        def to_hash(decorator_options = {})
+          error_list = []
+          walk_errors(errors, error_list, "", decorator_options.dig(:user_options, :base_url))
+          {
+            "title" => "Validation errors",
+            "type" => "#{decorator_options.dig(:user_options, :base_url)}/problems/validation-error",
+            "status" => 400,
+            "instance" => "/",
+            "errors" => error_list
+          }
+        end
+
+        # @return [String] JSON
+        def to_json(decorator_options = {})
+          to_hash(decorator_options).to_json
+        end
+
+        private
+
+        attr_reader :errors
+
+        # The path is meant to be implemented using JSON Pointer, but this will probably do for now.
+        # As per https://gregsdennis.github.io/Manatee.Json/usage/pointer.html
+        # the only things that need to be escaped are "~" and "/", which are unlikely to be used
+        # in a key name. You get what you deserve if you've done that.
+        def walk_errors(object, list, path, base_url)
+          if object.is_a?(Hash)
+            object.each { | key, value | walk_errors(value, list, "#{path}/#{key}", base_url) }
+          elsif object.is_a?(Array)
+            object.each { | value | walk_errors(value, list, path, base_url) }
+          elsif object.is_a?(String)
+            append_error(list, object, path, base_url)
+          end
+        end
+
+        def append_error(list, message, path, base_url)
+          error = {
+            "type" => "#{base_url}/problems/invalid-body-property-value",
+            "title" => "Validation error",
+            "detail" => message,
+            "status" => 400
+          }
+          error["pointer"] = path if path.present?
+          list << error
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/middleware/http_debug_logs.rb

@@ -21,9 +21,9 @@ module PactBroker
             env_to_log = env.reject { | header, _ | header.start_with?(*EXCLUDE_HEADERS) }
             env_to_log["rack.session"] = env["rack.session"].to_hash if env["rack.session"]
             env_to_log["rack.input"] = request_body(env) if env["rack.input"]
-            logger.debug("env", payload: env_to_log)
+            logger.debug("env", env_to_log)
             status, headers, body = @app.call(env)
-            logger.debug("response", payload: { "status" => status, "headers" => headers, "body" => body })
+            logger.debug("response", "status" => status, "headers" => headers, "body" => body)
             [status, headers, body]
           else
             @app.call(env)

data/lib/pact_broker/api/resources/badge_methods.rb

@@ -37,7 +37,7 @@ module PactBroker
             badge_url
           rescue StandardError => e
             # Want to render a badge, even if there's an error
-            badge_service.error_badge_url("error", ErrorResponseBodyGenerator.display_message(e, "reference: #{PactBroker::Errors.generate_error_reference}"))
+            badge_service.error_badge_url("error", ErrorResponseGenerator.display_message(e, "reference: #{PactBroker::Errors.generate_error_reference}"))
           end
         end
 

data/lib/pact_broker/api/resources/base_resource.rb

@@ -10,6 +10,8 @@ require "pact_broker/pacts/pact_params"
 require "pact_broker/api/resources/authentication"
 require "pact_broker/api/resources/authorization"
 require "pact_broker/errors"
+require "pact_broker/api/resources/error_handling_methods"
+require "pact_broker/api/contracts/utf_8_validation"
 
 module PactBroker
   module Api
@@ -22,6 +24,8 @@ module PactBroker
         include PactBroker::Api::PactBrokerUrls
         include PactBroker::Api::Resources::Authentication
         include PactBroker::Api::Resources::Authorization
+        include PactBroker::Api::Resources::ErrorHandlingMethods
+        include PactBroker::Api::Contracts::UTF8Validation
 
         include PactBroker::Logging
 
@@ -111,45 +115,27 @@ module PactBroker
           { user_options: decorator_context(options) }
         end
 
-        def handle_exception(error)
-          error_reference = PactBroker::Errors.generate_error_reference
-          application_context.error_logger.call(error, error_reference, request.env)
-          if PactBroker::Errors.reportable_error?(error)
-            PactBroker::Errors.report(error, error_reference, request.env)
-          end
-          response.body = application_context.error_response_body_generator.call(error, error_reference, request.env)
-        end
-
         # rubocop: disable Metrics/CyclomaticComplexity
         def params(options = {})
           return options[:default] if options.key?(:default) && request_body.empty?
 
           symbolize_names = !options.key?(:symbolize_names) || options[:symbolize_names]
-          if symbolize_names
-            @params_with_symbol_keys ||= JSON.parse(request_body, { symbolize_names: true }.merge(PACT_PARSING_OPTIONS)) #Not load! Otherwise it will try to load Ruby classes.
-          else
-            @params_with_string_keys ||= JSON.parse(request_body, { symbolize_names: false }.merge(PACT_PARSING_OPTIONS)) #Not load! Otherwise it will try to load Ruby classes.
+          parsed_params = if symbolize_names
+                            @params_with_symbol_keys ||= JSON.parse(request_body, { symbolize_names: true }.merge(PACT_PARSING_OPTIONS)) #Not load! Otherwise it will try to load Ruby classes.
+                          else
+                            @params_with_string_keys ||= JSON.parse(request_body, { symbolize_names: false }.merge(PACT_PARSING_OPTIONS)) #Not load! Otherwise it will try to load Ruby classes.
+                          end
+
+          if !parsed_params.is_a?(Hash) && !parsed_params.is_a?(Array)
+            raise "Expected JSON Object in request body but found #{parsed_params.class.name}"
           end
-        rescue StandardError => e
-          fragment = fragment_before_invalid_utf_8_char
 
-          if fragment
-            raise NonUTF8CharacterFound.new(message("errors.non_utf_8_char_in_request_body", char_number: fragment.length + 1, fragment: fragment))
-          else
-            raise InvalidJsonError.new(e.message)
-          end
+          parsed_params
+        rescue StandardError => e
+          raise InvalidJsonError.new(e.message)
         end
         # rubocop: enable Metrics/CyclomaticComplexity
 
-        def fragment_before_invalid_utf_8_char
-          request_body.each_char.with_index do | char, index |
-            if !char.valid_encoding?
-              return index < 100 ? request_body[0...index] : request_body[index-100...index]
-            end
-          end
-          nil
-        end
-
         def params_with_string_keys
           params(symbolize_names: false)
         end
@@ -158,16 +144,6 @@ module PactBroker
           @pact_params ||= PactBroker::Pacts::PactParams.from_request(request, identifier_from_path)
         end
 
-        def set_json_error_message message
-          response.headers["Content-Type"] = "application/hal+json;charset=utf-8"
-          response.body = { error: message }.to_json
-        end
-
-        def set_json_validation_error_messages errors
-          response.headers["Content-Type"] = "application/hal+json;charset=utf-8"
-          response.body = { errors: errors }.to_json
-        end
-
         def request_body
           @request_body ||= request.body.to_s
         end
@@ -210,18 +186,20 @@ module PactBroker
 
         def invalid_json?
           begin
-            params
-            false
-          rescue NonUTF8CharacterFound => e
-            logger.info(e.message) # Don't use the default SemanticLogger error logging method because it will try and print out the cause which will contain non UTF-8 chars in the message
-            set_json_error_message(e.message)
-            response.headers["Content-Type"] = "application/hal+json;charset=utf-8"
-            true
+            char_number, fragment = fragment_before_invalid_utf_8_char(request_body)
+            if char_number
+              error_message = message("errors.non_utf_8_char_in_request_body", char_number: char_number, fragment: fragment)
+              logger.info(error_message)
+              set_json_error_message(error_message)
+              true
+            else
+              params
+              false
+            end
           rescue StandardError => e
             message = "#{e.cause ? e.cause.class.name : e.class.name} - #{e.message}"
             logger.info(message)
             set_json_error_message(message)
-            response.headers["Content-Type"] = "application/hal+json;charset=utf-8"
             true
           end
         end
@@ -244,7 +222,9 @@ module PactBroker
 
         def find_pacticipant name, role
           pacticipant_service.find_pacticipant_by_name(name).tap do | pacticipant |
-            set_json_error_message("No #{role} with name '#{name}' found") if pacticipant.nil?
+            if pacticipant.nil?
+              set_json_error_message("No #{role} with name '#{name}' found", title: "Not found", type: "not_found", status: 404)
+            end
           end
         end