twilio-ruby 7.10.7 → 7.11.2

data/lib/rack/twilio_webhook_authentication.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rack/media_type'
+require 'rack/utils'
 
 module Rack
   # Middleware that authenticates webhooks from Twilio using the request
@@ -33,7 +34,7 @@ module Rack
     end
 
     def call(env)
-      return @app.call(env) unless env['PATH_INFO'].match(@path_regex)
+      return @app.call(env) unless protected_path?(env['PATH_INFO'])
       request = Rack::Request.new(env)
       original_url = request.url
       params = extract_params!(request)
@@ -51,6 +52,48 @@ module Rack
       end
     end
 
+    # Decide whether a request path needs its signature validated.
+    #
+    # PATH_INFO arrives percent-encoded, but the routers we sit in front of
+    # (Rails, Sinatra) decode and normalize the path before matching it against
+    # their routes. Comparing the configured patterns against the raw PATH_INFO
+    # alone therefore lets a request like `/%76oice` slip past this middleware
+    # unvalidated and still reach the `/voice` action.
+    #
+    # We compare against every form the path could take downstream and validate
+    # if any of them matches. Erring towards validating means a path we can't
+    # make sense of is still checked rather than waved through.
+    def protected_path?(path)
+      path = path.to_s
+      candidates = [path, decode(path)]
+      candidates << remove_dot_segments(candidates.last)
+      candidates.uniq.any? { |candidate| candidate.match(@path_regex) }
+    end
+
+    # Percent-decode a path the way a downstream router would. `unescape_path`
+    # (rather than `unescape`) leaves `+` alone, since a plus is a literal plus
+    # in a path and only means a space in a query string. Undecodable bytes are
+    # scrubbed, as matching a Regexp against invalid UTF-8 raises.
+    def decode(path)
+      decoded = Rack::Utils.unescape_path(path)
+      decoded.valid_encoding? ? decoded : decoded.scrub
+    rescue ArgumentError
+      path
+    end
+
+    # Collapse `.`, `..` and repeated slashes, so an anchored pattern such as
+    # %r{\A/voice\z} still recognizes `/sms/../voice`.
+    def remove_dot_segments(path)
+      segments = path.split('/').each_with_object([]) do |segment, resolved|
+        case segment
+        when '', '.' then next
+        when '..' then resolved.pop
+        else resolved << segment
+        end
+      end
+      "/#{segments.join('/')}"
+    end
+
     # Extract the params from the the request that we can use to determine the
     # signature. This _may_ modify the passed in request since it may read/rewind
     # the body.
@@ -67,6 +110,6 @@ module Rack
       end
     end
 
-    private :extract_params!
+    private :extract_params!, :protected_path?, :decode, :remove_dot_segments
   end
 end

data/lib/twilio-ruby/rest/accounts/v1/auth_token_promotion.rb

@@ -58,8 +58,15 @@ module Twilio
                     end
                     ##
                     # Update the AuthTokenPromotionInstance
+                    # @param [Boolean] suppress_email_notification Whether to suppress the email notification that Twilio sends to the owners and administrators of the account about this Auth Token change. Defaults to `false`, so Twilio sends the email. Set to `true` when rotating Auth Tokens across many subaccounts.
                     # @return [AuthTokenPromotionInstance] Updated AuthTokenPromotionInstance
-                    def update
+                    def update(
+                      suppress_email_notification: :unset
+                    )
+
+                        data = Twilio::Values.of({
+                            'SuppressEmailNotification' => suppress_email_notification,
+                        })
 
                         headers = Twilio::Values.of({'Content-Type' => 'application/x-www-form-urlencoded', })
                         
@@ -67,7 +74,7 @@ module Twilio
                         
                         
                         
-                        payload = @version.update('POST', @uri, headers: headers)
+                        payload = @version.update('POST', @uri, data: data, headers: headers)
                         AuthTokenPromotionInstance.new(
                             @version,
                             payload,
@@ -76,8 +83,15 @@ module Twilio
 
                     ##
                     # Update the AuthTokenPromotionInstanceMetadata
+                    # @param [Boolean] suppress_email_notification Whether to suppress the email notification that Twilio sends to the owners and administrators of the account about this Auth Token change. Defaults to `false`, so Twilio sends the email. Set to `true` when rotating Auth Tokens across many subaccounts.
                     # @return [AuthTokenPromotionInstance] Updated AuthTokenPromotionInstance
-                    def update_with_metadata
+                    def update_with_metadata(
+                      suppress_email_notification: :unset
+                    )
+
+                        data = Twilio::Values.of({
+                            'SuppressEmailNotification' => suppress_email_notification,
+                        })
 
                         headers = Twilio::Values.of({'Content-Type' => 'application/x-www-form-urlencoded', })
                         
@@ -85,7 +99,7 @@ module Twilio
                         
                         
                         
-                        response = @version.update_with_metadata('POST', @uri, headers: headers)
+                        response = @version.update_with_metadata('POST', @uri, data: data, headers: headers)
                         auth_token_promotion_instance = AuthTokenPromotionInstance.new(
                             @version,
                             response.body,
@@ -191,65 +205,6 @@ module Twilio
                     end
                 end
 
-                class AuthTokenPromotionPageMetadata < PageMetadata
-                    attr_reader :auth_token_promotion_page
-
-                    def initialize(version, response, solution, limit)
-                        super(version, response)
-                        @auth_token_promotion_page = []
-                        @limit = limit
-                        key = get_key(response.body)
-                        records = 0
-                        while( limit != :unset && records < limit )
-                            @auth_token_promotion_page << AuthTokenPromotionListResponse.new(version, @payload, key, limit - records)
-                            @payload = self.next_page
-                            break unless @payload
-                            records += (@payload.body[key] || []).size
-                        end
-                        # Path Solution
-                        @solution = solution
-                    end
-
-                    def each
-                        @auth_token_promotion_page.each do |record|
-                          yield record
-                        end
-                    end
-
-                    def to_s
-                      '<Twilio::REST::Accounts::V1PageMetadata>';
-                    end
-                end
-                class AuthTokenPromotionListResponse < InstanceListResource
-
-                    # @param [Array<AuthTokenPromotionInstance>] instance
-                    # @param [Hash{String => Object}] headers
-                    # @param [Integer] status_code
-                    def initialize(version, payload, key, limit = :unset)
-                      data_list = payload.body[key]  || []
-                      if limit != :unset
-                        data_list = data_list[0, limit]
-                      end
-                      @auth_token_promotion = data_list.map do |data|
-                        AuthTokenPromotionInstance.new(version, data)
-                      end
-                      @headers = payload.headers
-                      @status_code = payload.status_code
-                    end
-
-                    def auth_token_promotion
-                        @auth_token_promotion
-                    end
-
-                    def headers
-                      @headers
-                    end
-
-                    def status_code
-                      @status_code
-                    end
-                end
-
                 class AuthTokenPromotionInstance < InstanceResource
                     ##
                     # Initialize the AuthTokenPromotionInstance
@@ -321,10 +276,15 @@ module Twilio
                     
                     ##
                     # Update the AuthTokenPromotionInstance
+                    # @param [Boolean] suppress_email_notification Whether to suppress the email notification that Twilio sends to the owners and administrators of the account about this Auth Token change. Defaults to `false`, so Twilio sends the email. Set to `true` when rotating Auth Tokens across many subaccounts.
                     # @return [AuthTokenPromotionInstance] Updated AuthTokenPromotionInstance
-                    def update
+                    def update(
+                      suppress_email_notification: :unset
+                    )
 
-                        context.update
+                        context.update(
+                            suppress_email_notification: suppress_email_notification, 
+                        )
                     end
 
                     ##

data/lib/twilio-ruby/rest/accounts/v1/bulk_consents.rb

@@ -126,65 +126,6 @@ module Twilio
                     end
                 end
 
-                class BulkConsentsPageMetadata < PageMetadata
-                    attr_reader :bulk_consents_page
-
-                    def initialize(version, response, solution, limit)
-                        super(version, response)
-                        @bulk_consents_page = []
-                        @limit = limit
-                        key = get_key(response.body)
-                        records = 0
-                        while( limit != :unset && records < limit )
-                            @bulk_consents_page << BulkConsentsListResponse.new(version, @payload, key, limit - records)
-                            @payload = self.next_page
-                            break unless @payload
-                            records += (@payload.body[key] || []).size
-                        end
-                        # Path Solution
-                        @solution = solution
-                    end
-
-                    def each
-                        @bulk_consents_page.each do |record|
-                          yield record
-                        end
-                    end
-
-                    def to_s
-                      '<Twilio::REST::Accounts::V1PageMetadata>';
-                    end
-                end
-                class BulkConsentsListResponse < InstanceListResource
-
-                    # @param [Array<BulkConsentsInstance>] instance
-                    # @param [Hash{String => Object}] headers
-                    # @param [Integer] status_code
-                    def initialize(version, payload, key, limit = :unset)
-                      data_list = payload.body[key]  || []
-                      if limit != :unset
-                        data_list = data_list[0, limit]
-                      end
-                      @bulk_consents = data_list.map do |data|
-                        BulkConsentsInstance.new(version, data)
-                      end
-                      @headers = payload.headers
-                      @status_code = payload.status_code
-                    end
-
-                    def bulk_consents
-                        @bulk_consents
-                    end
-
-                    def headers
-                      @headers
-                    end
-
-                    def status_code
-                      @status_code
-                    end
-                end
-
                 class BulkConsentsInstance < InstanceResource
                     ##
                     # Initialize the BulkConsentsInstance

data/lib/twilio-ruby/rest/accounts/v1/bulk_contacts.rb

@@ -126,65 +126,6 @@ module Twilio
                     end
                 end
 
-                class BulkContactsPageMetadata < PageMetadata
-                    attr_reader :bulk_contacts_page
-
-                    def initialize(version, response, solution, limit)
-                        super(version, response)
-                        @bulk_contacts_page = []
-                        @limit = limit
-                        key = get_key(response.body)
-                        records = 0
-                        while( limit != :unset && records < limit )
-                            @bulk_contacts_page << BulkContactsListResponse.new(version, @payload, key, limit - records)
-                            @payload = self.next_page
-                            break unless @payload
-                            records += (@payload.body[key] || []).size
-                        end
-                        # Path Solution
-                        @solution = solution
-                    end
-
-                    def each
-                        @bulk_contacts_page.each do |record|
-                          yield record
-                        end
-                    end
-
-                    def to_s
-                      '<Twilio::REST::Accounts::V1PageMetadata>';
-                    end
-                end
-                class BulkContactsListResponse < InstanceListResource
-
-                    # @param [Array<BulkContactsInstance>] instance
-                    # @param [Hash{String => Object}] headers
-                    # @param [Integer] status_code
-                    def initialize(version, payload, key, limit = :unset)
-                      data_list = payload.body[key]  || []
-                      if limit != :unset
-                        data_list = data_list[0, limit]
-                      end
-                      @bulk_contacts = data_list.map do |data|
-                        BulkContactsInstance.new(version, data)
-                      end
-                      @headers = payload.headers
-                      @status_code = payload.status_code
-                    end
-
-                    def bulk_contacts
-                        @bulk_contacts
-                    end
-
-                    def headers
-                      @headers
-                    end
-
-                    def status_code
-                      @status_code
-                    end
-                end
-
                 class BulkContactsInstance < InstanceResource
                     ##
                     # Initialize the BulkContactsInstance

data/lib/twilio-ruby/rest/accounts/v1/credential.rb

@@ -98,65 +98,6 @@ module Twilio
                     end
                 end
 
-                class CredentialPageMetadata < PageMetadata
-                    attr_reader :credential_page
-
-                    def initialize(version, response, solution, limit)
-                        super(version, response)
-                        @credential_page = []
-                        @limit = limit
-                        key = get_key(response.body)
-                        records = 0
-                        while( limit != :unset && records < limit )
-                            @credential_page << CredentialListResponse.new(version, @payload, key, limit - records)
-                            @payload = self.next_page
-                            break unless @payload
-                            records += (@payload.body[key] || []).size
-                        end
-                        # Path Solution
-                        @solution = solution
-                    end
-
-                    def each
-                        @credential_page.each do |record|
-                          yield record
-                        end
-                    end
-
-                    def to_s
-                      '<Twilio::REST::Accounts::V1PageMetadata>';
-                    end
-                end
-                class CredentialListResponse < InstanceListResource
-
-                    # @param [Array<CredentialInstance>] instance
-                    # @param [Hash{String => Object}] headers
-                    # @param [Integer] status_code
-                    def initialize(version, payload, key, limit = :unset)
-                      data_list = payload.body[key]  || []
-                      if limit != :unset
-                        data_list = data_list[0, limit]
-                      end
-                      @credential = data_list.map do |data|
-                        CredentialInstance.new(version, data)
-                      end
-                      @headers = payload.headers
-                      @status_code = payload.status_code
-                    end
-
-                    def credential
-                        @credential
-                    end
-
-                    def headers
-                      @headers
-                    end
-
-                    def status_code
-                      @status_code
-                    end
-                end
-
                 class CredentialInstance < InstanceResource
                     ##
                     # Initialize the CredentialInstance

data/lib/twilio-ruby/rest/accounts/v1/messaging_geopermissions.rb

@@ -180,65 +180,6 @@ module Twilio
                     end
                 end
 
-                class MessagingGeopermissionsPageMetadata < PageMetadata
-                    attr_reader :messaging_geopermissions_page
-
-                    def initialize(version, response, solution, limit)
-                        super(version, response)
-                        @messaging_geopermissions_page = []
-                        @limit = limit
-                        key = get_key(response.body)
-                        records = 0
-                        while( limit != :unset && records < limit )
-                            @messaging_geopermissions_page << MessagingGeopermissionsListResponse.new(version, @payload, key, limit - records)
-                            @payload = self.next_page
-                            break unless @payload
-                            records += (@payload.body[key] || []).size
-                        end
-                        # Path Solution
-                        @solution = solution
-                    end
-
-                    def each
-                        @messaging_geopermissions_page.each do |record|
-                          yield record
-                        end
-                    end
-
-                    def to_s
-                      '<Twilio::REST::Accounts::V1PageMetadata>';
-                    end
-                end
-                class MessagingGeopermissionsListResponse < InstanceListResource
-
-                    # @param [Array<MessagingGeopermissionsInstance>] instance
-                    # @param [Hash{String => Object}] headers
-                    # @param [Integer] status_code
-                    def initialize(version, payload, key, limit = :unset)
-                      data_list = payload.body[key]  || []
-                      if limit != :unset
-                        data_list = data_list[0, limit]
-                      end
-                      @messaging_geopermissions = data_list.map do |data|
-                        MessagingGeopermissionsInstance.new(version, data)
-                      end
-                      @headers = payload.headers
-                      @status_code = payload.status_code
-                    end
-
-                    def messaging_geopermissions
-                        @messaging_geopermissions
-                    end
-
-                    def headers
-                      @headers
-                    end
-
-                    def status_code
-                      @status_code
-                    end
-                end
-
                 class MessagingGeopermissionsInstance < InstanceResource
                     ##
                     # Initialize the MessagingGeopermissionsInstance

data/lib/twilio-ruby/rest/accounts/v1/safelist.rb

@@ -224,65 +224,6 @@ module Twilio
                     end
                 end
 
-                class SafelistPageMetadata < PageMetadata
-                    attr_reader :safelist_page
-
-                    def initialize(version, response, solution, limit)
-                        super(version, response)
-                        @safelist_page = []
-                        @limit = limit
-                        key = get_key(response.body)
-                        records = 0
-                        while( limit != :unset && records < limit )
-                            @safelist_page << SafelistListResponse.new(version, @payload, key, limit - records)
-                            @payload = self.next_page
-                            break unless @payload
-                            records += (@payload.body[key] || []).size
-                        end
-                        # Path Solution
-                        @solution = solution
-                    end
-
-                    def each
-                        @safelist_page.each do |record|
-                          yield record
-                        end
-                    end
-
-                    def to_s
-                      '<Twilio::REST::Accounts::V1PageMetadata>';
-                    end
-                end
-                class SafelistListResponse < InstanceListResource
-
-                    # @param [Array<SafelistInstance>] instance
-                    # @param [Hash{String => Object}] headers
-                    # @param [Integer] status_code
-                    def initialize(version, payload, key, limit = :unset)
-                      data_list = payload.body[key]  || []
-                      if limit != :unset
-                        data_list = data_list[0, limit]
-                      end
-                      @safelist = data_list.map do |data|
-                        SafelistInstance.new(version, data)
-                      end
-                      @headers = payload.headers
-                      @status_code = payload.status_code
-                    end
-
-                    def safelist
-                        @safelist
-                    end
-
-                    def headers
-                      @headers
-                    end
-
-                    def status_code
-                      @status_code
-                    end
-                end
-
                 class SafelistInstance < InstanceResource
                     ##
                     # Initialize the SafelistInstance