servel 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 283ef8ff838b1a149aee4379a02233d006d5dfec7887de4791e20c2e61cbe86e
-  data.tar.gz: b6fa99503294d5bba7b338c86fd0eb9bb46b06944de3fe2b10b225a6120b6794
+  metadata.gz: 36dac91c1fba1bbaa2ab70a7dc39404996216867968c93438f503ccc8dd15631
+  data.tar.gz: fedf2fb5c899e69de6715c40b64c4d7c652f6f01c6bec40c99cea1780ce6c16a
 SHA512:
-  metadata.gz: d44b0fef9dac7e95483e13856f4b030813019c26ed7676a8154cdad88eef8b9db9b5075c4a463dc374353c0e73a09b9c408aa069b79f80da58c221451a227bc3
-  data.tar.gz: d7a4126762ab129714b328aaf1dd492a17d1354870f4f943f799e2816f490de1ef85af253f8f4fcb96bd1d879fff5a134a7043f48112f2fe00bce7eac4af237a
+  metadata.gz: 6b52f97da999645b081ad452866fb032e841f073dbb9e3be5c28b4501062cca015d131872c237fc14cf5920421a0671ef8114d984c7bc320c4183f407da66cb3
+  data.tar.gz: 3d621057dd5499b01a69251a08e3d18c3dab29435fde99313f43484d0ae53ba443ca9aec6c16b71369a8e0a25dd5319bf029104cf7c385bf32913cc4d928cc92

data/lib/servel.rb

@@ -9,18 +9,51 @@ require 'tty-config'
 require 'thread'
 require 'pathname'
 require 'json'
+require 'digest'
 
 module Servel
-  def self.build_app(path_map)
+  def self.build_app(listings:, username: nil, password: nil)
+    app = build_listings_app(build_path_map(listings))
+
+    if username && username != ""
+      build_authentication_app(app: app, username: username, password: password)
+    else
+      app
+    end
+  end
+
+  def self.build_authentication_app(app:, username:, password:)
+    hashed_username = Digest::SHA512.digest(username)
+    hashed_password = Digest::SHA512.digest(password)
+
+    Rack::Auth::Basic.new(app) do |submitted_username, submitted_password|
+      hashed_submitted_username = Digest::SHA512.digest(submitted_username)
+      hashed_submitted_password = Digest::SHA512.digest(submitted_password)
+
+      Rack::Utils.secure_compare(
+        "#{hashed_username}#{hashed_password}",
+        "#{hashed_submitted_username}#{hashed_submitted_password}"
+      )
+    end
+  end
+
+  def self.build_path_map(listings)
+    listings.map do |listing|
+      listing = { listing => nil } if listing.is_a?(String)
+
+      root, url_root = listing.keys.first, listing.values.first || "/"
+      [Pathname.new(root).realpath, url_root]
+    end.to_h
+  end
+
+  def self.build_listings_app(path_map)
     url_map = path_map.map { |root, url_root| [url_root, Servel::App.new(root)] }.to_h
     url_map["/"] = Servel::HomeApp.new(path_map.values) unless url_map.keys.include?("/")
 
     Rack::URLMap.new(url_map)
   end
 
-  def self.config
-    @config ||= Servel::ConfigParser.new.config
-  end
+
 end
 
 require "servel/version"

data/lib/servel/cli.rb

@@ -5,20 +5,12 @@ class Servel::CLI
     :binds
   ]
 
-  def start
-    Rack::Handler::Puma.run(Servel.build_app(path_map), **puma_options)
+  def initialize
+    @config = Servel::ConfigParser.new.config
   end
 
-  def path_map
-    Servel.config.fetch(:listings).map do |listing|
-      listing = { listing => nil } if listing.is_a?(String)
-
-      root, url_root = listing.keys.first, listing.values.first || "/"
-      [Pathname.new(root).realpath, url_root]
-    end.to_h
-  end
-
-  def puma_options
-    Servel.config.to_h.transform_keys(&:to_sym).slice(*ALLOWED_PUMA_OPTIONS)
+  def start
+    app = Servel.build_app(**@config.slice(:listings, :username, :password))
+    Rack::Handler::Puma.run(app, **@config.slice(*ALLOWED_PUMA_OPTIONS))
   end
 end

data/lib/servel/config_parser.rb

@@ -2,17 +2,19 @@ class Servel::ConfigParser
   attr_reader :config
 
   def initialize
-    @config = TTY::Config.new
-    @config.filename = "servel"
-    @config.append_path(Dir.pwd)
-    @config.append_path((Pathname.new(Dir.home) + ".servel").to_s)
-    @config.append_path(Dir.home)
-    @config.env_prefix = "servel"
-    @config.autoload_env
-    @config.read if @config.exist?
-
-    @config.append(*parse_argv, to: :listings)
+    @tty_config = TTY::Config.new
+    @tty_config.filename = "servel"
+    @tty_config.append_path(Dir.pwd)
+    @tty_config.append_path((Pathname.new(Dir.home) + ".servel").to_s)
+    @tty_config.append_path(Dir.home)
+    @tty_config.env_prefix = "servel"
+    @tty_config.autoload_env
+    @tty_config.read if @tty_config.exist?
+
+    @tty_config.append(*parse_argv, to: :listings)
     parse_binds
+
+    @config = @tty_config.to_h.transform_keys(&:to_sym)
   end
 
   def parse_argv
@@ -23,21 +25,21 @@ class Servel::ConfigParser
   end
 
   def parse_binds
-    return parse_ssl_bind if @config.fetch(:cert) && @config.fetch(:key)
+    return parse_ssl_bind if @tty_config.fetch(:cert) && @tty_config.fetch(:key)
 
-    host = @config.fetch(:host)
-    port = @config.fetch(:port)
-    @config.set(:Host, value: host) if host
-    @config.set(:Port, value: port) if port
+    host = @tty_config.fetch(:host)
+    port = @tty_config.fetch(:port)
+    @tty_config.set(:Host, value: host) if host
+    @tty_config.set(:Port, value: port) if port
   end
 
   def parse_ssl_bind
-    host = @config.fetch(:host, default: ::Puma::ConfigDefault::DefaultTCPHost)
-    port = @config.fetch(:port, default: ::Puma::ConfigDefault::DefaultTCPPort)
-    key = Pathname.new(@config.fetch(:key)).expand_path
-    cert = Pathname.new(@config.fetch(:cert)).expand_path
+    host = @tty_config.fetch(:host, default: ::Puma::ConfigDefault::DefaultTCPHost)
+    port = @tty_config.fetch(:port, default: ::Puma::ConfigDefault::DefaultTCPPort)
+    key = Pathname.new(@tty_config.fetch(:key)).expand_path
+    cert = Pathname.new(@tty_config.fetch(:cert)).expand_path
 
     query = URI.encode_www_form(key: key, cert: cert)
-    @config.append("ssl://#{host}:#{port}?#{query}", to: :binds)
+    @tty_config.append("ssl://#{host}:#{port}?#{query}", to: :binds)
   end
 end

data/lib/servel/version.rb

@@ -1,3 +1,3 @@
 module Servel
-  VERSION = "0.32.0"
+  VERSION = "0.33.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler