chef-zero 4.8.0 → 4.9.0

data/lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb

@@ -1,5 +1,5 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
+require "ffi_yajl"
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
@@ -7,18 +7,18 @@ module ChefZero
     class OrganizationAuthenticateUserEndpoint < RestBase
       def post(request)
         request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        name = request_json['name']
-        password = request_json['password']
+        name = request_json["name"]
+        password = request_json["password"]
         begin
-          user = data_store.get(request.rest_path[0..-2] + ['users', name])
+          user = data_store.get(request.rest_path[0..-2] + ["users", name])
           user = FFI_Yajl::Parser.parse(user, :create_additions => false)
-          verified = user['password'] == password
+          verified = user["password"] == password
         rescue DataStore::DataNotFoundError
           verified = false
         end
         json_response(200, {
-          'name' => name,
-          'verified' => !!verified
+          "name" => name,
+          "verified" => !!verified,
         })
       end
     end

data/lib/chef_zero/endpoints/organization_endpoint.rb

@@ -1,37 +1,37 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
+require "ffi_yajl"
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
     # /organizations/NAME
     class OrganizationEndpoint < RestBase
       def get(request)
-        org = get_data(request, request.rest_path + [ 'org' ])
+        org = get_data(request, request.rest_path + [ "org" ])
         already_json_response(200, populate_defaults(request, org))
       end
 
       def put(request)
-        org = FFI_Yajl::Parser.parse(get_data(request, request.rest_path + [ 'org' ]), :create_additions => false)
+        org = FFI_Yajl::Parser.parse(get_data(request, request.rest_path + [ "org" ]), :create_additions => false)
         new_org = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
         new_org.each do |key, value|
           org[key] = value
         end
         save_org = FFI_Yajl::Encoder.encode(org, :pretty => true)
-        if new_org['name'] != request.rest_path[-1]
+        if new_org["name"] != request.rest_path[-1]
           # This is a rename
           return error(400, "Cannot rename org #{request.rest_path[-1]} to #{new_org['name']}: rename not supported for orgs")
         end
-        set_data(request, request.rest_path + [ 'org' ], save_org)
+        set_data(request, request.rest_path + [ "org" ], save_org)
         json_response(200, {
           "uri" => "#{build_uri(request.base_uri, request.rest_path)}",
-          "name" => org['name'],
-          "org_type" => org['org_type'],
-          "full_name" => org['full_name']
+          "name" => org["name"],
+          "org_type" => org["org_type"],
+          "full_name" => org["full_name"],
         })
       end
 
       def delete(request)
-        org = get_data(request, request.rest_path + [ 'org' ])
+        org = get_data(request, request.rest_path + [ "org" ])
         delete_data_dir(request, request.rest_path, :recursive)
         already_json_response(200, populate_defaults(request, org))
       end

data/lib/chef_zero/endpoints/organization_user_base.rb

@@ -1,5 +1,5 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
+require "ffi_yajl"
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/organization_user_default_key_endpoint.rb

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

data/lib/chef_zero/endpoints/organization_user_endpoint.rb

@@ -1,5 +1,5 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
+require "ffi_yajl"
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
@@ -8,16 +8,16 @@ module ChefZero
       def get(request)
         username = request.rest_path[3]
         get_data(request) # 404 if user is not in org
-        user = get_data(request, [ 'users', username ])
+        user = get_data(request, [ "users", username ])
         user = FFI_Yajl::Parser.parse(user, :create_additions => false)
-        json_response(200, ChefData::DataNormalizer.normalize_user(user, username, ['username'], server.options[:osc_compat], request.method))
+        json_response(200, ChefData::DataNormalizer.normalize_user(user, username, ["username"], server.options[:osc_compat], request.method))
       end
 
       def delete(request)
         user = get_data(request)
         delete_data(request)
         user = FFI_Yajl::Parser.parse(user, :create_additions => false)
-        json_response(200, ChefData::DataNormalizer.normalize_user(user, request.rest_path[3], ['username'], server.options[:osc_compat]))
+        json_response(200, ChefData::DataNormalizer.normalize_user(user, request.rest_path[3], ["username"], server.options[:osc_compat]))
       end
 
       # Note: post to a named org user is not permitted, alllow invalid method handling (405)

data/lib/chef_zero/endpoints/organization_user_key_endpoint.rb

@@ -1,5 +1,5 @@
-require 'chef_zero/rest_base'
-require 'chef_zero/endpoints/actor_keys_endpoint'
+require "chef_zero/rest_base"
+require "chef_zero/endpoints/actor_keys_endpoint"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/organization_user_keys_endpoint.rb

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

data/lib/chef_zero/endpoints/organization_users_endpoint.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-require 'chef_zero/endpoints/organization_user_base'
+require "ffi_yajl"
+require "chef_zero/rest_base"
+require "chef_zero/endpoints/organization_user_base"
 
 module ChefZero
   module Endpoints
@@ -9,28 +9,28 @@ module ChefZero
       def post(request)
         orgname = request.rest_path[1]
         json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        username = json['username']
+        username = json["username"]
 
-        if exists_data?(request, [ 'organizations', orgname, 'users', username ])
+        if exists_data?(request, [ "organizations", orgname, "users", username ])
           raise RestErrorResponse.new(409, "User #{username} is already in organization #{orgname}")
         end
 
-        users = get_data(request, [ 'organizations', orgname, 'groups', 'users' ])
+        users = get_data(request, [ "organizations", orgname, "groups", "users" ])
         users = FFI_Yajl::Parser.parse(users, :create_additions => false)
 
-        create_data(request, request.rest_path, username, '{}')
+        create_data(request, request.rest_path, username, "{}")
 
         # /organizations/ORG/association_requests/USERNAME-ORG
         begin
-          delete_data(request, [ 'organizations', orgname, 'association_requests', username], :data_store_exceptions)
+          delete_data(request, [ "organizations", orgname, "association_requests", username], :data_store_exceptions)
         rescue DataStore::DataNotFoundError
         end
 
         # Add the user to the users group if it isn't already there
-        if !users['users'] || !users['users'].include?(username)
-          users['users'] ||= []
-          users['users'] |= [ username ]
-          set_data(request, [ 'organizations', orgname, 'groups', 'users' ], FFI_Yajl::Encoder.encode(users, :pretty => true))
+        if !users["users"] || !users["users"].include?(username)
+          users["users"] ||= []
+          users["users"] |= [ username ]
+          set_data(request, [ "organizations", orgname, "groups", "users" ], FFI_Yajl::Encoder.encode(users, :pretty => true))
         end
         json_response(201, { "uri" => build_uri(request.base_uri, request.rest_path + [ username ]) })
       end

data/lib/chef_zero/endpoints/organization_validator_key_endpoint.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-require 'uuidtools'
+require "ffi_yajl"
+require "chef_zero/rest_base"
+require "uuidtools"
 
 module ChefZero
   module Endpoints
@@ -8,12 +8,12 @@ module ChefZero
     class OrganizationValidatorKeyEndpoint < RestBase
       def post(request)
         org_name = request.rest_path[-2]
-        validator_path = [ 'organizations', org_name, 'clients', "#{org_name}-validator"]
+        validator_path = [ "organizations", org_name, "clients", "#{org_name}-validator"]
         validator = FFI_Yajl::Parser.parse(get_data(request, validator_path), :create_additions => false)
         private_key, public_key = server.gen_key_pair
-        validator['public_key'] = public_key
+        validator["public_key"] = public_key
         set_data(request, validator_path, FFI_Yajl::Encoder.encode(validator, :pretty => true))
-        json_response(200, { 'private_key' => private_key })
+        json_response(200, { "private_key" => private_key })
       end
     end
   end

data/lib/chef_zero/endpoints/organizations_endpoint.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-require 'uuidtools'
+require "ffi_yajl"
+require "chef_zero/rest_base"
+require "uuidtools"
 
 module ChefZero
   module Endpoints
@@ -16,8 +16,8 @@ module ChefZero
 
       def post(request)
         contents = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        name = contents['name']
-        full_name = contents['full_name']
+        name = contents["name"]
+        full_name = contents["full_name"]
         if name.nil?
           error(400, "Must specify 'name' in JSON")
         elsif full_name.nil?
@@ -28,32 +28,31 @@ module ChefZero
           create_data_dir(request, request.rest_path, name, :requestor => request.requestor)
 
           org = {
-            "guid" => UUIDTools::UUID.random_create.to_s.gsub('-', ''),
-            "assigned_at" => Time.now.to_s
+            "guid" => UUIDTools::UUID.random_create.to_s.delete("-"),
+            "assigned_at" => Time.now.to_s,
           }.merge(contents)
           org_path = request.rest_path + [ name ]
-          set_data(request, org_path + [ 'org' ], FFI_Yajl::Encoder.encode(org, :pretty => true))
+          set_data(request, org_path + [ "org" ], FFI_Yajl::Encoder.encode(org, :pretty => true))
 
           if server.generate_real_keys?
             # Create the validator client
             validator_name = "#{name}-validator"
-            validator_path = org_path + [ 'clients', validator_name ]
+            validator_path = org_path + [ "clients", validator_name ]
             private_key, public_key = server.gen_key_pair
             validator = FFI_Yajl::Encoder.encode({
-              'validator' => true,
-              'public_key' => public_key
+              "validator" => true,
+              "public_key" => public_key,
             }, :pretty => true)
             set_data(request, validator_path, validator)
           end
 
-
           json_response(201, {
             "uri" => "#{build_uri(request.base_uri, org_path)}",
             "name" => name,
             "org_type" => org["org_type"],
             "full_name" => full_name,
             "clientname" => validator_name,
-            "private_key" => private_key
+            "private_key" => private_key,
           })
         end
       end

data/lib/chef_zero/endpoints/policies_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/chef_data/data_normalizer'
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
@@ -15,7 +15,7 @@ module ChefZero
 
           response_data[policy_name] = {
             uri: policy_uri,
-            revisions: hashify_list(revisions)
+            revisions: hashify_list(revisions),
           }
         end
 

data/lib/chef_zero/endpoints/policy_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/chef_data/data_normalizer'
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/policy_group_endpoint.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-require 'chef_zero/chef_data/data_normalizer'
+require "ffi_yajl"
+require "chef_zero/rest_base"
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
@@ -11,7 +11,7 @@ module ChefZero
       def get(request)
         data = {
           uri: build_uri(request.base_uri, request.rest_path),
-          policies: get_policy_group_policies(request)
+          policies: get_policy_group_policies(request),
         }
         json_response(200, data)
       end
@@ -24,7 +24,7 @@ module ChefZero
         policy_names = list_data(request, policies_path)
         policy_names.each do |policy_name|
           revision = parse_json(get_data(request, policies_path + [policy_name]))
-          policies_revisions[policy_name] = { revision_id: revision}
+          policies_revisions[policy_name] = { revision_id: revision }
         end
 
         policies_revisions
@@ -37,7 +37,7 @@ module ChefZero
 
         data = {
           uri: build_uri(request.base_uri, request.rest_path),
-          policies: policy_group_policies
+          policies: policy_group_policies,
         }
         json_response(200, data)
       end

data/lib/chef_zero/endpoints/policy_group_policy_endpoint.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-require 'chef_zero/chef_data/data_normalizer'
+require "ffi_yajl"
+require "chef_zero/rest_base"
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
@@ -74,7 +74,6 @@ module ChefZero
         policy_path = request.rest_path[0..1] + ["policies", policy_name,
                                                  "revisions", current_revision_id]
 
-
         full_policy_doc = parse_json(get_data(request, policy_path))
         full_policy_doc = ChefData::DataNormalizer.normalize_policy(full_policy_doc, policy_name, current_revision_id)
         return json_response(200, full_policy_doc)

data/lib/chef_zero/endpoints/policy_groups_endpoint.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-require 'chef_zero/chef_data/data_normalizer'
+require "ffi_yajl"
+require "chef_zero/rest_base"
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
@@ -26,7 +26,7 @@ module ChefZero
           end
 
           response_data[group_name] = {
-            uri: build_uri(request.base_uri, group_path)
+            uri: build_uri(request.base_uri, group_path),
           }
           response_data[group_name][:policies] = policies unless policies.empty?
         end

data/lib/chef_zero/endpoints/policy_revision_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/chef_data/data_normalizer'
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/policy_revisions_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/chef_data/data_normalizer'
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/principal_endpoint.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'chef_zero'
-require 'chef_zero/rest_base'
+require "ffi_yajl"
+require "chef_zero"
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
@@ -9,33 +9,33 @@ module ChefZero
       def get(request)
         name = request.rest_path[-1]
         # If /organizations/ORG/users/NAME exists, use this user (only org members have precedence over clients).        hey are an org member.
-        json = get_data(request, request.rest_path[0..1] + [ 'users', name ], :nil)
+        json = get_data(request, request.rest_path[0..1] + [ "users", name ], :nil)
         if json
-          type = 'user'
+          type = "user"
           org_member = true
         else
           # If /organizations/ORG/clients/NAME exists, use the client.
-          json = get_data(request, request.rest_path[0..1] + [ 'clients', name ], :nil)
+          json = get_data(request, request.rest_path[0..1] + [ "clients", name ], :nil)
           if json
-            type = 'client'
+            type = "client"
             org_member = true
           else
             # If there is no client with that name, check for a user (/users/NAME) and return that with
             # org_member = false.
-            json = get_data(request, [ 'users', name ], :nil)
+            json = get_data(request, [ "users", name ], :nil)
             if json
-              type = 'user'
+              type = "user"
               org_member = false
             end
           end
         end
         if json
           principal_data = {
-            'name' => name,
-            'type' => type,
-            'public_key' => FFI_Yajl::Parser.parse(json)['public_key'] || PUBLIC_KEY,
-            'authz_id' => '0'*32,
-            'org_member' => org_member
+            "name" => name,
+            "type" => type,
+            "public_key" => FFI_Yajl::Parser.parse(json)["public_key"] || PUBLIC_KEY,
+            "authz_id" => "0" * 32,
+            "org_member" => org_member,
           }
 
           response_data =
@@ -47,7 +47,7 @@ module ChefZero
 
           json_response(200, response_data)
         else
-          error(404, 'Principal not found')
+          error(404, "Principal not found")
         end
       end
     end