chef 11.14.0.alpha.3-x86-mingw32 → 11.14.0.alpha.4-x86-mingw32

data/spec/unit/provider/package/apt_spec.rb

@@ -169,6 +169,11 @@ SHOWPKG_STDOUT
       @provider.load_current_resource
     end
 
+    it "raises an exception if a source is specified (CHEF-5113)" do
+      @new_resource.source "pluto"
+      @provider.define_resource_requirements
+      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+    end
   end
 
   context "after loading the current resource" do

data/spec/unit/provider/package/windows_spec.rb

@@ -27,6 +27,7 @@ describe Chef::Provider::Package::Windows, :windows_only do
 
   describe "load_current_resource" do
     before(:each) do
+      Chef::Util::PathHelper.stub(:validate_path)
       provider.stub(:package_provider).and_return(double('package_provider',
           :installed_version => "1.0", :package_version => "2.0"))
     end
@@ -46,6 +47,11 @@ describe Chef::Provider::Package::Windows, :windows_only do
       provider.load_current_resource
       expect(provider.new_resource.version).to eql("2.0")
     end
+
+    it "checks that the source path is valid" do
+      expect(Chef::Util::PathHelper).to receive(:validate_path)
+      provider.load_current_resource
+    end
   end
 
   describe "package_provider" do

data/spec/unit/resource_reporter_spec.rb

@@ -436,7 +436,7 @@ describe Chef::ResourceReporter do
         @backtrace = ["foo.rb:1 in `foo!'","bar.rb:2 in `bar!","'baz.rb:3 in `baz!'"]
         @node = Chef::Node.new
         @node.name("spitfire")
-        @exception = double("ArgumentError")
+        @exception = ArgumentError.new
         @exception.stub(:inspect).and_return("Net::HTTPServerException")
         @exception.stub(:message).and_return("Object not found")
         @exception.stub(:backtrace).and_return(@backtrace)
@@ -463,7 +463,7 @@ describe Chef::ResourceReporter do
 
       it "includes the error inspector output in the event data" do
         @report["data"]["exception"].should have_key("description")
-        @report["data"]["exception"]["description"].should include({"title"=>"Error expanding the run_list:", "sections"=>[{"Unexpected Error:" => "RSpec::Mocks::Mock: Object not found"}]})
+        @report["data"]["exception"]["description"].should include({"title"=>"Error expanding the run_list:", "sections"=>[{"Unexpected Error:" => "ArgumentError: Object not found"}]})
       end
 
     end

data/spec/unit/util/path_helper_spec.rb

@@ -0,0 +1,136 @@
+#
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+require 'chef/util/path_helper'
+require 'spec_helper'
+
+describe Chef::Util::PathHelper do
+  let(:path_helper) { Chef::Util::PathHelper }
+
+  describe "validate_path" do
+    context "on windows" do
+      before(:each) do
+        # pass by default
+        Chef::Platform.stub(:windows?).and_return(true)
+        path_helper.stub(:printable?).and_return(true)
+        path_helper.stub(:windows_max_length_exceeded?).and_return(false)
+      end
+
+      it "returns the path if the path passes the tests" do
+        expect(path_helper.validate_path("C:\\ThisIsRigged")).to eql("C:\\ThisIsRigged")
+      end
+
+      it "does not raise an error if everything looks great" do
+        expect { path_helper.validate_path("C:\\cool path\\dude.exe") }.not_to raise_error
+      end
+
+      it "raises an error if the path has invalid characters" do
+        path_helper.stub(:printable?).and_return(false)
+        expect { path_helper.validate_path("Newline!\n") }.to raise_error(Chef::Exceptions::ValidationFailed)
+      end
+
+      it "Adds the \\\\?\\ prefix if the path exceeds MAX_LENGTH and does not have it" do
+        long_path = "C:\\" + "a" * 250 + "\\" + "b" * 250
+        prefixed_long_path = "\\\\?\\" + long_path
+        path_helper.stub(:windows_max_length_exceeded?).and_return(true)
+        expect(path_helper.validate_path(long_path)).to eql(prefixed_long_path)
+      end
+    end
+  end
+
+  describe "windows_max_length_exceeded?" do
+    it "returns true if the path is too long (259 + NUL) for the API" do
+      expect(path_helper.windows_max_length_exceeded?("C:\\" + "a" * 250 + "\\" + "b" * 6)).to be_true
+    end
+
+    it "returns false if the path is not too long (259 + NUL) for the standard API" do
+      expect(path_helper.windows_max_length_exceeded?("C:\\" + "a" * 250 + "\\" + "b" * 5)).to be_false
+    end
+
+    it "returns false if the path is over 259 characters but uses the \\\\?\\ prefix" do
+      expect(path_helper.windows_max_length_exceeded?("\\\\?\\C:\\" + "a" * 250 + "\\" + "b" * 250)).to be_false
+    end
+  end
+
+  describe "printable?" do
+    it "returns true if the string contains no non-printable characters" do
+      expect(path_helper.printable?("C:\\Program Files (x86)\\Microsoft Office\\Files.lst")).to be_true
+    end
+
+    it "returns true when given 'abc' in unicode" do
+      expect(path_helper.printable?("\u0061\u0062\u0063")).to be_true
+    end
+
+    it "returns true when given japanese unicode" do
+      expect(path_helper.printable?("\uff86\uff87\uff88")).to be_true
+    end
+
+    it "returns false if the string contains a non-printable character" do
+      expect(path_helper.printable?("\my files\work\notes.txt")).to be_false
+    end
+
+    # This isn't necessarily a requirement, but here to be explicit about functionality.
+    it "returns false if the string contains a newline or tab" do
+      expect(path_helper.printable?("\tThere's no way,\n\t *no* way,\n\t that you came from my loins.\n")).to be_false
+    end
+  end
+
+  describe "canonical_path" do
+    context "on windows", :windows_only do
+      it "returns an absolute path with backslashes instead of slashes" do
+        expect(path_helper.canonical_path("\\\\?\\C:/windows/win.ini")).to eq("\\\\?\\c:\\windows\\win.ini")
+      end
+
+      it "adds the \\\\?\\ prefix if it is missing" do
+        expect(path_helper.canonical_path("C:/windows/win.ini")).to eq("\\\\?\\c:\\windows\\win.ini")
+      end
+
+      it "returns a lowercase path" do
+        expect(path_helper.canonical_path("\\\\?\\C:\\CASE\\INSENSITIVE")).to eq("\\\\?\\c:\\case\\insensitive")
+      end
+    end
+
+    context "not on windows", :unix_only  do
+      context "ruby is at least 1.9", :ruby_gte_19_only do
+        it "returns a canonical path" do
+          expect(path_helper.canonical_path("/etc//apache.d/sites-enabled/../sites-available/default")).to eq("/etc/apache.d/sites-available/default")
+        end
+      end
+
+      context "ruby is less than 1.9", :ruby_18_only do
+        it "returns a canonical path" do
+          expect { path_helper.canonical_path("/etc//apache.d/sites-enabled/../sites-available/default") }.to raise_error(NotImplementedError)
+        end
+      end
+    end
+  end
+
+  describe "paths_eql?" do
+    it "returns true if the paths are the same" do
+      path_helper.stub(:canonical_path).with("bandit").and_return("c:/bandit/bandit")
+      path_helper.stub(:canonical_path).with("../bandit/bandit").and_return("c:/bandit/bandit")
+      expect(path_helper.paths_eql?("bandit", "../bandit/bandit")).to be_true
+    end
+
+    it "returns false if the paths are different" do
+      path_helper.stub(:canonical_path).with("bandit").and_return("c:/Bo/Bandit")
+      path_helper.stub(:canonical_path).with("../bandit/bandit").and_return("c:/bandit/bandit")
+      expect(path_helper.paths_eql?("bandit", "../bandit/bandit")).to be_false
+     end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.14.0.alpha.3
+  version: 11.14.0.alpha.4
 platform: x86-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -279,47 +279,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -1111,6 +1111,7 @@ files:
 - lib/chef/provider/mount.rb
 - lib/chef/provider/mount/aix.rb
 - lib/chef/provider/mount/mount.rb
+- lib/chef/provider/mount/solaris.rb
 - lib/chef/provider/mount/windows.rb
 - lib/chef/provider/ohai.rb
 - lib/chef/provider/package.rb
@@ -1277,6 +1278,7 @@ files:
 - lib/chef/util/diff.rb
 - lib/chef/util/editor.rb
 - lib/chef/util/file_edit.rb
+- lib/chef/util/path_helper.rb
 - lib/chef/util/selinux.rb
 - lib/chef/util/threaded_job_queue.rb
 - lib/chef/util/windows.rb
@@ -1563,6 +1565,7 @@ files:
 - spec/data/trusted_certs/intermediate.pem
 - spec/data/trusted_certs/opscode.pem
 - spec/data/trusted_certs/root.pem
+- spec/functional/application_spec.rb
 - spec/functional/assets/PkgA.1.0.0.0.bff
 - spec/functional/assets/PkgA.2.0.0.0.bff
 - spec/functional/assets/dummy-1-0.aix6.1.noarch.rpm
@@ -1730,6 +1733,7 @@ files:
 - spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb
 - spec/unit/handler/json_file_spec.rb
 - spec/unit/handler_spec.rb
+- spec/unit/http/basic_client_spec.rb
 - spec/unit/http/simple_spec.rb
 - spec/unit/http/ssl_policies_spec.rb
 - spec/unit/http/validate_content_length_spec.rb
@@ -1844,6 +1848,7 @@ files:
 - spec/unit/provider/deploy/timestamped_spec.rb
 - spec/unit/provider/deploy_spec.rb
 - spec/unit/provider/directory_spec.rb
+- spec/unit/provider/env/windows_spec.rb
 - spec/unit/provider/env_spec.rb
 - spec/unit/provider/erl_call_spec.rb
 - spec/unit/provider/execute_spec.rb
@@ -1868,6 +1873,7 @@ files:
 - spec/unit/provider/mdadm_spec.rb
 - spec/unit/provider/mount/aix_spec.rb
 - spec/unit/provider/mount/mount_spec.rb
+- spec/unit/provider/mount/solaris_spec.rb
 - spec/unit/provider/mount/windows_spec.rb
 - spec/unit/provider/mount_spec.rb
 - spec/unit/provider/ohai_spec.rb
@@ -2019,6 +2025,7 @@ files:
 - spec/unit/util/diff_spec.rb
 - spec/unit/util/editor_spec.rb
 - spec/unit/util/file_edit_spec.rb
+- spec/unit/util/path_helper_spec.rb
 - spec/unit/util/selinux_spec.rb
 - spec/unit/util/threaded_job_queue_spec.rb
 - spec/unit/version/platform_spec.rb