fugit 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85c52688755255cf02f4dde422a66df260a9e9b1e13d7aebc08ff48e4c3fd158
-  data.tar.gz: bf29e925bda6258e55e25208cfacff5ad82dfd9bd28683bb65c79ec95c5e37f1
+  metadata.gz: da93feee9bdfd44a793ce2b45b81109c0f7cd08ff9a930d15629a29c6a381e07
+  data.tar.gz: 32d9b447734805d3b58ae64c70a6699b931ef4fb4e6a76d8f279e66d4b5cb7df
 SHA512:
-  metadata.gz: 6754049a51e4886bd806fe7d97ea64e5e0fc74851c579a7e8d46b7b42dedaa08aea04a9a8bec2f6c560df8a5cf57977dfdc6f8f33a73675dad885ad95b22c73f
-  data.tar.gz: 03b507d208bee88cae70f7d85875e931600576a2e048fd8523d8c7ed58b8d34ea40423ff93be04cab42e73bb67ed5580e41e89e0bae1363c9a624a8865979d4f
+  metadata.gz: e7ac7afec4cfdcfdac22e5d2113892a0c7cb1f790d205bc32ecaea75c30f6ceb73af811824712c6781b480831f2a09479a6344af0d9b3c0ee92ae5cff7ef6c38
+  data.tar.gz: d87ecc490a49f19680891a82979903987843b5853ecfdc9ebee57d0b047fa4dffa96dfbbde43ef5d3011dbd07d492ac8f7a151fa6354478050c18efae9b911e4

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## fugit 1.11.1 released 2024-08-15
+
+* Prevent nat parsing chocking on long input (> 256 chars), gh-104
+
+
 ## fugit 1.11.0 released 2024-04-24
 
 * Revert gh-86 ban on `every 27 hours` / `* */27 * * *` for gh-103

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* https://github.com/personnumber3377, gh-104 Fugit.parse choke on long input
 * Michael Scrivo, https://github.com/mscrivo, gh-103
 * Benjamin Darcet, https://github.com/bdarcet gh-95 gh-96 et-orbi #rweek
 * https://github.com/franckduche gh-95 gh-96 et-orbi #rweek

data/README.md

@@ -474,6 +474,8 @@ Fugit::Nat.parse('every day at 16:15 nada 18:30', multi: true)
 
 `multi: false` is the default behaviour, return a single `Fugit::Cron` instance or nil when it cannot parse.
 
+Please note that "nat" input is limited to 256 characters (fugit 1.11.1).
+
 ### Nat Midnight
 
 `"Every day at midnight"` is supported, but `"Every monday at midnight"` will be interpreted (as of Fugit <= 1.4.x) as `"Every monday at 00:00"`. Sorry about that.

data/lib/fugit/cron.rb

@@ -46,7 +46,20 @@ module Fugit
       def do_parse(s)
 
         parse(s) ||
-        fail(ArgumentError.new("invalid cron string #{s.inspect}"))
+        fail(ArgumentError.new("invalid cron string #{trunc(s)}"))
+      end
+
+      protected
+
+      def trunc(s)
+
+        if s.is_a?(String)
+          r = s.length > 28 ? s[0, 28] + "... len #{s.length}" : s
+          r.inspect
+        else
+          r = s.inspect
+          r.length > 35 ? s[0, 35] + '...' : r
+        end
       end
     end
 

data/lib/fugit/nat.rb

@@ -7,6 +7,8 @@ module Fugit
   #
   module Nat
 
+    MAX_INPUT_LENGTH = 256
+
     class << self
 
       def parse(s, opts={})
@@ -17,6 +19,16 @@ module Fugit
 
         s = s.strip
 
+        if s.length > MAX_INPUT_LENGTH
+
+          fail ArgumentError.new(
+            "input too long for a nat string, " +
+            "#{s.length} > #{MAX_INPUT_LENGTH}"
+          ) if opts[:do_parse]
+
+          return nil
+        end
+
 #p s; Raabro.pp(Parser.parse(s, debug: 3), colours: true)
 #(p s; Raabro.pp(Parser.parse(s, debug: 1), colours: true)) rescue nil
 
@@ -29,7 +41,7 @@ module Fugit
 
       def do_parse(s, opts={})
 
-        parse(s, opts) ||
+        parse(s, opts.merge(do_parse: true)) ||
         fail(ArgumentError.new("could not parse a nat #{s.inspect}"))
       end
     end

data/lib/fugit/parse.rb

@@ -20,10 +20,10 @@ module Fugit
 
       opts[:at] = opts[:in] if opts.has_key?(:in)
 
-      (opts[:cron] != false && parse_cron(s)) ||
-      (opts[:duration] != false && parse_duration(s)) ||
-      (opts[:nat] != false && parse_nat(s, opts)) ||
-      (opts[:at] != false && parse_at(s)) ||
+      (opts[:cron] != false && parse_cron(s)) || # 542ms 616ms
+      (opts[:duration] != false && parse_duration(s)) || # 645ms # 534ms
+      (opts[:nat] != false && parse_nat(s, opts)) || # 2s # 35s
+      (opts[:at] != false && parse_at(s)) || # 568ms 622ms
       nil
     end
 

data/lib/fugit.rb

@@ -3,7 +3,7 @@
 
 module Fugit
 
-  VERSION = '1.11.0'
+  VERSION = '1.11.1'
 end
 
 require 'time'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro