bugsnag 6.26.2 → 6.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87508e2fde2b235e826dea54f9f05ee75cca5d046cd76e95a5f4d6136c1a401c
-  data.tar.gz: c832d4f17a80904cc9b786043d8f56bd01c495aeb00fc98a5129bd4297c96eea
+  metadata.gz: 0f5f206e7ff8559ae2b853a2600004877d41d36414ea82b1cce49c41940e34dc
+  data.tar.gz: '08e3054a24b2c3928cd8e130a995525223989d09fdf1d0a5fdaefc71d460bbc0'
 SHA512:
-  metadata.gz: cbe54bdc037eccae528486bd8608ea265c16718b6644c522415245fed6b003e47cff209f21a2bdd152e2270c17ba978a2d9d5f0e8f11c6ac902b503e56cec1b6
-  data.tar.gz: 7c5ed7ae765769c16dfa9c59892520618bfbfc31e4142ad198d0988d21f834255d7c31f8f3b3d12ae5e80fe3d9707ca93981c24981ad01dc14231161b17089fa
+  metadata.gz: 785d927eeaf5c3c2d2af5c04b33295dee3ce172354da1434b245e0d706b29d04aa6261c9a55764d9b726e0d6e9f0cf1e4523925925bb5f7118b86954e391b1d9
+  data.tar.gz: f11f3d9508cee3b65a4da040d681aa703710cc2e3718b40292daa5534d4ffdcb929334ef9640bca4901754379848d2bd42e8f63b9211b7eb5d2f758499b9d950

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 Changelog
 =========
 
+## v6.26.4 (25 March 2024)
+
+### Fixes
+
+* Fix Unicode encoding issues when using `Exception#detailed_message` (Ruby 3.2+)
+  | [#817](https://github.com/bugsnag/bugsnag-ruby/pull/817)
+* Fix compatibility with Ruby 3.4-dev
+  | [#815](https://github.com/bugsnag/bugsnag-ruby/pull/815)
+  | [k0kubun](https://github.com/k0kubun)
+
+## v6.26.3 (24 January 2024)
+
+### Fixes
+
+* Handle mailto links in `Cleaner#clean_url`
+  | [#813](https://github.com/bugsnag/bugsnag-ruby/pull/813)
+
 ## v6.26.2 (17 January 2024)
 
 ### Fixes

data/VERSION

@@ -1 +1 @@
-6.26.2
+6.26.4

data/lib/bugsnag/cleaner.rb

@@ -30,25 +30,19 @@ module Bugsnag
 
       begin
         uri = URI(url)
-      rescue URI::InvalidURIError
-        pre_query_string, _query_string = url.split('?', 2)
-
-        return "#{pre_query_string}?#{FILTERED}"
-      end
 
-      return url unless uri.query
-
-      query_params = uri.query.split('&').map { |pair| pair.split('=') }
-      query_params.map! do |key, val|
-        if filters_match?(key)
-          "#{key}=#{FILTERED}"
+        if uri.is_a?(URI::MailTo)
+          clean_mailto_url(url, uri)
         else
-          "#{key}=#{val}"
+          clean_generic_url(url, uri)
         end
-      end
+      rescue URI::InvalidURIError
+        pre_query_string, _query_string = url.split('?', 2)
 
-      uri.query = query_params.join('&')
-      uri.to_s
+        "#{pre_query_string}?#{FILTERED}"
+      rescue StandardError
+        FILTERED
+      end
     end
 
     ##
@@ -209,5 +203,33 @@ module Bugsnag
         scope.start_with?("#{scope_to_filter}.")
       end
     end
+
+    def clean_generic_url(original_url, uri)
+      return original_url unless uri.query
+
+      query_params = uri.query.split('&').map { |pair| pair.split('=') }
+
+      uri.query = filter_uri_parameter_array(query_params).join('&')
+      uri.to_s
+    end
+
+    def clean_mailto_url(original_url, uri)
+      return original_url unless uri.headers
+
+      # headers in mailto links can't contain square brackets so we replace
+      # filtered parameters with 'FILTERED' instead of '[FILTERED]'
+      uri.headers = filter_uri_parameter_array(uri.headers, 'FILTERED').join('&')
+      uri.to_s
+    end
+
+    def filter_uri_parameter_array(parameters, replacement = FILTERED)
+      parameters.map do |key, value|
+        if filters_match?(key)
+          "#{key}=#{replacement}"
+        else
+          "#{key}=#{value}"
+        end
+      end
+    end
   end
 end

data/lib/bugsnag/report.rb

@@ -466,8 +466,15 @@ module Bugsnag
           exception.detailed_message
         end
 
+      # the string returned by 'detailed_message' defaults to 'ASCII_8BIT' but
+      # is actually UTF-8 encoded; we can't convert the encoding normally as its
+      # internal encoding doesn't match its actual encoding
+      message.force_encoding(::Encoding::UTF_8) if message.encoding == ::Encoding::ASCII_8BIT
+
       # remove the class name to be consistent with Exception#message
-      message.sub(" (#{class_name})", '')
+      message.sub!(" (#{class_name})".encode(message.encoding), "") rescue nil
+
+      message
     end
 
     def generate_raw_exceptions(exception)

data/lib/bugsnag/stacktrace.rb

@@ -3,7 +3,7 @@ require_relative 'code_extractor'
 module Bugsnag
   module Stacktrace
     # e.g. "org/jruby/RubyKernel.java:1264:in `catch'"
-    BACKTRACE_LINE_REGEX = /^((?:[a-zA-Z]:)?[^:]+):(\d+)(?::in `([^']+)')?$/
+    BACKTRACE_LINE_REGEX = /^((?:[a-zA-Z]:)?[^:]+):(\d+)(?::in [`']([^']+)')?$/
 
     # e.g. "org.jruby.Ruby.runScript(Ruby.java:807)"
     JAVA_BACKTRACE_REGEX = /^(.*)\((.*)(?::([0-9]+))?\)$/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag
 version: !ruby/object:Gem::Version
-  version: 6.26.2
+  version: 6.26.4
 platform: ruby
 authors:
 - James Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -107,7 +107,7 @@ homepage: https://github.com/bugsnag/bugsnag-ruby
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://github.com/bugsnag/bugsnag-ruby/blob/v6.26.2/CHANGELOG.md
+  changelog_uri: https://github.com/bugsnag/bugsnag-ruby/blob/v6.26.4/CHANGELOG.md
   documentation_uri: https://docs.bugsnag.com/platforms/ruby/
   source_code_uri: https://github.com/bugsnag/bugsnag-ruby/
   rubygems_mfa_required: 'true'
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby notifier for bugsnag.com