pact_broker 2.19.0 → 2.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a315c4d4db3576fad3d6fbb76104b211382b36d
-  data.tar.gz: 88587d68f58299bd29b576172ce920c60bc4a2d7
+  metadata.gz: 6f1619d6f62ce6aaa00ca73eca6b1cdf76ee0305
+  data.tar.gz: c8fc20b4a52499d6bc259a4937d463c1a902567e
 SHA512:
-  metadata.gz: d061e082b1b76232f88f8a0d5e6f21bd53a9c1f1dd84ff1694ee5066ab62468c1d36c123bcb19c0f52f9663db318d14ce0c4aef0366e2f6961cef9975b85a7fb
-  data.tar.gz: 5db882315d0172d445f4966dece781605ceb818e7a4527710d0d5ca5721030950148bab308552c688dc51b077022935c8e66d2f0e85f96b32e4df6ed3c0fbb13
+  metadata.gz: 1a8ad6a1480b3a288c11e66f4473ba5af7890fe6ccab8f5ff81f69054dd0df7dc47d24ffc3e77b1888a202b5c9d73ef118794a9c8def6acce31e25590962f89c
+  data.tar.gz: c7270ddcf9932fc5579263dbb0149de7b1e3da15f8e69be217f4b2ddbc47182b409b0fcb0fc3b2d232922b854caae41eb47f2fc08d4ec9ae84d5773b3152751e

data/.gitignore

@@ -29,6 +29,8 @@ _yardoc
 Gemfile.lock
 
 bethtest/
+*bethtest*
+*dogfood*
 bin/
 db/test/change_migration_strategy/pact_broker_database.sqlite3
 coverage

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="v2.19.1"></a>
+### v2.19.1 (2018-05-18)
+
+
+#### Features
+
+* rename relations in pact diff view	 ([8c3c62e](/../../commit/8c3c62e))
+
+
+#### Bug Fixes
+
+* add pact name back into title of deprecated pacts relation of provider pacts resource	 ([f5f002a](/../../commit/f5f002a))
+* set correct content type for verification result resources	 ([c177fdd](/../../commit/c177fdd))
+
+
 <a name="v2.19.0"></a>
 ### v2.19.0 (2018-05-03)
 

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

@@ -21,6 +21,7 @@ module PactBroker
           }
         end
 
+        # TODO make the title and name consistent with title and name of other resources
         links :'pb:pacts' do | context |
           represented.collect do | pact |
             {
@@ -35,7 +36,7 @@ module PactBroker
           represented.collect do | pact |
             {
               :href => pact_url(context[:base_url], pact),
-              :title => 'DEPRECATED - please use the pb:pacts relation',
+              :title => "DEPRECATED - please use the pb:pacts relation. #{pact.name}",
               :name => pact.consumer_name
             }
           end

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

@@ -11,7 +11,7 @@ module PactBroker
       class Verification < BaseResource
 
         def content_types_provided
-          [["application/json", :to_json]]
+          [["application/hal+json", :to_json], ["application/json", :to_json]]
         end
 
         def allowed_methods

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

@@ -14,6 +14,10 @@ module PactBroker
           [["application/json", :from_json]]
         end
 
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
         def allowed_methods
           ["POST"]
         end

data/lib/pact_broker/pacts/diff.rb

@@ -84,12 +84,12 @@ module PactBroker
           previous_distinct_url = PactBroker::Api::PactBrokerUrls.pact_url(base_url, comparison_pact)
 
           links = {
-            "current-pact-version" => {
+            "pact-version" => {
               "title" => "Pact",
               "name" => pact.name,
               "href" => self_url
             },
-            "previous-distinct-pact-version" => {
+            "comparison-pact-version" => {
               "title" => "Pact",
               "name" => comparison_pact.name,
               "href" => previous_distinct_url

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.19.0'
+  VERSION = '2.19.1'
 end

data/script/generate-certificates-for-webooks-certificate-spec.rb

@@ -0,0 +1,41 @@
+#Code to generate certificates
+require 'openssl'
+
+root_key = OpenSSL::PKey::RSA.new 2048 # the CA's public/private key
+root_ca = OpenSSL::X509::Certificate.new
+root_ca.version = 2 # cf. RFC 5280 - to make it a "v3" certificate
+root_ca.serial = 1
+root_ca.subject = OpenSSL::X509::Name.parse "/DC=org/DC=ruby-lang/CN=Ruby CA"
+root_ca.issuer = root_ca.subject # root CA's are "self-signed"
+root_ca.public_key = root_key.public_key
+root_ca.not_before = Time.now
+root_ca.not_after = root_ca.not_before + (100 * 365 * 24 * 60 * 60) # 100 years validity
+ef = OpenSSL::X509::ExtensionFactory.new
+ef.subject_certificate = root_ca
+ef.issuer_certificate = root_ca
+root_ca.add_extension(ef.create_extension("basicConstraints","CA:TRUE",true))
+root_ca.add_extension(ef.create_extension("keyUsage","keyCertSign, cRLSign", true))
+root_ca.add_extension(ef.create_extension("subjectKeyIdentifier","hash",false))
+root_ca.add_extension(ef.create_extension("authorityKeyIdentifier","keyid:always",false))
+root_ca.sign(root_key, OpenSSL::Digest::SHA256.new)
+puts root_ca.to_pem
+File.open("spec/fixtures/certificates/cacert.pem", "w") { |file| file << root_ca.to_pem  }
+
+key = OpenSSL::PKey::RSA.new 2048
+cert = OpenSSL::X509::Certificate.new
+cert.version = 2
+cert.serial = 2
+cert.subject = OpenSSL::X509::Name.parse "/DC=org/DC=ruby-lang/CN=localhost"
+cert.issuer = root_ca.subject # root CA is the issuer
+cert.public_key = key.public_key
+cert.not_before = Time.now
+cert.not_after = cert.not_before + (100 * 365 * 24 * 60 * 60) # 100 years validity
+ef = OpenSSL::X509::ExtensionFactory.new
+ef.subject_certificate = cert
+ef.issuer_certificate = root_ca
+cert.add_extension(ef.create_extension("keyUsage","digitalSignature", true))
+cert.add_extension(ef.create_extension("subjectKeyIdentifier","hash",false))
+cert.sign(root_key, OpenSSL::Digest::SHA256.new)
+puts cert.to_pem
+File.open("spec/fixtures/certificates/cert.pem", "w") { |file| file << cert.to_pem  }
+File.open("spec/fixtures/certificates/key.pem", "w") { |file| file << key.to_pem }

data/script/publish.sh

@@ -4,12 +4,16 @@ function finish {
 }
 trap finish EXIT
 
+set -x
+
 consumer=${1:-Foo}
 provider=${2:-Bar}
+escaped_consumer=$(echo $consumer | ruby -e "require 'uri'; puts URI.encode(ARGF.read.strip)")
+escaped_provider=$(echo $provider | ruby -e "require 'uri'; puts URI.encode(ARGF.read.strip)")
 echo $consumer $provider
 body=$(cat script/foo-bar.json | sed "s/Foo/${consumer}/" | sed "s/Bar/${provider}/")
 echo $body > tmp/pact.json
 curl -v -XPUT \-H "Content-Type: application/json" \
 -d@tmp/pact.json \
-http://127.0.0.1:9292/pacts/provider/${provider}/consumer/${consumer}/version/1.0.0
+http://127.0.0.1:9292/pacts/provider/${escaped_provider}/consumer/${escaped_consumer}/version/1.0.0
 echo ""

data/script/query.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+require 'benchmark'
+require 'sequel'
+require 'logger'
+require 'table_print'
+DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: ARGV[0], :encoding => 'utf8'}
+#DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: "pact_broker_database_test.sqlite3", :encoding => 'utf8'}
+#DATABASE_CREDENTIALS = {adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}
+connection = Sequel.connect(DATABASE_CREDENTIALS)
+connection.timezone = :utc
+
+time = Benchmark.measure {
+  puts connection[DATA.read].to_a
+}
+
+puts time.real
+
+__END__
+
+
+select * from matrix

data/script/recreate-pg-db.sh

@@ -1,7 +1,9 @@
 SCHEMA="pact_broker"
-set -e
+set +e
 psql postgres -c "DROP DATABASE ${SCHEMA};"
 psql postgres -c "CREATE DATABASE ${SCHEMA};"
+psql postgres -c "CREATE USER pact_broker WITH PASSWORD 'pact_broker'"
+psql postgres -c "GRANT ALL PRIVILEGES ON DATABASE pact_broker to pact_broker;"
 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 ""

data/script/seed-example-matrix.rb

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+
+raise "Please supply database path" unless ARGV[0]
+
+$LOAD_PATH.unshift './lib'
+$LOAD_PATH.unshift './spec'
+$LOAD_PATH.unshift './tasks'
+ENV['RACK_ENV'] = 'development'
+require 'sequel'
+require 'logger'
+DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: ARGV[0], :encoding => 'utf8'}
+#DATABASE_CREDENTIALS = {adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}
+
+connection = Sequel.connect(DATABASE_CREDENTIALS)
+connection.timezone = :utc
+require 'pact_broker/db'
+PactBroker::DB.connection = connection
+require 'pact_broker'
+require 'support/test_data_builder'
+
+require 'database/table_dependency_calculator'
+PactBroker::Database::TableDependencyCalculator.call(connection).each do | table_name |
+  connection[table_name].delete
+end
+
+PactBroker.configuration.order_versions_by_date = true
+
+TestDataBuilder.new
+  .create_consumer("zoo-app")
+  .create_provider("animal-service")
+  .create_consumer_version("96327295487f71f8af70a72da820d85333ab5d3e")
+  .create_consumer_version_tag("master")
+  .create_consumer_version_tag("prod")
+  .create_pact(created_at: DateTime.now - 4)
+  .create_verification(provider_version: "a519731ba244b7c0a5de7b1c862d5949e7e5db33", success: true, tag_names: ["master", "prod"], execution_date: DateTime.now - 3)
+  .create_consumer_version("955b9ea2b9eb0c8515ed94b919b0bb3be06db5b5")
+  .create_consumer_version_tag("master")
+  .create_pact(created_at: DateTime.now - 2)
+  .create_verification(provider_version: "82b59ef5f8aef1b1abfb47c3e0004e9697d03b7e", success: false, number: 2, tag_names: ["master"], execution_date: DateTime.now - 1)
+  .create_consumer_version("07247012de27131ff879c3109023942b272d2716")
+  .create_consumer_version_tag("master")
+  .create_pact(created_at: DateTime.now - 0.5)
+
+#   # .create_webhook(method: 'GET', url: 'https://localhost:9393?url=${pactbroker.pactUrl}', body: '${pactbroker.pactUrl}')
+# TestDataBuilder.new
+#   .create_consumer("Foo")
+#   .create_label("microservice")
+#   .create_provider("Bar")
+#   .create_label("microservice")
+#   .create_webhook(method: 'GET', url: 'https://self-signed.badssl.com')
+#   .create_consumer_version("1.2.100")
+#   .create_environment("production")
+#   .publish_pact
+#   .create_verification(provider_version: "1.4.234", success: true, execution_date: DateTime.now - 15)
+#   .revise_pact
+#   .create_consumer_version("1.2.101")
+#   .create_consumer_version_tag('prod')
+#   .publish_pact
+#   .create_verification(provider_version: "9.9.10", success: false, execution_date: DateTime.now - 15)
+#   .create_consumer_version("1.2.102")
+#   .publish_pact(created_at: (Date.today - 7).to_datetime)
+#   .create_verification(provider_version: "9.9.9", success: true, execution_date: DateTime.now - 14)
+#   .create_provider("Animals")
+#   .create_webhook(method: 'GET', url: 'http://localhost:9393/')
+#   .publish_pact(created_at: (Time.now - 140).to_datetime)
+#   .create_verification(provider_version: "2.0.366", execution_date: Date.today - 2) #changed
+#   .create_provider("Wiffles")
+#   .publish_pact
+#   .create_verification(provider_version: "3.6.100", success: false, execution_date: Date.today - 7)
+#   .create_provider("Hello World App")
+#   .create_consumer_version("1.2.107")
+#   .publish_pact(created_at: (Date.today - 1).to_datetime)
+#   .create_consumer("The Android App")
+#   .create_provider("The back end")
+#   .create_webhook(method: 'GET', url: 'http://localhost:9393/')
+#   .create_consumer_version("1.2.106")
+#   .create_consumer_version_tag("production")
+#   .create_consumer_version_tag("feat-x")
+#   .publish_pact
+#   .create_consumer("Some other app")
+#   .create_provider("A service")
+#   .create_webhook(method: 'GET', url: 'http://localhost:9393/')
+#   .create_triggered_webhook(status: 'success')
+#   .create_webhook_execution
+#   .create_webhook(method: 'POST', url: 'http://foo:9393/')
+#   .create_triggered_webhook(status: 'failure')
+#   .create_webhook_execution
+#   .create_consumer_version("1.2.106")
+#   .publish_pact(created_at: (Date.today - 26).to_datetime)
+#   .create_verification(provider_version: "4.8.152", execution_date: DateTime.now)
+
+# # TestDataBuilder.new
+# #   .create_pact_with_hierarchy("A", "1", "B")
+# #   .create_consumer_version_tag("master")
+# #   .create_consumer_version_tag("prod")
+# #   .create_verification(provider_version: "1")
+# #   .create_consumer_version("2")
+# #   .create_consumer_version_tag("master")
+# #   .create_pact
+# #   .create_verification(provider_version: "2")
+
+# # TestDataBuilder.new
+# #   .create_pact_with_hierarchy("Foo", "1", "Bar")
+# #   .create_webhook(method: 'GET', url: 'http://localhost:9393', events: [{ name: 'provider_verification_published' }, {name: ''}])
+

data/script/seed-matrix.rb

@@ -59,6 +59,7 @@ TestDataBuilder.new
   .create_pact
   .use_consumer("A")
   .create_consumer_version("2")
+  .create_consumer_version_tag("master")
   .use_provider("B")
   .create_pact
   .create_verification(provider_version: '5')

data/script/seed.rb

@@ -9,6 +9,8 @@ ENV['RACK_ENV'] = 'development'
 require 'sequel'
 require 'logger'
 DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: ARGV[0], :encoding => 'utf8'}
+#DATABASE_CREDENTIALS = {adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}
+
 connection = Sequel.connect(DATABASE_CREDENTIALS)
 connection.timezone = :utc
 require 'pact_broker/db'

data/spec/features/publish_verification_spec.rb

@@ -8,7 +8,7 @@ describe "Recording a pact verification" do
   let(:parsed_response_body) { JSON.parse(subject.body) }
   let(:pact) { td.pact }
 
-  subject { post path, verification_content, {'CONTENT_TYPE' => 'application/json' }; last_response  }
+  subject { post path, verification_content, {'CONTENT_TYPE' => 'application/json', 'HTTP_ACCEPT' => 'application/hal+json' }; last_response  }
 
   before do
     td.create_provider("Provider")
@@ -40,7 +40,7 @@ describe "Recording a pact verification" do
 
   it "returns a link to itself that can be followed" do
     get_verification_link = parsed_response_body['_links']['self']['href']
-    get get_verification_link
+    get get_verification_link, nil, { 'HTTP_ACCEPT' => 'application/hal+json' }
     expect(last_response.status).to be 200
     expect(JSON.parse(subject.body)).to include JSON.parse(verification_content)
   end

data/spec/fixtures/certificates/cacert.pem

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
 MIIDZDCCAkygAwIBAgIBATANBgkqhkiG9w0BAQsFADBCMRMwEQYKCZImiZPyLGQB
 GRYDb3JnMRkwFwYKCZImiZPyLGQBGRYJcnVieS1sYW5nMRAwDgYDVQQDDAdSdWJ5
-IENBMCAXDTE4MDEwODAwNTkyMloYDzIxMTcxMjE1MDA1OTIyWjBCMRMwEQYKCZIm
+IENBMCAXDTE4MDUxNzA3NDQzNVoYDzIxMTgwNDIzMDc0NDM1WjBCMRMwEQYKCZIm
 iZPyLGQBGRYDb3JnMRkwFwYKCZImiZPyLGQBGRYJcnVieS1sYW5nMRAwDgYDVQQD
-DAdSdWJ5IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv5dZFUaE
-+bvxnOGSNEg0DmAMnEFBK5xNV4dDQwe3qNBzvZZxcZ+Y/AefR6mPKx7MMbXFjS4j
-BBGgs3fatBqGAbPlBnqUJqe+Oa/HRcrnM2SW6ipisX0PG1TjvJ1fTUXv8MAfBI5t
-bnKyErs0Mbe+HugZAiTJSdWfbyKbxca1hBltoRYZP/NrYyMWM5n8qhzGu7K6bTGI
-qtlnLJ5RD/BC7ze9SkWsPkWPP1WVGsuCqHkUfCBZkY+6qbWQHLBrFmIZYo6Ixk2y
-Pk5Py4wRUNGkRTXDRLRyQMTX6TUKNod7J2/tXkAMLxPVbd52C0XHfnzw1DZIkE7k
-DR7KxnL0tyBhkQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQUMrYg0IBY8mSqxL8TIjQM9Eiuox0wHwYDVR0jBBgwFoAU
-MrYg0IBY8mSqxL8TIjQM9Eiuox0wDQYJKoZIhvcNAQELBQADggEBAHQIZ/nWUrf4
-p34ZbWs3H7THSF4m3RlYcl+vf9ngP3peDw/SCTpuR2xlextUhJnpJFBIOoZHA+14
-mxoPgufFhgdXdhsUvivoB7d6jlFz+mDZPVRrYEYfPGi+JeMukbfqIXC5rake4QCI
-ENoo7MPVS4RWibqeN2x5sFXARKepi/GFm8jg5IqRH6Ctu4BJ/NB7wXPZn/wtNISR
-7m+hgN1u0+Wk4zLuUSsbHWkZeZKrvQuU8ZSInIiLFXnN4BgJ5QGnStTFdypxDtw7
-Kb97JG0MWy6BGrLKaqkNtsX4xezSg4NlPZNJ4mNYZMQs3fHI2RKIwM3+klMtm8GF
-qygx7MqK9bI=
+DAdSdWJ5IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tcEnh7S
+iiL46HNfx5LkGxBZ9Dn7tUm6CKlPzykjlCGZ9a5VpnZxwEK5LkIvbMiBz8UjhcVh
+8pUghbyvwSHdtiMDNU4zpKIgrTXZ/tiqctgYYSFbtEtE17VrVM8JZFSxzLSJEvEZ
+rhkOqeVEGJJY28taItbjxfHYkTlQYTjn6tA18KT13nGAUMEoC0HZTHYr2nCY7MzI
+cEISvm5PP7gXKHrOfpbm+E3qMm9kyDQLkez8iGfq2aGSshuT4mcAvxq5dS6TsPSy
+ZphnfHw3THqgBrR8Bw1tMhsnLhD96Miy5sRnY2gQEAQngccLZ/F6ls6a+5Adka2o
+zFmJVZXhHbVeRwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQUBX8ZMupoE2NMwyE1kdlVptFti/kwHwYDVR0jBBgwFoAU
+BX8ZMupoE2NMwyE1kdlVptFti/kwDQYJKoZIhvcNAQELBQADggEBAIxS0jDTRC9R
+mxsr2j/o9oQvRi5+74qDlXs7YzbQ1V7dy++g48St6Yjk4xfdGdgAS8IrS9vIRKUy
+jnlwUklnkvoWk2DKF9NFA32c1mxZhau5QGu3VH7pgmcWQawXttqpgHbSLEDAf9wU
+jgTRdL8LxMIf6xy2uPL8GZWFbmdU5HOb3czS1drouE0U3ZI+1uzAlR3vqGo0Mvhd
+MwYBodIJlWa0mXKMnfZxYLtiv7m5H5I2zBfget3+3ovuN79Zn6RA3ecnxn75jalA
+R6MNlS/tzpXcS/gwnSKrwHSjb1V+B4Q96EsfulWC2UpTa0WTxngyiqtp6GU6RZva
+jHT1Ty2CglM=
 -----END CERTIFICATE-----

data/spec/fixtures/certificates/cert.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDMjCCAhqgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBCMRMwEQYKCZImiZPyLGQB
+MIIDNDCCAhygAwIBAgIBAjANBgkqhkiG9w0BAQsFADBCMRMwEQYKCZImiZPyLGQB
 GRYDb3JnMRkwFwYKCZImiZPyLGQBGRYJcnVieS1sYW5nMRAwDgYDVQQDDAdSdWJ5
-IENBMB4XDTE4MDEwODAwNTkyM1oXDTE5MDEwODAwNTkyM1owRDETMBEGCgmSJomT
-8ixkARkWA29yZzEZMBcGCgmSJomT8ixkARkWCXJ1YnktbGFuZzESMBAGA1UEAwwJ
-bG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtjNCx+If
-GDeaI1rxw6X09IxsaGg6TenO8FXo808yC+38VMePSHzrNlfGBh4GLRX9TV4dd9k2
-hAWf/UpdvcucYjlKBdTGisY4ADbqlXcwJRbOk/Ag0W3al4u7WJ4EMRVZDGgif59y
-Pz0b1jTcJFWmD98rZoRHzStDK+Ok+Ru1Rh7IIYSVsuhH+JivZxTrJDKZoAqMPgiO
-txnzJX2LsZiT0cdH9zsefmYttkmMHUydCdhiGuFSNDzGXQeUlncZYAcxp6FIIZVg
-Xs1ZY8Xwn3RsiNpkqAQrhXLX/NX+b5LnMerul9t2OE1thTyW6iz5X7P2RmtaGN5X
-Ej65mg73lhc4VwIDAQABozEwLzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFIsz
-dweRZTX0WpGJkWo5dG5GjUi5MA0GCSqGSIb3DQEBCwUAA4IBAQAt0WA5eWgCxRNs
-yk5m1lJEEvcxb1LRBXRIZQQooAel2cq546NfVwE7XCvQBmM5eXcY4pEUFOdpcJWA
-Wr2US7hiWDrN4XpZUtXAK5hBJXXzHaOmiAARZvfXMi0AwJqgtc7V/o+6j1VBMhMM
-r3YXmn84FeSnbT5umjjuZ6qbZnSRxXU+g2Db4LqInEfdg8BOKvyPz5oyiEKIeRsK
-FkdWx3f2Xn4As4DAR7sszdU0r0QiaAFpFoVbqV8glCqygcqv0UAmM1N2qUrf1u6x
-SPI3WTZiiwH4Bb6N28gC0v80PEQEQXfb/0kJqrapKJU1hCb/PkrrQOIq7QAVb+lK
-6cnn0hrz
+IENBMCAXDTE4MDUxNzA3NDQzNVoYDzIxMTgwNDIzMDc0NDM1WjBEMRMwEQYKCZIm
+iZPyLGQBGRYDb3JnMRkwFwYKCZImiZPyLGQBGRYJcnVieS1sYW5nMRIwEAYDVQQD
+DAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCRSyWN
+EBxxMKdSJucoT4b3rs8xq98TVV3Lo7RyLZbf/KUl7Q3GttdfnLRBRb49rAMcXLOA
+pccdBVq7kImNQPZOBhlD839sxpupYRiQ7ehVcsZkGVMw13gL31SHcaeYIVxFcAMJ
+iBCSusqk2p5KpcgoihznOX6MkYV1s2TRARbfobSzA3mGczA0frJe/dJ5xZymBhpQ
+3cFUonNrnLeBL2pP2jKAyQLLYW+Cfj+U26CEKZSAre/Y5xcSOP0AIVsnQjUGYYsb
+PM1PokA8n/CYpeppQdyL+nQcOe2csHAiBa9kSdiM1GshdvnOO1UoHQ9GcyN7Xikm
+Bw34JvB7VUvilaeJAgMBAAGjMTAvMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU
+qVjAGwu3nbFw5OJDPEmJ/lO24gQwDQYJKoZIhvcNAQELBQADggEBAMK3j313EZxR
+msAdmlVKKldRQGTXpu59wune60cME/BWYrPlprmIREy8ygJl1hqLivoQpxyWfJw3
+RxTNSg6b1JYDq1ze3OxqcWMVPOC2rAwOAa57eQxS4fB9RLL18PuLzcHPRnNBbphl
+NfB47ymIdMwH2WuuSg2qY0E35ufX09dK6sV+LdgzKsYDQFgYTzBoWen+WGCvNZ/i
+dzCv7ZhZwVhDm8CoBoc6eHamzFmt4ysdZ95FarMHGTllAVrqLMwu6IIoIEj4C07X
+n7E5lMFJkOPlA9UJFHHzOqEb3jk/fIe/QPuyXQDLxOY+tLCBRw32lO+3jzpgLrJ2
+YbVnmeUvpz0=
 -----END CERTIFICATE-----

data/spec/fixtures/certificates/key.pem

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAtjNCx+IfGDeaI1rxw6X09IxsaGg6TenO8FXo808yC+38VMeP
-SHzrNlfGBh4GLRX9TV4dd9k2hAWf/UpdvcucYjlKBdTGisY4ADbqlXcwJRbOk/Ag
-0W3al4u7WJ4EMRVZDGgif59yPz0b1jTcJFWmD98rZoRHzStDK+Ok+Ru1Rh7IIYSV
-suhH+JivZxTrJDKZoAqMPgiOtxnzJX2LsZiT0cdH9zsefmYttkmMHUydCdhiGuFS
-NDzGXQeUlncZYAcxp6FIIZVgXs1ZY8Xwn3RsiNpkqAQrhXLX/NX+b5LnMerul9t2
-OE1thTyW6iz5X7P2RmtaGN5XEj65mg73lhc4VwIDAQABAoIBAEOdeF33U3TIRaJz
-QJ9LukD6z8xbSa/aYdqc9ys8K6Vztx27RTgwa5WqMynYAJDAxVTt5V+xs2KBN+Nm
-sq0Zn7pv6kGJufiMIQIrXxkCt1I8SYNrLLKr4uA0kd0MHyAb/QT2rD7SbDJ9uhPf
-YAb35f2j41ZTJtZEBNSH0ZRErRwM9bpOgkAReDoNlxkZpNz9KK988vTT5i/njtiQ
-9lSxbRgVFc/00LnFwd5IEAjX6uqIXqnsYCd5h8+B6YSFLCb5DVeHDP/Bb1/UFS6V
-cttKpt06Q4BrG0d+SQ6AqgA3HhIUyet7fMsPAd70HSNft5O+h2S5m+6m3DazTCqd
-g9eAf2kCgYEA5d8+SwWAL/1/HjRXVvYXB8z/cSMwYziDMiAl9g85zpJlSNuOWmdB
-T4RgxDZOC/kMe29BNRLMykRKeD+JpIgFfydDAx1ykdyUcOWhAUmaS5cSeHH25Sng
-ACYVINxTCIL/v9j/YjB54eXs3rdpsslnq+xISIoSerO7wTe2EPeoVKUCgYEAyujg
-Mf+l9jKi6EWFfJ3URU4QL2lhKgMs80/uOLRyGSeSRPJoI/xMRSXxLVy/eh/+K6zN
-zksXeDeqq0l6jzBDlgMl8Kc63hLdOkWXtFneGxfk0bBzcTZ5dZ0TET9+aWF4gMq9
-NqT62Yu7wZe/6HBRy0U7iMrRLYSRXEv4+/Rk/EsCgYEAnLSMnc4ZLh4M+4VJCTJo
-TtwUQ4dupCVRYumBl3WXvdgVDg8Gw2BiqJeg9AHlQMo+FSOp+0lerIDTl5gQ+EX2
-IVGdoFEB2qfZ1gDkuqD3e5J4d/2RB3Z9ivxrKOSqAkJzoNCIgOJ1JGd/C/FTMBuW
-/h/swu7FXDqMw1J8XqLGcTUCgYEAuXjuXaWCDS4x7MCHiOY3vvXhI4VetGlcsDdS
-2HBQjx+1uuIdQS+AhABvmPhbagVObpuxL61CEbhIf/NVXQdP8BKGnpgt3go+P+KX
-DdrLg9ZuaSGyFD0n/tMKN8zi/u6CmK85D3b0eOAaSpYsbAonKffpuFszozi3Kjej
-qqK1oEsCgYANLkfN2vldeLbu8JnY1moGFnss4hqE+0FV4VUFPob+4CgSNhnk1taS
-Zgw0E8d54s/tiPLEb0PCWbc9gzgyhgh57V2FnPzeXz/X0swjQvkab1T/YO1DVWJ+
-cYQZZ1ZngyQ6sZB7FIZO4CcurwpDk+czagofD7bt6B6UlOcN9J4cZA==
+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
 -----END RSA PRIVATE KEY-----

data/spec/integration/webhooks/certificate_spec.rb

@@ -1,4 +1,5 @@
 require 'pact_broker/domain/webhook_request'
+# certificates and key generated by script/generate-certificates-for-webooks-certificate-spec.rb
 
 describe "executing a webhook to a server with a self signed certificate" do
   let(:td) { TestDataBuilder.new }
@@ -38,43 +39,3 @@ describe "executing a webhook to a server with a self signed certificate" do
     Process.kill 'KILL', @pipe.pid
   end
 end
-
-# Code to generate certificates
-# root_key = OpenSSL::PKey::RSA.new 2048 # the CA's public/private key
-# root_ca = OpenSSL::X509::Certificate.new
-# root_ca.version = 2 # cf. RFC 5280 - to make it a "v3" certificate
-# root_ca.serial = 1
-# root_ca.subject = OpenSSL::X509::Name.parse "/DC=org/DC=ruby-lang/CN=Ruby CA"
-# root_ca.issuer = root_ca.subject # root CA's are "self-signed"
-# root_ca.public_key = root_key.public_key
-# root_ca.not_before = Time.now
-# root_ca.not_after = root_ca.not_before + 100 * 365 * 24 * 60 * 60 # 100 years validity
-# ef = OpenSSL::X509::ExtensionFactory.new
-# ef.subject_certificate = root_ca
-# ef.issuer_certificate = root_ca
-# root_ca.add_extension(ef.create_extension("basicConstraints","CA:TRUE",true))
-# root_ca.add_extension(ef.create_extension("keyUsage","keyCertSign, cRLSign", true))
-# root_ca.add_extension(ef.create_extension("subjectKeyIdentifier","hash",false))
-# root_ca.add_extension(ef.create_extension("authorityKeyIdentifier","keyid:always",false))
-# root_ca.sign(root_key, OpenSSL::Digest::SHA256.new)
-# puts root_ca.to_pem
-# File.open("spec/fixtures/certificates/cacert.pem", "w") { |file| file << root_ca.to_pem  }
-
-# key = OpenSSL::PKey::RSA.new 2048
-# cert = OpenSSL::X509::Certificate.new
-# cert.version = 2
-# cert.serial = 2
-# cert.subject = OpenSSL::X509::Name.parse "/DC=org/DC=ruby-lang/CN=Ruby certificate"
-# cert.issuer = root_ca.subject # root CA is the issuer
-# cert.public_key = key.public_key
-# cert.not_before = Time.now
-# cert.not_after = cert.not_before + 1 * 365 * 24 * 60 * 60 # 1 years validity
-# ef = OpenSSL::X509::ExtensionFactory.new
-# ef.subject_certificate = cert
-# ef.issuer_certificate = root_ca
-# cert.add_extension(ef.create_extension("keyUsage","digitalSignature", true))
-# cert.add_extension(ef.create_extension("subjectKeyIdentifier","hash",false))
-# cert.sign(root_key, OpenSSL::Digest::SHA256.new)
-# puts cert.to_pem
-# File.open("spec/fixtures/certificates/cert.pem", "w") { |file| file << cert.to_pem  }
-# File.open("spec/fixtures/certificates/key.pem", "w") { |file| file << key.to_pem }

data/spec/lib/pact_broker/api/decorators/provider_pacts_decorator_spec.rb

@@ -40,7 +40,7 @@ module PactBroker
                 :name => "Foo" }],
               :pacts => [{
                 :href => "pact_url",
-                :title => "DEPRECATED - please use the pb:pacts relation",
+                :title => "DEPRECATED - please use the pb:pacts relation. Pact name",
                 :name => "Foo"
                 }
               ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.19.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -537,7 +537,6 @@ files:
 - RELEASING.md
 - Rakefile
 - UPGRADING.md
-- bethtest.rb
 - config.ru
 - config/boot.rb
 - config/database.travis.yml
@@ -943,16 +942,19 @@ files:
 - script/db-spec.sh
 - script/foo-bar-verification.json
 - script/foo-bar.json
+- script/generate-certificates-for-webooks-certificate-spec.rb
 - script/insert-self-signed-certificate-from-url.rb
 - script/publish-2.sh
 - script/publish-new.sh
 - script/publish-not-a-pact.sh
 - script/publish-verification.sh
 - script/publish.sh
+- script/query.rb
 - script/recreate-mysql-db.sh
 - script/recreate-pg-db.sh
 - script/recreate-test-database.sh
 - script/release.sh
+- script/seed-example-matrix.rb
 - script/seed-matrix.rb
 - script/seed.rb
 - script/update-hal-browser

data/bethtest.rb

@@ -1,30 +0,0 @@
-require 'openssl'
-require 'uri'
-require 'net/http'
-
-uri = URI('https://self-signed.badssl.com')
-downloaded_cert_path = '/tmp/downloaded_cert.pem'
-
-puts `openssl s_client -showcerts -servername #{uri.host} -connect #{uri.host}:#{uri.port} </dev/null 2>/dev/null|openssl x509 -text`
-command = "openssl s_client -showcerts -servername #{uri.host} -connect #{uri.host}:#{uri.port} </dev/null 2>/dev/null|openssl x509 -outform PEM > #{downloaded_cert_path}"
-puts command
-puts `#{command}`
-
-
-cert_store = OpenSSL::X509::Store.new
-puts "Adding certificate #{downloaded_cert_path}"
-cert_store.add_file(downloaded_cert_path)
-
-req = Net::HTTP::Get.new(uri)
-
-options = {
-  :use_ssl => uri.scheme == 'https',
-  verify_mode: OpenSSL::SSL::VERIFY_PEER,
-  cert_store: cert_store
-}
-
-response = Net::HTTP.start(uri.hostname, uri.port, options) do |http|
-  http.request req
-end
-
-puts response