pact_broker 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2edb308c7e322351a0d87be210ccd4c9eaf4153
-  data.tar.gz: 24b63e6f8b5806bb363391f7b862ee3537855076
+  metadata.gz: 941974e21c5b34f41911366af7278a0b436436a1
+  data.tar.gz: 7e6f31d82d4da9f20838edd731f2af50852cef85
 SHA512:
-  metadata.gz: dc2bf80f0f162989597ff0046c506ba67d0020b4cf0210ac33bca85221e8bc1ca54ef59bd7b356915daeb533e041e45eafdf2e39b2823c54ffc7ab25506b2c20
-  data.tar.gz: 9c81983d516bb00fc61d6dae594b33c9202c3b2ba4e33d7ef6901d25800615c574578e9701c3ea16b8f70b526cdf8d9dc70ba61d16ec139232d31f9beb08b668
+  metadata.gz: dd4d89bdaca1e461cf662aa47f95b2ed6557d7731b7ed3364075c759e1a2d40d9cd8da5c0354e5781be23b0d6a800a8d267e99e0eeacf00583fbea6ae290646f
+  data.tar.gz: dfca11736f092764368478fde2ae871863c8b6a4092be8c4e17355e29ef69546261413e5e990ca06de80e40506325ae52c13c14f2c9c55471195ef66be2fd302

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+#### 2.1.0 (2017-07-03)
+* 53f0b5e - feat(get latest untagged pact): Add /latest-untagged endpoint to return the latest untagged pact (Beth Skurrie, Mon Jul 3 08:31:18 2017 +1000)
+* a963fce - Add pact_broker:db:version task. (Beth Skurrie, Thu Jun 29 20:29:55 2017 +1000)
+* 7ee134f - Add basic auth (authentication) to the UI, but no authorization (Beth Skurrie, Mon Jun 26 10:44:07 2017 +1000)
+
 #### 2.0.5 (2017-06-15)
 * e924c96 - Fixed webhook deletion bug (Beth Skurrie, Tue Jun 13 10:04:33 2017 +1000)
 

data/RELEASING.md

@@ -8,7 +8,7 @@
 3. Add files to git
 
       $ git add CHANGELOG.md lib/pact_broker/version.rb
-      $ git commit -m "Releasing version X.Y.Z"
+      $ git commit -m "Releasing version $(ruby -r ./lib/pact_broker/version.rb -e "puts PactBroker::VERSION")"
 
 3. Release:
 

data/db/migrations/33_create_config_table.rb

@@ -1,7 +1,7 @@
 require_relative 'migration_helper'
 
 Sequel.migration do
-  up do
+  change do
     create_table(:config, charset: 'utf8') do
       primary_key :id
       String :name, null: false

data/db/migrations/34_create_index_on_consumer_version_order.rb

@@ -1,5 +1,5 @@
 Sequel.migration do
-  up do
+  change do
     alter_table(:versions) do
       # Not actually sure which index it will use for OrderVersions, so CREATE ALL THE INDEXES!
       add_index [:number], name: 'ndx_ver_num' # Not sure if this is useful give we use LIKE not EQ

data/db/migrations/35_create_index_on_names.rb

@@ -1,5 +1,5 @@
 Sequel.migration do
-  up do
+  change do
     alter_table(:pacticipants) do
       add_index [:name], name: 'ndx_ppt_name' # Not sure if this is useful give we use LIKE not EQ
     end

data/lib/pact_broker/api.rb

@@ -52,6 +52,7 @@ module PactBroker
         # Latest pacts
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Api::Resources::LatestPact, {resource_name: "latest_pact_publication"}
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest', :tag], Api::Resources::LatestPact, {resource_name: "latest_tagged_pact_publication"}
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest-untagged'], Api::Resources::LatestPact, {resource_name: "latest_untagged_pact_publication", tag: :untagged}
         add ['pacts', 'provider', :provider_name, 'latest'], Api::Resources::LatestProviderPacts, {resource_name: "latest_provider_pact_publications"}
         add ['pacts', 'provider', :provider_name, 'latest', :tag], Api::Resources::LatestProviderPacts, {resource_name: "latest_tagged_provider_pact_publications"}
         add ['pacts', 'latest'], Api::Resources::LatestPacts, {resource_name: "latest_pacts"}

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

@@ -0,0 +1,30 @@
+require 'webmachine/resource/authentication'
+
+module PactBroker
+  module Api
+    module Resources
+      module Authentication
+
+        include Webmachine::Resource::Authentication
+
+        def authenticated? resource, authorization_header
+          return true unless PactBroker.configuration.authentication_configured?
+
+          if PactBroker.configuration.authenticate
+            authorized = PactBroker.configuration.authenticate.call(resource, authorization_header, {})
+            return true if authorized
+          end
+
+          if PactBroker.configuration.authenticate_with_basic_auth
+            basic_auth(authorization_header, "Pact Broker") do |username, password|
+              authorized = PactBroker.configuration.authenticate_with_basic_auth.call(resource, username, password, {})
+              return true if authorized
+            end
+          end
+
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ require 'pact_broker/api/pact_broker_urls'
 require 'pact_broker/api/decorators/decorator_context'
 require 'pact_broker/json'
 require 'pact_broker/pacts/pact_params'
+require 'pact_broker/api/resources/authentication'
 
 module PactBroker
 
@@ -29,8 +30,12 @@ module PactBroker
 
         include PactBroker::Services
         include PactBroker::Api::PactBrokerUrls
+        include PactBroker::Api::Resources::Authentication
         include PactBroker::Logging
 
+
+        attr_accessor :user
+
         def initialize
           PactBroker.configuration.before_resource.call(self)
         end
@@ -39,6 +44,15 @@ module PactBroker
           PactBroker.configuration.after_resource.call(self)
         end
 
+        def is_authorized?(authorization_header)
+          authenticated?(self, authorization_header)
+        end
+
+        def forbidden?
+          return false if PactBroker.configuration.authorize.nil?
+          !PactBroker.configuration.authorize.call(self, {})
+        end
+
         def identifier_from_path
           request.path_info.each_with_object({}) do | pair, hash|
             hash[pair.first] = pair.last === String ? URI.decode(pair.last) : pair.last

data/lib/pact_broker/app.rb

@@ -8,6 +8,7 @@ require 'rack/pact_broker/convert_file_extension_to_accept_header'
 require 'rack/pact_broker/database_transaction'
 require 'rack/pact_broker/invalid_uri_protection'
 require 'rack/pact_broker/accepts_html_filter'
+require 'rack/pact_broker/ui_authentication'
 require 'sucker_punch'
 
 module PactBroker
@@ -97,6 +98,7 @@ module PactBroker
       require 'pact_broker/ui'
       builder = ::Rack::Builder.new
       builder.use Rack::PactBroker::AcceptsHtmlFilter
+      builder.use Rack::PactBroker::UIAuthentication
       builder.run PactBroker::UI::App.new
       builder
     end

data/lib/pact_broker/configuration.rb

@@ -22,6 +22,8 @@ module PactBroker
     def initialize
       @before_resource_hook = ->(resource){}
       @after_resource_hook = ->(resource){}
+      @authenticate_with_basic_auth = nil
+      @authorize = nil
     end
 
     def logger
@@ -53,6 +55,38 @@ module PactBroker
       }
     end
 
+    def authentication_configured?
+      !!authenticate || !!authenticate_with_basic_auth
+    end
+
+    def authenticate &block
+      if block_given?
+        @authenticate = block
+      else
+        @authenticate
+      end
+    end
+
+    def authenticate_with_basic_auth &block
+      if block_given?
+        @authenticate_with_basic_auth = block
+      else
+        @authenticate_with_basic_auth
+      end
+    end
+
+    def authorization_configured?
+      !!authorize
+    end
+
+    def authorize &block
+      if block_given?
+        @authorize = block
+      else
+        @authorize
+      end
+    end
+
     def before_resource &block
       if block_given?
         @before_resource_hook = block

data/lib/pact_broker/db/migrate.rb

@@ -0,0 +1,15 @@
+require 'sequel'
+require 'pact_broker/project_root'
+Sequel.extension :migration
+
+module PactBroker
+  module DB
+    class Migrate
+      def self.call database_connection, options = {}
+        db_migrations_dir = PactBroker.project_root.join('db','migrations')
+        puts "Running migrations in directory #{db_migrations_dir}, target=#{options.fetch(:target, 'end')}"
+        Sequel::Migrator.run(database_connection, db_migrations_dir, options)
+      end
+    end
+  end
+end

data/lib/pact_broker/db/version.rb

@@ -0,0 +1,17 @@
+module PactBroker
+  module DB
+    class Version
+      def self.call database_connection
+        # if database_connection.tables.include?(:schema_migrations)
+        #   last_migration_filename = database_connection[:schema_migrations].order(:filename).last[:filename]
+        #   last_migration_filename.split(MIGRATION_SPLITTER, 2).first.to_i
+
+        if database_connection.tables.include?(:schema_info)
+          database_connection[:schema_info].first[:version]
+        else
+          0
+        end
+      end
+    end
+  end
+end

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

@@ -1,9 +1,22 @@
 require 'webmachine'
+require 'pact_broker/api/resources/authentication'
 
 module PactBroker
   module Diagnostic
     module Resources
       class BaseResource < Webmachine::Resource
+
+        include PactBroker::Api::Resources::Authentication
+
+        def is_authorized?(authorization_header)
+          authenticated?(self, authorization_header)
+        end
+
+        def forbidden?
+          return false if PactBroker.configuration.authorize.nil?
+          !PactBroker.configuration.authorize.call(self, {})
+        end
+
         def initialize
           PactBroker.configuration.before_resource.call(self)
         end

data/lib/pact_broker/pacts/all_pact_publications.rb

@@ -33,6 +33,11 @@ module PactBroker
           join(:tags, {version_id: :consumer_version_id}).where(filter)
         end
 
+        def untagged
+          left_outer_join(:tags, {version_id: :consumer_version_id})
+            .where(Sequel.qualify(:tags, :name) => nil)
+        end
+
         def consumer_version_number number
           where(name_like(:consumer_version_number, number))
         end

data/lib/pact_broker/pacts/repository.rb

@@ -91,9 +91,14 @@ module PactBroker
 
       def find_latest_pact(consumer_name, provider_name, tag = nil)
         query = LatestPactPublicationsByConsumerVersion
+          .select_all_qualified
           .consumer(consumer_name)
           .provider(provider_name)
-        query = query.tag(tag) unless tag.nil?
+        if tag == :untagged
+          query = query.untagged
+        elsif tag
+          query = query.tag(tag)
+        end
         query.latest.all.collect(&:to_domain_with_content)[0]
       end
 

data/lib/pact_broker/repositories/helpers.rb

@@ -20,6 +20,10 @@ module PactBroker
         Sequel::Model.db.adapter_scheme.to_s =~ /mysql/
       end
 
+      def select_all_qualified
+        select(Sequel[model.table_name].*)
+      end
+
       def select_for_subquery column
         if mysql? #stoopid mysql doesn't allow subqueries
           select(column).collect{ | it | it[column] }

data/lib/pact_broker/tasks.rb

@@ -1 +1,2 @@
 require 'pact_broker/tasks/migration_task'
+require 'pact_broker/tasks/version_task'

data/lib/pact_broker/tasks/migration_task.rb

@@ -25,13 +25,14 @@ module PactBroker
         namespace :pact_broker do
           namespace :db do
             desc "Run sequel migrations for pact broker database"
-            task :migrate do
+            task :migrate, [:target] do | t, args |
+              require 'pact_broker/db/migrate'
               instance_eval(&block)
-              require 'sequel'
-              Sequel.extension :migration
-              db_migrations_dir = File.expand_path("../../../../db/migrations", __FILE__)
-              puts "Running migrations in directory #{db_migrations_dir}"
-              Sequel::Migrator.run(database_connection, db_migrations_dir)
+              options = {}
+              if args[:target]
+                options[:target] = args[:target].to_i
+              end
+              PactBroker::DB::Migrate.call(database_connection, options)
             end
           end
         end

data/lib/pact_broker/tasks/version_task.rb

@@ -0,0 +1,38 @@
+require 'rake/tasklib'
+
+=begin
+
+require 'pact_broker/tasks'
+
+PactBroker::DB::VersionTask.new do | task |
+  require 'my_app/db'
+  task.database_connection = MyApp::DB
+end
+
+=end
+
+module PactBroker
+  module DB
+    class VersionTask < ::Rake::TaskLib
+
+      attr_accessor :database_connection
+
+      def initialize &block
+        rake_task &block
+      end
+
+      def rake_task &block
+        namespace :pact_broker do
+          namespace :db do
+            desc "Display the current database migration version"
+            task :version do
+              instance_eval(&block)
+              require 'pact_broker/db/version'
+              puts PactBroker::DB::Version.call(database_connection)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.0.5'
+  VERSION = '2.1.0'
 end

data/lib/rack/pact_broker/ui_authentication.rb

@@ -0,0 +1,26 @@
+require 'pact_broker/api/resources/authentication'
+
+module Rack
+  module PactBroker
+    class UIAuthentication
+
+      include ::PactBroker::Api::Resources::Authentication
+
+      def initialize app
+        @app = app
+      end
+
+      def call env
+        if auth? env
+          @app.call(env)
+        else
+          [401, {'WWW-Authenticate' => 'Basic realm="Restricted Area"'}, []]
+        end
+      end
+
+      def auth? env
+        authenticated? nil, env['HTTP_AUTHORIZATION']
+      end
+    end
+  end
+end

data/pact_broker.gemspec

@@ -48,4 +48,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'pg'
+  gem.add_development_dependency 'dry-types', '~> 0.10.3' # https://travis-ci.org/pact-foundation/pact_broker/jobs/249448621
 end

data/script/recreate-pg-db.sh

@@ -1,13 +1,14 @@
+SCHEMA="pact_broker"
 set -e
-psql postgres -c "DROP DATABASE pact_broker;"
-psql postgres -c "CREATE DATABASE pact_broker;"
-psql postgres -c "GRANT ALL PRIVILEGES ON DATABASE pact_broker TO pact_broker;"
+psql postgres -c "DROP DATABASE ${SCHEMA};"
+psql postgres -c "CREATE DATABASE ${SCHEMA};"
+psql postgres -c "GRANT ALL PRIVILEGES ON DATABASE ${SCHEMA} TO pact_broker;"
 ip=$(ifconfig en0 | sed -n -e '/inet/s/.*inet \([0-9.]*\) netmask .*/\1/p')
 echo ""
 echo "run the following command to set your environment variables:"
 echo "export PACT_BROKER_DATABASE_USERNAME=pact_broker"
 echo "export PACT_BROKER_DATABASE_PASSWORD=pact_broker"
-echo "export PACT_BROKER_DATABASE_NAME=pact_broker"
+echo "export PACT_BROKER_DATABASE_NAME=${SCHEMA}"
 echo "export PACT_BROKER_DATABASE_HOST=${ip}"
 echo "To test:"
-echo "psql -h \$PACT_BROKER_DATABASE_HOST -d \$PACT_BROKER_DATABASE_NAME -U \$PACT_BROKER_DATABASE_USERNAME"
+echo "psql -h \$PACT_BROKER_DATABASE_HOST -d \$PACT_BROKER_DATABASE_NAME -U \$PACT_BROKER_DATABASE_USERNAME"

data/spec/features/create_webhook_spec.rb

@@ -1,9 +1,9 @@
-require 'support/provider_state_builder'
+require 'support/test_data_builder'
 
 describe "Creating a webhook" do
 
   before do
-    ProviderStateBuilder.new.create_pact_with_hierarchy("Some Consumer", "1", "Some Provider")
+    TestDataBuilder.new.create_pact_with_hierarchy("Some Consumer", "1", "Some Provider")
   end
 
   let(:path) { "/webhooks/provider/Some%20Provider/consumer/Some%20Consumer" }

data/spec/features/delete_pact_spec.rb

@@ -8,7 +8,7 @@ describe "Deleting a pact" do
 
   context "when the pact exists" do
     before do
-      ProviderStateBuilder.new.create_pact_with_hierarchy "A Consumer", "1.2.3", "A Provider"
+      TestDataBuilder.new.create_pact_with_hierarchy "A Consumer", "1.2.3", "A Provider"
     end
 
     it "deletes the pact" do