itsi-server 0.2.2 → 0.2.4

data/lib/itsi/server.rb

@@ -27,7 +27,6 @@ module Itsi
     extend RouteTester
 
     class << self
-
       def running?
         @running && !@running.empty?
       end
@@ -62,9 +61,8 @@ module Itsi
           server
         end
         background ? [server, Thread.new(&run)] : run[]
-      rescue Exception => e
+      rescue Exception => e # rubocop:disable Lint/RescueException
         Itsi.log_error e.message
-        raise e
       end
 
       def static(cli_params)
@@ -72,7 +70,8 @@ module Itsi
       end
 
       def stop
-        return unless pid = get_pid
+        return unless (pid = get_pid)
+
         Process.kill(:INT, pid)
         i = 0
         while i < 10
@@ -96,7 +95,7 @@ module Itsi
         File.write(Itsi::Server::Config.pid_file_path, Process.pid)
       end
 
-      def get_pid(warn=true)
+      def get_pid(warn = true)
         pid = File.read(Itsi::Server::Config.pid_file_path).to_i
         if Process.kill(0, pid)
           pid
@@ -110,7 +109,7 @@ module Itsi
       end
 
       def test
-        Itsi::Server::Config.test!(cli_params = {})
+        Itsi::Server::Config.test!({})
       end
 
       def init
@@ -118,25 +117,25 @@ module Itsi
       end
 
       def reload
-        return unless pid = get_pid
+        return unless (pid = get_pid)
 
         Process.kill(:HUP, pid)
       end
 
       def restart
-        return unless pid = get_pid
+        return unless (pid = get_pid)
 
         Process.kill(:USR1, pid)
       end
 
       def passfile(options, subcmd)
         filename = options[:passfile]
-        unless filename || subcmd == 'echo'
+        unless filename || subcmd == "echo"
           puts "Error: passfile not set. Use --passfile option to provide a path to a file containing hashed credentials."
           puts "This file contains hashed credentials and should not be included in source control without additional protection."
           exit(1)
         end
-        algorithm = options.fetch(:algorithm, 'sha256')
+        algorithm = options.fetch(:algorithm, "sha256")
 
         unless %w[sha256 sha512 bcrypt argon2 none].include?(algorithm)
           puts "Invalid algorithm"
@@ -144,9 +143,9 @@ module Itsi
         end
 
         case subcmd
-        when 'add', 'echo'
+        when "add", "echo"
           Passfile.send(subcmd, filename, algorithm)
-        when 'remove', 'list'
+        when "remove", "list"
           Passfile.send(subcmd, filename)
         else
           puts "Valid subcommands are: add | remove | list"
@@ -165,6 +164,7 @@ module Itsi
           new_name = "#{base}_#{i}#{ext}"
           candidate = File.join(dir, new_name)
           return candidate unless File.exist?(candidate)
+
           i += 1
         end
       end
@@ -189,11 +189,11 @@ module Itsi
 
         case alg
         when /^HS(\d+)$/
-          bits = $1.to_i
+          bits = ::Regexp.last_match(1).to_i
           bytes = bits / 8
           key = SecureRandom.random_bytes(bytes)
           pem = Base64.strict_encode64(key)
-          content =  "=== HMAC #{bits}-bit Secret (base64) ===\n#{pem}\n"
+          content = "=== HMAC #{bits}-bit Secret (base64) ===\n#{pem}\n"
           save_or_print("hmac_#{bits}_secret.txt", content, options)
 
         when /^RS/, /^PS/
@@ -215,32 +215,33 @@ module Itsi
           save_or_print("ecdsa_public.pem",  "=== ECDSA Public Key ===\n#{pub}", options)
 
         else
-          STDERR.puts "Unsupported algorithm: #{alg}"
+          warn "Unsupported algorithm: #{alg}"
           exit 1
         end
       end
 
-
       def add_worker
-        return unless pid = get_pid
+        return unless (pid = get_pid)
 
         Process.kill(:TTIN, pid)
       end
 
       def remove_worker
-        return unless pid = get_pid
+        return unless (pid = get_pid)
 
         Process.kill(:TTOU, pid)
       end
 
       def status
-        return unless pid = get_pid
+        return unless (pid = get_pid)
+
         Itsi.log_info("Itsi running on #{pid}")
         Process.kill(:USR2, pid)
       end
 
       def load_route_middleware_stack(cli_params)
-        middleware, errors = Config.build_config(cli_params, Itsi::Server::Config.config_file_path(cli_params[:config_file_path]))
+        middleware, errors = Config.build_config(cli_params,
+                                                 Itsi::Server::Config.config_file_path(cli_params[:config_file_path]))
         if errors.any?
           puts errors
           []
@@ -261,7 +262,7 @@ module Itsi
       end
 
       def routes(cli_params = {})
-        load_route_middleware_stack(cli_params).each do |stack|
+        load_route_middleware_stack(cli_params).first.each do |stack|
           routes = explode_route_pattern(stack["route"].source)
           routes.each do |route|
             print_route(route, stack)
@@ -271,7 +272,6 @@ module Itsi
       end
 
       alias serve start
-
     end
   end
 end

data/lib/itsi/standard_headers.rb

@@ -1,86 +1,86 @@
 module Itsi
   module StandardHeaders
     ALL = [
-      ACCEPT = "accept",
-      ACCEPT_CHARSET = "accept-charset",
-      ACCEPT_ENCODING = "accept-encoding",
-      ACCEPT_LANGUAGE = "accept-language",
-      ACCEPT_RANGES = "accept-ranges",
-      ACCESS_CONTROL_ALLOW_CREDENTIALS = "access-control-allow-credentials",
-      ACCESS_CONTROL_ALLOW_HEADERS = "access-control-allow-headers",
-      ACCESS_CONTROL_ALLOW_METHODS = "access-control-allow-methods",
-      ACCESS_CONTROL_ALLOW_ORIGIN = "access-control-allow-origin",
-      ACCESS_CONTROL_EXPOSE_HEADERS = "access-control-expose-headers",
-      ACCESS_CONTROL_MAX_AGE = "access-control-max-age",
-      ACCESS_CONTROL_REQUEST_HEADERS = "access-control-request-headers",
-      ACCESS_CONTROL_REQUEST_METHOD = "access-control-request-method",
-      AGE = "age",
-      ALLOW = "allow",
-      ALT_SVC = "alt-svc",
-      AUTHORIZATION = "authorization",
-      CACHE_CONTROL = "cache-control",
-      CACHE_STATUS = "cache-status",
-      CDN_CACHE_CONTROL = "cdn-cache-control",
-      CONNECTION = "connection",
-      CONTENT_DISPOSITION = "content-disposition",
-      CONTENT_ENCODING = "content-encoding",
-      CONTENT_LANGUAGE = "content-language",
-      CONTENT_LENGTH = "content-length",
-      CONTENT_LOCATION = "content-location",
-      CONTENT_RANGE = "content-range",
-      CONTENT_SECURITY_POLICY_REPORT_ONLY = "content-security-policy-report-only",
-      CONTENT_TYPE = "content-type",
-      COOKIE = "cookie",
-      DNT = "dnt",
-      DATE = "date",
-      ETAG = "etag",
-      EXPECT = "expect",
-      EXPIRES = "expires",
-      FORWARDED = "forwarded",
-      FROM = "from",
-      HOST = "host",
-      IF_MATCH = "if-match",
-      IF_MODIFIED_SINCE = "if-modified-since",
-      IF_NONE_MATCH = "if-none-match",
-      IF_RANGE = "if-range",
-      IF_UNMODIFIED_SINCE = "if-unmodified-since",
-      LAST_MODIFIED = "last-modified",
-      LINK = "link",
-      LOCATION = "location",
-      MAX_FORWARDS = "max-forwards",
-      ORIGIN = "origin",
-      PRAGMA = "pragma",
-      PROXY_AUTHENTICATE = "proxy-authenticate",
-      PROXY_AUTHORIZATION = "proxy-authorization",
-      PUBLIC_KEY_PINS = "public-key-pins",
-      PUBLIC_KEY_PINS_REPORT_ONLY = "public-key-pins-report-only",
-      RANGE = "range",
-      REFERER = "referer",
-      REFERRER_POLICY = "referrer-policy",
-      REFRESH = "refresh",
-      RETRY_AFTER = "retry-after",
-      SEC_WEBSOCKET_ACCEPT = "sec-websocket-accept",
-      SEC_WEBSOCKET_EXTENSIONS = "sec-websocket-extensions",
-      SEC_WEBSOCKET_KEY = "sec-websocket-key",
-      SEC_WEBSOCKET_PROTOCOL = "sec-websocket-protocol",
-      SEC_WEBSOCKET_VERSION = "sec-websocket-version",
-      SERVER = "server",
-      SET_COOKIE = "set-cookie",
-      STRICT_TRANSPORT_SECURITY = "strict-transport-security",
-      TE = "te",
-      TRAILER = "trailer",
-      TRANSFER_ENCODING = "transfer-encoding",
-      USER_AGENT = "user-agent",
-      UPGRADE = "upgrade",
-      UPGRADE_INSECURE_REQUESTS = "upgrade-insecure-requests",
-      VARY = "vary",
-      VIA = "via",
-      WARNING = "warning",
-      WWW_AUTHENTICATE = "www-authenticate",
-      X_CONTENT_TYPE_OPTIONS = "x-content-type-options",
-      X_DNS_PREFETCH_CONTROL = "x-dns-prefetch-control",
-      X_FRAME_OPTIONS = "x-frame-options",
-      X_XSS_PROTECTION = "x-xss-protection",
+      ACCEPT = "accept".freeze,
+      ACCEPT_CHARSET = "accept-charset".freeze,
+      ACCEPT_ENCODING = "accept-encoding".freeze,
+      ACCEPT_LANGUAGE = "accept-language".freeze,
+      ACCEPT_RANGES = "accept-ranges".freeze,
+      ACCESS_CONTROL_ALLOW_CREDENTIALS = "access-control-allow-credentials".freeze,
+      ACCESS_CONTROL_ALLOW_HEADERS = "access-control-allow-headers".freeze,
+      ACCESS_CONTROL_ALLOW_METHODS = "access-control-allow-methods".freeze,
+      ACCESS_CONTROL_ALLOW_ORIGIN = "access-control-allow-origin".freeze,
+      ACCESS_CONTROL_EXPOSE_HEADERS = "access-control-expose-headers".freeze,
+      ACCESS_CONTROL_MAX_AGE = "access-control-max-age".freeze,
+      ACCESS_CONTROL_REQUEST_HEADERS = "access-control-request-headers".freeze,
+      ACCESS_CONTROL_REQUEST_METHOD = "access-control-request-method".freeze,
+      AGE = "age".freeze,
+      ALLOW = "allow".freeze,
+      ALT_SVC = "alt-svc".freeze,
+      AUTHORIZATION = "authorization".freeze,
+      CACHE_CONTROL = "cache-control".freeze,
+      CACHE_STATUS = "cache-status".freeze,
+      CDN_CACHE_CONTROL = "cdn-cache-control".freeze,
+      CONNECTION = "connection".freeze,
+      CONTENT_DISPOSITION = "content-disposition".freeze,
+      CONTENT_ENCODING = "content-encoding".freeze,
+      CONTENT_LANGUAGE = "content-language".freeze,
+      CONTENT_LENGTH = "content-length".freeze,
+      CONTENT_LOCATION = "content-location".freeze,
+      CONTENT_RANGE = "content-range".freeze,
+      CONTENT_SECURITY_POLICY_REPORT_ONLY = "content-security-policy-report-only".freeze,
+      CONTENT_TYPE = "content-type".freeze,
+      COOKIE = "cookie".freeze,
+      DNT = "dnt".freeze,
+      DATE = "date".freeze,
+      ETAG = "etag".freeze,
+      EXPECT = "expect".freeze,
+      EXPIRES = "expires".freeze,
+      FORWARDED = "forwarded".freeze,
+      FROM = "from".freeze,
+      HOST = "host".freeze,
+      IF_MATCH = "if-match".freeze,
+      IF_MODIFIED_SINCE = "if-modified-since".freeze,
+      IF_NONE_MATCH = "if-none-match".freeze,
+      IF_RANGE = "if-range".freeze,
+      IF_UNMODIFIED_SINCE = "if-unmodified-since".freeze,
+      LAST_MODIFIED = "last-modified".freeze,
+      LINK = "link".freeze,
+      LOCATION = "location".freeze,
+      MAX_FORWARDS = "max-forwards".freeze,
+      ORIGIN = "origin".freeze,
+      PRAGMA = "pragma".freeze,
+      PROXY_AUTHENTICATE = "proxy-authenticate".freeze,
+      PROXY_AUTHORIZATION = "proxy-authorization".freeze,
+      PUBLIC_KEY_PINS = "public-key-pins".freeze,
+      PUBLIC_KEY_PINS_REPORT_ONLY = "public-key-pins-report-only".freeze,
+      RANGE = "range".freeze,
+      REFERER = "referer".freeze,
+      REFERRER_POLICY = "referrer-policy".freeze,
+      REFRESH = "refresh".freeze,
+      RETRY_AFTER = "retry-after".freeze,
+      SEC_WEBSOCKET_ACCEPT = "sec-websocket-accept".freeze,
+      SEC_WEBSOCKET_EXTENSIONS = "sec-websocket-extensions".freeze,
+      SEC_WEBSOCKET_KEY = "sec-websocket-key".freeze,
+      SEC_WEBSOCKET_PROTOCOL = "sec-websocket-protocol".freeze,
+      SEC_WEBSOCKET_VERSION = "sec-websocket-version".freeze,
+      SERVER = "server".freeze,
+      SET_COOKIE = "set-cookie".freeze,
+      STRICT_TRANSPORT_SECURITY = "strict-transport-security".freeze,
+      TE = "te".freeze,
+      TRAILER = "trailer".freeze,
+      TRANSFER_ENCODING = "transfer-encoding".freeze,
+      USER_AGENT = "user-agent".freeze,
+      UPGRADE = "upgrade".freeze,
+      UPGRADE_INSECURE_REQUESTS = "upgrade-insecure-requests".freeze,
+      VARY = "vary".freeze,
+      VIA = "via".freeze,
+      WARNING = "warning".freeze,
+      WWW_AUTHENTICATE = "www-authenticate".freeze,
+      X_CONTENT_TYPE_OPTIONS = "x-content-type-options".freeze,
+      X_DNS_PREFETCH_CONTROL = "x-dns-prefetch-control".freeze,
+      X_FRAME_OPTIONS = "x-frame-options".freeze,
+      X_XSS_PROTECTION = "x-xss-protection".freeze
     ]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi-server
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -525,8 +525,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://itsi.fyi
-  source_code_uri: https://github.com/wouterken/itsi/server
-  changelog_uri: https://github.com/wouterken/itsi/server/blob/main/CHANGELOG.md
+  source_code_uri: https://github.com/wouterken/itsi
+  changelog_uri: https://github.com/wouterken/itsi/blob/main/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib