itsi 0.1.14 → 0.1.18

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

@@ -2,12 +2,16 @@
 
 require "stringio"
 require "socket"
+require "uri"
+require_relative 'http_request/response_status_shortcodes'
 
 module Itsi
   class HttpRequest
+    include Server::TypedHandlers::ParamParser
+    include ResponseStatusShortcodes
     attr_accessor :hijacked
 
-    EMPTY_IO = StringIO.new("").freeze
+    EMPTY_IO = StringIO.new("")
     RACK_HEADER_MAP = StandardHeaders::ALL.map do |header|
       rack_form = if header == "content-type"
                     "CONTENT_TYPE"
@@ -28,7 +32,7 @@ module Itsi
       {
         "SERVER_SOFTWARE" => "Itsi",
         "SCRIPT_NAME" => script_name,
-        "REQUEST_METHOD" => method,
+        "REQUEST_METHOD" => request_method,
         "PATH_INFO" => path,
         "REQUEST_PATH" => path,
         "QUERY_STRING" => query_string,
@@ -49,39 +53,134 @@ module Itsi
         "rack.run_once" => false,
         "rack.hijack?" => true,
         "rack.multipart.buffer_size" => 16_384,
-        "rack.hijack" => build_hijack_proc
+        "rack.hijack" => method(:hijack)
       }.tap do |r|
         headers.each do |(k, v)|
-          r[RACK_HEADER_MAP[k]] = v
+          r[case k
+            when "content-type" then "CONTENT_TYPE"
+            when "content-length" then "CONTENT_LENGTH"
+            when "accept" then "HTTP_ACCEPT"
+            when "accept-encoding" then "HTTP_ACCEPT_ENCODING"
+            when "accept-language" then "HTTP_ACCEPT_LANGUAGE"
+            when "user-agent" then "HTTP_USER_AGENT"
+            when "referer" then "HTTP_REFERER"
+            when "origin" then "HTTP_ORIGIN"
+            when "cookie" then "HTTP_COOKIE"
+            when "authorization" then "HTTP_AUTHORIZATION"
+            when "x-forwarded-for" then "HTTP_X_FORWARDED_FOR"
+            when "x-forwarded-proto" then "HTTP_X_FORWARDED_PROTO"
+            else RACK_HEADER_MAP[k]
+            end
+          ] = v
         end
       end
     end
 
-    def respond(_body = nil, _status = 200, _header = nil, status: _status, headers: _header, body: _body,
-                hijack: false, &blk)
+    def respond(
+      _body = nil, _status = 200, _headers = nil,
+      json: nil,
+      html: nil,
+      text: nil,
+      xml: nil,
+      hijack: false,
+      as: nil,
+      status: _status,
+      headers: _headers,
+      body: _body,
+      &blk
+    )
+
+      if json
+        validate!(json, as: as) if as
+        body = json.to_json
+        headers ||= {}
+        headers["Content-Type"] ||= "application/json"
+      elsif html
+        body = html
+        headers ||= {}
+        headers["Content-Type"] ||= "text/html"
+      elsif xml
+        body = xml
+        headers ||= {}
+        headers["Content-Type"] ||= "application/xml"
+      elsif text
+        body = text
+        headers ||= {}
+        headers["Content-Type"] ||= "text/plain"
+      end
+
       response.respond(status: status, headers: headers, body: body, hijack: hijack, &blk)
     end
 
-    def build_hijack_proc
-      lambda do
-        self.hijacked = true
-        UNIXSocket.pair.yield_self do |(server_sock, app_sock)|
-          server_sock.autoclose = false
-          response.hijack(server_sock.fileno)
-          server_sock.sync = true
-          app_sock.sync = true
-          app_sock
-        end
+    def hijack
+      self.hijacked = true
+      UNIXSocket.pair.yield_self do |(server_sock, app_sock)|
+        server_sock.autoclose = false
+        self.response.hijack(server_sock.fileno)
+        server_sock.sync = true
+        app_sock.sync = true
+        app_sock
       end
     end
 
     def build_input_io
       case body
-      when nil then StringIO.new("")
+      when nil then EMPTY_IO
       when String then StringIO.new(body)
       when Array then File.open(body.first, "rb")
       else body
       end
     end
+
+    def validate!(params, as: nil)
+      as ? apply_schema!(params, as) : params
+    end
+
+    def params(schema=nil)
+      params = case
+      when url_encoded? then URI.decode_www_form(build_input_io.read).to_h
+      when json? then JSON.parse(build_input_io.read)
+      when multipart?
+        Rack::Multipart::Parser.parse(
+          build_input_io,
+          content_length,
+          content_type,
+          Rack::Multipart::Parser::TEMPFILE_FACTORY,
+          Rack::Multipart::Parser::BUFSIZE,
+          Rack::Utils.default_query_parser
+        ).params
+      else
+        {}
+      end
+
+      params.merge!(query_params).merge!(url_params)
+
+      yield schema ? apply_schema!(params, schema) : params
+
+    rescue StandardError => e
+      if response.json?
+        respond(json: {error: e.message}, status: 400)
+      else
+        respond(e.message, 400)
+      end
+    ensure
+      clean_temp_files(params)
+    end
+
+    def clean_temp_files(params)
+      case params
+      when Hash
+        if params.key?(:tempfile)
+          params[:tempfile].unlink
+        else
+        params.each_value { |v| clean_temp_files(v) }
+        end
+      when Array then params.each { |v| clean_temp_files(v) }
+      end
+    end
+
+    def query_params
+      URI.decode_www_form(query_string).to_h
+    end
   end
 end

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

@@ -10,6 +10,8 @@ module Itsi
     def respond _body=nil, _status=200, _header=nil, status: _status, headers: _header, body: _body, hijack: false, &blk
       self.status = status
 
+      body = body.to_s unless body.is_a?(String)
+
       if headers
         headers.each do |key, value|
           if value.is_a?(Array)

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

@@ -0,0 +1,109 @@
+module Itsi
+  class Server
+
+    module Passfile
+      require 'io/console'
+
+      module_function
+
+      def load(filename)
+        if filename.nil? || filename.strip.empty?
+          puts "Error: a valid filename is required."
+          return nil
+        end
+
+        creds = {}
+        if File.exist?(filename)
+          File.foreach(filename) do |line|
+            line.chomp!
+            next if line.empty?
+
+            user, pass = line.split(':', 2)
+            creds[user] = pass
+          end
+        end
+        creds
+      end
+
+      def save(creds, filename)
+        File.open(filename, 'w', 0o600) do |f|
+          creds.each do |u, p|
+            f.puts "#{u}:#{p}"
+          end
+        end
+      end
+
+      def echo(filename, algorithm)
+        return unless (creds = load(filename))
+        print "Enter username: "
+        username = $stdin.gets.chomp
+
+        print "Enter password: "
+
+        password = $stdin.noecho(&:gets).chomp
+        puts
+
+        print "Confirm password: "
+        password_confirm = $stdin.noecho(&:gets).chomp
+        puts
+
+        if password != password_confirm
+          puts "Error: Passwords do not match!"
+          exit(1)
+        end
+
+        puts "#{username}:#{Itsi.create_password_hash(password, algorithm)}"
+      end
+
+      def add(filename, algorithm)
+        return unless (creds = load(filename))
+        print "Enter username: "
+        username = $stdin.gets.chomp
+
+        print "Enter password: "
+
+        password = $stdin.noecho(&:gets).chomp
+        puts
+
+        print "Confirm password: "
+        password_confirm = $stdin.noecho(&:gets).chomp
+        puts
+
+        if password != password_confirm
+          puts "Error: Passwords do not match!"
+          exit(1)
+        end
+
+        creds[username] = Itsi.create_password_hash(password, algorithm)
+
+        save(creds, filename)
+
+        puts "User '#{username}' added."
+      end
+
+      def remove(filename)
+        return unless (creds = load(filename))
+
+        print "Enter username to remove: "
+        username = $stdin.gets.chomp
+
+        if creds.key?(username)
+          creds.delete(username)
+          save(creds, filename)
+          puts "User '#{username}' removed."
+        else
+          puts "Warning: User '#{username}' not found."
+        end
+      end
+
+      def list(filename)
+        puts "Current credentials in '#{filename}':"
+        return unless (creds = load(filename))
+        creds.each do |u, p|
+          puts "#{u}:#{p}"
+        end
+      end
+
+    end
+  end
+end