kibana-rack 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8a77c4673874c623af6c587228a48f59400c531
-  data.tar.gz: 89f98d20b09d90e4972a84f8006bf8af42fcdc75
+  metadata.gz: d9b991332964c43f341d86bf0eb6f037aba64e76
+  data.tar.gz: 5c25476aa7ac8daee036ec839b4b86d3eaa5fc4f
 SHA512:
-  metadata.gz: ead603df5f794c5d3d72f173b987a796d0602b6e5479cce9983a19b918b0993fd9dd69ceab77603c5fba7eda53fcfe10531cfbaa08efec8688ce44f6ae55ecca
-  data.tar.gz: 7040a490372406bc06e9925b084b4c6c6f7394ffbe6c829f934849c549d200540fc1fe8e79cdfa78a54d9d75aea6016dfa33e579d93e5373acb3e46c456a71d7
+  metadata.gz: e7339e39d1c59ae6be114aa0f5031e9ceac796272fa4e884059a3e188c9baa36b14f62c7b43f105ba7917bf867128dd55b974b3e6b0a912ff8f586dbf3fff748
+  data.tar.gz: 4c51e220d44aa5ee78d133314651b9c47a79a4cea0048bdacf90270fc4b88f99de16758a1f1d546e854337825da8443387a15047f94632a4f4bd857e4c26f66d

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-��#�P�F`M?�0c0n�r�X�i������6�'�M?D�ڲCp�U����d���HI�:"�?��eR��΍�υw���3�k7��î�#ooj%9+-�ȉ���x7
-V�-�1�!a�!�`�]�����X�o��e��Cb��8���T�V���Nu���K����M���?N!-j؝U+���l.nʕ8
+�t�H���r�γ����9��YX<);��YI�Nnv���*���m)!�W9]��e�?A5D=��S��Ӗ�bڥ�6�%H?��%�Y�+� ��:�@���	�^�r�F레Iך>��C��l���/�AƵ??�bx�{
p
+'�@Ycm.�$+fqq�Dz�Ct��F�Ԯ;�9�'��S�;
��V��
+�w����*Pq>}]

data/AUTHORS.md

@@ -0,0 +1,9 @@
+# kibana-rack Authors
+
+## Maintainer
+
+[Tony Burns](https://github.com/tabolario)
+
+## Contributors
+
+[Dan Carley](https://github.com/dcarley)

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change history for kibana-rack
 
+## [v0.1.4](https://github.com/tabolario/kibana-rack/releases/tag/v0.1.4)
+
+* [Bug] [Proxy temporary and permanent dashboards to ES](https://github.com/tabolario/kibana-rack/pull/12) - [dcarley](https://github.com/dcarley)
+
 ## [v0.1.3](https://github.com/tabolario/kibana-rack/releases/tag/v0.1.3)
 
 * [Bug] [Serve dashboard files from app/dashboards](https://github.com/tabolario/kibana-rack/issues/10)

data/lib/kibana/rack/version.rb

@@ -1,5 +1,5 @@
 module Kibana
   module Rack
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/lib/kibana/rack/web.rb

@@ -15,11 +15,33 @@ module Kibana
       set :kibana_index, -> { Kibana.kibana_index }
 
       helpers do
+        def validate_kibana_index_name
+          render_not_found unless params[:index] == settings.kibana_index
+        end
+
         def proxy
           es_host = settings.elasticsearch_host
           es_port = settings.elasticsearch_port
           @proxy ||= Faraday.new(url: "http://#{es_host}:#{es_port}")
         end
+
+        def proxy_es_request
+          request.body.rewind
+
+          proxy_method = request.request_method.downcase.to_sym
+          proxy_response = proxy.send(proxy_method) do |proxy_request|
+            proxy_request.url(request.path_info)
+            proxy_request.headers['Content-Type'] = 'application/json'
+            proxy_request.params = env['rack.request.query_hash']
+            proxy_request.body = request.body.read if [:post, :put].include?(proxy_method)
+          end
+
+          [proxy_response.status, proxy_response.headers, proxy_response.body]
+        end
+
+        def render_not_found
+          halt(404, '<h1>Not Found</h1>')
+        end
       end
 
       get '/' do
@@ -36,25 +58,46 @@ module Kibana
         dashboard_ext = params[:captures][1]
         dashboard_path = File.join(settings.kibana_dashboards_path, "#{dashboard_name}.#{dashboard_ext}")
 
-        halt(404, { 'Content-Type' => 'application/json' }, '{"error":"Not found"}') unless File.exist?(dashboard_path)
+        render_not_found unless File.exist?(dashboard_path)
 
         template = IO.read(dashboard_path)
         content_type "application/#{dashboard_ext}"
         erb template
       end
 
-      route(:delete, :get, :post, :put, %r{^((/_(aliases|nodes))|(.+/_(aliases|mapping|search)))}) do
-        request.body.rewind
+      route(:delete, :get, :post, :put, '/_aliases') do
+        proxy_es_request
+      end
 
-        proxy_method = request.request_method.downcase.to_sym
-        proxy_response = proxy.send(proxy_method) do |proxy_request|
-          proxy_request.url(params[:captures].first)
-          proxy_request.headers['Content-Type'] = 'application/json'
-          proxy_request.params = env['rack.request.query_hash']
-          proxy_request.body = request.body.read if proxy_method == :post
-        end
+      route(:delete, :get, :post, :put, '/_nodes') do
+        proxy_es_request
+      end
+
+      route(:delete, :get, :post, :put, '/:index/_aliases') do
+        proxy_es_request
+      end
+
+      route(:delete, :get, :post, :put, '/:index/_mapping') do
+        proxy_es_request
+      end
+
+      route(:delete, :get, :post, :put, '/:index/_search') do
+        proxy_es_request
+      end
+
+      route(:delete, :get, :post, :put, '/:index/temp') do
+        validate_kibana_index_name
+        proxy_es_request
+      end
+
+      route(:delete, :get, :post, :put, '/:index/temp/:name') do
+        validate_kibana_index_name
+        proxy_es_request
+      end
 
-        [proxy_response.status, proxy_response.headers, proxy_response.body]
+      route(:delete, :get, :post, :put, '/:index/dashboard/:dashboard') do
+        validate_kibana_index_name
+        proxy_es_request
       end
     end
   end

data/spec/unit/kibana/rack/web_spec.rb

@@ -3,14 +3,16 @@ require 'spec_helper'
 describe Kibana::Rack::Web do
   include Rack::Test::Methods
 
-  let(:app) { described_class }
+  KIBANA_INDEX = 'test-int'
 
+  let(:app) { described_class }
   let(:dashboards_path) { File.expand_path('../../../../fixtures/dashboards', __FILE__) }
 
   before do
     app.set(:raise_exceptions, true)
     app.set(:show_exceptions, false)
     app.set(:kibana_dashboards_path, dashboards_path)
+    app.set(:kibana_index, KIBANA_INDEX)
   end
 
   it 'serves the Kibana application' do
@@ -49,17 +51,44 @@ describe Kibana::Rack::Web do
   it 'returns 404 if a dashboard does not exist' do
     get '/app/dashboards/nonexistent.json'
 
-    expect(last_response.body.strip).to eql('{"error":"Not found"}')
+    expect(last_response.body.strip).to eql('<h1>Not Found</h1>')
     expect(last_response.status).to eql(404)
   end
 
+  [
+    %w(put /_cluster/settings),
+    %w(post /_shutdown),
+    %w(post /_cluster/nodes/_shutdown),
+    %w(delete /*),
+    %w(delete /_all),
+    %w(delete /_all/_query?q=*),
+    %w(delete /logstash-2014.08.08/_query?q=*),
+    %w(delete /logstash-2014.08.08),
+    %w(post /logstash-2014.08.08),
+    %w(put /logstash-2014.08.08/message/123),
+    %w(post /logstash-2014.08.08/message/123/_update),
+    %w(get /logstash-2014.08.08/dashboard/123),
+    %w(get /logstash-2014.08.08/temp/123)
+  ].each do |method, path|
+    it "should prevent #{method.upcase} #{path} being proxied to Elasticsearch" do
+      send(method, path)
+
+      expect(last_response.body.strip).to eql('<h1>Not Found</h1>')
+      expect(last_response.status).to eql(404)
+    end
+  end
+
   {
     '/_aliases'                                         => { method: :get },
     '/_nodes'                                           => { method: :get },
     '/_all/_aliases'                                    => { method: :get },
     '/_all/_mapping'                                    => { method: :get },
     '/_all/_search'                                     => { method: :post, body: '{"j":"s","o":"n"}' },
-    '/logstash-2014.08.08,logstash-2014.08.09/_aliases' => { method: :get, params: { ignore_missing: 'true' } }
+    '/logstash-2014.08.08,logstash-2014.08.09/_aliases' => { method: :get, params: { ignore_missing: 'true' } },
+    "/#{KIBANA_INDEX}/temp?ttl=30d"                     => { method: :post, body: '{"j":"s","o":"n"}' },
+    "/#{KIBANA_INDEX}/temp/GjO0MfT5QL6dLqOytd6qDw"      => { method: :get, params: { cache: 123 } },
+    "/#{KIBANA_INDEX}/dashboard/read_example"           => { method: :get, params: { cache: 123 } },
+    "/#{KIBANA_INDEX}/dashboard/write_example"          => { method: :put, body: '{"j":"s","o":"n"}' }
   }.each do |path, options|
     it "proxies #{options[:method].upcase} #{path} to Elasticsearch" do
       request_method = options[:method]
@@ -67,7 +96,7 @@ describe Kibana::Rack::Web do
         .with(body: options[:body], query: options[:params])
         .to_return(body: '{}', headers: { 'foo' => 'bar' }, status: 200)
 
-      request_params = request_method == :post ? options[:body] : options[:params]
+      request_params = options[:body] || options[:params]
       send(request_method, path, request_params)
 
       expect(last_response.body).to eql('{}')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kibana-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tony Burns
@@ -30,7 +30,7 @@ cert_chain:
   WdK2SktNC0LYNRz+x3DdkcnVGS5BbSE7CYk7ap0J9jTobkmBTZ6tNWhVQiy7eJLr
   pOgabsoLeT6zXAW+EOudMh1S/ZA=
   -----END CERTIFICATE-----
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -104,6 +104,7 @@ files:
 - ".simplecov"
 - ".travis.yml"
 - ".yardopts"
+- AUTHORS.md
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile