ronin-support 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b9f7e7aa3d25c5742621faaeba6ce51150d3959d82867d41901c7cd1a2af06
-  data.tar.gz: 4e081a47953f762edca8e267c6a31fc168cf8a91f93ce464f7586a1d3e81b2dc
+  metadata.gz: 780803451e208e445bd91de1151b5eb486f0cd0ff1b43a683b0a84af631bbeae
+  data.tar.gz: 2c9fdafcb627bd9dface2d37aaf980a087642d94ea3c33807917c38c0ce174ff
 SHA512:
-  metadata.gz: 5611fdbe096f30f8ad9a4d828b722c221e90b93a9e217e6fb9c3ca3eb54dc7103cb0d39e7b5b98f5a74192c6339adedad97c5c11f69bb5019b2ebc7ca0ef3b03
-  data.tar.gz: 107956428d0b34d47378c338143e70820cee6a62fedf24927157d5f06f16b4b978957fb02f945f7eabb75e897dc81a2ab58665fbcf56b072a7f7ad4493bb116a
+  metadata.gz: 666cffd23c7725aa75d02d89ddeb14ad7e7f1ae012758f9dc14031f5c3bf147a61921dd25b870be45b680abb1a24b9bba4ae5f78957459762a8cd77f97153bdd
+  data.tar.gz: 88713bb5dc755570e73a4466a055953adf30979c3a3d83f6d829b780a398655101cdd88ebbf7639691d159640c4cd13554df23368f9d881cfc62e55b96ebf6f8

data/ChangeLog.md

@@ -1,3 +1,12 @@
+### 1.0.7 / 2024-07-13
+
+* Improved the performance of {Ronin::Support::Encoding::JS.unescape} and
+  {String#js_unescape} by 2x.
+* Correctly parse Unicode surrogate character pairs in JavaScript
+  strings (ex: `"\uD83D\uDE80"`) in {Ronin::Support::Encoding::JS.unescape},
+  {String#js_unescape}, {Ronin::Support::Encoding::JS.unquote}, and
+  {String#js_unquote}.
+
 ### 1.0.6 / 2024-06-19
 
 * Fixed error messages in {Ronin::Support::Encoding::Base64.encode} and

data/lib/ronin/support/encoding/js.rb

@@ -183,16 +183,22 @@ module Ronin
         #
         def self.unescape(data)
           unescaped = String.new(encoding: Encoding::UTF_8)
+          scanner   = StringScanner.new(data)
 
-          data.scan(/[\\%]u[0-9a-fA-F]{1,4}|[\\%][0-9a-fA-F]{1,2}|\\[btnfr\'\"\\]|./) do |c|
-            unescaped << BACKSLASHED_CHARS.fetch(c) do
-                           if (c.start_with?("\\u") || c.start_with?("%u"))
-                             c[2..].to_i(16)
-                           elsif (c.start_with?("\\") || c.start_with?("%"))
-                             c[1..].to_i(16)
-                           else
-                             c
-                           end
+          until scanner.eos?
+            unescaped << if (backslash_escape = scanner.scan(/\\[btnfr'"\\]/))
+                           BACKSLASHED_CHARS[backslash_escape]
+                         elsif (surrogate_pair = scanner.scan(/\\u[dD][890abAB][0-9a-fA-F]{2}\\u[dD][cdefCDEF][0-9a-fA-F]{2}/))
+                           hi = surrogate_pair[2..6].to_i(16)
+                           lo = surrogate_pair[8..12].to_i(16)
+
+                           (0x1_0000 + ((hi - 0xd800) * 0x400) + (lo - 0xdc00))
+                         elsif (unicode_escape = scanner.scan(/[\\%]u[0-9a-fA-F]{1,4}/))
+                           unicode_escape[2..].to_i(16)
+                         elsif (hex_escape     = scanner.scan(/[\\%][0-9a-fA-F]{1,2}/))
+                           hex_escape[1..].to_i(16)
+                         else
+                           scanner.getch
                          end
           end
 

data/lib/ronin/support/version.rb

@@ -19,6 +19,6 @@
 module Ronin
   module Support
     # ronin-support version
-    VERSION = '1.0.6'
+    VERSION = '1.0.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ronin-support
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Postmodern
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chars