bnb_blazer 0.4.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437e6d1c035864ecdc01a74748e2845068ea7ce0ef423ccee284389e2c623d6f
-  data.tar.gz: 8fe7e32b6e9e13a5e6c8965624d053296897a8e37c163985e3880935c5221c31
+  metadata.gz: 6c4eeb11855b3ee65cfc2502b2cdab2b23cd90d2288839c4deaa95e91a969656
+  data.tar.gz: 067f920d2ad254337973ab555bb8f8e7ec24c2406e5398dc208dcf4860a7f2e1
 SHA512:
-  metadata.gz: 6e888e6840446ef55a40bbd21c2bb97ea9f1b7c83b21c402b0862cff5e3449259314c177041f2ca107deddb6643750cc57a1389f3f77774bbec39cd9f0872a6b
-  data.tar.gz: da26c670aafa02dd626216c17abb30c524adc9b7cd899c34c25f657d326ed35667149e23998f49529236103b52b2aae977459122cd6979c8dce0ec1bdc1d6c23
+  metadata.gz: '0891b743b0d8b6335c7aed43b4fb72a67b39e45c1529d05fe21e338294df4ba353885f3bb9cb6e117e5deacfaef9333cd94d65fe54d319d612837867c25cf7b8'
+  data.tar.gz: a0842017c74108c065d0c9dde22a912320fa1573a28eb71e1cc2184019ef810552c1fcaa8f7bb1b0305ec09eaa273120a9ecc5f5fc8c09e266c1ce123bbaf026

data/app/overrides/controllers/blazer/base_controller_override.rb

@@ -0,0 +1,133 @@
+Blazer::BaseController.class_eval do
+  # skip filters
+  filters = _process_action_callbacks.map(&:filter) - [:activate_authlogic]
+  skip_before_action(*filters, raise: false)
+  skip_after_action(*filters, raise: false)
+  skip_around_action(*filters, raise: false)
+
+  clear_helpers
+
+  protect_from_forgery with: :exception
+
+  if ENV["BLAZER_PASSWORD"]
+    http_basic_authenticate_with name: ENV["BLAZER_USERNAME"], password: ENV["BLAZER_PASSWORD"]
+  end
+
+  if Blazer.settings["before_action"]
+    raise Blazer::Error, "The docs for protecting Blazer with a custom before_action had an incorrect example from August 2017 to June 2018. The example method had a boolean return value. However, you must render or redirect if a user is unauthorized rather than return a falsy value. Double check that your before_action works correctly for unauthorized users (if it worked when added, there should be no issue). Then, change before_action to before_action_method in config/blazer.yml."
+  end
+
+  if Blazer.before_action
+    before_action Blazer.before_action.to_sym
+  end
+
+  if Blazer.override_csp
+    after_action do
+      response.headers['Content-Security-Policy'] = "default-src 'self' https: 'unsafe-inline' 'unsafe-eval' data:"
+    end
+  end
+
+  layout "bnb_blazer/application"
+  append_view_path(["views/blazer", "views/bnb_blazer", "views/blazer"])
+
+  private
+
+    def process_vars(statement, data_source)
+      (@bind_vars ||= []).concat(Blazer.extract_vars(statement)).uniq!
+      @bind_vars.each do |var|
+        params[var] ||= Blazer.data_sources[data_source].variable_defaults[var]
+      end
+      @success = @bind_vars.all? { |v| params[v] }
+
+      if @success
+        @bind_vars.each do |var|
+          value = params[var].presence
+          if value
+            if ["start_time", "end_time"].include?(var)
+              value = value.to_s.gsub(" ", "+") # fix for Quip bug
+            end
+
+            if var.end_with?("_at")
+              begin
+                value = Blazer.time_zone.parse(value)
+              rescue
+                # do nothing
+              end
+            end
+
+            if value =~ /\A\d+\z/
+              value = value.to_i
+            elsif value =~ /\A\d+\.\d+\z/
+              value = value.to_f
+            end
+          end
+          value = Blazer.transform_variable.call(var, value) if Blazer.transform_variable
+          statement.gsub!("{#{var}}", ActiveRecord::Base.connection.quote(value))
+        end
+      end
+    end
+
+    def add_cohort_analysis_vars
+      @bind_vars << "cohort_period" unless @bind_vars.include?("cohort_period")
+      @smart_vars["cohort_period"] = ["day", "week", "month"]
+      params[:cohort_period] ||= "week"
+    end
+
+    def parse_smart_variables(var, data_source)
+      smart_var_data_source =
+        ([data_source] + Array(data_source.settings["inherit_smart_settings"]).map { |ds| Blazer.data_sources[ds] }).find { |ds| ds.smart_variables[var] }
+
+      if smart_var_data_source
+        query = smart_var_data_source.smart_variables[var]
+
+        if query.is_a? Hash
+          smart_var = query.map { |k,v| [v, k] }
+        elsif query.is_a? Array
+          smart_var = query.map { |v| [v, v] }
+        elsif query
+          result = smart_var_data_source.run_statement(query)
+          smart_var = result.rows.map { |v| v.reverse }
+          error = result.error if result.error
+        end
+      end
+
+      [smart_var, error]
+    end
+
+    # don't pass to url helpers
+    #
+    # some are dangerous when passed as symbols
+    # root_url({host: "evilsite.com"})
+    #
+    # certain ones (like host) only affect *_url and not *_path
+    #
+    # when permitted parameters are passed in Rails 6,
+    # they appear to be added as GET parameters
+    # root_url(params.permit(:host))
+    UNPERMITTED_KEYS = [:controller, :action, :id, :host, :query, :dashboard, :query_id, :query_ids, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name, :fork_query_id, :blazer, :run_id, :script_name, :original_script_name]
+
+    # remove unpermitted keys from both params and permitted keys for better sleep
+    def variable_params(resource)
+      permitted_keys = resource.variables - UNPERMITTED_KEYS.map(&:to_s)
+      params.except(*UNPERMITTED_KEYS).slice(*permitted_keys).permit!
+    end
+    helper_method :variable_params
+
+    def blazer_user
+      send(Blazer.user_method) if Blazer.user_method && respond_to?(Blazer.user_method, true)
+    end
+    helper_method :blazer_user
+
+    def render_errors(resource)
+      @errors = resource.errors
+      action = resource.persisted? ? :edit : :new
+      render action, status: :unprocessable_entity
+    end
+
+    # do not inherit from ApplicationController - #120
+    def default_url_options
+      {}
+    end
+end
+
+end

data/app/views/{blazer → bnb_blazer}/dashboards/show.html.haml

@@ -1,7 +1,7 @@
 - blazer_title @dashboard.name
 %nav.navbar.navbar-default.navbar-fixed-top
   .container
-    = render layout: "layouts/blazer/navbar" do
+    = render layout: "layouts/bnb_blazer/navbar" do
       %li= link_to "Edit", edit_dashboard_path(@dashboard, variable_params(@dashboard))
 
 %div{:style => "margin-bottom: 70px;"}
@@ -11,7 +11,7 @@
     Some queries may be cached
     \#{link_to "Refresh", refresh_dashboard_path(@dashboard, variable_params(@dashboard)), method: :post}
 - if @bind_vars.any?
-  = render partial: "blazer/variables", locals: {action: dashboard_path(@dashboard)}
+  = render partial: "bnb_blazer/variables", locals: {action: dashboard_path(@dashboard)}
 - else
   %div{:style => "padding-bottom: 15px;"}
 - @queries.each_with_index do |query, i|

data/app/views/{blazer → bnb_blazer}/queries/show.html.haml

@@ -1,7 +1,7 @@
 - blazer_title @query.name
 %nav.navbar.navbar-default.navbar-fixed-top
   .container
-    = render layout: "layouts/blazer/navbar" do
+    = render layout: "layouts/bnb_blazer/navbar" do
       %li= link_to "Edit", edit_query_path(@query, variable_params(@query)), class: "text-muted font-weight-bold px-1", disabled: !@query.editable?(blazer_user)
       %li= link_to "Fork", new_query_path(variable_params(@query).merge(fork_query_id: @query.id, data_source: @query.data_source, name: @query.name)), class: "text-muted font-weight-bold px-1"
       - if !@error && @success
@@ -17,7 +17,7 @@
   %h3.text-center=@query.name
   - if @query.description.present?
     %p= @query.description
-  = render partial: "blazer/variables", locals: {action: query_path(@query)}
+  = render partial: "bnb_blazer/variables", locals: {action: query_path(@query)}
   %pre#code
     %code= @statement
   - if @success

data/app/views/layouts/{blazer → bnb_blazer}/application.html.haml

@@ -5,10 +5,10 @@
     %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
     %title= blazer_title ? blazer_title : "Blazer"
     %meta{:charset => "utf-8"}/
-    = favicon_link_tag "blazer/favicon.png"
-    = stylesheet_link_tag "blazer/application"
+    = favicon_link_tag "bnb_blazer/favicon.png"
+    = stylesheet_link_tag "bnb_blazer/application"
     = stylesheet_link_tag "application"
-    = javascript_include_tag "blazer/application"
+    = javascript_include_tag "bnb_blazer/application"
     :javascript
       #{blazer_js_var "rootPath", root_path}
     - if blazer_maps?
@@ -18,4 +18,4 @@
   %body
     .container.blazer-content
       = yield
-    = render "layouts/blazer/footer"
+    = render "layouts/bnb_blazer/footer"

data/lib/bnb_blazer.rb

@@ -2,6 +2,7 @@
 require "blazer"
 
 # modules
+# require "bnb_blazer/engine"
 require "bnb_blazer/version"
 
 module BnbBlazer

data/lib/bnb_blazer/engine.rb

@@ -0,0 +1,5 @@
+module BnbBlazer
+  class Enginer < ::Rails::Engine
+    isolate_namespace BnbBlazer
+  end
+end

data/lib/bnb_blazer/version.rb

@@ -1,3 +1,3 @@
 module BnbBlazer
-  VERSION = "0.4.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bnb_blazer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Joe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blazer
@@ -31,101 +31,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".docker-development-vars"
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
-- ".travis.yml"
-- Gemfile
-- Gemfile.lock
-- LICENSE.txt
-- README.md
 - Rakefile
-- app/assets/config/manifest.js
-- app/assets/images/.keep
-- app/assets/images/bnb_intel_logo.png
-- app/assets/stylesheets/application.css
-- app/channels/application_cable/channel.rb
-- app/channels/application_cable/connection.rb
-- app/controllers/application_controller.rb
-- app/controllers/concerns/.keep
-- app/helpers/application_helper.rb
-- app/jobs/application_job.rb
-- app/mailers/application_mailer.rb
-- app/models/application_record.rb
-- app/models/concerns/.keep
-- app/models/user.rb
-- app/views/blazer/_variables.html.haml
-- app/views/blazer/checks/_form.html.haml
-- app/views/blazer/checks/edit.html.haml
-- app/views/blazer/checks/index.html.haml
-- app/views/blazer/checks/new.html.haml
-- app/views/blazer/dashboards/_form.html.haml
-- app/views/blazer/dashboards/edit.html.haml
-- app/views/blazer/dashboards/new.html.haml
-- app/views/blazer/dashboards/show.html.haml
-- app/views/blazer/queries/_form.html.haml
-- app/views/blazer/queries/edit.html.haml
-- app/views/blazer/queries/home.html.haml
-- app/views/blazer/queries/new.html.haml
-- app/views/blazer/queries/run.html.haml
-- app/views/blazer/queries/show.html.haml
-- app/views/layouts/blazer/_footer.html.haml
-- app/views/layouts/blazer/_navbar.html.haml
-- app/views/layouts/blazer/application.html.haml
-- bin/bundle
-- bin/console
-- bin/rails
-- bin/rake
-- bin/setup
-- bin/spring
-- bin/update
-- bin/yarn
-- bnb_blazer.gemspec
-- config.ru
-- config/application.rb
-- config/blazer.yml
-- config/boot.rb
-- config/cable.yml
-- config/credentials.yml.enc
-- config/database.yml
-- config/environment.rb
-- config/environments/development.rb
-- config/environments/production.rb
-- config/environments/test.rb
-- config/initializers/application_controller_renderer.rb
-- config/initializers/assets.rb
-- config/initializers/backtrace_silencers.rb
-- config/initializers/content_security_policy.rb
-- config/initializers/cookies_serializer.rb
-- config/initializers/filter_parameter_logging.rb
-- config/initializers/inflections.rb
-- config/initializers/mime_types.rb
-- config/initializers/wrap_parameters.rb
-- config/locales/en.yml
-- config/puma.rb
-- config/routes.rb
-- config/spring.rb
-- config/storage.yml
-- db/migrate/20210309231658_install_blazer.rb
-- db/migrate/20210309231908_create_users.rb
-- db/schema.rb
-- db/seeds.rb
-- docker-compose.yml
+- app/overrides/controllers/blazer/base_controller_override.rb
+- app/views/bnb_blazer/_variables.html.haml
+- app/views/bnb_blazer/checks/_form.html.haml
+- app/views/bnb_blazer/checks/edit.html.haml
+- app/views/bnb_blazer/checks/index.html.haml
+- app/views/bnb_blazer/checks/new.html.haml
+- app/views/bnb_blazer/dashboards/_form.html.haml
+- app/views/bnb_blazer/dashboards/edit.html.haml
+- app/views/bnb_blazer/dashboards/new.html.haml
+- app/views/bnb_blazer/dashboards/show.html.haml
+- app/views/bnb_blazer/queries/_form.html.haml
+- app/views/bnb_blazer/queries/edit.html.haml
+- app/views/bnb_blazer/queries/home.html.haml
+- app/views/bnb_blazer/queries/new.html.haml
+- app/views/bnb_blazer/queries/run.html.haml
+- app/views/bnb_blazer/queries/show.html.haml
+- app/views/layouts/bnb_blazer/_footer.html.haml
+- app/views/layouts/bnb_blazer/_navbar.html.haml
+- app/views/layouts/bnb_blazer/application.html.haml
 - lib/bnb_blazer.rb
+- lib/bnb_blazer/engine.rb
 - lib/bnb_blazer/version.rb
-- lib/tasks/.keep
-- log/.keep
-- package.json
-- public/404.html
-- public/422.html
-- public/500.html
-- public/apple-touch-icon-precomposed.png
-- public/apple-touch-icon.png
-- public/favicon.ico
-- public/robots.txt
-- tmp/.keep
-- vendor/.keep
 homepage: https://github.com/brandnewbox/bnb_blazer
 licenses:
 - MIT

data/.docker-development-vars

@@ -1 +0,0 @@
-DATABASE_URL=postgresql://postgres:password@postgresql:5432

data/.gitignore

@@ -1,34 +0,0 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore all logfiles and tempfiles.
-/log/*
-/tmp/*
-!/log/.keep
-!/tmp/.keep
-
-# Ignore uploaded files in development
-/storage/*
-!/storage/.keep
-
-/node_modules
-/yarn-error.log
-
-/public/assets
-.byebug_history
-
-.DS_Store
-/pgdata
-/vendor/bundle
-
-# Ignore master key for decrypting credentials and more.
-/config/master.key
-
-# Ignore built versions
-bnb_blazer-*

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper