ppr 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e44434cdd2a83270beb33c69d7d1141cc3333857505910f16cb2baa9fcdbae
-  data.tar.gz: f3a4d37780596606a2a1957c28a099dac51eef57330ad02f499ad7291821ee61
+  metadata.gz: 2042d52e7ba854cb3813ded3c053f15f0d62cf72e3a5c62b3b2546d9fc24e12a
+  data.tar.gz: c03dc06cb0f09e56efdae00063e0451389319163b4b674a3d959c22915216dfb
 SHA512:
-  metadata.gz: 77bc95d237a38e2979a861ab617b6a86ca31dc1008f85fc54ad82f15cc7f6dbcd1303d88993bb020aca05793eda2377a1ee1f713b19fb0412f670dfe24a83688
-  data.tar.gz: 04a6ba69898af70b296f1199e9106c3e984b6d8f8df9c81e4cb3d93f96ff77b8b031b14440bef6450eaae2092f8493bcbd7161cd17bce0189ef0a5f5e878da66
+  metadata.gz: 5c9c6b98dc45c18bc65a219e7c220b55bfd606d411f1bbcd28ad12bd42cd6271dc224725cb1ad8521e5211f657e3c99627883426252ad5917f9fafd07235113a
+  data.tar.gz: b687e440a1fd675306a070258c0b8807b2725c4a133d05602f9fb7134a1b1073c0a451d63a9f4dc2c07bba151d18ce223bd628cf543c211ccdac7f66de18e018

data/lib/ppr/safer_generator.rb

@@ -43,6 +43,16 @@ class SaferGenerator
         methods = DANGER_METHODS + @black_methods
         # Gather the constants to strip.
         constants = DANGER_CONSTANTS + @black_constants
+        # Save the dangerous methods in a private safe.
+        @safe_of_methods = {}
+        methods.each do |meth|
+            @safe_of_methods[meth]=method(meth)
+        end
+        # Save the dangerous constants in a private safe.
+        @safe_of_constants = {}
+        constants.each do |cst|
+            @safe_of_constants[cst] = Object.send(:const_get,cst)
+        end
         # Strip the dangerous methods.
         methods.each do |meth|
             Kernel.send(:undef_method,meth)
@@ -53,6 +63,21 @@ class SaferGenerator
         end
     end
 
+    # Restores all the stripped Kernel methods and constants appart from the
+    # elements of the white list.
+    # Also strip Object from dangerous methods and constants apart
+    # from the elements of the white list.
+    def unsecure
+        # Restores the dangerous methods in a private safe.
+        @safe_of_methods.each do |(name,pr)|
+            Kernel.send(:define_method,name,&pr)
+        end
+        # Restors the dangerous constants in a private safe.
+        @safe_of_constants.each do |(name,cst)|
+            Object.const_set(name,cst)
+        end
+    end
+
 
     # Executes +block+ in a safe context for  generating text into a +stream+.
     #
@@ -65,61 +90,97 @@ class SaferGenerator
         end
         # Creates the pipe for communicating with the block.
         rd,wr = IO.pipe
-        # Creates a process for executing the block.
-        pid = fork
-        if pid then
-            # This is the parent: waits for the block execution result.
-            # No need to write on the pipe. close it.
-            wr.close
-            # Read the result of the process and send it to stream
-            until rd.eof?
-                stream << rd.read
-            end
-            # No more need of rd.
-            rd.close
-            # Wait the end of the child process
-            Process.wait(pid)
-            # Where there a trouble?
-            unless $?.exited? then
-                # pid did not exit, internal error.
-                raise "*Internal error*: safer process #{pid} did not exit."
-            end
-            if $?.exitstatus !=0 then
-                # Reconstruct the exception from the stream, the exit
-                # status is the number of line to use.
-                e0 = Marshal.load( stream.string.each_line.
-                                   to_a[-$?.exitstatus..-1].join )
-                # Then resend the eception encapsulated into another one
-                # telling the safer process failed.
-                begin
-                    raise e0
-                rescue Exception => e1
-                    raise SaferException.new("*Error*: exception occured in safer process #{pid}.")
-                end
-            end
-        else
-            # This is the child: enter in safe mode and execute the block.
-            # No need to write on the pipe. close it.
-            rd.close
-            # Secure.
-            secure
-            # Execute the block.
+        # # Creates a process for executing the block.
+        # pid = fork
+        # if pid then
+        #     # This is the parent: waits for the block execution result.
+        #     # No need to write on the pipe. close it.
+        #     wr.close
+        #     # Read the result of the process and send it to stream
+        #     until rd.eof?
+        #         stream << rd.read
+        #     end
+        #     # No more need of rd.
+        #     rd.close
+        #     # Wait the end of the child process
+        #     Process.wait(pid)
+        #     # Where there a trouble?
+        #     unless $?.exited? then
+        #         # pid did not exit, internal error.
+        #         raise "*Internal error*: safer process #{pid} did not exit."
+        #     end
+        #     if $?.exitstatus !=0 then
+        #         # Reconstruct the exception from the stream, the exit
+        #         # status is the number of line to use.
+        #         e0 = Marshal.load( stream.string.each_line.
+        #                            to_a[-$?.exitstatus..-1].join )
+        #         # Then resend the eception encapsulated into another one
+        #         # telling the safer process failed.
+        #         begin
+        #             raise e0
+        #         rescue Exception => e1
+        #             raise SaferException.new("*Error*: exception occured in safer process #{pid}.")
+        #         end
+        #     end
+        # else
+        #     # This is the child: enter in safe mode and execute the block.
+        #     # No need to write on the pipe. close it.
+        #     rd.close
+        #     # Secure.
+        #     secure
+        #     # Execute the block.
+        #     begin
+        #         block.call(wr)
+        #     rescue Exception => e
+        #         # The exception is serialized and passed to the main process
+        #         # through the pipe.
+        #         e = Marshal.dump(e)
+        #         wr << "\n" << e 
+        #         # The exit status is the number of line of the serialized
+        #         # exception.
+        #         exit!(e.each_line.count)
+        #     end
+        #     # No more need of wr.
+        #     wr.close
+        #     # End the process without any error.
+        #     exit!(0)
+        # end
+        # 
+        # # Is there a string to return?
+        # if to_return then
+        #     return stream.string
+        # else
+        #     return nil
+        # end
+
+        # Secure.
+        secure
+        trouble = nil
+        # Execute the block.
+        begin
+            block.call(wr)
+        rescue Exception => e
+            trouble = e
+        end
+        # No more need of wr.
+        wr.close
+
+        # Unsecure and process the result.
+        unsecure
+        # Read the result of the process and send it to stream
+        until rd.eof?
+            stream << rd.read
+        end
+        # No more need of rd.
+        rd.close
+        if trouble then
             begin
-                block.call(wr)
-            rescue Exception => e
-                # The exception is serialized and passed to the main process
-                # through the pipe.
-                e = Marshal.dump(e)
-                wr << "\n" << e 
-                # The exit status is the number of line of the serialized
-                # exception.
-                exit!(e.each_line.count)
+                raise trouble
+            rescue Exception => e1
+                raise SaferException.new("*Error*: exception occured in safe mode.")
             end
-            # No more need of wr.
-            wr.close
-            # End the process without any error.
-            exit!(0)
         end
+          
         # Is there a string to return?
         if to_return then
             return stream.string

data/lib/ppr/test_ppr.rb

@@ -3,6 +3,7 @@
 ######################################################################
 
 require "ppr.rb"
+require 'stringio'
 
 # Function for testing a preprocessor
 def test_preprocessor(preprocessor,input,expected)

data/lib/ppr/version.rb

@@ -1,3 +1,3 @@
 module Ppr
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppr
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Lovic Gauthier