eucalypt 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9e3dd1d0d0df1183688e146ebce87a369d4c7b13430169af4fe3e58c9a1deb
-  data.tar.gz: 8d1811d2f5967a0ffb4de011b1422a9a3cadb8c27595a8f69108a4cacc2b5053
+  metadata.gz: 6fa3d16ea8245275cf420eb8ab1dc852e4c0da5f6416f53f09c6636372747806
+  data.tar.gz: f7e333eec6111947870dc43454517259d0ec06a42419d56b7c10022493c16e1e
 SHA512:
-  metadata.gz: da21a8de24eae9a10d4319dc9543687b5c34cb966d0ce72b47832d005e5b08b79f024166881e8a135166fd07b9c2ec9d76d279bfb0770942f0bc76c1190c692e
-  data.tar.gz: bbfd6801e3066443bbd0cce2059de11158ff6d96d7efad5adeddb1217527b573ae44a991ced17518a4be060d76d2d8b6d97b51bddcddec96d3b4cc206f4b7e17
+  metadata.gz: 00b29405bdef2c7f706f5b906cabdbd6a74b663c1a911e0b2fd82ee06dfdd28f9d489ba33609116505e907097d29b4a846f135c911f3057de1bda2675491d387
+  data.tar.gz: 678144c567da5a0fa49019f8a9ca50f5921ae8ddca2693c2e9455a58060ed15a9847e031a4d62ffa479ed00f30ffc806489e79e100836eff6c9894a14e67c7f7

data/eucalypt.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "string-builder", "~> 2.3"
   spec.add_runtime_dependency "activesupport", "~> 5.2"
   spec.add_runtime_dependency "activerecord", "~> 5.2"
+  spec.add_runtime_dependency "bcrypt", "~> 3.1"
   spec.add_runtime_dependency "front_matter_parser", "0.2.0"
   spec.add_runtime_dependency "thor", "~> 0.20"
   spec.add_runtime_dependency "sinatra", "~> 2.0", ">= 2.0.4"

data/lib/eucalypt/blog/namespaces/blog/cli/blog.rb

@@ -32,14 +32,14 @@ module Eucalypt
         generator.controller(route: options[:route])
         generator.views
 
-        asset_pipeline_file = File.join(directory, 'config', 'asset_pipeline.rb')
+        assets_file = File.join(directory, 'config', 'assets.rb')
 
-        File.open(asset_pipeline_file) do |f|
+        File.open(assets_file) do |f|
           return if f.read.include? "assets.append_path Eucalypt.path 'app', 'assets', 'blog'"
         end
 
         insert_into_file(
-          asset_pipeline_file,
+          assets_file,
           "  assets.append_path Eucalypt.path 'app', 'assets', 'blog'\n",
           after: "set :assets, Sprockets::Environment.new\n"
         )

data/lib/eucalypt/core/helpers/maintenance.rb

@@ -1,4 +1,22 @@
 require 'sinatra'
+require 'bcrypt'
 class ApplicationController < Sinatra::Base
-  get('*') { redirect '/maintenance.html' } if settings.maintenance
+  if settings.methods(false).include?(:maintenance)
+    if settings.maintenance
+      define_singleton_method(:maintenance) do |&block|
+        get '*', &block
+        post '*', &block
+        put '*', &block
+        patch '*', &block
+        delete '*', &block
+        options '*', &block
+        link '*', &block
+        unlink '*', &block
+      end
+    else
+      define_singleton_method(:maintenance) {|&block| get "/#{BCrypt::Password.create(?1)}", &block}
+    end
+  else
+    define_singleton_method(:maintenance) {|&block| get "/#{BCrypt::Password.create(?1)}", &block}
+  end
 end

data/lib/eucalypt/core/helpers/static.rb

@@ -0,0 +1,15 @@
+require 'sinatra'
+class ApplicationController < Sinatra::Base
+  def static(uri, *args)
+    if env['HTTP_VERSION'] == 'HTTP/1.1' and env["REQUEST_METHOD"] != 'GET'
+      status 303
+    else
+      status 302
+    end
+
+    # According to RFC 2616 section 14.30, "the field value consists of a
+    # single absolute URI"
+    response['Location'] = uri(uri.to_s, settings.absolute_redirects?, settings.prefixed_redirects?)
+    halt(*args)
+  end
+end

data/lib/eucalypt/core/templates/eucalypt/app/controllers/application_controller.rb

@@ -1,6 +1,10 @@
 class ApplicationController < Sinatra::Base
   helpers ApplicationHelper if defined? ApplicationHelper
 
+  maintenance do
+    static '/maintenance.html'
+  end
+
   get '/' do
     erb :index
   end

data/lib/eucalypt/core/templates/eucalypt/app.rb

@@ -5,15 +5,9 @@ Bundler.require :default, settings.environment
 Eucalypt.set_root __dir__
 
 class ApplicationController < Sinatra::Base
-  # Set server
-  set :server, %w[thin webrick]
-
   # Set core application file
   set :app_file, __FILE__
 
-  # Set application root directory
-  set :root, Eucalypt.root
-
   # Set public folder for static files
   set :public_folder, Eucalypt.path('app', 'static')
 
@@ -27,16 +21,14 @@ class ApplicationController < Sinatra::Base
   # Set default ERB template
   set :erb, layout: :'layouts/main'
 
+  # Set IP whitelist
+  set :whitelist, Eucalypt::Whitelist.new(Eucalypt.path 'config', 'whitelist')
+
   # Toggle maintenance mode
   disable :maintenance
-  require 'eucalypt/core/helpers/maintenance'
 
   # Set Hanami HTML and asset helpers
   helpers Hanami::Helpers, Hanami::Assets::Helpers
-end
 
-Eucalypt.require 'config', '*.rb'
-Eucalypt.require 'config', 'initializers', '*.rb'
-Eucalypt.require 'app', 'helpers', '{application_helper.rb}'
-Eucalypt.require 'app', 'controllers', 'application_controller.rb'
-Eucalypt.require 'app', '{models,policies,helpers,controllers}', '*.rb'
+  require 'eucalypt/load'
+end

data/lib/eucalypt/exceptions.rb

@@ -0,0 +1,12 @@
+module Eucalypt
+  class NotWhitelistedError < Exception
+    def initialize(ip)
+      super "IP address #{ip} not whitelisted"
+    end
+  end
+  class InvalidSettingTypeError < Exception
+    def initialize(setting, actual, classes)
+      super "!\nInvalid type for setting :#{setting}, got:\n\t#{actual},\nmust be one of:\n\t#{classes}"
+    end
+  end
+end

data/lib/eucalypt/load.rb

@@ -0,0 +1,8 @@
+Eucalypt.require 'config', '*.rb'
+Eucalypt.require 'config', 'initializers', '*.rb'
+
+require 'eucalypt/core/helpers/maintenance'
+
+Eucalypt.require 'app', 'helpers', '{application_helper.rb}'
+Eucalypt.require 'app', 'controllers', 'application_controller.rb'
+Eucalypt.require 'app', '{models,policies,helpers,controllers}', '*.rb'

data/lib/eucalypt/version.rb

@@ -1,3 +1,3 @@
 module Eucalypt
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/lib/eucalypt/whitelist.rb

@@ -0,0 +1,70 @@
+require 'sinatra'
+require 'bcrypt'
+require_relative 'exceptions'
+module Eucalypt
+  class Whitelist
+    def initialize(file)
+      @file = file
+      File.new(file, "a").close
+      add '::1', '127.0.0.1', '0.0.0.0'
+    end
+
+    def add(*to_add)
+      to_add.flatten.each do |ip|
+        next if include? ip
+        File.open(@file, 'a+') do |f|
+          lines = File.readlines(@file)
+          if lines.empty? || lines.all? {|line| line == "\n"}
+            File.open(@file, 'w') do |f1|
+              f1.write "#{BCrypt::Password.create(ip)}\n"
+            end
+          else
+            prefix = f.read.last == "\n" ? '' : "\n"
+            f.puts prefix + BCrypt::Password.create(ip)
+          end
+        end
+      end
+    end
+
+    def remove(*to_remove)
+      whitelist = []
+      hashed = File.readlines(@file).select{|ip| /\$.*/.match ip}.map(&:strip)
+
+      hashed.each do |ip|
+        if to_remove.flatten.any? {|request| BCrypt::Password.new(ip) == request}
+          next
+        else
+          whitelist << ip unless whitelist.include?(ip)
+        end
+      end
+
+      File.open(@file, 'w') {|f| f.write whitelist*("\n")<<"\n"}
+    end
+
+    def ips()
+      File.readlines(@file).map(&:strip).
+        select{|ip| /\$.*/.match ip}.
+        map {|ip| BCrypt::Password.new ip}
+    end
+
+    def include?(ip)
+      ips.any? {|whitelisted| whitelisted == ip}
+    end
+  end
+end
+
+class ApplicationController < Sinatra::Base
+  helpers do
+    def whitelisted?
+      case settings.whitelist
+      when Eucalypt::Whitelist then settings.whitelist.include?(request.ip)
+      when FalseClass          then true
+      else raise Eucalypt::InvalidSettingTypeError.new(:whitelist, settings.whitelist.class, %w[FalseClass Eucalypt::Whitelist])
+      end
+    end
+
+    def ip_check()
+      raise Eucalypt::NotWhitelistedError.new(request.ip) unless whitelisted?
+    end
+  end
+end

data/lib/eucalypt.rb

@@ -12,5 +12,10 @@ require 'eucalypt/root'
 require 'eucalypt/list'
 require 'eucalypt/core/helpers/manifest'
 require 'eucalypt/core/helpers/partial'
+require 'eucalypt/whitelist'
+require 'eucalypt/core/helpers/static'
 
-Eucalypt::CLI.extend Eucalypt::List
+Eucalypt::CLI.extend Eucalypt::List
+
+class ApplicationController < Sinatra::Base; end
+def app() ApplicationController end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eucalypt
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Edwin Onuonga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2018-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: front_matter_parser
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +251,7 @@ files:
 - lib/eucalypt/core/helpers/maintenance.rb
 - lib/eucalypt/core/helpers/manifest.rb
 - lib/eucalypt/core/helpers/partial.rb
+- lib/eucalypt/core/helpers/static.rb
 - lib/eucalypt/core/templates/Gemfile.tt
 - lib/eucalypt/core/templates/eucalypt/.gitignore
 - lib/eucalypt/core/templates/eucalypt/.travis.yml
@@ -257,7 +272,7 @@ files:
 - lib/eucalypt/core/templates/eucalypt/app/views/layouts/main.erb
 - lib/eucalypt/core/templates/eucalypt/app/views/partials/.empty_directory
 - lib/eucalypt/core/templates/eucalypt/config.ru
-- lib/eucalypt/core/templates/eucalypt/config/asset_pipeline.rb
+- lib/eucalypt/core/templates/eucalypt/config/assets.rb
 - lib/eucalypt/core/templates/eucalypt/config/database.yml
 - lib/eucalypt/core/templates/eucalypt/config/initializers/.empty_directory
 - lib/eucalypt/core/templates/eucalypt/config/logging.rb
@@ -273,6 +288,7 @@ files:
 - lib/eucalypt/destroy/namespaces/destroy/cli/destroy-scaffold.rb
 - lib/eucalypt/destroy/namespaces/destroy/cli/destroy.rb
 - lib/eucalypt/errors.rb
+- lib/eucalypt/exceptions.rb
 - lib/eucalypt/generate/.gitkeep
 - lib/eucalypt/generate/namespaces/generate-controller/cli/generate-controller.rb
 - lib/eucalypt/generate/namespaces/generate-controller/generators/controller.rb
@@ -298,6 +314,7 @@ files:
 - lib/eucalypt/helpers/migration.rb
 - lib/eucalypt/helpers/numeric.rb
 - lib/eucalypt/list.rb
+- lib/eucalypt/load.rb
 - lib/eucalypt/migration/helpers.rb
 - lib/eucalypt/migration/migration_base.tt
 - lib/eucalypt/migration/namespaces/migration-add/cli/add-column.rb
@@ -354,6 +371,7 @@ files:
 - lib/eucalypt/security/namespaces/security/cli/security.rb
 - lib/eucalypt/static.rb
 - lib/eucalypt/version.rb
+- lib/eucalypt/whitelist.rb
 homepage: https://eucalypt.gitbook.io/eucalypt
 licenses:
 - MIT