Fixing CHEF-229(/193): properly catching Chef::Exceptions::FileNotFound and returning a 404 in cookbook_files.rb

Author: chris

chef-server-slice/app/controllers/cookbook_files.rb

@@ -45,15 +45,19 @@ def index
 
   def show
     only_provides :json
-    to_send = find_preferred_file(
-      params[:cookbook_id], 
-      :remote_file, 
-      params[:id], 
-      params[:fqdn], 
-      params[:platform], 
-      params[:version]
-    )
-    raise NotFound, "Cannot find a suitable file!" unless to_send
+    begin
+      to_send = find_preferred_file(
+        params[:cookbook_id], 
+        :remote_file, 
+        params[:id], 
+        params[:fqdn], 
+        params[:platform], 
+        params[:version]
+      )
+    rescue Chef::Exceptions::FileNotFound
+      raise NotFound, "Cannot find a suitable file!"
+    end
+
     current_checksum = checksum(to_send)
     Chef::Log.debug("old sum: #{params[:checksum]}, new sum: #{current_checksum}") 
     if current_checksum == params[:checksum]

features/data/cookbooks/transfer_remote_files/recipes/transfer_a_non-existent_file_from_a_cookbook.rb

@@ -0,0 +1,22 @@
+#
+# Cookbook Name:: transfer_remote_files
+# Recipe:: default
+#
+# Copyright 2009, Opscode
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+remote_file "#{node[:tmpdir]}/transfer_a_non-existent_file_from_a_cookbook.txt" do
+  source "transfer_a_non-existent_file_from_a_cookbook.txt"
+end

features/transfer_remote_files.feature

@@ -10,6 +10,13 @@ Feature: Transfer Remote Files
      Then the run should exit '0'
       And a file named 'transfer_a_file_from_a_cookbook.txt' should contain 'easy like sunday morning'
 
+  Scenario: Transfer a non-existent file from a cookbook and should return a 404
+    Given a validated node
+      And it includes the recipe 'transfer_remote_files::transfer_a_non-existent_file_from_a_cookbook'
+     When I run the chef-client
+     Then the run should exit '1'
+      And 'stdout' should have '404'
+      
   Scenario: Should prefer the file for this specific host
     Given a validated node
       And it includes the recipe 'transfer_remote_files::should_prefer_the_file_for_this_specific_host'