itsi 0.1.19 → 0.2.2

data/gems/server/README.md

@@ -1,5 +1,7 @@
 ---
 type: docs
+sidebar:
+  exclude: true
 ---
 
 # ItsiServer

data/gems/server/Rakefile

@@ -12,10 +12,6 @@ Minitest::TestTask.create(:test) do |t|
   t.test_prelude = 'require "helpers/test_helper.rb"'
 end
 
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
 require "rb_sys/extensiontask"
 
 task build: :compile

data/gems/server/exe/itsi

@@ -8,15 +8,17 @@ require "optparse"
 COMMANDS = {
   "init" => "Initialize a new Itsi.rb server configuration file",
   "status" => "Show the status of the server",
-  "start" => "Start the Isti server",
-  "serve" => "Start the Isti server",
+  "start" => "Start the Itsi server",
+  "serve" => "Start the Itsi server",
   "stop" => "Stop the server",
   "reload" => "Reload the server",
   "restart" => "Restart the server",
+  "test" => "Test config file validity",
   "add_worker" => "Add a new worker to the server cluster",
   "remove_worker" => "Remove a worker from the server cluster",
   "routes" => "Print the routes of the server",
-  "passfile" => "Manage hashed users and passwords in a passfile (like .htpasswd). [add, remove, list]",
+  "passfile" => "Manage hashed users and passwords in a passfile (like .htpasswd). [add, echo, remove, list]",
+  "secret" => "Generate a new secret for use in a JWT verifier",
   "test_route" => "Test which route a request will be routed to",
   "static" => "Serve static assets in the given directory"
 }
@@ -37,7 +39,7 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on("-d", "--daemonize", "Run the process as a daemon") do
-    Process.daemon(true)
+    options[:daemonize] = true
   end
 
   opts.on("-t", "--threads THREADS", Integer, "Number of threads (default: 1)") do |t|
@@ -57,7 +59,7 @@ parser = OptionParser.new do |opts|
     options[:worker_memory_limit] = ml
   end
 
-  opts.on("-f", "--fiber_scheduler [CLASS_NAME]", [String],
+  opts.on("-f", "--fiber_scheduler [CLASS_NAME]", String,
           "Scheduler class to use (default: nil). Provide blank or true to use Itsi::Scheduler, or a classname to use an alternative scheduler") do |scheduler_class|
     if scheduler_class.nil? || scheduler_class == "true"
       options[:scheduler_class] = "Itsi::Scheduler"
@@ -146,6 +148,15 @@ parser = OptionParser.new do |opts|
   opts.on("--algorithm ALGORITHM", String, "Algorithm for password hashing") do |algorithm|
     options[:algorithm] = algorithm
   end
+
+  opts.on("-dDIR", "--dir=DIR", "(For use with secret) Save keys/secret to DIR instead of printing") do |d|
+    options[:save_dir] = d
+  end
+
+  opts.on("-v", "--version", "Show version") do
+    puts "Itsi version #{Itsi::Server::VERSION}"
+    exit(0)
+  end
 end
 
 if ENV['COMP_LINE'] || ARGV.include?('--completion')

data/gems/server/lib/itsi/http_request/response_status_shortcodes.rb

@@ -66,6 +66,8 @@ module Itsi
         511 => :network_authentication_required
       }.freeze
 
+      HTTP_STATUS_NAME_TO_CODE_MAP = HTTP_STATUS_CODES.invert.freeze
+
       HTTP_STATUS_CODES.each do |code, name|
         define_method(name) {|*args, **kwargs| respond(*args, **kwargs, status: code) }
       end

data/gems/server/lib/itsi/http_request.rb

@@ -92,7 +92,14 @@ module Itsi
     )
 
       if json
-        validate!(json, as: as) if as
+        if as
+          begin
+            validate!(json, as: as)
+          rescue ValidationError => e
+            json = {type: 'error', message: "Validation Error: #{e.message}"}
+            status = 400
+          end
+        end
         body = json.to_json
         headers ||= {}
         headers["Content-Type"] ||= "application/json"
@@ -111,6 +118,8 @@ module Itsi
       end
 
       response.respond(status: status, headers: headers, body: body, hijack: hijack, &blk)
+
+
     end
 
     def hijack
@@ -124,12 +133,16 @@ module Itsi
       end
     end
 
+    def body
+      @body ||= build_input_io
+    end
+
     def build_input_io
-      case body
+      case body_parts
       when nil then EMPTY_IO
-      when String then StringIO.new(body)
-      when Array then File.open(body.first, "rb")
-      else body
+      when String then StringIO.new(body_parts)
+      when Array then File.open(body_parts.first, "rb")
+      else body_parts
       end
     end
 
@@ -155,15 +168,33 @@ module Itsi
       end
 
       params.merge!(query_params).merge!(url_params)
-
-      yield schema ? apply_schema!(params, schema) : params
-
-    rescue StandardError => e
+      validated = schema ? apply_schema!(params, schema) : params
+      unless block_given?
+        if multipart?
+          raise "#params must take a block for multipart requests"
+        else
+          return validated
+        end
+      else
+        yield validated
+      end
+    rescue ValidationError => e
       if response.json?
         respond(json: {error: e.message}, status: 400)
       else
         respond(e.message, 400)
       end
+    rescue StandardError => e
+      Itsi.log_error e.message
+      puts e.backtrace
+
+      # Unexpected error.
+      # Don't reveal potential sensitive information to client.
+      if response.json?
+        respond(json: {error: "Internal Server Error"}, status: 500)
+      else
+        respond("Internal Server Error", 500)
+      end
     ensure
       clean_temp_files(params)
     end

data/gems/server/lib/itsi/http_response.rb

@@ -8,7 +8,8 @@ module Itsi
   class HttpResponse
 
     def respond _body=nil, _status=200, _header=nil, status: _status, headers: _header, body: _body, hijack: false, &blk
-      self.status = status
+
+      self.status = status.kind_of?(Symbol) ? HTTP_STATUS_NAME_TO_CODE_MAP.fetch(status) : status.to_i
 
       body = body.to_s unless body.is_a?(String)
 

data/gems/server/lib/itsi/passfile.rb

@@ -34,7 +34,6 @@ module Itsi
       end
 
       def echo(filename, algorithm)
-        return unless (creds = load(filename))
         print "Enter username: "
         username = $stdin.gets.chomp
 

data/gems/server/lib/itsi/server/config/config_helpers.rb

@@ -0,0 +1,105 @@
+module Itsi
+  class Server
+    module Config
+      module ConfigHelpers
+
+        def self.load_and_register(klass)
+          config_type = klass.name.split("::").last.downcase.gsub(/([a-z]()[A-Z])/, '\1_\2')
+
+          listing = [
+            Dir[File.expand_path(File.dirname(__FILE__) + "/#{config_type}/**/*.rb")],
+            Dir[File.expand_path(File.dirname(__FILE__) + "/#{config_type}s/**/*.rb")]
+          ].flatten
+
+          listing.each do |file|
+            current = klass.subclasses
+            require file
+            following = klass.subclasses
+            new_class = (following - current).first
+
+            documentation_file = "#{file[/(.*)\.rb/,1]}.md"
+            if ! File.exist?(documentation_file)
+              documentation_file =  "#{file[/(.*)\/[^\/]+\.rb/,1]}/_index.md"
+            end
+            if File.exist?(documentation_file) && new_class
+              new_class.documentation IO.read(documentation_file)
+                .gsub(/^---.*?\n.*?-+/m,'') # Strip frontmatter
+                .gsub(/^(```.*?)\{.*?\}.*$/, "\\1") # Strip filename from code blocks
+                .gsub(/^\{\{[^\}]+\}\}/, "") # Strip Hugo blocks
+            end
+          end
+        end
+
+        def normalize_keys!(hash, expected=[])
+          hash.keys.each do |key|
+            value = hash.delete(key)
+            key = key.to_s.downcase.to_sym
+            hash[key] = value
+            raise "Unexpected key: #{key}" unless expected.include?(key)
+            expected -= [key]
+          end
+          raise "Missing required keys: #{expected.join(', ')}" unless expected.empty?
+          hash
+        end
+
+        def self.included(cls)
+          def cls.inherited(base)
+            %i[detail documentation insert_text schema].each do |attr|
+              base.define_singleton_method(attr) do |value=nil|
+                @middleware_class_attrs ||= {}
+                if value
+                  @middleware_class_attrs[attr] = value
+                else
+                  @middleware_class_attrs[attr]
+                end
+              end
+
+              base.define_method(attr) do |value=nil|
+                self.class.send(attr)
+              end
+            end
+
+            def base.schema(value=nil, &blk)
+              @middleware_class_attrs ||= {}
+              if blk
+                @middleware_class_attrs[:schema] = TypedStruct.new(&blk)
+              elsif value
+                @middleware_class_attrs[:schema] = value
+              else
+                @middleware_class_attrs[:schema]
+              end
+            end
+          end
+
+          load_and_register(cls)
+
+          config_type = cls.name.split("::").last.downcase
+
+          cls.define_singleton_method("#{config_type}_name") do |name=self.name|
+            @config_name ||= name.split("::").last.gsub(/([a-z])([A-Z])/, '\1_\2').downcase.to_sym
+          end
+          cls.define_method(:opt_name){ self.class.send("#{config_type}_name") }
+          cls.define_method(:location){ @location }
+        end
+
+        def initialize(location, params={})
+          if !self.class.ancestors.include?(Middleware) && !location.parent.nil?
+            raise "#{opt_name} must be set at the top level"
+          end
+          @location = location
+          @params = case self.schema
+          when TypedStruct::Validation
+            self.schema.validate!(params)
+          when Array
+            default, validation = self.schema
+            params ? validation.validate!(params) : default
+          when nil
+            nil
+          else
+            self.schema.new(params).to_h
+          end
+        end
+      end
+    end
+  end
+end