proxes 0.9.9 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f06c68171f233ccce5d7cb06ab76f6503254ae8159c8906a53170af8e6e4b78
-  data.tar.gz: c4022844adcbf0d5740fe3b78f841a2be8c0db6b6d182a9d383f79ceb6d28299
+  metadata.gz: daa368238a056af49baf95e92dc664489f80b44e0146508e4006d8b454f79e37
+  data.tar.gz: 4cc6c9716a2101d1b7bba50bce22392772bb80124f6e959d525faaf1f2a43d56
 SHA512:
-  metadata.gz: 9b7d4ad313c188b7dd2e9db490870828bf6b6c2590c15349ccc58d167bc29c6f1e455e3706a6202cb78d072a1b105308c0c9004cb239d06cefb4fe0ae951e7cf
-  data.tar.gz: 3ed39b26565420d629984d4e932bce2b239369554b84d0daf2744cca469a65ec634ee17f514790b11d8a5a4d7833d23b15e55519051fdec046371d9b0e49524d
+  metadata.gz: 5384c2901a06e83e904f2444f30b2b410b67f6e09e69271390b2298ee29b7762e294cee00a11ed466b869a32c66f0f48f229df3823496ca9520cdfa1682d9241
+  data.tar.gz: cd8c9489ae8593f5e9cab925a00e27f07da849d0eb2b3f16002e9a0b836ce9c0ec0263dc8c260d5205ca95b7dd27c6bdd4e8bb867185c74000ae6478c436a680

data/lib/ditty/components/proxes.rb

@@ -64,10 +64,8 @@ module Ditty
         ::ProxES::Permission.find_or_create(role: user_role, verb: 'INDEX', pattern: 'user-{user.id}')
 
         # Kibana Specific
-        anon = ::Ditty::User.find_or_create(email: 'anonymous@proxes.io')
-        anon.remove_role user_role
         anon_role = ::Ditty::Role.find_or_create(name: 'anonymous')
-        anon.add_role anon_role unless anon.role?('anonymous')
+        ::Ditty::User.create_anonymous_user('anonymous@proxes.io')
         ::ProxES::Permission.find_or_create(role: anon_role, verb: 'GET', pattern: '/.kibana/config/*')
         ::ProxES::Permission.find_or_create(role: anon_role, verb: 'INDEX', pattern: '.kibana')
 

data/lib/proxes/helpers/indices.rb

@@ -17,16 +17,18 @@ module ProxES
       end
 
       def patterns
-        return [] if user.nil?
+        current_user = user || Ditty::User.anonymous_user
+        return [] if current_user.nil?
         patterns_for('INDEX').map do |permission|
           return nil if permission.pattern.blank?
-          permission.pattern.gsub(/\{user.(.*)\}/) { |_match| user.send(Regexp.last_match[1].to_sym) }
+          permission.pattern.gsub(/\{user.(.*)\}/) { |_match| current_user.send(Regexp.last_match[1].to_sym) }
         end.compact
       end
 
       def patterns_for(action)
-        return [] if user.nil?
-        Permission.for_user(user, action)
+        current_user = user || Ditty::User.anonymous_user
+        return [] if current_user.nil?
+        Permission.for_user(current_user, action)
       end
     end
   end

data/lib/proxes/policies/request_policy.rb

@@ -21,6 +21,7 @@ module ProxES
     def method_missing(method_sym, *arguments, &block)
       return super if method_sym.to_s[-1] != '?'
 
+      return true if user && user.super_admin?
       return false if request.indices? && !index_allowed?
       action_allowed? method_sym[0..-2].upcase
     end

data/lib/proxes/request.rb

@@ -34,8 +34,8 @@ module ProxES
     end
 
     def user_id
-      return env['omniauth.auth'].uid if env['omniauth.auth']
-      env['rack.session']['user_id'] if env['rack.session']
+      return env['rack.session']['user_id'] if env['rack.session']
+      env['omniauth.auth'].uid if env['omniauth.auth']
     end
 
     def user

data/lib/proxes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProxES
-  VERSION = '0.9.9'.freeze
+  VERSION = '0.9.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.12
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-02 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler