gloo 3.3.0 → 3.4.0

data/lib/gloo/objs/security/password.rb

@@ -0,0 +1,167 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# A hashed password (with salt).
+#
+# BCrypt is used to hash the password.
+#   https://www.rubydoc.info/gems/bcrypt-ruby
+#   https://github.com/bcrypt-ruby/bcrypt-ruby/blob/master/lib/bcrypt/password.rb
+#
+require 'bcrypt'
+
+module Gloo
+  module Objs
+    class Password < Gloo::Core::Obj
+
+      KEYWORD = 'password'.freeze
+      KEYWORD_SHORT = 'hash'.freeze
+
+      SALT = 'salt'.freeze
+      PASSWORD = 'password'.freeze
+      HASH = 'hash'.freeze
+
+      #
+      # The name of the object type.
+      #
+      def self.typename
+        return KEYWORD
+      end
+
+      #
+      # The short name of the object type.
+      #
+      def self.short_typename
+        return KEYWORD_SHORT
+      end
+
+      #
+      # Get the password salt.
+      # Returns nil if there is none.
+      #
+      def salt
+        o = find_child SALT
+        return o&.value
+      end
+
+      #
+      # Get the password value.
+      # Returns nil if there is none.
+      #
+      def password
+        o = find_child PASSWORD
+        return o&.value
+      end
+
+      #
+      # Update the password value.
+      #
+      def update_password( new_pwd )
+        o = find_child PASSWORD
+        return unless o
+
+        o.set_value new_pwd
+      end
+
+      #
+      # Get the salted password.
+      #
+      def salt_pwd
+        return "#{salt}#{password}"
+      end
+
+      #
+      # Get the hashed password value.
+      # Returns nil if there is none.
+      #
+      def hash
+        o = find_child HASH
+        return o&.value
+      end
+
+      #
+      # Update the hashed password value.
+      #
+      def update_hash( new_hash )
+        o = find_child HASH
+        return unless o
+
+        o.set_value new_hash
+      end
+
+      # ---------------------------------------------------------------------
+      #    Children
+      # ---------------------------------------------------------------------
+
+      #
+      # Does this object have children to add when an object
+      # is created in interactive mode?
+      # This does not apply during obj load, etc.
+      #
+      def add_children_on_create?
+        return true
+      end
+
+      #
+      # Add children to this object.
+      # This is used by containers to add children needed
+      # for default configurations.
+      #
+      def add_default_children
+        fac = @engine.factory
+        fac.create_string SALT, '', self
+        fac.create_string PASSWORD, '', self
+        fac.create_string HASH, '', self
+      end
+
+      # ---------------------------------------------------------------------
+      #    Messages
+      # ---------------------------------------------------------------------
+
+      #
+      # Get a list of message names that this object receives.
+      #
+      def self.messages
+        return super + %w[hash check generate]
+      end
+
+      #
+      # Generate a random alphanumeric password.
+      # By default the length is 7 characters.
+      # Set the length with an optional parameter.
+      #
+      def msg_generate
+        len = 7
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          data = expr.evaluate
+          len = data.to_i
+        end
+
+        s = StringGenerator.alphanumeric( len )
+        update_password s
+        @engine.heap.it.set_to s
+        return s
+      end
+
+      #
+      # Hash the password with the salt.
+      # Uses the salt and the password to create a hash.
+      #
+      def msg_hash
+        hashed_pwd = BCrypt::Password.create( salt_pwd )
+        update_hash hashed_pwd
+      end
+
+      #
+      # Check the password against the hash.
+      # Uses the salt and the hash to check the password.
+      #
+      def msg_check
+        hashed_pwd = BCrypt::Password.new( hash )
+        result = ( hashed_pwd == salt_pwd )
+        @engine.heap.it.set_to result
+      end
+
+    end
+  end
+end

data/lib/gloo/objs/system/file_handle.rb

@@ -3,7 +3,6 @@
 #
 # An object that points to a file in the system.
 #
-require 'tty-pager'
 
 module Gloo
   module Objs
@@ -58,8 +57,7 @@ module Gloo
       def msg_page
         return unless value && File.file?( value )
 
-        pager = TTY::Pager.new
-        pager.page( path: value )
+        system "less #{value}"
       end
 
       #

data/lib/gloo/objs/web/json.rb

@@ -66,6 +66,9 @@ module Gloo
         return unless self.value
 
         json = JSON.parse( self.value )
+        if self.value.start_with?( '"{' )
+          json = JSON.parse( json )
+        end
         pretty = JSON.pretty_generate( json )
         set_value pretty
       end

data/lib/gloo/objs/web_svr/page.rb

@@ -13,7 +13,8 @@ module Gloo
 
       # Events
       ON_RENDER = 'on_render'.freeze
-      ON_RENDERED = 'on_rendered'.freeze
+      ON_PRERENDER = 'on_prerender'.freeze
+      AFTER_RENDER = 'after_render'.freeze
 
       # Parameters used during render.
       PARAMS = 'params'.freeze
@@ -189,6 +190,18 @@ module Gloo
       #    Events
       # ---------------------------------------------------------------------
 
+      #
+      # Run the on prerender script if there is one.
+      #
+      def run_on_prerender
+        o = find_child ON_PRERENDER
+        return unless o
+
+        @engine.log.debug "running on_prerender for page"
+
+        Gloo::Exec::Dispatch.message( @engine, 'run', o )
+      end
+
       #
       # Run the on render script if there is one.
       #
@@ -204,11 +217,11 @@ module Gloo
       #
       # Run the on rendered script if there is one.
       #
-      def run_on_rendered
-        o = find_child ON_RENDERED
+      def run_after_render
+        o = find_child AFTER_RENDER
         return unless o
 
-        @engine.log.debug "running on_rendered for page"
+        @engine.log.debug "running after_render for page"
 
         Gloo::Exec::Dispatch.message( @engine, 'run', o )
       end
@@ -236,7 +249,7 @@ module Gloo
         fac = @engine.factory
 
         fac.create_script ON_RENDER, '', self
-        fac.create_script ON_RENDERED, '', self
+        fac.create_script AFTER_RENDER, '', self
         fac.create_can PARAMS, self
 
         params = { :name => HEAD,
@@ -325,12 +338,15 @@ module Gloo
         @request = request
         set_id if @request
 
-        run_on_render
-        return nil if redirect_set?
+        # Run the on prerender script
+        run_on_prerender
 
         # Set Params before running on render
         params = params_hash
 
+        run_on_render
+        return nil if redirect_set?
+
         if is_html?
           contents = render_html params
         elsif is_json?
@@ -342,7 +358,7 @@ module Gloo
           return nil
         end
 
-        run_on_rendered
+        run_after_render
         @request = nil
         return nil if redirect_set?
 

data/lib/gloo/objs/web_svr/partial.rb

@@ -13,7 +13,7 @@ module Gloo
 
       # Events
       ON_RENDER = 'on_render'.freeze
-      ON_RENDERED = 'on_rendered'.freeze
+      AFTER_RENDER = 'after_render'.freeze
 
       # Parameters used during render.
       PARAMS = 'params'.freeze
@@ -92,8 +92,8 @@ module Gloo
       #
       # Run the on rendered script if there is one.
       #
-      def run_on_rendered
-        o = find_child ON_RENDERED
+      def run_after_render
+        o = find_child AFTER_RENDER
         return unless o
 
         Gloo::Exec::Dispatch.message( @engine, 'run', o )
@@ -122,7 +122,7 @@ module Gloo
         fac = @engine.factory
 
         fac.create_script ON_RENDER, '', self
-        fac.create_script ON_RENDERED, '', self
+        fac.create_script AFTER_RENDER, '', self
 
         fac.create_can PARAMS, self
         fac.create_can CONTENT, self
@@ -149,6 +149,7 @@ module Gloo
         return part_content
       end
 
+
       # ---------------------------------------------------------------------
       #    Render
       # ---------------------------------------------------------------------
@@ -173,7 +174,7 @@ module Gloo
         # part_content = Page.render_params part_content, params_hash
         part_content = @engine.running_app.obj.embedded_renderer.render part_content, params_hash
 
-        run_on_rendered
+        run_after_render
         return part_content
       end
 
@@ -200,7 +201,7 @@ module Gloo
         # part_content = Page.render_params part_content, params
         part_content = @engine.running_app.obj.embedded_renderer.render part_content, params
 
-        run_on_rendered
+        run_after_render
         return part_content
       end