icfs 0.1.0 → 0.1.1

data/lib/icfs/validate.rb

@@ -10,7 +10,6 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 require 'set'
-require 'json'
 require 'tempfile'
 
 module ICFS
@@ -18,71 +17,9 @@ module ICFS
 ##########################################################################
 # Object validation
 #
-# @todo Move .parse and .generate to items or ICFS
-# @todo Remove all use of Error module
-#
 module Validate
 
 
-  ###############################################
-  # Parse JSON string and validate
-  #
-  # @param json [String] the JSON to parse
-  # @param name [String] description of the item
-  # @param val [Hash] the check to use
-  # @return [Object] the item
-  #
-  # @raise [Error::NotFound] if json is nil
-  # @raise [Error::Value] if parsing or validation fails
-  #
-  def self.parse(json, name, val)
-    if json.nil?
-      raise(Error::NotFound, '%s not found'.freeze % name)
-    end
-    begin
-      itm = JSON.parse(json)
-    rescue
-      raise(Error::Value, 'JSON parsing failed'.freeze)
-    end
-    Validate.validate(itm, name, val)
-    return itm
-  end # def self.parse()
-
-
-  ###############################################
-  # Validate and generate JSON
-  #
-  # @param itm [Object] item to validate
-  # @param name [String] description of the item
-  # @param val [Hash] the check to use
-  # @return [String] JSON encoded item
-  #
-  # @raise [Error::Value] if validation fails
-  #
-  def self.generate(itm, name, val)
-    Validate.validate(itm, name, val)
-    return JSON.pretty_generate(itm)
-  end # def self.generate()
-
-
-  ###############################################
-  # Validate an object
-  #
-  # @param obj [Object] object to validate
-  # @param name [String] description of the object
-  # @param val [Hash] the check to use
-  #
-  # @raise [Error::Value] if validation fails
-  #
-  def self.validate(obj, name, val)
-    err = Validate.check(obj, val)
-    if err
-      raise(Error::Value, '%s has bad values: %s'.freeze %
-        [name, err.inspect])
-    end
-  end
-
-
   ###############################################
   # check an object
   #

data/lib/icfs/web/auth_ssl.rb

@@ -55,12 +55,20 @@ class AuthSsl
       return [
         400,
         {'Content-Type' => 'text/plain'.freeze},
-        ['User not found for %s' % env['SSL_CLIENT_S_DN']]
+        ['%s: No User' % env['SSL_CLIENT_S_DN']]
       ]
     end
 
     # pass to app
-    @api.user = user
+    begin
+      @api.user = user
+    rescue Error::NotFound, Error::Value => err
+      return [
+        400,
+        {'Content-Type' => 'text/plain'.freeze},
+        ['%s: %s' % [err.message, env['SSL_CLIENT_S_DN']]]
+      ]
+    end
     env['icfs'] = @api
     return @app.call(env)
   end # def call()

data/lib/icfs/web/client.rb

@@ -562,7 +562,7 @@ class Client
 
       # process entry
       ent = _post_entry(env, para)
-      Validate.validate(tid, 'Template ID'.freeze, Items::FieldCaseid)
+      Items.validate(tid, 'Template ID'.freeze, Items::FieldCaseid)
       ent['caseid'] = cid
 
       # create
@@ -4268,7 +4268,7 @@ class Client
       raise(Error::NotFound, 'No case specified in the URL'.freeze)
     end
     cid = Rack::Utils.unescape(cmps[1])
-    Validate.validate(cid, 'case'.freeze, Items::FieldCaseid)
+    Items.validate(cid, 'case'.freeze, Items::FieldCaseid)
     env['icfs.cid'] = cid
     return cid
   end # def _util_case()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icfs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Graham A. Field
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies: []
 description: |2-
 
@@ -24,12 +24,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
+- bin/icfs_demo_check.rb
 - bin/icfs_demo_create.rb
 - bin/icfs_demo_fcgi.rb
 - bin/icfs_demo_ssl_gen.rb
 - bin/icfs_demo_web.rb
 - bin/icfs_dev_todo.rb
 - data/demo_config.yml
+- data/docker/build-web.sh
+- data/docker/compose-demo.yml
+- data/docker/compose-init.yml
+- data/docker/icfs-app.rb
+- data/docker/icfs-cfg.yml
+- data/docker/icfs-init.rb
+- data/docker/icfs-ruby/Dockerfile
+- data/docker/icfs-ruby/build.sh
+- data/docker/nginx.conf
 - data/icfs.css
 - data/icfs.js
 - lib/icfs.rb
@@ -47,6 +57,8 @@ files:
 - lib/icfs/users.rb
 - lib/icfs/users_elastic.rb
 - lib/icfs/users_fs.rb
+- lib/icfs/utils/backup.rb
+- lib/icfs/utils/check.rb
 - lib/icfs/validate.rb
 - lib/icfs/web/auth_ssl.rb
 - lib/icfs/web/client.rb