safe_regexp 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1ef6c0df7c6e214380ee04d7cb031024464a50d49ad12e0cdf825a1a9304531
-  data.tar.gz: afa6f06caa7c0378cdaba0d69e0eb5a210c4afce6631f352d4c7e917c406e9c0
+  metadata.gz: fc901f108ce8414bcee7e00f16a4a7ad630e90c8106dbbf4d2cdb31b96f8bc0b
+  data.tar.gz: '0690404a49a7fe5bdbc14c5500cf0144b9d88e322f6a863a29a1c17f97cef443'
 SHA512:
-  metadata.gz: 928559f2fb198ceb875de832efa8389faaec72f56e30c69889e37c2631c366304358a54a79d5bfe24efae56c271ee48330e6417b7d6d840a6b9a93367149469e
-  data.tar.gz: 4dd3585d1f00f8a9cf6188310cd432702ae37615a4ee937780919e5ae7d8b4cc51a86edcb3c7f7a77ebd78a918829d109c289be75275745033ffb3cc04d07ac8
+  metadata.gz: 600aee1cdd8b2a2bd7e222f52251a7fee8842243d0b4b92ebd7a508ec3088f8481e259dc5a7f16ae22bd7435a9f5912eff6627114e97b46d22f57e86c9167727
+  data.tar.gz: 4e98a42ccad498915ffbf6d7b18706f6dfa85a0a5a956a3fe93a65c36aec09edbd2dffde67834acbda890e0235bfb7e9883fad18a314f0c801ab713e15b1b294

data/lib/safe_regexp/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module SafeRegexp
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/safe_regexp.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-require "timeout"
 
 module SafeRegexp
-  class SubprocessTimeout < Timeout::Error
-  end
+  RESCUED_EXCEPTION = StandardError
 
   class RegexpTimeout < Timeout::Error
   end
@@ -13,20 +11,21 @@ module SafeRegexp
       retried = false
       begin
         read, write, pid = executor
-        write.puts Marshal.dump([regex, method, string, keepalive])
-      rescue Errno::EPIPE # keepalive killed the process
+        Marshal.dump([regex, method, string, keepalive], write)
+      rescue Errno::EPIPE # keepalive already killed the process
         raise if retried
         retried = true
-        discard_executor
-        retry
+        discard_executor # avoiding kill overhead since it's already dead
+        retry # new executor will be created by `executor` call
       end
 
-      begin
-        Timeout.timeout(timeout, SubprocessTimeout) { Marshal.load(read.gets) }
-      rescue SubprocessTimeout
+      unless IO.select([read], nil, nil, timeout)
         kill_executor pid
         raise RegexpTimeout
       end
+
+      result = Marshal.load(read)
+      result.is_a?(RESCUED_EXCEPTION) ? raise(result) : result
     end
 
     def shutdown
@@ -39,13 +38,14 @@ module SafeRegexp
     def kill_executor(pid)
       begin
         Process.kill :KILL, pid # kill -9
+      rescue Errno::ESRCH
+        nil # already dead
+      else
         begin
           Process.wait pid # reap child
         rescue Errno::ECHILD
           nil # already reaped
         end
-      rescue Errno::ESRCH
-        nil # already dead
       end
       discard_executor
     end
@@ -57,7 +57,7 @@ module SafeRegexp
 
     # - keepalive gets extended by whatever time the matching takes, but that should not be too bad
     #   we could fix it, but that means extra overhead that I'd rather avoid
-    # - using select to avoid having extra threads
+    # - using select to avoid having extra threads / Timeout
     def executor
       Thread.current[:safe_regexp_executor] ||= begin
         in_read, in_write = IO.pipe
@@ -65,13 +65,17 @@ module SafeRegexp
         pid = fork do
           in_write.close
           out_read.close
-          keepalive = 1
+          keepalive = 1 # initial payload should come in shortly after boot
           loop do
             break unless IO.select([in_read], nil, nil, keepalive)
-            break unless (instructions = in_read.gets)
-            regexp, method, string, keepalive = Marshal.load(instructions)
-            result = regexp.public_send(method, string)
-            out_write.puts Marshal.dump(result)
+            regexp, method, string, keepalive = Marshal.load(in_read)
+            begin
+              result = regexp.public_send(method, string)
+              result = result.to_a if result.is_a?(MatchData) # cannot be dumped
+            rescue RESCUED_EXCEPTION
+              result = $!
+            end
+            Marshal.dump(result, out_write)
           end
           exit! # to not run any kind of at_exit hook the parent might have configured
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safe_regexp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-03-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it