bullet_train-outgoing_webhooks 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6be4e0d5f7f4402a856328977644650feed3518bda7416ffccdb37daee3af9e5
-  data.tar.gz: 489154f44092593888ac060b6b9c1f854e75b5d97cda359e3e3cca3bd658a869
+  metadata.gz: e8374fc77da7bb26e3f82e7b38f7324fac6b5e817a285810e57c61c596a13a8e
+  data.tar.gz: f508d273562d3c44b0792f70e4ceb4730e301f77d338f4af43d343d41869d10b
 SHA512:
-  metadata.gz: df4f726e66ff41bf55013e7080b90393ad246b6ea9294747a1c2d8260c060f0678be3b880ac67442aeb6705bcf5c0939f32791352cda3e8ae782ad274396a90b
-  data.tar.gz: e583f36d727b71c1d5e919773140033809ce34477255fad81b18449e319b2352c75c41b05f6cdf4b648ccd81fce619200baa39a13bc86c4a6d7e35d9ac1c2201
+  metadata.gz: 959cacc6c161f66a9910a512810592aba4a38f99bfad0b60f1b37932d90cf6b6deb261d64d8a3eebf96d30840b9a7970b8f9c90e981e61005ac38dfcc8c6f0e6
+  data.tar.gz: 42df3deb39cdc68862cf1aeaf444940bf182f704badaeedfff5f6cf318a31a9e292c57d4fb13584b091586532653bf5a9735f09fdf6a8d4854a502cc3c34432e

data/app/controllers/api/v1/webhooks/outgoing/endpoints_controller.rb

@@ -41,8 +41,10 @@ class Api::V1::Webhooks::Outgoing::EndpointsController < Api::V1::ApplicationCon
         *permitted_fields,
         :url,
         :name,
+        :scaffolding_absolutely_abstract_creative_concept_id,
         # 🚅 super scaffolding will insert new fields above this line.
         *permitted_arrays,
+        event_type_ids: [],
         # 🚅 super scaffolding will insert new arrays above this line.
       )
 

data/app/models/concerns/webhooks/outgoing/delivery_attempt_support.rb

@@ -31,13 +31,21 @@ module Webhooks::Outgoing::DeliveryAttemptSupport
   def attempt
     uri = URI.parse(delivery.endpoint_url)
 
-    unless allowed_uri?(uri)
-      self.response_code = 0
-      self.error_message = "URI is not allowed: " + uri
-      return false
+    if BulletTrain::OutgoingWebhooks.advanced_hostname_security
+      unless allowed_uri?(uri)
+        self.response_code = 0
+        self.error_message = "URI is not allowed: " + uri
+        return false
+      end
+    end
+
+    hostname = if BulletTrain::OutgoingWebhooks.advanced_hostname_security
+      resolve_ip_from_authoritative(uri.hostname.downcase)
+    else
+      uri.hostname.downcase
     end
 
-    http = Net::HTTP.new(resolve_ip_from_authoritative(uri.hostname.downcase), uri.port)
+    http = Net::HTTP.new(hostname, uri.port)
     http.use_ssl = true if uri.scheme == "https"
     request = Net::HTTP::Post.new(uri.path)
     request.add_field("Host", uri.host)

data/app/models/concerns/webhooks/outgoing/event_support.rb

@@ -30,11 +30,11 @@ module Webhooks::Outgoing::EventSupport
   def endpoints
     endpoints = send(BulletTrain::OutgoingWebhooks.parent_association).webhooks_outgoing_endpoints.listening_for_event_type_id(event_type_id)
 
-    case self.class.name
+    case subject_type
     when "Scaffolding::AbsolutelyAbstract::CreativeConcept"
-      endpoints.where(scaffolding_absolutely_abstract_creative_concept_id: [object.id, nil])
+      endpoints.where(scaffolding_absolutely_abstract_creative_concept_id: [subject.id, nil])
     when "Scaffolding::CompletelyConcrete::TangibleThing"
-      endpoints.where(scaffolding_absolutely_abstract_creative_concept_id: [object.absolutely_abstract_creative_concept_id, nil])
+      endpoints.where(scaffolding_absolutely_abstract_creative_concept_id: [subject.absolutely_abstract_creative_concept_id, nil])
     else
       endpoints
     end

data/app/views/account/webhooks/outgoing/endpoints/_form.html.erb

@@ -4,10 +4,10 @@
   <% with_field_settings form: form do %>
     <%= render 'shared/fields/text_field', method: :name, options: {autofocus: true} %>
     <%= render 'shared/fields/text_field', method: :url %>
-    <%= render 'shared/fields/super_select', method: :scaffolding_absolutely_abstract_creative_concept_id,
-    choices: [['None', '']] + @endpoint.creative_concepts.map { |event_type| [event_type.name, event_type.id] }, other_options: {search: true} %>
     <%= render 'shared/fields/super_select', method: :event_type_ids, html_options: {multiple: true},
-    choices: @endpoint.valid_event_types.map { |event_type| [event_type.label_string, event_type.id] } %>
+      choices: @endpoint.valid_event_types.map { |event_type| [event_type.label_string, event_type.id] } %>
+    <%= render 'shared/fields/super_select', method: :scaffolding_absolutely_abstract_creative_concept_id,
+      choices: [['None', '']] + @endpoint.creative_concepts.map { |event_type| [event_type.name, event_type.id] }, other_options: {search: true} %>
     <%# 🚅 super scaffolding will insert new fields above this line. %>
   <% end %>
 

data/app/views/account/webhooks/outgoing/endpoints/show.html.erb

@@ -12,6 +12,7 @@
         <% with_attribute_settings object: @endpoint, strategy: :label do %>
           <%= render 'shared/attributes/text', attribute: :name %>
           <%= render 'shared/attributes/code', attribute: :url %>
+
           <% # TODO We should make the `has_many` attribute partial configurable enough to handle this use case. %>
           <%= render 'shared/attributes/attribute', attribute: :event_types do %>
             <% if @endpoint.event_type_ids.any? %>
@@ -25,6 +26,8 @@
               <%= t('webhooks/outgoing/endpoints.fields.event_types.all') %>
             <% end %>
           <% end %>
+
+          <%= render 'shared/attributes/belongs_to', attribute: :scaffolding_absolutely_abstract_creative_concept %>
           <%# 🚅 super scaffolding will insert new fields above this line. %>
         <% end %>
       <% end %>

data/config/locales/en/webhooks/outgoing/endpoints.en.yml

@@ -46,11 +46,12 @@ en:
         all: All Events
       event_types: *event_types
 
-      scaffolding_absolutely_abstract_creative_concept_id:
-        _: &scaffolding_absolutely_abstract_creative_concept_id Creative Concept
+      scaffolding_absolutely_abstract_creative_concept_id: &scaffolding_absolutely_abstract_creative_concept
+        _: &scaffolding_absolutely_abstract_creative_concept_id Within Creative Concept
         label: *scaffolding_absolutely_abstract_creative_concept_id
         heading: *scaffolding_absolutely_abstract_creative_concept_id
-        placeholder: "Type your response here"
+
+      scaffolding_absolutely_abstract_creative_concept: *scaffolding_absolutely_abstract_creative_concept
 
       # 🚅 super scaffolding will insert new fields above this line.
       created_at:

data/lib/bullet_train/outgoing_webhooks/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module OutgoingWebhooks
-    VERSION = "1.2.4"
+    VERSION = "1.2.5"
   end
 end

data/lib/bullet_train/outgoing_webhooks.rb

@@ -9,6 +9,7 @@ module BulletTrain
 
     mattr_accessor :parent_class, default: default_for(BulletTrain, :parent_class, "Team")
     mattr_accessor :base_class, default: default_for(BulletTrain, :base_class, "ApplicationRecord")
+    mattr_accessor :advanced_hostname_security, default: false
 
     def self.parent_association
       parent_class.underscore.to_sym

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-outgoing_webhooks
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-17 00:00:00.000000000 Z
+date: 2022-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard