ppr 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3c2c8adf60e11d57a5c5bd231828482b93e9da72
-  data.tar.gz: b2a411642ca9e8f9de4aa225779082cd5d0d1324
+SHA256:
+  metadata.gz: 2042d52e7ba854cb3813ded3c053f15f0d62cf72e3a5c62b3b2546d9fc24e12a
+  data.tar.gz: c03dc06cb0f09e56efdae00063e0451389319163b4b674a3d959c22915216dfb
 SHA512:
-  metadata.gz: 32baf77bd2913db328a208c6666bc415d752df5f498b77be528e80cb8403b84a788890f4dc1f7087362832b93a12e558b10a23c759670093152d45f6e70e8364
-  data.tar.gz: 47bbe12fae200d8152034b76ff247aa7ccee4254f2b7a9e9ef397d29541eb4c8f3a65e36a1416e974801da4107413e7a84463da328cbf0c34cde4d0fcd4968c4
+  metadata.gz: 5c9c6b98dc45c18bc65a219e7c220b55bfd606d411f1bbcd28ad12bd42cd6271dc224725cb1ad8521e5211f657e3c99627883426252ad5917f9fafd07235113a
+  data.tar.gz: b687e440a1fd675306a070258c0b8807b2725c4a133d05602f9fb7134a1b1073c0a451d63a9f4dc2c07bba151d18ce223bd628cf543c211ccdac7f66de18e018

data/lib/ppr/ppr_core.rb

@@ -4,6 +4,7 @@
 
 require "ppr/safer_generator.rb"
 require "ppr/keyword_searcher.rb"
+require 'delegate'
 
 module Ppr
 
@@ -302,11 +303,26 @@ class LoadRequire < Macro
         super("",num,ppr,expand: expand)
     end
 
+    def set_locations(locations)
+        @locations = locations
+    end
+
+    def find_file(name)
+        @locations.each do |i|
+          filepath =  i + "/" + name
+          if File.exist?(filepath)
+            return filepath
+          end
+        end
+
+        raise "File #{name} was not found in includes."
+    end
+
     # Loads and preprocess file +name+.
     def loadm(name)
         output = StringIO.new("")
         # print "name=#{name}\n"
-        File.open(name,"r") do |input|
+        File.open(find_file(name),"r") do |input|
             @ppr.preprocess(input,output)
         end
         return output.string
@@ -392,7 +408,8 @@ class Preprocessor
                    endm: ".end",
                    expand: ":<",
                    separator: /^|[^\w]|$/, glue: "##",
-                   escape: "\\")
+                   escape: "\\",
+                   includes: Dir.pwd)
         # Check and Initialize the keywords
         # NOTE: since there are a lot of checks, use a generic but
         # harder to read code.
@@ -453,6 +470,10 @@ class Preprocessor
         params.each do |k,v|
             parameter_set(k,v)
         end
+
+        #include folder locations to search for load and require
+        @includes = []
+        (@includes << includes).flatten!
     end
 
     # Methods for handling the execution context of the macros.
@@ -531,17 +552,17 @@ class Preprocessor
 
     # Tells if a line corresponds to an end keyword.
     def is_endm?(line)
-        @endm.match(line)
+        @endm.match(line.strip)
     end
 
     # Tells if a line corresponds to an else keyword.
     def is_elsem?(line)
-        @elsem.match(line)
+        @elsem.match(line.strip)
     end
 
     # Tells if a line corresponds to an endif keyword.
     def is_endifm?(line)
-        @endifm.match(line)
+        @endifm.match(line.strip)
     end
 
     # Extract a macro definition from a +line+ if there is one.
@@ -606,8 +627,10 @@ class Preprocessor
             macro = Assign.new(name,@number,self,expand: @expand)
         when @loadm then
             macro = Load.new(@number,self,expand: @expand)
+            macro.set_locations(@includes)
         when @requirem then
             macro = Require.new(@number,self,expand: @expand)
+            macro.set_locations(@includes)
         when @ifm then
             macro = If.new(@number,self,expand: @expand)
         else

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)
@@ -149,7 +150,7 @@ $success &= test_preprocessor_exception($ppr,
 print "... Undefined symbol in macro code... "
 $success &= test_preprocessor_exception($ppr, 
                         "\n.def HE(name)\n :< foobar \n.end\nHE(Foo)",
-                        "HE:5):2: undefined local variable or method")
+                        "HE:5):3: undefined local variable or method")
 
 
 # puts "\nBuilding a preprocessor with an invalid escape character."

data/lib/ppr/version.rb

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

data/ppr.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", ">= 12.3.3"
+  spec.add_development_dependency "minitest", ">= 12.3.3"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ppr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Lovic Gauthier
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2022-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 12.3.3
 description: |-
   Preprocessor in Ruby: provides a Ruby class named Rpp which implements a text preprocessor where macros are specified in Ruby language.
    Usage:
@@ -90,7 +90,7 @@ homepage: https://github.com/civol
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: 'Preprocessor in Ruby: text preprocessor where macros are specified in Ruby
   language.'