hieraviz 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c92243305adbd29684586595b9756031dbab5890
-  data.tar.gz: 92149f89aebee317256c51b143613111431730ab
+  metadata.gz: ecd646feab7d0eb2b8f2e4ed17b7417bad5e1539
+  data.tar.gz: ede3db1196637027b576e6180b972d8311f0c5b8
 SHA512:
-  metadata.gz: 2910ecf14f76df96f33f1b211bcfe315a6ba2acec195a2375c7cc95a6f3a7a02230e8703256e79d673069178cfaaa7cd19190a86660a9a23420136984bca0852
-  data.tar.gz: 868f5226fc033dc439515f4b3f81182f6a40068ae17da91fec87a67296384d0789d29b4e70b23176581578069e34abd6a44f71750599640ed829488ed173ad26
+  metadata.gz: e6b1383225fdd48cff661db970b4a2ae217bfb852cd11a9d7196c2e8e507ec8f3d169552dde470d8ff2ef2850b7bdaab744317a594df4c7665275c17b6fc5fbf
+  data.tar.gz: a97c8a77ad48a4cd2ed204c8113433783e4a85f12d9fff0210381597d4899ccd5afc080a42cd15107143e39288ae94ff6baaba06aaa14cb3dd2e7c144265eb80

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Hieraviz Changelog
 ========================
 
+### v0.2.2 - 2016-04-05
+- sort branches order
+- prepare debian package
+- add a filter on farm api calls
+
 ### v0.2.1 - 2016-04-04
 - replaced sinatra-flash (weird license, no debian package) with rack-flash3
 

data/README.md

@@ -41,7 +41,7 @@ Production
 ----------------
 
     gem install thin
-    thin -s 1 -C config.yml -R config.ru start
+    thin -s 1 -C config/thin.yml -R config.ru start
 
 Contributing
 ----------------

data/app/apiv1.rb

@@ -1,4 +1,5 @@
 require 'sinatra/json'
+require 'sinatra/cross-origin'
 
 require 'digest/sha1'
 require 'dotenv'
@@ -11,11 +12,18 @@ require File.expand_path '../common.rb', __FILE__
 
 module HieravizApp
   class ApiV1 < Common
+    register Sinatra::CrossOrigin
 
     configure do
       set :session_secret, settings.configdata['session_seed']
       set :protection, :origin_whitelist => ['http://web.example.com']
       enable :sessions
+      enable :cross_origin
+      set :allow_origin, :any
+      set :allow_methods, [:get, :post, :options]
+      set :allow_credentials, true
+      set :max_age, "1728000"
+      set :expose_headers, ['Content-Type']
     end
 
     case settings.configdata['auth_method']
@@ -53,11 +61,17 @@ module HieravizApp
       def get_facts(base, node)
         Hieraviz::Facts.new(settings.configdata['tmpdir'], base, node, username)
       end
-      def cors_headers()
-        headers 'Access-Control-Allow-Origin' => '*'
-        headers 'Access-Control-Allow-Headers' => 'Authorization,Accepts,Content-Type,X-CSRF-Token,X-Requested-With,X-AUTH'
-        headers 'Access-Control-Allow-Methods' => 'GET,POST,PUT,DELETE,OPTIONS'
-      end
+      # def cors_headers()
+      #   headers 'Access-Control-Allow-Origin' => '*'
+      #   headers 'Access-Control-Allow-Headers' => 'Authorization,Accepts,Content-Type,X-CSRF-Token,X-Requested-With,X-AUTH'
+      #   headers 'Access-Control-Allow-Methods' => 'GET,POST,PUT,DELETE,OPTIONS'
+      # end
+    end
+
+    options '*' do
+      response.headers["Allow"] = "HEAD,GET,PUT,POST,DELETE,OPTIONS"
+      response.headers["Access-Control-Allow-Headers"] = "X-Requested-With, X-HTTP-Method-Override, Content-Type, Cache-Control, Accept"
+      200
     end
 
     get %r{^/?([-_\.a-zA-Z0-9]+)?/nodes} do |base|
@@ -115,7 +129,7 @@ module HieravizApp
 
     get %r{^/?([-_\.a-zA-Z0-9]+)?/farms} do |base|
       check_authorization
-      cors_headers
+      cross_origin
       hieracles_config = prepare_config(base)
       json Hieracles::Registry.farms_counted(hieracles_config, base)
     end
@@ -144,18 +158,22 @@ module HieravizApp
       json res
     end
 
-    options %r{^/.*/$} do
-      cors_headers
-      halt 200
-    end
-
     get %r{^/?([-_\.a-zA-Z0-9]+)?/farm/([-_\.a-zA-Z0-9]+)$} do |base, farm|
       # check_authorization
-      cors_headers
+      cross_origin
       hieracles_config = prepare_config(base)
       nodes =  Hieracles::Registry.nodes_data(hieracles_config, base).each_with_object({}) do |(key, val), acc|
         acc[key] = val if val['farm'] == farm
       end
+      params = request.env['rack.request.query_hash']
+      if params.count > 0
+        puts params
+        params.each do |k, v|
+          nodes = nodes.keep_if do |key, item|
+            item[k] == v
+          end
+        end
+      end
       json nodes
     end
 

data/app/web.rb

@@ -1,6 +1,5 @@
 require 'sinatra/content_for'
 
-require 'better_errors'
 require 'rack-flash'
 require 'dotenv'
 require 'oauth2'
@@ -24,11 +23,6 @@ module HieravizApp
       enable :sessions
     end
 
-    configure :development do
-      use BetterErrors::Middleware
-      BetterErrors.application_root = File.expand_path('../../', __FILE__)
-    end
-
     case settings.configdata['auth_method']
     when 'dummy'
 

data/lib/hieraviz/config.rb

@@ -12,7 +12,7 @@ module Hieraviz
     def basepaths
       basepath_dir = @_config['basepath_dir']
       if @_config && basepath_dir
-        Dir.glob(root_path(basepath_dir)).map { |path| File.expand_path(path) }
+        Dir.glob(root_path(basepath_dir)).map { |path| File.expand_path(path) }.sort
       end
     end
 

data/lib/hieraviz.rb

@@ -5,6 +5,7 @@ require 'hieraviz/store'
 require 'hieraviz/facts'
 require 'hieraviz/auth_gitlab'
 require 'hieraviz/puppetdb'
+require 'sinatra/cross-origin'
 
 module Hieraviz
   # Your code goes here...

data/lib/sinatra/cross-origin.rb

@@ -0,0 +1,82 @@
+require 'sinatra/base'
+
+# Helper to enable cross origin requests.
+# More on Cross Origin Resource Sharing here:
+#   https://developer.mozilla.org/En/HTTP_access_control
+#
+# To enable cross origin requests for all routes:
+#   configure do
+#     enable :cross_origin
+#     ...
+#
+# To enable cross origin requests for a single domain:
+#   get '/' do
+#     cross_origin
+#     ...
+#
+# More info at:
+#   http://github.com/britg/sinatra-cross_origin
+#
+
+module Sinatra
+  module CrossOrigin
+    module Helpers
+
+      # Apply cross origin headers either
+      # from global config or custom config passed
+      # as a hash
+      def cross_origin(hash=nil)
+        request_origin = request.env['HTTP_ORIGIN']
+        return unless request_origin
+        settings.set hash if hash
+
+        if settings.allow_origin == :any
+          origin = request_origin
+        else
+          allowed_origins = *settings.allow_origin # make sure its an array
+          origin = allowed_origins.join('|')       # we'll return this unless allowed
+
+          allowed_origins.each do |allowed_origin|
+            if allowed_origin.is_a?(Regexp) ? 
+                request_origin =~ allowed_origin : 
+                request_origin == allowed_origin
+              origin = request_origin
+              break
+            end
+          end
+        end
+
+        methods = settings.allow_methods.map{ |m| m.to_s.upcase! }.join(', ')
+
+        headers_list = {
+          'Access-Control-Allow-Origin' => origin,
+          'Access-Control-Allow-Methods' => methods,
+          'Access-Control-Allow-Headers' => settings.allow_headers.map(&:to_s).join(', '),
+          'Access-Control-Allow-Credentials' => settings.allow_credentials.to_s,
+          'Access-Control-Max-Age' => settings.max_age.to_s,
+          'Access-Control-Expose-Headers' => settings.expose_headers.join(', ')
+        }
+
+        headers headers_list
+      end
+    end
+
+    def self.registered(app)
+
+      app.helpers CrossOrigin::Helpers
+
+      app.set :cross_origin, false
+      app.set :allow_origin, :any
+      app.set :allow_methods, [:post, :get, :options]
+      app.set :allow_credentials, true
+      app.set :allow_headers, ["*", "Content-Type", "Accept", "AUTHORIZATION", "Cache-Control"]
+      app.set :max_age, 1728000
+      app.set :expose_headers, ['Cache-Control', 'Content-Language', 'Content-Type', 'Expires', 'Last-Modified', 'Pragma']
+
+      app.before do
+        cross_origin if settings.cross_origin
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieraviz
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -301,6 +301,7 @@ files:
 - lib/hieraviz/store.rb
 - lib/hieraviz/utilities.rb
 - lib/hieraviz/version.rb
+- lib/sinatra/cross-origin.rb
 - spec/app/apiv1_spec.rb
 - spec/app/web_dummy_auth_spec.rb
 - spec/app/web_spec.rb