pact_broker 2.77.0 → 2.80.0

data/lib/rack/hal_browser.rb

@@ -1 +1 @@
-require_relative 'hal_browser/redirect'
+require_relative "hal_browser/redirect"

data/lib/rack/hal_browser/redirect.rb

@@ -1,21 +1,21 @@
-require 'uri'
-require 'rack/request'
-require 'rack/static'
+require "uri"
+require "rack/request"
+require "rack/static"
 
 module Rack
   module HalBrowser
     class Redirect
 
-      def initialize(app, options = {}, &block)
+      def initialize(app, options = {})
         @app = app
-        @excluded_paths = Array(options[:exclude]) << '/hal-browser'
-        @hal_browser = Rack::Static.new(@app, :urls => ['/hal-browser'], :root => ::File.expand_path('../../../../vendor', __FILE__))
+        @excluded_paths = Array(options[:exclude]) << "/hal-browser"
+        @hal_browser = Rack::Static.new(@app, :urls => ["/hal-browser"], :root => ::File.expand_path("../../../../vendor", __FILE__))
       end
 
       def call(env)
         request = Rack::Request.new(env)
         if match?(request)
-          return [303, {'Location' => hal_browser_url_from_request(request)}, []]
+          return [303, {"Location" => hal_browser_url_from_request(request)}, []]
         end
         @hal_browser.call(env)
       end
@@ -28,7 +28,7 @@ module Rack
 
       def prefers_html?(request)
         # TODO: actually follow real HTTP content negotiation rules
-        request.env.fetch('HTTP_ACCEPT', '').start_with?('text/html') && request.env.fetch('HTTP_ACCEPT', '').include?('json')
+        request.env.fetch("HTTP_ACCEPT", "").start_with?("text/html") && request.env.fetch("HTTP_ACCEPT", "").include?("json")
       end
 
       def path_not_excluded?(request)
@@ -36,7 +36,7 @@ module Rack
       end
 
       def hal_browser_url_from_request(request)
-        url = URI.parse('/hal-browser/browser.html')
+        url = URI.parse("/hal-browser/browser.html")
         url.fragment = request.path_info
         url.to_s
       end

data/lib/rack/pact_broker/add_pact_broker_version_header.rb

@@ -1,10 +1,10 @@
-require 'pact_broker/version'
+require "pact_broker/version"
 
 module Rack
   module PactBroker
     class AddPactBrokerVersionHeader
 
-      X_PACT_BROKER_VERSION = 'X-Pact-Broker-Version'.freeze
+      X_PACT_BROKER_VERSION = "X-Pact-Broker-Version".freeze
 
       def initialize app
         @app = app

data/lib/rack/pact_broker/convert_404_to_hal.rb

@@ -9,8 +9,8 @@ module Rack
       def call env
         response = @app.call(env)
 
-        if response.first == 404 && response[1]['Content-Type'] == 'text/html' && !(env['HTTP_ACCEPT'] =~ /html|javascript|css/)
-          [404, { 'Content-Type' => 'application/hal+json'},[]]
+        if response.first == 404 && response[1]["Content-Type"] == "text/html" && !(env["HTTP_ACCEPT"] =~ /html|javascript|css/)
+          [404, { "Content-Type" => "application/hal+json;charset=utf-8"},[]]
         else
           response
         end

data/lib/rack/pact_broker/convert_file_extension_to_accept_header.rb

@@ -39,7 +39,7 @@ module Rack
 
       def set_accept_header_and_path_info env, file_extension
         env.merge(
-          "PATH_INFO" => env["PATH_INFO"].gsub(EXTENSION_REGEXP, ''),
+          "PATH_INFO" => env["PATH_INFO"].gsub(EXTENSION_REGEXP, ""),
           "HTTP_ACCEPT" => EXTENSIONS[file_extension]
         )
       end

data/lib/rack/pact_broker/database_transaction.rb

@@ -1,6 +1,6 @@
-require 'pact_broker/constants'
-require 'sequel'
-require 'ostruct'
+require "pact_broker/constants"
+require "sequel"
+require "ostruct"
 
 module Rack
   module PactBroker

data/lib/rack/pact_broker/invalid_uri_protection.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'uri'
-require 'pact_broker/messages'
+require "uri"
+require "pact_broker/messages"
 
 
 # This class is for https://github.com/pact-foundation/pact_broker/issues/101
@@ -19,7 +19,7 @@ module Rack
       def call env
         if (uri = valid_uri?(env))
           if (error_message = validate(uri))
-            [422, {'Content-Type' => 'text/plain'}, [error_message]]
+            [422, {"Content-Type" => "text/plain"}, [error_message]]
           else
             app.call(env)
           end
@@ -47,9 +47,9 @@ module Rack
       def validate(uri)
         decoded_path = URI.decode(uri.path)
         if decoded_path.include?("\n")
-          message('errors.new_line_in_url_path')
+          message("errors.new_line_in_url_path")
         elsif decoded_path.include?("\t")
-          message('errors.tab_in_url_path')
+          message("errors.tab_in_url_path")
         end
       end
     end

data/lib/rack/pact_broker/no_auth.rb

@@ -1,7 +1,7 @@
 module Rack
   module PactBroker
     class NoAuth
-      def initialize app, *args, &block
+      def initialize app, *_args
         @app = app
       end
 

data/lib/rack/pact_broker/request_target.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'pact_broker/api/paths'
+require "pact_broker/api/paths"
 
 module Rack
   module PactBroker
@@ -20,7 +20,7 @@ module Rack
       private
 
       def body_is_json(env)
-        env['CONTENT_TYPE']&.include?("json")
+        env["CONTENT_TYPE"]&.include?("json")
       end
 
       def explicit_request_for_api(env)
@@ -28,11 +28,11 @@ module Rack
       end
 
       def accepts_api_content_type(env)
-        is_api_content_type((env['HTTP_ACCEPT']&.downcase) || "")
+        is_api_content_type((env["HTTP_ACCEPT"]&.downcase) || "")
       end
 
       def body_is_api_content_type(env)
-        is_api_content_type((env['CONTENT_TYPE']&.downcase) || "")
+        is_api_content_type((env["CONTENT_TYPE"]&.downcase) || "")
       end
 
       def is_api_content_type(header)
@@ -40,23 +40,23 @@ module Rack
       end
 
       def is_badge_request?(env)
-        env['HTTP_ACCEPT'].include?('svg') && ::PactBroker::Api::Paths.is_badge_path?(env['PATH_INFO'])
+        env["HTTP_ACCEPT"].include?("svg") && ::PactBroker::Api::Paths.is_badge_path?(env["PATH_INFO"])
       end
 
       # default curl Accept header
       # Also used by browsers to request various web assets like woff files
       def accept_all(env)
-        env['HTTP_ACCEPT'] == "*/*"
+        env["HTTP_ACCEPT"] == "*/*"
       end
 
       # No browser ever makes a request without an accept header, so it must be an API
       # request if there is no Accept header
       def no_accept_header(env)
-        env['HTTP_ACCEPT'] == nil || env['HTTP_ACCEPT'] == ""
+        env["HTTP_ACCEPT"] == nil || env["HTTP_ACCEPT"] == ""
       end
 
       def is_web_extension(env)
-        env['PATH_INFO'].end_with?(*WEB_ASSET_EXTENSIONS)
+        env["PATH_INFO"].end_with?(*WEB_ASSET_EXTENSIONS)
       end
     end
   end

data/lib/rack/pact_broker/reset_thread_data.rb

@@ -1,4 +1,4 @@
-require 'ostruct'
+require "ostruct"
 
 module Rack
   module PactBroker

data/lib/rack/pact_broker/set_base_url.rb

@@ -1,22 +1,52 @@
 module Rack
   module PactBroker
     class SetBaseUrl
-      def initialize app, base_url
+      X_FORWARDED_PATTERN = /_X_FORWARDED_/.freeze
+
+      def initialize app, base_urls
         @app = app
-        @base_url = base_url
+        @base_urls = base_urls
       end
 
-      def call env
+      def call(env)
         if env["pactbroker.base_url"]
           app.call(env)
         else
-          app.call(env.merge("pactbroker.base_url" => base_url))
+          app.call(env.merge("pactbroker.base_url" => select_matching_base_url(env)))
         end
       end
 
       private
 
-      attr_reader :app, :base_url
+      attr_reader :app, :base_urls
+
+      def select_matching_base_url(env)
+        if base_urls.size > 1
+          return matching_base_url_considering_x_forwarded_headers(env) ||
+            matching_base_url_not_considering_x_forwarded_headers(env) ||
+            default_base_url
+        end
+        default_base_url
+      end
+
+      def default_base_url
+        base_urls.first
+      end
+
+      def matching_base_url_considering_x_forwarded_headers(env)
+        matching_base_url(env)
+      end
+
+      def matching_base_url_not_considering_x_forwarded_headers(env)
+        matching_base_url(env.reject{ |k, _| k =~ X_FORWARDED_PATTERN} )
+      end
+
+      def matching_base_url(env)
+        request_base_url = Rack::Request.new(env).base_url
+        if base_urls.include?(request_base_url)
+          request_base_url
+        end
+      end
     end
   end
 end

data/lib/rack/pact_broker/ui_authentication.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/api/resources/authentication'
+require "pact_broker/api/resources/authentication"
 
 module Rack
   module PactBroker
@@ -14,12 +14,12 @@ module Rack
         if auth? env
           @app.call(env)
         else
-          [401, {'WWW-Authenticate' => 'Basic realm="Restricted Area"'}, []]
+          [401, {"WWW-Authenticate" => 'Basic realm="Restricted Area"'}, []]
         end
       end
 
       def auth? env
-        authenticated? nil, env['HTTP_AUTHORIZATION']
+        authenticated? nil, env["HTTP_AUTHORIZATION"]
       end
     end
   end

data/lib/rack/pact_broker/ui_request_filter.rb

@@ -4,7 +4,7 @@
 # to actually handle the request, as it would short circuit the cascade
 # logic.
 
-require 'rack/pact_broker/request_target'
+require "rack/pact_broker/request_target"
 
 module Rack
   module PactBroker

data/lib/sequel/extensions/statement_timeout.rb

@@ -3,15 +3,15 @@ module Sequel
     def with_statement_timeout(timeout_seconds = 20)
       # Might not have postgres class loaded, use class name
       if self.class.name == "Sequel::Postgres::Database"
-          # Don't want to use a transaction because this will often be a read and a transaction is unnecessary.
-          # Also, when using it for clean, want to control the transactions outside this.
-          current_statement_timeout = execute("show statement_timeout") { |r| r.first.values.first }
-          run("SET statement_timeout = '#{timeout_seconds}s'")
-          begin
-            yield
-          ensure
-            run("SET statement_timeout = '#{current_statement_timeout}'")
-          end
+        # Don't want to use a transaction because this will often be a read and a transaction is unnecessary.
+        # Also, when using it for clean, want to control the transactions outside this.
+        current_statement_timeout = execute("show statement_timeout") { |r| r.first.values.first }
+        run("SET statement_timeout = '#{timeout_seconds}s'")
+        begin
+          yield
+        ensure
+          run("SET statement_timeout = '#{current_statement_timeout}'")
+        end
       else
         yield
       end

data/pact_broker.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pact_broker/version'
+require "pact_broker/version"
 
 
 Gem::Specification.new do |gem|
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{See description}
   gem.homepage      = "https://github.com/pact-foundation/pact_broker"
 
-  gem.required_ruby_version = '>= 2.2.0'
+  gem.required_ruby_version = ">= 2.2.0"
 
   gem.files         = begin
                         if Dir.exist?(".git")
@@ -40,28 +40,29 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.license       = 'MIT'
+  gem.license       = "MIT"
 
   #gem.add_runtime_dependency 'pact'
-  gem.add_runtime_dependency 'httparty', '~> 0.14'
-  gem.add_runtime_dependency 'json', '~> 2.3'
-  gem.add_runtime_dependency 'roar', '~> 1.1'
-  gem.add_runtime_dependency 'reform', '~> 2.3','>= 2.3.1'
-  gem.add_runtime_dependency 'dry-validation', '~> 0.10.5'
-  gem.add_runtime_dependency 'sequel', '~> 5.28'
-  gem.add_runtime_dependency 'webmachine', '1.5.0'
-  gem.add_runtime_dependency 'semver2', '~> 3.4.2'
-  gem.add_runtime_dependency 'rack', '>= 2.2.3', '~> 2.2'
-  gem.add_runtime_dependency 'redcarpet', '>= 3.5.1', '~>3.5'
-  gem.add_runtime_dependency 'pact-support' , '~> 1.16', '>= 1.16.4'
-  gem.add_runtime_dependency 'padrino-core', '>= 0.14.3', '~> 0.14'
-  gem.add_runtime_dependency 'sinatra', '>= 2.0.8.1', '< 3.0'
-  gem.add_runtime_dependency 'haml', '~>5.0'
-  gem.add_runtime_dependency 'sucker_punch', '~>2.0'
-  gem.add_runtime_dependency 'rack-protection', '>= 2.0.8.1', '< 3.0'
-  gem.add_runtime_dependency 'dry-types', '~> 0.10.3' # https://travis-ci.org/pact-foundation/pact_broker/jobs/249448621
-  gem.add_runtime_dependency 'dry-logic', '0.4.2' # Later version cases ArgumentError: wrong number of arguments
-  gem.add_runtime_dependency 'table_print', '~> 1.5'
-  gem.add_runtime_dependency 'semantic_logger', '~> 4.3'
-  gem.add_runtime_dependency 'sanitize', '>= 5.2.1', '~> 5.2'
+  gem.add_runtime_dependency "httparty", "~> 0.14"
+  gem.add_runtime_dependency "json", "~> 2.3"
+  gem.add_runtime_dependency "roar", "~> 1.1"
+  gem.add_runtime_dependency "reform", "~> 2.3.3"
+  gem.add_runtime_dependency "dry-validation", "~> 0.10.5"
+  gem.add_runtime_dependency "sequel", "~> 5.28"
+  gem.add_runtime_dependency "webmachine", "1.6.0"
+  gem.add_runtime_dependency "semver2", "~> 3.4.2"
+  gem.add_runtime_dependency "rack", ">= 2.2.3", "~> 2.2"
+  gem.add_runtime_dependency "redcarpet", ">= 3.5.1", "~>3.5"
+  gem.add_runtime_dependency "pact-support" , "~> 1.16", ">= 1.16.4"
+  gem.add_runtime_dependency "padrino-core", ">= 0.14.3", "~> 0.14"
+  gem.add_runtime_dependency "sinatra", ">= 2.0.8.1", "< 3.0"
+  gem.add_runtime_dependency "haml", "~>5.0"
+  gem.add_runtime_dependency "sucker_punch", "~>2.0"
+  gem.add_runtime_dependency "rack-protection", ">= 2.0.8.1", "< 3.0"
+  gem.add_runtime_dependency "dry-types", "~> 0.10.3" # https://travis-ci.org/pact-foundation/pact_broker/jobs/249448621
+  gem.add_runtime_dependency "dry-logic", "0.4.2" # Later version cases ArgumentError: wrong number of arguments
+  gem.add_runtime_dependency "table_print", "~> 1.5"
+  gem.add_runtime_dependency "semantic_logger", "~> 4.3"
+  gem.add_runtime_dependency "sanitize", ">= 5.2.1", "~> 5.2"
+  gem.add_runtime_dependency "wisper", "~> 2.0"
 end

data/public/javascripts/clipboard.js

@@ -24,9 +24,15 @@ function initializeClipper(selector) {
     .children(".clippy")
     .click(function() {
       const clippyButton = $(this);
-      const text = $.trim(clippyButton.closest(selector).text());
+      const clipTarget = clippyButton.closest(selector);
+      let text = null;
+      if(clipTarget.data('clippable')) {
+        text = clipTarget.data('clippable');
+      } else {
+        text = clippyButton.closest(selector).text();
+      }
+      copyToClipboard($.trim(text));
 
-      copyToClipboard(text);
       flashClipped(clippyButton);
     });
 }

data/public/javascripts/matrix.js

@@ -20,20 +20,25 @@ function toggleLatestFlag(selectBox, enabled) {
 
 function showApplicableTextBoxes(selectorizor) {
   var selectorizorType = selectorizor.val();
+  setTextboxVisibility(selectorizor, '.version', false);
+  setTextboxVisibility(selectorizor, '.branch', false);
+  setTextboxVisibility(selectorizor, '.environment', false);
+  setTextboxVisibility(selectorizor, '.tag', false);
+
   if( selectorizorType === 'specify-version') {
     setTextboxVisibility(selectorizor, '.version', true);
-    setTextboxVisibility(selectorizor, '.tag', false);
   }
   else if( selectorizorType === 'specify-latest-tag' || selectorizorType === 'specify-all-tagged') {
-    setTextboxVisibility(selectorizor, '.version', false);
     setTextboxVisibility(selectorizor, '.tag', true);
   }
-  else if ( selectorizorType === 'specify-all-versions' || selectorizorType === 'specify-latest') {
-    setTextboxVisibility(selectorizor, '.version', false);
-    setTextboxVisibility(selectorizor, '.tag', false);
+  else if( selectorizorType === 'specify-latest-branch') {
+    setTextboxVisibility(selectorizor, '.branch', true);
+  }
+  else if ( selectorizorType === 'specify-environment') {
+    setTextboxVisibility(selectorizor, '.environment', true);
   }
 
-  if (selectorizorType === 'specify-latest' || selectorizorType === 'specify-latest-tag') {
+  if (selectorizorType === 'specify-latest' || selectorizorType === 'specify-latest-tag' || selectorizorType === 'specify-latest-branch') {
     toggleLatestFlag(selectorizor, true);
   } else {
     toggleLatestFlag(selectorizor, false);

data/public/stylesheets/index.css

@@ -52,7 +52,10 @@ body { padding-top: 10px; }
   word-wrap: break-word;
 }
 
-.consumer-version-number, .provider-version-number {
+.consumer-version,
+.provider-version,
+.consumer-version-number,
+.provider-version-number {
   word-wrap: break-word;
 }
 
@@ -229,3 +232,13 @@ span.copy-success-icon {
   width: 16px;
   height: 16px;
 }
+
+.field {
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+
+div.top-of-group {
+  margin-top: 20px;
+  margin-bottom: 20px;
+}