pact_broker 2.58.0 → 2.59.2

data/lib/pact_broker/pacts/verifiable_pact.rb

@@ -22,6 +22,14 @@ module PactBroker
       def wip?
         wip
       end
+
+      def <=> other
+        if self.consumer_name != other.consumer_name
+          return self.consumer_name <=> other.consumer_name
+        else
+          return self.consumer_version.order <=> other.consumer_version.order
+        end
+      end
     end
   end
 end

data/lib/pact_broker/policies.rb

@@ -0,0 +1,53 @@
+require 'pact_broker/configuration'
+
+module PactBroker
+  class DefaultPolicy
+    def initialize(current_user, resource)
+      @current_user = current_user
+      @resource = resource
+    end
+
+    def update?
+      true
+    end
+
+    def delete?
+      true
+    end
+
+    def create?
+      true
+    end
+
+    def view?
+      true
+    end
+
+    private
+
+    attr_reader :current_user, :resource
+
+    class Scope
+      def initialize(user, scope)
+        @user = user
+        @scope = scope
+      end
+
+      def resolve
+        scope
+      end
+
+      private
+
+      attr_reader :user, :scope
+    end
+  end
+
+  def self.policy!(*args)
+    PactBroker.configuration.policy_builder.call(*args)
+  end
+
+  def self.policy_scope!(*args)
+    PactBroker.configuration.policy_scope_builder.call(*args)
+  end
+end

data/lib/pact_broker/repositories/helpers.rb

@@ -44,30 +44,13 @@ module PactBroker
       end
 
       def select_for_subquery column
-        if mysql? #stoopid mysql doesn't allow subqueries
-          select(column).collect{ | it | it[column] }
+        if mysql? #stoopid mysql doesn't allow you to modify datasets with subqueries
+          column_name = column.respond_to?(:alias) ? column.alias : column
+          select(column).collect{ | it | it[column_name] }
         else
           select(column)
         end
       end
-
-      def upsert row, unique_key_names, columns_to_update = nil
-        if postgres?
-          insert_conflict(update: row, target: unique_key_names).insert(row)
-        elsif mysql?
-          update_cols = columns_to_update || (row.keys - unique_key_names)
-          on_duplicate_key_update(*update_cols).insert(row)
-        else
-          # Sqlite
-          key = row.reject{ |k, v| !unique_key_names.include?(k) }
-          if where(key).count == 0
-            insert(row)
-          else
-            where(key).update(row)
-          end
-        end
-        model.where(row.select{ |key, _| unique_key_names.include?(key)}).single_record
-      end
     end
   end
 end

data/lib/pact_broker/test/test_data_builder.rb

@@ -73,14 +73,14 @@ module PactBroker
         self
       end
 
-      def create_pact_with_hierarchy consumer_name = "Consumer", consumer_version_number = "1.2.3", provider_name = "Provider", json_content = default_json_content
+      def create_pact_with_hierarchy consumer_name = "Consumer", consumer_version_number = "1.2.3", provider_name = "Provider", json_content = nil
         use_consumer(consumer_name)
         create_consumer(consumer_name) if !consumer
         use_provider(provider_name)
         create_provider provider_name if !provider
         use_consumer_version(consumer_version_number)
         create_consumer_version(consumer_version_number) if !consumer_version
-        create_pact json_content: json_content
+        create_pact json_content: json_content || default_json_content
         self
       end
 
@@ -436,10 +436,10 @@ module PactBroker
       def default_json_content
         {
           "consumer" => {
-             "name" => "Condor"
+             "name" => consumer.name
            },
            "provider" => {
-             "name" => "Pricing Service"
+             "name" => provider.name
            },
            "interactions" => [],
            "random" => rand

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

@@ -19,7 +19,7 @@ module PactBroker
 
         get "/" do
           view_model = ViewDomain::IndexItems.new(pacticipant_service.find_index_items, base_url: base_url)
-          haml 'clusters/show', locals: {relationships: view_model, base_url: base_url}
+          haml 'clusters/show', locals: { relationships: view_model, base_url: base_url }, escape_html: true
         end
 
       end

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

@@ -13,13 +13,13 @@ module PactBroker
           pacticipant = pacticipant_service.find_pacticipant_by_name(params[:name])
           erb :'groups/show.html', {
               locals: {
-                csv_path: "#{base_url}/groups/#{params[:name]}.csv",
+                csv_path: "#{base_url}/groups/#{ERB::Util.url_encode(params[:name])}.csv",
                 pacticipant_name: params[:name],
                 repository_url: pacticipant&.repository_url,
                 base_url: base_url
               }
             }, {
-              layout: 'layouts/main'
+              layout: 'layouts/main',
             }
         end
 

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

@@ -23,8 +23,6 @@ module PactBroker
             page_size: page_size
           }
 
-          # TODO remove this code when verified
-          options[:optimised] = true unless params[:optimised] == 'false'
           index_items = ViewDomain::IndexItems.new(index_service.find_index_items(options), base_url: base_url)
 
           page = tags ? :'index/show-with-tags' : :'index/show'
@@ -38,7 +36,7 @@ module PactBroker
             base_url: base_url
           }
 
-          haml page, {locals: locals, layout: :'layouts/main'}
+          haml page, { locals: locals, layout: :'layouts/main', escape_html: true }
         end
 
         def set_headers

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

@@ -42,7 +42,7 @@ module PactBroker
             Padrino.logger.exception(e) unless e.is_a?(PactBroker::Error)
             locals[:errors] = [e.message]
           end
-          haml :'matrix/show', {locals: locals, layout: :'layouts/main'}
+          haml :'matrix/show', { locals: locals, layout: :'layouts/main', escape_html: true }
         end
 
         get "/provider/:provider_name/consumer/:consumer_name" do
@@ -60,7 +60,7 @@ module PactBroker
             badge_url: nil,
             base_url: base_url
           }
-          haml :'matrix/show', {locals: locals, layout: :'layouts/main'}
+          haml :'matrix/show', { locals: locals, layout: :'layouts/main', escape_html: true }
         end
 
         def create_selector_objects(selector_hashes)

data/lib/pact_broker/ui/views/groups/show.html.erb

@@ -31,13 +31,13 @@ body{
 <!-- developed by Duncan Alexander - hypothete.com -->
 </head>
 <body>
-<h1>Network graph of <%= pacticipant_name %> relationships</h1>
+<h1>Network graph of <%= escape_html(pacticipant_name) %> relationships</h1>
 
 <% if repository_url %>
 <p>Repository URL:
 
 <%
-repository_link = "<a href='#{repository_url}'>#{escape_html(repository_url)}</a>"
+repository_link = "<a href=\"#{repository_url}\">#{repository_url}</a>"
 %>
 
 <%= Sanitize.fragment(repository_link, Sanitize::Config::BASIC) %>
@@ -105,7 +105,7 @@ var relationshipPath = function(relationship, nodeLocations, pacticipants) {
 
 var latestPactUrl = function (consumerName, providerName) {
     //TODO send this with the relationship data
-    return '<%= base_url %>/pacts/provider/' + providerName + '/consumer/' + consumerName + '/latest';
+    return '<%= base_url %>' + '/pacts/provider/' + encodeURIComponent(providerName) + '/consumer/' + encodeURIComponent(consumerName) + '/latest';
 };
 
 var relationshipData = function(pacticipant, relationships) {

data/lib/pact_broker/ui/views/index/show-with-tags.haml

@@ -1,9 +1,9 @@
 %body
-  = render :haml, :'index/_css_and_js', :layout => false
+  != render :haml, :'index/_css_and_js', :layout => false
   .container
-    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: false, base_url: base_url}
+    != render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: false, base_url: base_url}
     - if index_items.empty?
-      = render :haml, :'index/_getting-started', :layout => false
+      != render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }
@@ -37,10 +37,10 @@
           %tr{'data-pact-versions-url': index_item.pact_versions_url, 'data-consumer-name': index_item.consumer_name, 'data-provider-name': index_item.provider_name, 'data-integration-url': index_item.integration_url}
             %td.consumer
               %a{:href => index_item.consumer_group_url }
-                = escape_html(index_item.consumer_name)
+                = index_item.consumer_name
             %td.consumer-version-number{"data-text": index_item.consumer_version_order}
               %div.clippable
-                = escape_html(index_item.consumer_version_number)
+                = index_item.consumer_version_number
                 - if index_item.consumer_version_number
                   %button.clippy.invisible{ title: "Copy to clipboard" }
                     %span.glyphicon.glyphicon-copy
@@ -49,7 +49,7 @@
                   latest
               - index_item.consumer_version_latest_tag_names.each do | tag_name |
                 .tag.label.label-primary
-                  = escape_html(tag_name)
+                  = tag_name
             %td.pact
               %span.pact
                 %a{ href: index_item.pact_url, title: "View pact" }
@@ -57,16 +57,16 @@
                 %a{ href: index_item.pact_matrix_url, title: "View pact matrix" }
             %td.provider
               %a{ href: index_item.provider_group_url }
-                = escape_html(index_item.provider_name)
+                = index_item.provider_name
             %td.provider-version-number
               %div.clippable
-                = escape_html(index_item.provider_version_number)
+                = index_item.provider_version_number
                 - if index_item.provider_version_number
                   %button.clippy.invisible{ title: "Copy to clipboard" }
                     %span.glyphicon.glyphicon-copy
               - index_item.provider_version_latest_tag_names.each do | tag_name |
                 .tag.label.label-primary
-                  = escape_html(tag_name)
+                  = tag_name
             %td{"data-text": index_item.publication_date_of_latest_pact_order}
               = index_item.publication_date_of_latest_pact.gsub("about ", "")
             %td{ class: index_item.webhook_status }
@@ -86,7 +86,7 @@
     %div.pagination
 
     - pagination_locals = { page_number: page_number, page_size: page_size, pagination_record_count: pagination_record_count, current_page_size: current_page_size }
-    = render :haml, :'index/_pagination', :layout => false, locals: pagination_locals
+    != render :haml, :'index/_pagination', :layout => false, locals: pagination_locals
 
   :javascript
     $(function(){

data/lib/pact_broker/ui/views/index/show.haml

@@ -1,9 +1,9 @@
 %body
-  = render :haml, :'index/_css_and_js', :layout => false
+  != render :haml, :'index/_css_and_js', :layout => false
   .container
-    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: true, base_url: base_url}
+    != render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: true, base_url: base_url}
     - if index_items.empty?
-      = render :haml, :'index/_getting-started', :layout => false
+      != render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }
@@ -32,7 +32,7 @@
             %td
             %td.consumer
               %a{ href: index_item.consumer_group_url }
-                = escape_html(index_item.consumer_name)
+                = index_item.consumer_name
             %td.pact
               %span.pact
                 %a{ href: index_item.latest_pact_url, :title => "View pact" }
@@ -40,7 +40,7 @@
                 %a{ href: index_item.pact_matrix_url, title: "View pact matrix" }
             %td.provider
               %a{ href: index_item.provider_group_url }
-                = escape_html(index_item.provider_name)
+                = index_item.provider_name
             %td
             %td{"data-text": index_item.publication_date_of_latest_pact_order}
               = index_item.publication_date_of_latest_pact
@@ -58,7 +58,7 @@
     %div.pagination
 
     - pagination_locals = { page_number: page_number, page_size: page_size, pagination_record_count: pagination_record_count, current_page_size: current_page_size }
-    = render :haml, :'index/_pagination', :layout => false, locals: pagination_locals
+    != render :haml, :'index/_pagination', :layout => false, locals: pagination_locals
 
 
   :javascript

data/lib/pact_broker/ui/views/layouts/main.haml

@@ -6,4 +6,4 @@
     %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css"}
     %script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-3.3.1.min.js"}
     %script{type: 'text/javascript', src:"#{base_url}/js/bootstrap.min.js"}
-  = yield
+  != yield

data/lib/pact_broker/ui/views/matrix/show.haml

@@ -20,15 +20,14 @@
     - if defined?(errors) && errors.any?
       - errors.each do | error |
         %div.alert.alert-danger
-          = escape_html(error)
-
+          = error
 
     %form{action: "#{base_url}/matrix", onsubmit:'return onSubmit()'}
       - selectors.each_with_index do | selector, index |
         .selector
           %label{for: "pacticipant#{index}"}
             Pacticipant name
-          %input{name: 'q[]pacticipant', id: "pacticipant1#{index}", class: 'pacticipant_name', value: escape_html(selector.pacticipant_name)}
+          %input{name: 'q[]pacticipant', id: "pacticipant1#{index}", class: 'pacticipant_name', value: selector.pacticipant_name}
 
           .input-group
 
@@ -45,9 +44,9 @@
               %option{ value: 'specify-all-tagged', selected: selector.specify_all_tagged }
                 All versions with tag...
 
-            %input{name: 'q[]version', type: 'text', id: "pacticipant#{index}_version", class: 'version', value: escape_html(selector.pacticipant_version_number)}
+            %input{name: 'q[]version', type: 'text', id: "pacticipant#{index}_version", class: 'version', value: selector.pacticipant_version_number}
 
-            %input{name: 'q[]tag', type: 'text', id: "pacticipant#{index}_tag", class: 'tag', value: escape_html(selector.tag)}
+            %input{name: 'q[]tag', type: 'text', id: "pacticipant#{index}_tag", class: 'tag', value: selector.tag}
 
             %input{name: 'q[]latest', value: 'true', hidden: true, class: 'latest-flag'}
 

data/lib/pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version.rb

@@ -3,16 +3,14 @@ require 'pact_broker/domain/verification'
 module PactBroker
   module Verifications
     class LatestVerificationIdForPactVersionAndProviderVersion < Sequel::Model(:latest_verification_id_for_pact_version_and_provider_version)
-
       unrestrict_primary_key
+      set_primary_key [:pact_version_id, :provider_version_id]
+
+      plugin :upsert, identifying_columns: [:pact_version_id, :provider_version_id]
 
       dataset_module do
         include PactBroker::Repositories::Helpers
       end
-
-      def upsert
-        self.class.upsert(to_hash, [:pact_version_id, :provider_version_id])
-      end
     end
   end
 end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.58.0'
+  VERSION = '2.59.2'
 end

data/lib/pact_broker/versions/repository.rb

@@ -56,10 +56,8 @@ module PactBroker
           created_at: Sequel.datetime_class.now,
           updated_at: Sequel.datetime_class.now
         }
-        id = PactBroker::Domain::Version.dataset.insert_ignore.insert(version_params)
-        version = PactBroker::Domain::Version.find(number: args[:number], pacticipant_id: args[:pacticipant_id])
-        PactBroker::Domain::OrderVersions.(version)
-        version.refresh # reload with the populated order
+
+        PactBroker::Domain::Version.new(version_params).insert_ignore
       end
 
       def find_by_pacticipant_id_and_number_or_create pacticipant_id, number

data/lib/rack/pact_broker/request_target.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'pact_broker/api/paths'
 
 module Rack
   module PactBroker
@@ -13,7 +14,7 @@ module Rack
       end
 
       def request_for_api?(env)
-        explicit_request_for_api(env) || no_accept_header(env) || (accept_all(env) && !is_web_extension(env))
+        explicit_request_for_api(env) || no_accept_header(env) || is_badge_request?(env) || (accept_all(env) && !is_web_extension(env))
       end
 
       private
@@ -38,6 +39,10 @@ module Rack
         API_CONTENT_TYPES.any?{ |content_type| header.include?(content_type) }
       end
 
+      def is_badge_request?(env)
+        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)

data/lib/sequel/plugins/insert_ignore.rb

@@ -0,0 +1,69 @@
+# This plugin can be included into a Sequel model to allow the original record
+# to be loaded into the model if a duplicate is inserted.
+# This is to handle race conditions when two requests come in in parallel to create
+# the same resource.
+
+# Rather than re-writing the whole save method and all the hooks and validation logic in it,
+# it naughtily overrides the private _insert_dataset.
+
+module Sequel
+  module Plugins
+    module InsertIgnore
+      def self.configure(model, opts=OPTS)
+        model.instance_exec do
+          @insert_ignore_plugin_identifying_columns = opts.fetch(:identifying_columns)
+        end
+      end
+
+      module ClassMethods
+        attr_reader :insert_ignore_plugin_identifying_columns
+      end
+
+      module InstanceMethods
+        def insert_ignore(opts = {})
+          save(opts)
+          load_values_from_previously_inserted_object unless id
+          self
+        rescue Sequel::NoExistingObject
+          load_values_from_previously_inserted_object
+        end
+
+        private
+
+        def load_values_from_previously_inserted_object
+          set_primary_key_columns_from_previously_inserted_object
+          refresh
+        end
+
+        def set_primary_key_columns_from_previously_inserted_object
+          if !primary_key_columns_are_same_as_identifying_columns
+            existing_record = find_previously_inserted_object
+            insert_ignore_primary_key_columns.each do | column |
+              self.send("#{column}=".to_sym, existing_record[column])
+            end
+          end
+        end
+
+        def find_previously_inserted_object
+          query = self.class.insert_ignore_plugin_identifying_columns.each_with_object({}) do | column_name, q |
+            q[column_name] = values[column_name]
+          end
+          model.where(query).single_record
+        end
+
+        def insert_ignore_primary_key_columns
+          @insert_ignore_primary_key_columns ||= [*primary_key].sort
+        end
+
+        def primary_key_columns_are_same_as_identifying_columns
+          insert_ignore_primary_key_columns == self.class.insert_ignore_plugin_identifying_columns.sort
+        end
+
+        # naughty override of Sequel private method
+        def _insert_dataset
+          super.insert_ignore
+        end
+      end
+    end
+  end
+end