chef-zero 4.7.1 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe555937b43ccbb7feafd348d292c8d3fc0efc8
-  data.tar.gz: 3fbcb48f8503b03cb5a6231bd69e931d23d05870
+  metadata.gz: 0b1777b8332d31b59e467917da633172429a610f
+  data.tar.gz: 994c97845bc1a3cd6899f5effd61d5ffde45456e
 SHA512:
-  metadata.gz: 175cf74bbe8e73781b1b82ff7f22581b7665c3a13a07feb6f852246fd0c2401003f05622b53eeabd7acba6a478386172c897102149ffdec41713acad05b01a34
-  data.tar.gz: e0877b8047f093166e56ba5486167e4525e950266a1b6310046b27aa325b164c325c954373988c37196d13930818ac3d617593989b4461a0296838e8ec4d37e8
+  metadata.gz: 7d7cd1a182106317d3847068cc7f8db5bcc7f76a77734006ad884f31d4413b0c3c852cb6cf0d85b25f555fba1cc4526d04a40855446a62638080ce79b14fb17c
+  data.tar.gz: a55e55cca7fe1288808ce6a7ba6dc59f0d7cae8387a16ee9a61638caf9db9ec5b5a3c32a68ea40481f651614f967da95a8b3bce4808e30c6ffe624a62b921086

data/README.md

@@ -1,33 +1,20 @@
+# Chef Zero
 
-Chef Zero
-=========
+[![Status](https://travis-ci.org/chef/chef-zero.svg?branch=master)](https://travis-ci.org/chef/chef-zero) [![Gem Version](https://badge.fury.io/rb/chef-zero.svg)](http://badge.fury.io/rb/chef-zero)
 
-[![Status](https://travis-ci.org/chef/chef-zero.svg?branch=master)](https://travis-ci.org/chef/chef-zero)
-[![Gem Version](https://badge.fury.io/rb/chef-zero.svg)](http://badge.fury.io/rb/chef-zero)
-[![Stories in Ready](https://badge.waffle.io/chef/chef-zero.png?label=ready&title=Ready)](https://waffle.io/chef/chef-zero)
-[![Stories in Progress](https://badge.waffle.io/chef/chef-zero.png?label=in+progress&title=In+Progress)](https://waffle.io/chef/chef-zero)
+## Description
 
+Chef Zero is a simple, easy-install, in-memory Chef server that can be useful for Chef Client testing and chef-solo-like tasks that require a full Chef Server. It IS intended to be simple, Chef 11+ compliant, easy to run and fast to start. It is NOT intended to be secure, scalable, performant or persistent. It does NO input validation, authentication or authorization (it will not throw a 400, 401 or 403). It does not save data, and will start up empty each time you start it.
 
-Description
------------
-Chef Zero is a simple, easy-install, in-memory Chef server that can be useful
-for Chef Client testing and chef-solo-like tasks that require a full Chef
-Server. It IS intended to be simple, Chef 11 compliant, easy to run and fast
-to start. It is NOT intended to be secure, scalable, performant or persistent.
-It does NO input validation, authentication or authorization (it will not
-throw a 400, 401 or 403). It does not save data, and will start up empty each
-time you start it.
+Because Chef Zero runs in memory, it's super fast and lightweight. This makes it perfect for testing against a "real" Chef Server without mocking the entire Internet.
 
-Because Chef Zero runs in memory, it's super fast and lightweight. This makes
-it perfect for testing against a "real" Chef Server without mocking the
-entire Internet.
+## Installation
 
-
-Installation
-------------
 This server can be installed as a Ruby Gem.
 
-    $ gem install chef-zero
+```bash
+$ gem install chef-zero
+```
 
 If you're using bundler, add `chef-zero` as a development dependency:
 
@@ -45,10 +32,9 @@ s.add_development_dependency 'chef-zero'
 
 You can also clone the source repository and install it using `rake install`.
 
-Usage
------
-One of chef-zero's primary uses is as a small test server for people writing and
-testing clients. Here's a simple example of starting it up:
+## Usage
+
+One of chef-zero's primary uses is as a small test server for people writing and testing clients. Here's a simple example of starting it up:
 
 ```ruby
 require 'chef_zero/server'
@@ -62,8 +48,7 @@ This will create a server instance in the foreground. To stop the server:
 server.stop
 ```
 
-This is great for debugging and logging requests, but you'll probably want
-to run this in the background so you have full control of your thread.
+This is great for debugging and logging requests, but you'll probably want to run this in the background so you have full control of your thread.
 
 To run Chef Zero in the background, simply issue the `start_background` command:
 
@@ -80,65 +65,65 @@ server.stop
 ```
 
 ### Valid Options
+
 You may currently pass the following options to the initializer:
 
 - `host` - the host to run on (Default: '127.0.0.1')
 - `port` - the port to run on (Default: 8889)
 - `debug` - run in debug mode to see all requests and responses (Default: false)
 
+## CLI (Command Line)
 
-CLI (Command Line)
------------------
-If you don't want to use Chef Zero as a library, you can simply start an instance
-with the included `chef-zero` executable:
+If you don't want to use Chef Zero as a library, you can simply start an instance with the included `chef-zero` executable:
 
-    $ chef-zero
+```bash
+$ chef-zero
+```
 
 Note, this will run in the foreground.
 
 You now have a fully functional (empty) Chef Server running.
 
-To try it out, go into the `chef-zero/playground` directory and run `knife`. It
-will behave the same as a normal Chef Server, and all normal knife commands will
-work (show, list, delete, from file, upload, download, diff ...). For example,
-with +knife-essentials+ (or Chef 11) you can upload everything in the repo:
-
-    chef-zero/playground> knife upload .
-    Created nodes/desktop.json
-    Created data_bags/dns
-    Created environments/production.json
-    Created nodes/lb.json
-    Created nodes/dns.json
-    Created nodes/ldap.json
-    Created nodes/www.json
-    Created data_bags/dns/services.json
-    Created environments/staging.json
-    Created data_bags/passwords
-    Created data_bags/users
-    Created data_bags/users/jkeiser.json
-    Created data_bags/passwords/github.json
-    Created data_bags/passwords/twitter.json
-    Created data_bags/users/schisamo.json
-    Created data_bags/users/sethvargo.json
-    Created cookbooks/apache2
-    Created cookbooks/php
-
-    chef-zero/playground> knife environment list
-    _default
-    production
-    staging
+To try it out, go into the `chef-zero/playground` directory and run `knife`. It will behave the same as a normal Chef Server, and all normal knife commands will work (show, list, delete, from file, upload, download, diff ...). For example, with +knife-essentials+ (or Chef 11) you can upload everything in the repo:
+
+```bash
+chef-zero/playground> knife upload .
+Created nodes/desktop.json
+Created data_bags/dns
+Created environments/production.json
+Created nodes/lb.json
+Created nodes/dns.json
+Created nodes/ldap.json
+Created nodes/www.json
+Created data_bags/dns/services.json
+Created environments/staging.json
+Created data_bags/passwords
+Created data_bags/users
+Created data_bags/users/jkeiser.json
+Created data_bags/passwords/github.json
+Created data_bags/passwords/twitter.json
+Created data_bags/users/schisamo.json
+Created data_bags/users/sethvargo.json
+Created cookbooks/apache2
+Created cookbooks/php
+
+chef-zero/playground> knife environment list
+_default
+production
+staging
+```
 
 To use it in your own repository, create a `knife.rb` like so:
 
-    chef_server_url   'http://127.0.0.1:8889'
-    node_name         'stickywicket'
-    client_key        'path_to_any_pem_file.pem'
+```ruby
+chef_server_url   'http://127.0.0.1:8889'
+node_name         'stickywicket'
+client_key        'path_to_any_pem_file.pem'
+```
 
 And use knife like you normally would.
 
-Since Chef Zero does no authentication, any `.pem` file will do. The client just
-needs something to sign requests with (which will be ignored on the server). Even
-though it's ignored, the `.pem` must still be a valid format.
+Since Chef Zero does no authentication, any `.pem` file will do. The client just needs something to sign requests with (which will be ignored on the server). Even though it's ignored, the `.pem` must still be a valid format.
 
 Now, stop the Chef Zero server and all the data is gone!
 
@@ -147,9 +132,33 @@ Run `chef-zero --help` to see a list of the supported flags and options:
 ```text
 Usage: chef-zero [ARGS]
     -H, --host HOST                  Host to bind to (default: 127.0.0.1)
-    -p, --port PORT                  Port to listen on
+    -p, --port PORT                  Port to listen on (e.g. 8889, or 8500-8600 or 8885,8888)
         --[no-]generate-keys         Whether to generate actual keys or fake it (faster).  Default: false.
+    -d, --daemon                     Run as a daemon process
     -l, --log-level LEVEL            Set the output log level
+        --log-file FILE              Log to a file
+        --enterprise                 Whether to run in enterprise mode
+        --multi-org                  Whether to run in multi-org mode
+        --file-store PATH            Persist data to files at the given path
+        --[no-]ssl                   Use SSL with self-signed certificate(Auto generate before every run).  Default: false.
     -h, --help                       Show this message
         --version                    Show version
 ```
+
+## License
+
+Copyright 2012-2016, Chef Software, Inc.
+
+```
+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.
+```

data/bin/chef-zero

@@ -99,7 +99,11 @@ if options[:daemon]
     Process.daemon(true)
     server.start(true)
   else
-    abort 'Process.daemon requires Ruby >= 1.9'
+    if ENV['OS'] == 'Windows_NT' 
+      abort 'Daemonization is not supported on Windows. Running 'start chef-zero' will fork the process.'
+    else
+      abort 'Process.daemon requires Ruby >= 1.9'
+    end
   end
 else
   server.start(true)

data/lib/chef_zero/chef_data/cookbook_data.rb

@@ -129,11 +129,15 @@ module ChefZero
           self[key][cookbook] = version_constraints.first || ">= 0.0.0"
         end
 
-        def method_missing(key, value = nil)
-          if value.nil?
+        def method_missing(key, *values)
+          if values.nil?
             self[key.to_sym]
           else
-            store key.to_sym, value
+            if values.length > 1
+              store key.to_sym, values
+            else
+              store key.to_sym, values.first
+            end
           end
         end
       end
@@ -144,7 +148,7 @@ module ChefZero
           :attributes => load_child_files(directory, 'attributes', false),
           :definitions => load_child_files(directory, 'definitions', false),
           :recipes => load_child_files(directory, 'recipes', false),
-          :libraries => load_child_files(directory, 'libraries', false),
+          :libraries => load_child_files(directory, 'libraries', true),
           :templates => load_child_files(directory, 'templates', true),
           :files => load_child_files(directory, 'files', true),
           :resources => load_child_files(directory, 'resources', true),

data/lib/chef_zero/chef_data/data_normalizer.rb

@@ -163,7 +163,7 @@ module ChefZero
         node['chef_type'] ||= 'node'
         node['chef_environment'] ||= '_default'
         node['override'] ||= {}
-        node['normal'] ||= {}
+        node['normal'] ||= {"tags" => []}
         node['default'] ||= {}
         node['automatic'] ||= {}
         node['run_list'] ||= []

data/lib/chef_zero/endpoints/search_endpoint.rb

@@ -14,6 +14,8 @@ module ChefZero
         results = search(request, orgname)
         results['rows'] = results['rows'].map { |name,uri,value,search_value| value }
         json_response(200, results)
+      rescue ChefZero::Solr::ParseError
+        bad_search_request(request)
       end
 
       def post(request)
@@ -43,10 +45,18 @@ module ChefZero
           'start' => full_results['start'],
           'total' => full_results['total']
         })
+      rescue ChefZero::Solr::ParseError
+        bad_search_request(request)
       end
 
       private
 
+      def bad_search_request(request)
+        query_string = request.query_params['q']
+        resp = {"error" => ["invalid search query: '#{query_string}'"]}
+        json_response(400, resp)
+      end
+
       def search_container(request, index, orgname)
         relative_parts, normalize_proc = case index
         when 'client'

data/lib/chef_zero/rest_base.rb

@@ -61,7 +61,7 @@ module ChefZero
       begin
         self.send(method, request)
       rescue RestErrorResponse => e
-        ChefZero::Log.info("#{e.inspect}\n#{e.backtrace.join("\n")}")
+        ChefZero::Log.debug("#{e.inspect}\n#{e.backtrace.join("\n")}")
         error(e.response_code, e.error)
       end
     end
@@ -80,6 +80,7 @@ module ChefZero
 
     def get_data(request, rest_path=nil, *options)
       rest_path ||= request.rest_path
+      rest_path = rest_path.map { |v| URI.decode(v) }
       begin
         data_store.get(rest_path, request)
       rescue DataStore::DataNotFoundError
@@ -276,7 +277,7 @@ module ChefZero
     end
 
     def self.build_uri(base_uri, rest_path)
-      "#{base_uri}/#{rest_path.join('/')}"
+      "#{base_uri}/#{rest_path.map { |v| URI.escape(v) }.join('/')}"
     end
 
     def populate_defaults(request, response)

data/lib/chef_zero/rest_request.rb

@@ -14,7 +14,13 @@ module ChefZero
     attr_accessor :rest_base_prefix
 
     def base_uri
-      @base_uri ||= "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}#{env['SCRIPT_NAME']}"
+      # Load balancer awareness
+      if env['HTTP_X_FORWARDED_PROTO']
+        scheme = env['HTTP_X_FORWARDED_PROTO']
+      else
+        scheme = env['rack.url_scheme']
+      end
+      @base_uri ||= "#{scheme}://#{env['HTTP_HOST']}#{env['SCRIPT_NAME']}"
     end
 
     def base_uri=(value)

data/lib/chef_zero/server.rb

@@ -284,7 +284,9 @@ module ChefZero
         :DoNotListen => true,
         :AccessLog   => [],
         :Logger      => WEBrick::Log.new(StringIO.new, 7),
+        :RequestTimeout => 300,
         :SSLEnable  => options[:ssl],
+        :SSLOptions  => ssl_opts,
         :SSLCertName  => [ [ 'CN', WEBrick::Utils::getservername ] ],
         :StartCallback => proc {
           @running = true
@@ -708,5 +710,16 @@ module ChefZero
       end
       value
     end
+
+    ## Disable unsecure ssl
+    ## Ref: https://www.ruby-lang.org/en/news/2014/10/27/changing-default-settings-of-ext-openssl/
+    def ssl_opts
+      ssl_opts = OpenSSL::SSL::OP_ALL
+      ssl_opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS if defined?(OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS)
+      ssl_opts |= OpenSSL::SSL::OP_NO_COMPRESSION if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
+      ssl_opts |= OpenSSL::SSL::OP_NO_SSLv2 if defined?(OpenSSL::SSL::OP_NO_SSLv2)
+      ssl_opts |= OpenSSL::SSL::OP_NO_SSLv3 if defined?(OpenSSL::SSL::OP_NO_SSLv3)
+      ssl_opts
+    end
   end
 end

data/lib/chef_zero/solr/query/regexpable_query.rb

@@ -21,8 +21,8 @@ module ChefZero
         end
 
         DEFAULT_FIELD = "text"
-        WORD_CHARACTER = "[A-Za-z0-9@._':]"
-        NON_WORD_CHARACTER = "[^A-Za-z0-9@._':]"
+        WORD_CHARACTER = "[A-Za-z0-9@._':\-]"
+        NON_WORD_CHARACTER = "[^A-Za-z0-9@._':\-]"
       end
     end
   end

data/lib/chef_zero/solr/query/unary_operator.rb

@@ -16,8 +16,7 @@ module ChefZero
 
         def matches_doc?(doc)
           case @operator
-          when '-'
-          when 'NOT'
+          when '-', 'NOT'
             !operand.matches_doc?(doc)
           when '+'
             # TODO This operator uses relevance to eliminate other, unrelated
@@ -28,8 +27,7 @@ module ChefZero
 
         def matches_values?(values)
           case @operator
-          when '-'
-          when 'NOT'
+          when '-', 'NOT'
             !operand.matches_values?(values)
           when '+'
             # TODO This operator uses relevance to eliminate other, unrelated

data/lib/chef_zero/solr/solr_parser.rb

@@ -7,6 +7,8 @@ require 'chef_zero/solr/query/subquery'
 
 module ChefZero
   module Solr
+    class ParseError < RuntimeError; end
+
     class SolrParser
       def initialize(query_string)
         @query_string = query_string
@@ -114,7 +116,7 @@ module ChefZero
       end
 
       def parse_error(token, str)
-        raise "Error on token '#{token}' at #{@index} of '#{@query_string}': #{str}"
+        raise ChefZero::Solr::ParseError, "Error on token '#{token}' at #{@index} of '#{@query_string}': #{str}"
       end
 
       def read_single_expression

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '4.7.1'
+  VERSION = '4.8.0'
 end

data/spec/run_oc_pedant.rb

@@ -191,6 +191,15 @@ begin
   Pedant.setup(pedant_args + pedant_args_from_env)
 
   rspec_args = Pedant.config.rspec_args + rspec_args_from_env
+
+  if defined? Chef::ChefFS::FileSystemCache
+    RSpec.configure do |c|
+      c.before(:each) do
+        Chef::ChefFS::FileSystemCache.instance.reset!
+      end
+    end
+  end
+
   result = RSpec::Core::Runner.run(rspec_args)
 
   server.stop if server.running?

data/spec/search_spec.rb

@@ -24,6 +24,10 @@ describe ChefZero::Solr::SolrParser do
     search_for('foo:[a TO c]').size.should eq(1)
   end
 
+  it "handles -" do
+    search_for('-foo:a').size.should eq(1)
+  end
+
   it "handles wildcard ranges" do
     search_for('foo:[* TO c]').size.should eq(1)
     search_for('foo:[c TO *]').size.should eq(1)

data/spec/server_spec.rb

@@ -27,6 +27,10 @@ describe ChefZero::Server do
       expect { ChefZero::Server.new(:port => 8889.upto(8889)).start_background }.to raise_error Errno::EADDRINUSE
     end
 
+    it 'has a very patient request timeout' do
+      expect(@server.server.config[:RequestTimeout]).to eq 300
+    end
+
     context 'accept headers' do
       def get_nodes(accepts)
         uri = URI(@server.url)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.8.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log