From 1ad0f0b0696643dbf74f78868f6ebb436192c5d8 Mon Sep 17 00:00:00 2001
From: amartynov <amartynov@itcwin.com>
Date: Tue, 15 Jul 2014 14:06:58 +0400
Subject: [PATCH] fixed

---
 devops-service/routes/v2.0/server.rb | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/devops-service/routes/v2.0/server.rb b/devops-service/routes/v2.0/server.rb
index 95c693b..d8d9284 100644
--- a/devops-service/routes/v2.0/server.rb
+++ b/devops-service/routes/v2.0/server.rb
@@ -38,15 +38,6 @@ module Version2_0
       puts "Server routes initialized"
     end
 
-    before "/server/:name_or_cmd" do
-      if request.get?
-        check_headers :accept
-      else
-        check_headers :accept, :content_type
-      end
-      check_privileges("server")
-    end
-
     before %r{\A/server/[\w]+/(pause|unpouse|reserve|unreserve)\z} do
       check_headers :accept, :content_type
       check_privileges("server", "w")
@@ -54,11 +45,6 @@ module Version2_0
       @key = (body.nil? ? nil : body["key"])
     end
 
-    before "/servers/:provider" do
-      check_headers :accept
-      check_privileges("server", "r")
-    end
-
     after %r{\A/server(/[\w]+)?\z | \A/server/(add|bootstrap)\z | \A/server/[\w]+/(un)?pause\z} do
       statistic
     end
@@ -99,6 +85,8 @@ module Version2_0
     #     }
     #   ]
     get "/servers/chef" do
+      check_headers :accept
+      check_privileges("server", "r")
       json KnifeCommands.chef_node_list
     end
 
@@ -139,6 +127,8 @@ module Version2_0
     #     }
     #   ]
     get "/servers/:provider" do
+      check_headers :accept
+      check_privileges("server", "r")
       json ::Provider::ProviderFactory.get(params[:provider]).servers
     end
 
@@ -158,6 +148,8 @@ module Version2_0
     #     }
     #   ]
     get "/server/:name" do
+      check_headers :accept
+      check_privileges("server", "r")
       json get_server(params[:name], params[:key]).to_hash
     end
 
@@ -176,6 +168,8 @@ module Version2_0
     # * *Returns* :
     #   200 - Deleted
     delete "/server/:id" do
+      check_headers :accept
+      check_privileges("server", "w")
       body = create_object_from_json_body(Hash, true)
       key = (body.nil? ? nil : body["key"])
       s = get_server(params[:id], key)
@@ -387,6 +381,8 @@ module Version2_0
     # * *Returns* : text stream
     # TODO: check bootstrap template name
     post "/server/bootstrap" do
+      check_headers
+      check_privileges("server", "w")
       body = create_object_from_json_body(Hash, true)
       id = check_string(body["instance_id"], "Parameter 'instance_id' must be a not empty string")
       name = check_string(body["name"], "Parameter 'name' should be a not empty string", true)
@@ -456,6 +452,8 @@ module Version2_0
     #   200 - Added
     # TODO: should be refactored
     post "/server/add" do
+      check_headers
+      check_privileges("server", "w")
       body = create_object_from_json_body
       project = check_string(body["project"], "Parameter 'project' must be a not empty string")
       deploy_env = check_string(body["deploy_env"], "Parameter 'deploy_env' must be a not empty string")