icfs 0.1.3 → 0.2.0

data/lib/icfs/users_s3.rb

@@ -9,6 +9,8 @@
 # This program is distributed WITHOUT ANY WARRANTY; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# frozen_string_literal: true
+
 require 'aws-sdk-s3'
 
 module ICFS
@@ -28,7 +30,7 @@ class UsersS3 < Users
   def initialize(s3, bucket, prefix=nil)
     @s3 = s3
     @bck = bucket
-    @pre = prefix || ''.freeze
+    @pre = prefix || ''
   end
 
 
@@ -36,7 +38,7 @@ class UsersS3 < Users
   # Where to store user
   #
   def _path(user)
-    @pre + user + '.json'.freeze
+    @pre + user + '.json'
   end # def _path()
   private :_path
 
@@ -51,7 +53,7 @@ class UsersS3 < Users
   # (see Users#read)
   #
   def read(urg)
-    Items.validate(urg, 'User/Role/Group name'.freeze, Items::FieldUsergrp)
+    Items.validate(urg, 'User/Role/Group name', Items::FieldUsergrp)
     json = @s3.get_object( bucket: @bck, key: _path(urg) ).body.read
     return JSON.parse(json)
   rescue
@@ -63,7 +65,7 @@ class UsersS3 < Users
   # (see Users#write)
   #
   def write(obj)
-    Items.validate(obj, 'User/Role/Group'.freeze, Users::ValUser)
+    Items.validate(obj, 'User/Role/Group', Users::ValUser)
     json = JSON.pretty_generate(obj)
     @s3.put_object( bucket: @bck, key: _path(obj['name']), body: json )
   end # def write()

data/lib/icfs/utils/backup.rb

@@ -9,9 +9,10 @@
 # This program is distributed WITHOUT ANY WARRANTY; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# frozen_string_literal: true
+
 require_relative '../store_fs'
 
-#
 module ICFS
 
 module Utils
@@ -40,12 +41,12 @@ class Backup
   # Copy an item
   #
   def _copy_item(dest, title, read, write, args, val=nil)
-    @log.debug('ICFS copy: %s'.freeze % title)
+    @log.debug('ICFS copy: %s' % title)
 
     # read the item
     json = @store.send(read, *args)
     if !json
-      @log.warn('ICFS copy: %s is missing'.freeze % title)
+      @log.warn('ICFS copy: %s is missing' % title)
       return nil
     end
 
@@ -54,7 +55,7 @@ class Backup
       obj = JSON.parse(json)
       err = Validate.check(obj, val)
       if err
-        @log.error('ICFS copy: %s bad format'.freeze % title)
+        @log.error('ICFS copy: %s bad format' % title)
         return nil
       end
     end
@@ -64,7 +65,7 @@ class Backup
     return obj
 
   rescue JSON::ParserError
-    @log.error('ICFS copy: %s bad JSON'.freeze % title)
+    @log.error('ICFS copy: %s bad JSON' % title)
     return nil
   end # def _item
   private :_copy_item
@@ -79,17 +80,17 @@ class Backup
   # @param lnum_min [Integer] The lowest log
   #
   def copy(cid, dest, lnum_min=1, lnum_max=0)
-    @log.info('ICFS copy: %s %d-%d'.freeze % [cid, lnum_min, lnum_max])
+    @log.info('ICFS copy: %s %d-%d' % [cid, lnum_min, lnum_max])
 
     # if no max specified, pull from current
     if lnum_max == 0
       json = @cache.current_read(cid)
-      cur = Items.parse(json, 'current'.freeze, Items::ItemCurrent)
+      cur = Items.parse(json, 'current', Items::ItemCurrent)
       lnum_max = cur['log']
     end
 
     if lnum_min > lnum_max
-      raise ArgumentError, 'ICFS copy, log num min is larger than max'.freeze
+      raise ArgumentError, 'ICFS copy, log num min is larger than max'
     end
 
     # each log
@@ -98,7 +99,7 @@ class Backup
 
       # copy the log
       log = _copy_item(dest,
-        'log %d'.freeze % lnum,
+        'log %d' % lnum,
         :log_read,
         :log_write,
         [cid, lnum],
@@ -112,7 +113,7 @@ class Backup
       # entry
       enum = log['entry']['num']
       _copy_item(dest,
-        'entry %d-%d'.freeze % [enum, lnum],
+        'entry %d-%d' % [enum, lnum],
         :entry_read,
         :entry_write,
         [cid, enum, lnum]
@@ -122,7 +123,7 @@ class Backup
       if log['index']
         xnum = log['index']['num']
         _copy_item(dest,
-          'index %d-%d'.freeze % [xnum, lnum],
+          'index %d-%d' % [xnum, lnum],
           :index_read,
           :index_write,
           [cid, xnum, lnum]
@@ -133,7 +134,7 @@ class Backup
       if log['action']
         anum = log['action']['num']
         _copy_item(dest,
-          'action %d-%d'.freeze % [anum, lnum],
+          'action %d-%d' % [anum, lnum],
           :action_read,
           :action_write,
           [cid, anum, lnum]
@@ -143,7 +144,7 @@ class Backup
       # case
       if log['case_hash']
         _copy_item(dest,
-          'case %d'.freeze % lnum,
+          'case %d' % lnum,
           :case_read,
           :case_write,
           [cid, lnum]
@@ -155,12 +156,12 @@ class Backup
         log['files_hash'].each_index do |fraw|
           fnum = fraw + 1
 
-          @log.debug('ICFS copy: file %d-%d-%d'.freeze % [enum, lnum, fnum])
+          @log.debug('ICFS copy: file %d-%d-%d' % [enum, lnum, fnum])
 
           # read
           fi = @store.file_read(cid, enum, lnum, fnum)
           if !fi
-            @log.warn('ICFS copy: file %d-%d-%d missing'.freeze %
+            @log.warn('ICFS copy: file %d-%d-%d missing' %
                 [enum, lnum, fnum])
             next
           end
@@ -185,12 +186,12 @@ class Backup
   # Restore an item
   #
   def _restore_item(src, title, read, write, args_st, args_ca, val=nil)
-    @log.debug('ICFS restore: %s'.freeze % title)
+    @log.debug('ICFS restore: %s' % title)
 
     # read the item
     json = src.send(read, *args_st)
     if !json
-      @log.warn('ICFS restore: %s is missing'.freeze % title)
+      @log.warn('ICFS restore: %s is missing' % title)
       return nil
     end
 
@@ -199,7 +200,7 @@ class Backup
       obj = JSON.parse(json)
       err = Validate.check(obj, val)
       if err
-        @log.error('ICFS restore: %s bad format'.freeze % title)
+        @log.error('ICFS restore: %s bad format' % title)
         return nil
       end
     end
@@ -222,7 +223,7 @@ class Backup
   # @param lnum_min [Integer] The lowest log
   #
   def restore(cid, src, lnum_min=0, lnum_max=0)
-    @log.info('ICFS restore: %s %d-%d'.freeze % [cid, lnum_min, lnum_max])
+    @log.info('ICFS restore: %s %d-%d' % [cid, lnum_min, lnum_max])
 
     # take lock
     @cache.lock_take(cid)
@@ -231,7 +232,7 @@ class Backup
       # read current
       json = @cache.current_read(cid)
       if json
-        cur = Items.parse(json, 'current'.freeze, Items::ItemCurrent)
+        cur = Items.parse(json, 'current', Items::ItemCurrent)
       else
         cur = {
           'icfs' => 1,
@@ -248,7 +249,7 @@ class Backup
 
       # sanity check min & max
       if (lnum_min > lnum_max) && (lnum_max != 0)
-        raise ArgumentError: 'ICFS restore, log min is larger than max'.freeze
+        raise ArgumentError: 'ICFS restore, log min is larger than max'
       end
 
       # max entry, action, index
@@ -263,7 +264,7 @@ class Backup
 
         # copy the log
         log, litem = _restore_item(src,
-          'log %d'.freeze % lnum,
+          'log %d' % lnum,
           :log_read,
           :log_write,
           [cid, lnum],
@@ -281,7 +282,7 @@ class Backup
         # entry
         enum = log['entry']['num']
         _restore_item(src,
-          'entry %d-%d'.freeze % [enum, lnum],
+          'entry %d-%d' % [enum, lnum],
           :entry_read,
           :entry_write,
           [cid, enum, lnum],
@@ -293,7 +294,7 @@ class Backup
         if log['index']
           xnum = log['index']['num']
           _restore_item(src,
-            'index %d-%d'.freeze % [xnum, lnum],
+            'index %d-%d' % [xnum, lnum],
             :index_read,
             :index_write,
             [cid, xnum, lnum],
@@ -306,7 +307,7 @@ class Backup
         if log['action']
           anum = log['action']['num']
           _restore_item(src,
-            'action %d-%d'.freeze % [anum, lnum],
+            'action %d-%d' % [anum, lnum],
             :action_read,
             :action_write,
             [cid, anum, lnum],
@@ -318,7 +319,7 @@ class Backup
         # case
         if log['case_hash']
           _restore_item(src,
-            'case %d'.freeze % lnum,
+            'case %d' % lnum,
             :case_read,
             :case_write,
             [cid, lnum],
@@ -331,12 +332,12 @@ class Backup
           log['files_hash'].each_index do |fraw|
             fnum = fraw + 1
 
-            @log.debug('ICFS restore: file %d-%d-%d'.freeze % [enum, lnum, fnum])
+            @log.debug('ICFS restore: file %d-%d-%d' % [enum, lnum, fnum])
 
             # read
             fi = src.file_read(cid, enum, lnum, fnum)
             if !fi
-              @log.warn('ICFS restore: file %d-%d-%d missing'.freeze %
+              @log.warn('ICFS restore: file %d-%d-%d missing' %
                 [enum, lnum, fnum])
               next
             end
@@ -364,7 +365,7 @@ class Backup
         'index' => imax,
         'hash' => ICFS.hash(llast)
       }
-      nitem = Items.generate(cur, 'current'.freeze, Items::ItemCurrent)
+      nitem = Items.generate(cur, 'current', Items::ItemCurrent)
       @cache.current_write(cid, nitem)
 
     ensure

data/lib/icfs/utils/check.rb

@@ -9,6 +9,8 @@
 # This program is distributed WITHOUT ANY WARRANTY; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# frozen_string_literal: true
+
 #
 module ICFS
 
@@ -42,15 +44,15 @@ class Check
   #
   def _item(title, read, read_args, hist, hash, val, con)
 
-    @log.debug('ICFS check: %s'.freeze % title)
+    @log.debug('ICFS check: %s' % title)
 
     # read
     json = @store.send(read, *read_args)
     if !json
       if hist
-        @log.warn('ICFS check: %s is missing and historical'.freeze % title)
+        @log.warn('ICFS check: %s is missing and historical' % title)
       else
-        @log.error('ICFS check: %s is missing and current'.freeze % title)
+        @log.error('ICFS check: %s is missing and current' % title)
       end
       return nil
     end
@@ -58,24 +60,24 @@ class Check
     # hash
     if hash
       if hash != ICFS.hash(json)
-        @log.error('ICFS check: %s hash bad'.freeze % title)
+        @log.error('ICFS check: %s hash bad' % title)
       end
     else
-      @log.warn('ICFS check: %s hash unverified'.freeze % title)
+      @log.warn('ICFS check: %s hash unverified' % title)
     end
 
     # parse
     obj = JSON.parse(json)
     err = Validate.check(obj, val)
     if err
-      @log.error('ICFS check: %s bad format'.freeze % title)
+      @log.error('ICFS check: %s bad format' % title)
       return nil
     end
 
     # inconsistent
     con.each do |name, num|
       if obj[name] != read_args[num]
-        @log.error('ICFS check: %s inconsistent'.freeze % title)
+        @log.error('ICFS check: %s inconsistent' % title)
         return nil
       end
     end
@@ -83,7 +85,7 @@ class Check
     return obj
 
   rescue JSON::ParserError
-    @log.error('ICFS check: %s bad JSON'.freeze % title)
+    @log.error('ICFS check: %s bad JSON' % title)
     return nil
   end # def _item()
   private :_item
@@ -96,7 +98,7 @@ class Check
   # @param cur_hash [String] The hash of the last log
   #
   def check(cid, cur_log, cur_hash, opts={})
-    @log.info('ICFS check: case %s'.freeze % cid)
+    @log.info('ICFS check: case %s' % cid)
 
     ent_cur = Set.new
     cse_cur = false
@@ -113,15 +115,15 @@ class Check
 
       # log
       log = _item(
-        'log %d'.freeze % lnum,
+        'log %d' % lnum,
         :log_read,
         [cid, lnum],
         false,
         hash_log,
         Items::ItemLog,
         [
-          ['caseid'.freeze, 0].freeze,
-          ['log'.freeze, 1].freeze
+          ['caseid', 0].freeze,
+          ['log', 1].freeze
         ].freeze,
       )
       if !log
@@ -132,7 +134,7 @@ class Check
 
       # check that time decreases
       if log['time'] > time_log
-        @log.warn('ICFS check: log %d time inconsistent'.freeze % lnum)
+        @log.warn('ICFS check: log %d time inconsistent' % lnum)
       end
 
       # entry
@@ -145,9 +147,9 @@ class Check
         log['entry']['hash'],
         Items::ItemEntry,
         [
-          ['caseid'.freeze, 0].freeze,
-          ['entry'.freeze, 1].freeze,
-          ['log'.freeze, 2].freeze
+          ['caseid', 0].freeze,
+          ['entry', 1].freeze,
+          ['log', 2].freeze
         ].freeze,
       )
 
@@ -156,7 +158,7 @@ class Check
         ent_cur.add(enum)
         if ent['files']
           ent['files'].each do |fd|
-            file_cur.add( '%d-%d-%d'.freeze % [enum, fd['num'], fd['log']] )
+            file_cur.add( '%d-%d-%d' % [enum, fd['num'], fd['log']] )
           end
         end
       end
@@ -172,9 +174,9 @@ class Check
           log['index']['hash'],
           Items::ItemIndex,
           [
-            ['caseid'.freeze, 0].freeze,
-            ['index'.freeze, 1].freeze,
-            ['log'.freeze, 2].freeze
+            ['caseid', 0].freeze,
+            ['index', 1].freeze,
+            ['log', 2].freeze
           ]
         )
         idx_cur.add(xnum)
@@ -184,16 +186,16 @@ class Check
       if log['action']
         anum = log['action']['num']
         act = _item(
-          'action %d-%d'.freeze % [anum, lnum],
+          'action %d-%d' % [anum, lnum],
           :action_read,
           [cid, anum, lnum],
           act_cur.include?(anum),
           log['action']['hash'],
           Items::ItemAction,
           [
-            ['caseid'.freeze, 0].freeze,
-            ['action'.freeze, 1].freeze,
-            ['log'.freeze, 2].freeze
+            ['caseid', 0].freeze,
+            ['action', 1].freeze,
+            ['log', 2].freeze
           ]
         )
         act_cur.add(anum)
@@ -202,15 +204,15 @@ class Check
       # case
       if log['case_hash']
         cse = _item(
-          'case %d'.freeze % lnum,
+          'case %d' % lnum,
           :case_read,
           [cid, lnum],
           cse_cur,
           log['case_hash'],
           Items::ItemCase,
           [
-            ['caseid'.freeze, 0].freeze,
-            ['log'.freeze, 1].freeze
+            ['caseid', 0].freeze,
+            ['log', 1].freeze
           ]
         )
         cse_cur = true
@@ -221,11 +223,11 @@ class Check
         fnum = 0
         log['files_hash'].each do |hash|
           fnum = fnum + 1
-          fn = '%d-%d-%d'.freeze % [enum, fnum, lnum]
+          fn = '%d-%d-%d' % [enum, fnum, lnum]
           cur = file_cur.include?(fn)
           file_cur.delete(fn) if cur
 
-          @log.debug('ICFS check: file %s'.freeze % fn)
+          @log.debug('ICFS check: file %s' % fn)
 
           # read/size
           if opts[:hash_all] || (cur && opts[:hash_current])
@@ -239,10 +241,10 @@ class Check
           # missing
           if !fi
             if cur
-              @log.error('ICFS check: file %s missing and current'.freeze %
+              @log.error('ICFS check: file %s missing and current' %
                 fn)
             else
-              @log.warn('ICFS check: file %s missing and historical'.freeze %
+              @log.warn('ICFS check: file %s missing and historical' %
                 fn)
             end
           end
@@ -251,7 +253,7 @@ class Check
           if fi.is_a?(File)
             # check
             if hash != ICFS.hash_temp(fi)
-              @log.error('ICFS check: file %s hash bad'.freeze % fn)
+              @log.error('ICFS check: file %s hash bad' % fn)
             end
 
             # close
@@ -272,11 +274,11 @@ class Check
     # check for any non-existant current files
     unless file_cur.empty?
       file_cur.each do |fn|
-        @log.error('ICFS check: file %s current but not logged'.freeze % fn)
+        @log.error('ICFS check: file %s current but not logged' % fn)
       end
     end
 
-    @log.debug('ICFS check: case %s complete'.freeze % cid)
+    @log.debug('ICFS check: case %s complete' % cid)
   end # def check()
 
 

data/lib/icfs/validate.rb

@@ -9,6 +9,8 @@
 # This program is distributed WITHOUT ANY WARRANTY; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# frozen_string_literal: true
+
 require 'set'
 require 'tempfile'
 
@@ -107,7 +109,7 @@ module Validate
     if val[:check] == obj
       return nil
     else
-      return 'not equal'.freeze
+      return 'not equal'
     end
   end # def self.equals()
 
@@ -123,14 +125,14 @@ module Validate
   #
   #
   def self.integer(obj, val)
-    return 'not an Integer'.freeze unless obj.is_a?(Integer)
+    return 'not an Integer' unless obj.is_a?(Integer)
 
     if val[:min] && obj < val[:min]
-      return 'too small: %d < %d'.freeze % [obj, val[:min]]
+      return 'too small: %d < %d' % [obj, val[:min]]
     end
 
     if val[:max] && obj > val[:max]
-      return 'too large: %d > %d '.freeze % [obj, val[:max]]
+      return 'too large: %d > %d ' % [obj, val[:max]]
     end
 
     return nil
@@ -147,14 +149,14 @@ module Validate
   # @return [String,NilClass] error descriptions
   #
   def self.float(obj, val)
-    return 'not a Float'.freeze unless obj.is_a?(Float)
+    return 'not a Float' unless obj.is_a?(Float)
 
     if val[:min] && obj < val[:min]
-      return 'too small: %f < %f'.freeze % [obj, val[:min]]
+      return 'too small: %f < %f' % [obj, val[:min]]
     end
 
     if val[:max] && obj > val[:max]
-      return 'too large: %f > %f'.freeze % [obj, val[:max]]
+      return 'too large: %f > %f' % [obj, val[:max]]
     end
 
     return nil
@@ -173,10 +175,10 @@ module Validate
     if val[:type]
       if val[:type].is_a?(Array)
         val[:type].each{|cl| return nil if obj.is_a?(cl) }
-        return 'not a listed type'.freeze
+        return 'not a listed type'
       else
         if !obj.is_a?(val[:type])
-          return 'not a %s'.freeze % val[:type].name
+          return 'not a %s' % val[:type].name
         end
       end
     end
@@ -200,7 +202,7 @@ module Validate
   def self.string(obj, val)
 
     # type
-    return 'not a String'.freeze unless obj.is_a?(String)
+    return 'not a String' unless obj.is_a?(String)
 
     errors = {}
 
@@ -212,7 +214,7 @@ module Validate
 
     # if whitelisting
     if val[:whitelist]
-      errors[:whitelist] = 'Value was not whitelisted'.freeze
+      errors[:whitelist] = 'Value was not whitelisted'
     end
 
     # min length
@@ -250,7 +252,7 @@ module Validate
   def self.array(obj, val)
 
     # type
-    return 'not an Array'.freeze unless obj.is_a?(Array)
+    return 'not an Array' unless obj.is_a?(Array)
 
     errors = {}
 
@@ -316,7 +318,7 @@ module Validate
   def self.hash(obj, val)
 
     # type
-    return 'not a Hash'.freeze unless obj.is_a?(Hash)
+    return 'not a Hash' unless obj.is_a?(Hash)
 
     ary = obj.to_a
     chk = Array.new(ary.size)
@@ -331,7 +333,7 @@ module Validate
 
         # missing required key
         if ix.nil?
-          errors[key] = 'missing'.freeze
+          errors[key] = 'missing'
           next
         end
 
@@ -361,7 +363,7 @@ module Validate
     if !val[:others]
       chk.each_index do |ix|
         next if chk[ix]
-        errors[ary[ix][0]] = 'not allowed'.freeze
+        errors[ary[ix][0]] = 'not allowed'
       end
     end
 
@@ -411,6 +413,13 @@ module Validate
   }.freeze
 
 
+  # String
+  IsString = {
+    method: :type,
+    type: String,
+  }.freeze
+
+
 end # module ICFS::Validate
 
 end # module ICFS

data/lib/icfs/web/auth_ssl.rb

@@ -9,6 +9,8 @@
 # This program is distributed WITHOUT ANY WARRANTY; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# frozen_string_literal: true
+
 #
 module ICFS
 module Web
@@ -24,13 +26,11 @@ class AuthSsl
   # @param app [Object] The rack app
   # @param map [Object] Maps DN to user name
   # @param api [ICFS::Api] the Api
-  # @param cfg [ICFS::Web::Config] the config settings
   #
-  def initialize(app, map, api, cfg)
+  def initialize(app, map, api)
     @app = app
     @map = map
     @api = api
-    @cfg = cfg
   end
 
 
@@ -46,8 +46,8 @@ class AuthSsl
     unless env['SSL_CLIENT_VERIFY'] == 'SUCCESS'
       return [
         400,
-        {'Content-Type' => 'text/plain'.freeze},
-        ['Client certificate required.'.freeze]
+        {'Content-Type' => 'text/plain'},
+        ['Client certificate required.']
       ]
     end
 
@@ -56,7 +56,7 @@ class AuthSsl
     if user.nil?
       return [
         400,
-        {'Content-Type' => 'text/plain'.freeze},
+        {'Content-Type' => 'text/plain'},
         ['%s: No User' % env['SSL_CLIENT_S_DN']]
       ]
     end
@@ -67,13 +67,11 @@ class AuthSsl
     rescue Error::NotFound, Error::Value => err
       return [
         400,
-        {'Content-Type' => 'text/plain'.freeze},
+        {'Content-Type' => 'text/plain'},
         ['%s: %s' % [err.message, env['SSL_CLIENT_S_DN']]]
       ]
     end
     env['icfs'] = @api
-    @cfg.load(user)
-    env['icfs.config'] = @cfg
     return @app.call(env)
   end # def call()