bugfix #22

app/controllers/keys_controller.rb

@@ -48,7 +48,7 @@ def index
     end
 
     @keys = @keys.order(sort_clause) unless @keys.nil?
-
+    @keys = @keys.select { |key| key.whitelisted?(User,@project) }
     @keys = [] if @keys.nil? #hack for decryption
 
     @limit = per_page_option
@@ -60,8 +60,6 @@ def index
       @keys = @keys.offset(@offset).limit(@limit)
     end
 
-    @keys = @keys.select { |key| key.whitelisted?(User,@project) }
-
     @keys.map(&:decrypt!)
   end
 
@@ -118,16 +116,26 @@ def update_wishlist
   end
 
   def edit
-    @key.decrypt!
-    respond_to do |format|
-      format.html { render action: 'edit'}
+    if !@key.whitelisted?(User,@project)
+      render_error t("error.key.not_whitelisted")
+      return
+    else
+      @key.decrypt!
+      respond_to do |format|
+        format.html { render action: 'edit'}
+      end
     end
   end
 
   def show
-    @key.decrypt!
-    respond_to do |format|
-      format.html { render action: 'show'}
+    if !@key.whitelisted?(User,@project)
+      render_error t("error.key.not_whitelisted")
+      return
+    else
+      @key.decrypt!
+      respond_to do |format|
+        format.html { render action: 'show'}
+      end
     end
   end
 

app/models/vault/key.rb

@@ -54,4 +54,4 @@ def whitelisted?(user,project)
   class Vault::KeysVaultTags < ActiveRecord::Base
   end
 
-end
+end

app/views/keys/index.html.erb

@@ -31,24 +31,24 @@
 </h2>
 
 <%= form_tag({}, :data => {:cm_url => project_keys_context_menus_path(@project)}) do %>
-  <table class='list' id='keys_table'>
-    <thead><tr>
-      <th class="checkbox hide-when-print">
-         <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
-               :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
-      </th>
-      <%= sort_header_tag('name', caption: t('key.attr.name')) %>
-      <th><%= t('key.attr.url') %></th>
-      <th><%= t('key.attr.login') %></th>
-      <th><%= t('key.attr.body') %> </th>
-      <th><%= t('key.btn.actions') %></th>
-    </tr></thead>
-    <tbody>
-      <% @keys.each do |key| %>
-        <%= render partial: key, locals: {parity: cycle('odd', 'even')} %>
-      <% end %>
-    </tbody>
-  </table>
+<table class='list' id='keys_table'>
+  <thead><tr>
+    <th class="checkbox hide-when-print">
+       <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
+             :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
+    </th>
+    <%= sort_header_tag('name', caption: t('key.attr.name')) %>
+    <th><%= t('key.attr.url') %></th>
+    <th><%= t('key.attr.login') %></th>
+    <th><%= t('key.attr.body') %> </th>
+    <th><%= t('key.btn.actions') %></th>
+  </tr></thead>
+  <tbody>
+    <% @keys.each do |key| %>
+      <%= render partial: key, locals: {parity: cycle('odd', 'even')} %>
+    <% end %>
+  </tbody>
+</table>
 <% end %>
 
 <% if Redmine::VERSION.to_s.start_with?('3.3')  %>

config/locales/en.yml

@@ -88,4 +88,5 @@ en:
 
   error:
     key:
-      not_set: "The encryption key is not set in the settings"
+      not_set: "The encryption key is not set in the settings"
+      not_whitelisted: "Key not allowed for you"

config/locales/it.yml

@@ -88,4 +88,5 @@ it:
 
   error:
     key:
-      not_set: "La chiave crittografata non è definita nelle impostazioni"
+      not_set: "La chiave crittografata non è definita nelle impostazioni"
+      not_whitelisted: "Chiave non consentita per te"

config/locales/nl.yml

@@ -88,4 +88,5 @@ nl:
 
   error:
     key:
-      not_set: "De encryptie sleutel is niet gezet in de instellingen"
+      not_set: "De encryptie sleutel is niet gezet in de instellingen"
+      not_whitelisted: "Sleutel niet toegestaan voor jou"

config/locales/ru.yml

@@ -88,4 +88,5 @@ ru:
 
   error:
     key:
-      not_set: "Ключ шифрования не установлен в настройках"
+      not_set: "Ключ шифрования не установлен в настройках"
+      not_whitelisted: "Ключ вам не доступен"

config/locales/zh.yml

@@ -89,3 +89,4 @@ zh:
   error:
     key:
       not_set: "选项钥设置加密方法及密钥"
+      not_whitelisted: "关键不允许你"

init.rb

@@ -7,7 +7,7 @@
   name 'Vault plugin'
   author 'noshutdown.ru'
   description 'Plugin for keep keys and passwords'
-  version '0.3.4'
+  version '0.3.5'
   url 'https://noshutdown.ru/redmine-plugins-vault/'
   author_url 'https://noshutdown.ru/'