pact_broker 2.23.0 → 2.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8781ad53ce4869d80b5c2ad87288cd6d6e1561da
-  data.tar.gz: e83f9bc9fd4b337ac1d28a210402db80af340a5f
+  metadata.gz: af5e56af0fcb01af75c45a0f2d0377795c2d57b8
+  data.tar.gz: 90dd47be6e7aa273e7f5f7d50e381f3968bde7b3
 SHA512:
-  metadata.gz: 3c424033d9cb8fa602a2344d11eea58722001df6fc6555e10d51a4af28b29e92f660156650da1b7fd511a7496e5e9b9d01afdec1b4d288569cf49a567ef9a818
-  data.tar.gz: f746b17398c51084398b6c4197a4c42b61ea91b7f8b95c210234cb00102fff4f82e9f4ac5e4c26136ee1b375c1147d23909e137ee40e7ec8a21eefbd30432994
+  metadata.gz: 3aca8efd6e49da134e00322211e084ebb9696db70c7dc92cfdb6f09b342a8d48e1e7a6d5831315c2463dddd5b53b873576a527f57195495b3e2c78cb46e613f2
+  data.tar.gz: 84feaf4b1641bab2293d9b2f332ba8b5e9a92e9fe6afbd8270ad9618de90e58d5e34b5f2496c7ade4d91451ce8049c0df17e269468ab631ac08e3a38d74405b3

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name="v2.23.1"></a>
+### v2.23.1 (2018-06-23)
+
+
+#### Features
+
+* respond correctly to OPTIONS requests	 ([c5d3937](/../../commit/c5d3937))
+
+
+#### Bug Fixes
+
+* add missing require to pact_triggered_webhooks	 ([aaf1755](/../../commit/aaf1755))
+
+
 <a name="v2.23.0"></a>
 ### v2.23.0 (2018-06-20)
 

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

@@ -18,7 +18,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET", "POST"]
+          ["GET", "POST", "OPTIONS", "OPTIONS"]
         end
 
         def create_path

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

@@ -9,7 +9,7 @@ module PactBroker
       class Badge < BaseResource
 
         def allowed_methods
-          ['GET']
+          ["GET", "OPTIONS", "OPTIONS"]
         end
 
         def content_types_provided

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

@@ -30,6 +30,10 @@ module PactBroker
           PactBroker.configuration.before_resource.call(self)
         end
 
+        def options
+          { 'Access-Control-Allow-Methods' => allowed_methods.join(", ")}
+        end
+
         def update_matrix_after_request?
           false
         end

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

@@ -16,7 +16,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def to_json

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

@@ -20,7 +20,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET", "POST"]
+          ["GET", "POST", "OPTIONS"]
         end
 
         def to_json

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

@@ -13,7 +13,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -12,7 +12,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def to_json

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

@@ -15,7 +15,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET","PUT","DELETE"]
+          ["GET", "PUT", "DELETE", "OPTIONS"]
         end
 
         def from_json

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

@@ -14,7 +14,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -11,7 +11,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def to_json

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

@@ -11,7 +11,7 @@ module PactBroker
       class LatestVerificationsForConsumerVersion < BaseResource
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def content_types_provided

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

@@ -20,7 +20,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def malformed_request?

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

@@ -11,7 +11,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -34,7 +34,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET", "PUT", "DELETE", "PATCH"]
+          ["GET", "PUT", "DELETE", "PATCH", "OPTIONS"]
         end
 
         def known_methods

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

@@ -11,7 +11,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -1,3 +1,4 @@
+require 'pact_broker/api/resources/base_resource'
 require 'pact_broker/api/decorators/triggered_webhooks_decorator'
 
 module PactBroker
@@ -5,7 +6,7 @@ module PactBroker
     module Resources
       class PactTriggeredWebhooks < BaseResource
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def content_types_provided

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

@@ -5,7 +5,7 @@ module PactBroker
     module Resources
       class PactVersion < Pact
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
       end
     end

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

@@ -13,7 +13,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -11,7 +11,7 @@ module PactBroker
       class PactWebhooks < BaseResource
 
         def allowed_methods
-          ["POST", "GET"]
+          ["POST", "GET", "OPTIONS"]
         end
 
         def content_types_provided

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

@@ -9,7 +9,7 @@ module PactBroker
       class PactWebhooksStatus < BaseResource
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def content_types_provided

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

@@ -23,7 +23,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET", "PATCH", "DELETE"]
+          ["GET", "PATCH", "DELETE", "OPTIONS"]
         end
 
         def known_methods

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

@@ -17,7 +17,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET", "POST"]
+          ["GET", "POST", "OPTIONS"]
         end
 
         def malformed_request?

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

@@ -11,7 +11,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def to_json

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

@@ -14,7 +14,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -12,7 +12,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -12,7 +12,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def to_csv

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

@@ -14,7 +14,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET","PUT","DELETE"]
+          ["GET","PUT","DELETE", "OPTIONS"]
         end
 
         def from_json

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

@@ -12,7 +12,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -15,7 +15,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -5,7 +5,7 @@ module PactBroker
     module Resources
       class VerificationTriggeredWebhooks < BaseResource
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def content_types_provided

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

@@ -19,7 +19,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["POST"]
+          ["POST", "OPTIONS"]
         end
 
         def post_is_create?

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

@@ -13,7 +13,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET", "DELETE"]
+          ["GET", "DELETE", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -13,7 +13,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET"]
+          ["GET", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -17,7 +17,7 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET", "PUT", "DELETE"]
+          ["GET", "PUT", "DELETE", "OPTIONS"]
         end
 
         def resource_exists?

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

@@ -10,7 +10,7 @@ module PactBroker
       class WebhookExecution < BaseResource
 
         def allowed_methods
-          ["POST"]
+          ["POST", "OPTIONS"]
         end
 
         def process_post

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

@@ -9,7 +9,7 @@ module PactBroker
       class Webhooks < BaseResource
 
         def allowed_methods
-          ["POST", "GET"]
+          ["POST", "GET", "OPTIONS"]
         end
 
         def content_types_provided

data/lib/pact_broker/doc/views/webhooks.markdown

@@ -112,7 +112,7 @@ Example usage:
 <a name="whitelist"></a>
 ### Webhook Whitelist
 
-To ensure that webhooks cannot be used maliciously to expose either data about your contracts or your internal network, the following validation rules are applied to webhooks via the Pact Broker configuration settings.
+To ensure that webhooks cannot be used maliciously to expose either data about your contracts or your internal network, the following validation rules are applied to webhooks via the Pact Broker [webhook whitelist configuration settings](https://github.com/pact-foundation/pact_broker/wiki/Configuration#webhook-whitelists) .
 
 * **Scheme**: Must be included in the `webhook_scheme_whitelist`, which by default only includes `https`. You can change this to include `http` if absolutely necessary, however, keep in mind that the body of any http traffic is visible to the network. You can load a self signed certificate into the Pact Broker to be used for https connections using [script/insert-self-signed-certificate-from-url.rb](https://github.com/pact-foundation/pact_broker/blob/master/script/insert-self-signed-certificate-from-url.rb) in the
 Pact Broker Github repository.

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.23.0'
+  VERSION = '2.23.1'
 end

data/spec/lib/pact_broker/api/resources/base_resource_spec.rb

@@ -11,6 +11,27 @@ module PactBroker
         subject { BaseResource.new(request, response) }
 
         its(:resource_url) { is_expected.to eq 'http://example.org/path' }
+
+        describe "options" do
+          subject { options "/"; last_response }
+
+          it "returns a list of allowed methods" do
+            expect(subject.headers['Access-Control-Allow-Methods']).to eq "GET, OPTIONS"
+          end
+        end
+      end
+
+      ALL_RESOURCES = ObjectSpace.each_object(::Class).select {|klass| klass < BaseResource }
+
+      ALL_RESOURCES.each do | resource |
+        describe resource do
+          let(:request) { double('request', uri: URI("http://example.org")) }
+          let(:response) { double('response') }
+
+          it "includes OPTIONS in the list of allowed_methods" do
+            expect(resource.new(request, response).allowed_methods).to include "OPTIONS"
+          end
+        end
       end
     end
   end

data/spec/service_consumers/hal_relation_proxy_app.rb

@@ -7,7 +7,9 @@ class HalRelationProxyApp
     '/HAL-REL-PLACEHOLDER-INDEX-PB-LATEST-TAGGED-VERSION-Condor-production' =>
       '/pacticipants/Condor/latest-version/production',
     '/HAL-REL-PLACEHOLDER-INDEX-PB-LATEST-VERSION-Condor' =>
-      '/pacticipants/Condor/latest-version'
+      '/pacticipants/Condor/latest-version',
+    '/HAL-REL-PLACEHOLDER-PB-WEBHOOKS' =>
+      '/webhooks'
   }
 
   RESPONSE_BODY_REPLACEMENTS = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.23.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty