chef-zero 14.0.12 → 15.0.2

data/lib/chef_zero/endpoints/searches_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/server_api_version_endpoint.rb

@@ -1,4 +1,4 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/system_recovery_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
@@ -10,13 +10,13 @@ module ChefZero
         name = request_json["username"]
         password = request_json["password"]
         user = get_data(request, request.rest_path[0..-2] + ["users", name], :nil)
-        if !user
+        unless user
           raise RestErrorResponse.new(403, "Nonexistent user")
         end
 
         user = FFI_Yajl::Parser.parse(user)
         user = ChefData::DataNormalizer.normalize_user(user, name, [ "username" ], server.options[:osc_compat])
-        if !user["recovery_authentication_enabled"]
+        unless user["recovery_authentication_enabled"]
           raise RestErrorResponse.new(403, "Only users with recovery_authentication_enabled=true may use /system_recovery to log in")
         end
         if user["password"] != password

data/lib/chef_zero/endpoints/universe_endpoint.rb

@@ -1,6 +1,6 @@
-require "ffi_yajl"
-require "chef_zero/endpoints/rest_object_endpoint"
-require "chef_zero/chef_data/data_normalizer"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "rest_object_endpoint"
+require_relative "../chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/user_association_request_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints
@@ -11,6 +11,7 @@ module ChefZero
         if id !~ /^#{username}-(.+)/
           raise RestErrorResponse.new(400, "Association request #{id} is invalid.  Must be #{username}-orgname.")
         end
+
         orgname = $1
 
         json = FFI_Yajl::Parser.parse(request.body)

data/lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/user_association_requests_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/user_organizations_endpoint.rb

@@ -1,5 +1,5 @@
-require "ffi_yajl"
-require "chef_zero/rest_base"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/version_endpoint.rb

@@ -1,11 +1,12 @@
-require "chef_zero/rest_base"
+require_relative "../rest_base"
+require_relative "../dist"
 
 module ChefZero
   module Endpoints
     # /version
     class VersionEndpoint < RestBase
       def get(request)
-        text_response(200, "chef-zero #{ChefZero::VERSION}\n")
+        text_response(200, "#{ChefZero::Dist::CLIENT} #{ChefZero::VERSION}\n")
       end
     end
   end

data/lib/chef_zero/rest_base.rb

@@ -1,7 +1,7 @@
-require "chef_zero/rest_request"
-require "chef_zero/rest_error_response"
-require "chef_zero/data_store/data_not_found_error"
-require "chef_zero/chef_data/acl_path"
+require_relative "rest_request"
+require_relative "rest_error_response"
+require_relative "data_store/data_not_found_error"
+require_relative "chef_data/acl_path"
 
 module ChefZero
   class RestBase
@@ -30,15 +30,13 @@ module ChefZero
         }
 
         return json_response(406,
-                             response,
-                             request_version: version, response_version: -1
-                            )
+          response,
+          request_version: version, response_version: -1)
       end
     rescue ArgumentError
       json_response(406,
-                           { "username" => request.requestor },
-                           request_version: -1, response_version: -1
-                          )
+        { "username" => request.requestor },
+        request_version: -1, response_version: -1)
     end
 
     def call(request)
@@ -46,14 +44,15 @@ module ChefZero
       return response unless response.nil?
 
       method = request.method.downcase.to_sym
-      if !respond_to?(method)
-        accept_methods = [:get, :put, :post, :delete].select { |m| respond_to?(m) }
+      unless respond_to?(method)
+        accept_methods = %i{get put post delete}.select { |m| respond_to?(m) }
         accept_methods_str = accept_methods.map { |m| m.to_s.upcase }.join(", ")
-        return [405, { "Content-Type" => "text/plain", "Allow" => accept_methods_str }, "Bad request method for '#{request.env['REQUEST_PATH']}': #{request.env['REQUEST_METHOD']}"]
+        return [405, { "Content-Type" => "text/plain", "Allow" => accept_methods_str }, "Bad request method for '#{request.env["REQUEST_PATH"]}': #{request.env["REQUEST_METHOD"]}"]
       end
       if json_only && !accepts?(request, "application", "json")
         return [406, { "Content-Type" => "text/plain" }, "Must accept application/json"]
       end
+
       # Dispatch to get()/post()/put()/delete()
       begin
         send(method, request)
@@ -70,14 +69,15 @@ module ChefZero
     def accepts?(request, category, type)
       # If HTTP_ACCEPT is not sent at all, assume it accepts anything
       # This parses as per http://tools.ietf.org/html/rfc7231#section-5.3
-      return true if !request.env["HTTP_ACCEPT"]
+      return true unless request.env["HTTP_ACCEPT"]
+
       accepts = request.env["HTTP_ACCEPT"].split(/,\s*/).map { |x| x.split(";", 2)[0].strip }
       accepts.include?("#{category}/#{type}") || accepts.include?("#{category}/*") || accepts.include?("*/*")
     end
 
     def get_data(request, rest_path = nil, *options)
       rest_path ||= request.rest_path
-      rest_path = rest_path.map { |v| URI.decode(v) }
+      rest_path = rest_path.map { |v| self.class.rfc2396_parser.unescape(v) }
       begin
         data_store.get(rest_path, request)
       rescue DataStore::DataNotFoundError
@@ -284,7 +284,7 @@ module ChefZero
     end
 
     def self.build_uri(base_uri, rest_path)
-      "#{base_uri}/#{rest_path.map { |v| URI.escape(v) }.join('/')}"
+      "#{base_uri}/#{rest_path.map { |v| rfc2396_parser.escape(v) }.join("/")}"
     end
 
     def populate_defaults(request, response)
@@ -324,5 +324,9 @@ module ChefZero
         name.size > 255 ||
         name =~ /[+ !]/
     end
+
+    def self.rfc2396_parser
+      @parser ||= URI::RFC2396_Parser.new
+    end
   end
 end

data/lib/chef_zero/rest_request.rb

@@ -1,8 +1,8 @@
 require "rack/request"
+require "cgi" unless defined?(CGI)
 
 module ChefZero
   class RestRequest
-
     def initialize(env, rest_base_prefix = [])
       @env = env
       @rest_base_prefix = rest_base_prefix
@@ -18,7 +18,7 @@ module ChefZero
       else
         scheme = env["rack.url_scheme"]
       end
-      @base_uri ||= "#{scheme}://#{env['HTTP_HOST']}#{env['SCRIPT_NAME']}"
+      @base_uri ||= "#{scheme}://#{env["HTTP_HOST"]}#{env["SCRIPT_NAME"]}"
     end
 
     def base_uri=(value)
@@ -61,24 +61,28 @@ module ChefZero
       @query_params ||= begin
         params = Rack::Request.new(env).GET
         params.keys.each do |key|
-          params[key] = URI.unescape(params[key])
+          params[key] = self.class.rfc2396_parser.unescape(params[key])
         end
         params
       end
     end
 
     def to_s
-      result = "#{method} #{rest_path.join('/')}"
+      result = "#{method} #{rest_path.join("/")}"
       if query_params.size > 0
-        result << "?#{query_params.map { |k, v| "#{k}=#{v}" }.join('&')}"
+        result << "?#{query_params.map { |k, v| "#{k}=#{v}" }.join("&")}"
       end
       if body.chomp != ""
         result << "\n--- #{method} BODY ---\n"
         result << body
-        result << "\n" if !body.end_with?("\n")
+        result << "\n" unless body.end_with?("\n")
         result << "--- END #{method} BODY ---"
       end
       result
     end
+
+    def self.rfc2396_parser
+      @parser ||= URI::RFC2396_Parser.new
+    end
   end
 end

data/lib/chef_zero/rest_router.rb

@@ -1,13 +1,13 @@
-require "pp"
+require "pp" unless defined?(PP)
 
 module ChefZero
   class RestRouter
     def initialize(routes)
       @routes = routes.map do |route, endpoint|
         if route =~ /\*\*$/
-          pattern = Regexp.new("^#{route[0..-3].gsub('*', '[^/]*')}")
+          pattern = Regexp.new("^#{route[0..-3].gsub("*", "[^/]*")}")
         else
-          pattern = Regexp.new("^#{route.gsub('*', '[^/]*')}$")
+          pattern = Regexp.new("^#{route.gsub("*", "[^/]*")}$")
         end
         [ pattern, endpoint ]
       end

data/lib/chef_zero/rspec.rb

@@ -1,6 +1,6 @@
-require "tempfile"
-require "chef_zero/server"
-require "chef_zero/rest_request"
+require "tempfile" unless defined?(Tempfile)
+require_relative "server"
+require_relative "rest_request"
 
 module ChefZero
   module RSpec
@@ -42,7 +42,7 @@ module ChefZero
     extend RSpecClassMethods
 
     def when_the_chef_server(description, *tags, &block)
-      context "When the Chef server #{description}", *tags do
+      context "When the #{ChefZero::Dist::PRODUCT} server #{description}", *tags do
         extend WhenTheChefServerClassMethods
         include WhenTheChefServerInstanceMethods
 
@@ -69,7 +69,8 @@ module ChefZero
           if chef_server_options[:server_scope] != self.class.chef_server_options[:server_scope]
             raise "server_scope: #{chef_server_options[:server_scope]} will not be honored: it can only be set on when_the_chef_server!"
           end
-          Log.info("Starting Chef server with options #{chef_server_options}")
+
+          Log.info("Starting #{ChefZero::Dist::PRODUCT} server with options #{chef_server_options}")
 
           ChefZero::RSpec.set_server_options(chef_server_options)
 

data/lib/chef_zero/server.rb

@@ -16,96 +16,97 @@
 # limitations under the License.
 #
 
-require "openssl"
-require "open-uri"
-require "rubygems"
-require "timeout"
-require "stringio"
-
-require "rack"
-require "webrick"
+require "openssl" unless defined?(OpenSSL)
+require "open-uri" unless defined?(OpenURI)
+require "rubygems" unless defined?(Gem)
+require "timeout" unless defined?(Timeout)
+require "stringio" unless defined?(StringIO)
+
+require "rack" unless defined?(Rack)
+require "webrick" unless defined?(WEBrick)
 require "webrick/https"
 
-require "chef_zero"
-require "chef_zero/socketless_server_map"
-require "chef_zero/chef_data/cookbook_data"
-require "chef_zero/chef_data/acl_path"
-require "chef_zero/rest_router"
-require "chef_zero/data_store/memory_store_v2"
-require "chef_zero/data_store/v1_to_v2_adapter"
-require "chef_zero/data_store/default_facade"
-require "chef_zero/version"
-
-require "chef_zero/endpoints/rest_list_endpoint"
-require "chef_zero/endpoints/authenticate_user_endpoint"
-require "chef_zero/endpoints/acls_endpoint"
-require "chef_zero/endpoints/acl_endpoint"
-require "chef_zero/endpoints/actor_endpoint"
-require "chef_zero/endpoints/actors_endpoint"
-require "chef_zero/endpoints/actor_key_endpoint"
-require "chef_zero/endpoints/organization_user_key_endpoint"
-require "chef_zero/endpoints/organization_user_default_key_endpoint"
-require "chef_zero/endpoints/organization_user_keys_endpoint"
-require "chef_zero/endpoints/actor_default_key_endpoint"
-require "chef_zero/endpoints/actor_keys_endpoint"
-require "chef_zero/endpoints/cookbooks_endpoint"
-require "chef_zero/endpoints/cookbook_endpoint"
-require "chef_zero/endpoints/cookbook_version_endpoint"
-require "chef_zero/endpoints/cookbook_artifacts_endpoint"
-require "chef_zero/endpoints/cookbook_artifact_endpoint"
-require "chef_zero/endpoints/cookbook_artifact_identifier_endpoint"
-require "chef_zero/endpoints/containers_endpoint"
-require "chef_zero/endpoints/container_endpoint"
-require "chef_zero/endpoints/controls_endpoint"
-require "chef_zero/endpoints/dummy_endpoint"
-require "chef_zero/endpoints/data_bags_endpoint"
-require "chef_zero/endpoints/data_bag_endpoint"
-require "chef_zero/endpoints/data_bag_item_endpoint"
-require "chef_zero/endpoints/groups_endpoint"
-require "chef_zero/endpoints/group_endpoint"
-require "chef_zero/endpoints/environment_endpoint"
-require "chef_zero/endpoints/environment_cookbooks_endpoint"
-require "chef_zero/endpoints/environment_cookbook_endpoint"
-require "chef_zero/endpoints/environment_cookbook_versions_endpoint"
-require "chef_zero/endpoints/environment_nodes_endpoint"
-require "chef_zero/endpoints/environment_recipes_endpoint"
-require "chef_zero/endpoints/environment_role_endpoint"
-require "chef_zero/endpoints/license_endpoint"
-require "chef_zero/endpoints/node_endpoint"
-require "chef_zero/endpoints/nodes_endpoint"
-require "chef_zero/endpoints/node_identifiers_endpoint"
-require "chef_zero/endpoints/organizations_endpoint"
-require "chef_zero/endpoints/organization_endpoint"
-require "chef_zero/endpoints/organization_association_requests_endpoint"
-require "chef_zero/endpoints/organization_association_request_endpoint"
-require "chef_zero/endpoints/organization_authenticate_user_endpoint"
-require "chef_zero/endpoints/organization_users_endpoint"
-require "chef_zero/endpoints/organization_user_endpoint"
-require "chef_zero/endpoints/organization_validator_key_endpoint"
-require "chef_zero/endpoints/policies_endpoint"
-require "chef_zero/endpoints/policy_endpoint"
-require "chef_zero/endpoints/policy_revisions_endpoint"
-require "chef_zero/endpoints/policy_revision_endpoint"
-require "chef_zero/endpoints/policy_groups_endpoint"
-require "chef_zero/endpoints/policy_group_endpoint"
-require "chef_zero/endpoints/policy_group_policy_endpoint"
-require "chef_zero/endpoints/principal_endpoint"
-require "chef_zero/endpoints/role_endpoint"
-require "chef_zero/endpoints/role_environments_endpoint"
-require "chef_zero/endpoints/sandboxes_endpoint"
-require "chef_zero/endpoints/sandbox_endpoint"
-require "chef_zero/endpoints/searches_endpoint"
-require "chef_zero/endpoints/search_endpoint"
-require "chef_zero/endpoints/system_recovery_endpoint"
-require "chef_zero/endpoints/user_association_requests_endpoint"
-require "chef_zero/endpoints/user_association_requests_count_endpoint"
-require "chef_zero/endpoints/user_association_request_endpoint"
-require "chef_zero/endpoints/user_organizations_endpoint"
-require "chef_zero/endpoints/file_store_file_endpoint"
-require "chef_zero/endpoints/not_found_endpoint"
-require "chef_zero/endpoints/version_endpoint"
-require "chef_zero/endpoints/server_api_version_endpoint"
-require "chef_zero/endpoints/universe_endpoint"
+require_relative "../chef_zero"
+require_relative "socketless_server_map"
+require_relative "chef_data/cookbook_data"
+require_relative "chef_data/acl_path"
+require_relative "rest_router"
+require_relative "data_store/memory_store_v2"
+require_relative "data_store/v1_to_v2_adapter"
+require_relative "data_store/default_facade"
+require_relative "version"
+require "chef_zero/dist.rb"
+
+require_relative "endpoints/rest_list_endpoint"
+require_relative "endpoints/authenticate_user_endpoint"
+require_relative "endpoints/acls_endpoint"
+require_relative "endpoints/acl_endpoint"
+require_relative "endpoints/actor_endpoint"
+require_relative "endpoints/actors_endpoint"
+require_relative "endpoints/actor_key_endpoint"
+require_relative "endpoints/organization_user_key_endpoint"
+require_relative "endpoints/organization_user_default_key_endpoint"
+require_relative "endpoints/organization_user_keys_endpoint"
+require_relative "endpoints/actor_default_key_endpoint"
+require_relative "endpoints/actor_keys_endpoint"
+require_relative "endpoints/cookbooks_endpoint"
+require_relative "endpoints/cookbook_endpoint"
+require_relative "endpoints/cookbook_version_endpoint"
+require_relative "endpoints/cookbook_artifacts_endpoint"
+require_relative "endpoints/cookbook_artifact_endpoint"
+require_relative "endpoints/cookbook_artifact_identifier_endpoint"
+require_relative "endpoints/containers_endpoint"
+require_relative "endpoints/container_endpoint"
+require_relative "endpoints/controls_endpoint"
+require_relative "endpoints/dummy_endpoint"
+require_relative "endpoints/data_bags_endpoint"
+require_relative "endpoints/data_bag_endpoint"
+require_relative "endpoints/data_bag_item_endpoint"
+require_relative "endpoints/groups_endpoint"
+require_relative "endpoints/group_endpoint"
+require_relative "endpoints/environment_endpoint"
+require_relative "endpoints/environment_cookbooks_endpoint"
+require_relative "endpoints/environment_cookbook_endpoint"
+require_relative "endpoints/environment_cookbook_versions_endpoint"
+require_relative "endpoints/environment_nodes_endpoint"
+require_relative "endpoints/environment_recipes_endpoint"
+require_relative "endpoints/environment_role_endpoint"
+require_relative "endpoints/license_endpoint"
+require_relative "endpoints/node_endpoint"
+require_relative "endpoints/nodes_endpoint"
+require_relative "endpoints/node_identifiers_endpoint"
+require_relative "endpoints/organizations_endpoint"
+require_relative "endpoints/organization_endpoint"
+require_relative "endpoints/organization_association_requests_endpoint"
+require_relative "endpoints/organization_association_request_endpoint"
+require_relative "endpoints/organization_authenticate_user_endpoint"
+require_relative "endpoints/organization_users_endpoint"
+require_relative "endpoints/organization_user_endpoint"
+require_relative "endpoints/organization_validator_key_endpoint"
+require_relative "endpoints/policies_endpoint"
+require_relative "endpoints/policy_endpoint"
+require_relative "endpoints/policy_revisions_endpoint"
+require_relative "endpoints/policy_revision_endpoint"
+require_relative "endpoints/policy_groups_endpoint"
+require_relative "endpoints/policy_group_endpoint"
+require_relative "endpoints/policy_group_policy_endpoint"
+require_relative "endpoints/principal_endpoint"
+require_relative "endpoints/role_endpoint"
+require_relative "endpoints/role_environments_endpoint"
+require_relative "endpoints/sandboxes_endpoint"
+require_relative "endpoints/sandbox_endpoint"
+require_relative "endpoints/searches_endpoint"
+require_relative "endpoints/search_endpoint"
+require_relative "endpoints/system_recovery_endpoint"
+require_relative "endpoints/user_association_requests_endpoint"
+require_relative "endpoints/user_association_requests_count_endpoint"
+require_relative "endpoints/user_association_request_endpoint"
+require_relative "endpoints/user_organizations_endpoint"
+require_relative "endpoints/file_store_file_endpoint"
+require_relative "endpoints/not_found_endpoint"
+require_relative "endpoints/version_endpoint"
+require_relative "endpoints/server_api_version_endpoint"
+require_relative "endpoints/universe_endpoint"
 
 module ChefZero
 
@@ -175,7 +176,8 @@ module ChefZero
     end
 
     def local_mode_url
-      raise "Port not yet set, cannot generate URL" unless port.kind_of?(Integer)
+      raise "Port not yet set, cannot generate URL" unless port.is_a?(Integer)
+
       "chefzero://localhost:#{port}"
     end
 
@@ -231,7 +233,7 @@ module ChefZero
       if publish
         output = publish.respond_to?(:puts) ? publish : STDOUT
         output.puts <<-EOH.gsub(/^ {10}/, "")
-          >> Starting Chef Zero (v#{ChefZero::VERSION})...
+          >> Starting #{ChefZero::Dist::PRODUCT} (v#{ChefZero::VERSION})...
         EOH
       end
 
@@ -248,7 +250,7 @@ module ChefZero
 
       %w{INT TERM}.each do |signal|
         Signal.trap(signal) do
-          puts "\n>> Stopping Chef Zero..."
+          puts "\n>> Stopping #{ChefZero::Dist::PRODUCT}..."
           @server.shutdown
         end
       end
@@ -274,7 +276,7 @@ module ChefZero
       true
     rescue Errno::EADDRINUSE
       ChefZero::Log.warn("Port #{port} not available")
-      @server.listeners.each { |l| l.close }
+      @server.listeners.each(&:close)
       @server.listeners.clear
       false
     end
@@ -304,7 +306,7 @@ module ChefZero
           break
         end
       end
-      if !@port
+      unless @port
         raise Errno::EADDRINUSE,
           "No port in :port range #{options[:port]} is available"
       end
@@ -362,7 +364,7 @@ module ChefZero
       end
     rescue Timeout::Error
       if @thread
-        ChefZero::Log.error("Chef Zero did not stop within #{wait} seconds! Killing...")
+        ChefZero::Log.error("#{ChefZero::Dist::PRODUCT} did not stop within #{wait} seconds! Killing...")
         @thread.kill
         SocketlessServerMap.deregister(port)
       end
@@ -500,11 +502,13 @@ module ChefZero
             else
               cookbook_data = ChefData::CookbookData.to_hash(cookbook, name_version)
             end
-            raise "No version specified" if !cookbook_data[:version]
+            raise "No version specified" unless cookbook_data[:version]
+
             data_store.create_dir(["organizations", org_name, cookbook_type], cookbook_data[:cookbook_name], :recursive)
             data_store.set(["organizations", org_name, cookbook_type, cookbook_data[:cookbook_name], cookbook_data[:version]], FFI_Yajl::Encoder.encode(cookbook_data, pretty: true), :create)
             cookbook_data.values.each do |files|
               next unless files.is_a? Array
+
               files.each do |file|
                 data_store.set(["organizations", org_name, "file_store", "checksums", file[:checksum]], get_file(cookbook, file[:path]), :create)
               end
@@ -641,6 +645,7 @@ module ChefZero
 
     def app
       return @app if @app
+
       router = RestRouter.new(endpoints)
       router.not_found = NotFoundEndpoint.new