opscode-pushy-client 2.3.0

data/README.md

@@ -0,0 +1,43 @@
+# Push Jobs Client
+
+[![Build Status](https://travis-ci.org/chef/opscode-pushy-client.svg?branch=master)](https://travis-ci.org/chef/opscode-pushy-client)
+
+Want to find out more about Push Jobs? Check out [docs.chef.io](https://docs.chef.io/push_jobs.html)!
+
+## Development
+### Setup Local Machine
+
+    bundle install
+    brew install zeromq
+
+### Setup Chef Server w/ Push Jobs Server
+1. Check out chef/chef-server and start DVM w/ Manage and Push Jobs.
+```yaml
+# config.yml
+vm:
+  plugins:
+    chef-manage: true
+    push-jobs-server: true
+```
+Run `vagrant up` to bring up the Push Jobs Server.
+
+2. Register you local machine as a node on the chef-server. From `chef-server/dev`, run:
+```shell
+vagrant ssh
+sudo chef-server-ctl user-create local-dev Local Dev local@chef.io 'password' -f /installers/local-dev.pem
+sudo chef-server-ctl org-create push-client-local "Local Push Client Development" -a local-dev -f /installers/push-client-local-validator.pem
+```
+
+3. Add your local machine as a node on the Chef Server.
+```shell
+chef-client -c .chef/client.rb
+```
+
+### Start Push Jobs Client
+```shell
+./bin/pushy-client -c .chef/push-jobs-client.rb
+```
+
+## Contributing
+
+For information on contributing to this project see <https://github.com/chef/chef/blob/master/CONTRIBUTING.md>

data/RELEASE_PROCESS.md

@@ -0,0 +1,105 @@
+# Push Client Release Process
+
+## Document Purpose
+
+The purpose of this document is to describe the current release process such that any member of the team can do a release. As we improve the automation around the release process, the document should be updated such that it always has the exact steps required to release Push Client.
+
+This document is NOT aspirational. We have a number of automation tools that we intend to use to improve the release release process; however, many are not fully integrated with our process yet.. Do not add them to this document until they are ready to be part of the release process and can be used by any team member to perform a release.
+
+## Prequisites
+
+In order to release, you will need the following accounts/permissions:
+
+- Local checkouts of the opscode-pushy-client and chef-web-downloads repositories
+- Push access to the opscode-pushy-client github repository
+- Chef Software, Inc Slack account
+- Account on [https://discourse.chef.io](https://discourse.chef.io) using your Chef email address
+- VPN account for Chef Software, Inc.
+- Login for manhattan.ci.chef.co (This is linked to your github
+account.)
+- Access to artifactory credentials (use your LDAP credentials)
+
+## The Process
+
+### Testing the release
+
+Our current support platforms are as follows:
+
+- Debian 6, 7
+- Rhel 5, 6, 7
+- Ubuntu 10.04, 12.04, 14.04
+- Windows 7, 8, 8.1, 10, Server 2008 R2, 2012, 2012 R2
+
+Currently, push-client must be manually tested to verify that it behaves correctly on its supported platforms. You can use the [push-setup](https://github.com/chef/oc-pushy-pedant/tree/master/dev/push-setup) script to easily set up a push-jobs-client + push-jobs-server cluster with the desired build versions that you'd like to test.
+
+### Preparing the release
+
+- [ ] Double check CHANGELOG.md to ensure it includes all included changes. Update as appropriate.
+
+### Building and Releasing the Release
+
+- [ ] Tag the opscode-pushy-client repository with the release version: `git
+  tag -a VERSION_NUMBER`.
+
+- [ ] Push the new tag: `git push origin master --tags`.
+
+- [ ] Trigger a release build in Jenkins using the
+  `push-jobs-client-trigger-release` trigger. Use the tag you created
+  above as the GIT_REF parameter.
+  - Watch the [push-jobs-client-trigger-release](http://manhattan.ci.chef.co/job/push-jobs-client-trigger-release/) build. (Need to be on VPN.)
+
+- [ ] Wait for the pipeline to complete.
+  - Once the build is complete, the packages will be in the [Artifactory omnibus-current-local repository](http://artifactory.chef.co/simple/omnibus-current-local/com/getchef/push-jobs-client/) (Need to be on VPN.)
+
+- [ ] Use julia to promote the build: `@julia artifactory promote
+  push-jobs-client TAG`.  Replace TAG with the Git tag you created in the opscode-pushy-client repo. Please do this in the
+  "#eng-services-support" room.  Once this is done, the release is
+  available to the public via the APT and YUM repositories.
+
+- [ ] Chef employees should already know a release is coming; however, as a
+  courtesy, drop a message in the #cft-announce slack channel that the release
+  is coming. Provide the release number and any highlights of the release.
+
+- [ ] In your local checkout of the [chef-web-downloads](https://github.com/chef/chef-web-downloads) repository,
+generate an update to the download page using rake:
+
+```
+git checkout -b YOUR_INITIALS/release-push-jobs-client-VERSION
+export ARTIFACTORY_USERNAME="Your LDAP username"
+export ARTIFACTORY_PASSWORD="Your LDAP password"
+rake fetch[push-jobs-client]
+git add data/
+# make sure all the changes are what you expect
+# write a simple commit message
+git commit -v
+git push origin YOUR_INITIALS/release-push-jobs-client-VERSION
+```
+
+- [ ] Open a GitHub pull request for the chef-web-downloads repository
+based on the branch you just created.
+
+- [ ] Have someone review and approve the change by adding a comment to the PR: `@delivery approve`.
+  - Once approved and committed to master, Delivery will deploy the change to [the acceptance Downloads page](https://downloads-acceptance.chef.io/push-jobs-client/).
+
+- [ ] Once the change successfully completes the acceptance stage, verify the new release is visible on the acceptance Downloads page.
+
+- [ ] Deliver the change by adding a comment to the PR: `@delivery deliver`.
+  - Once Delivery is complete, the new release will be live on [the production Downloads page](http://downloads.chef.io/push-jobs-client/).
+
+- [ ] Write and then publish a Discourse post on https://discourse.chef.io
+  once the release is live. This post should contain a link to the downloads
+  page ([https://downloads.chef.io](https://downloads.chef.io)) and its contents
+  should be based on the information that was added to the RELEASE_NOTES.md file
+  in an earlier step. *The post should  be published to the Chef Release
+  Announcements category on https://discourse.chef.io. If it is a security
+  release, it should also be published to the Chef Security Announcements
+  category.* Full details on the policy of making release announcements on
+  Discourse can be found on the wiki: [https://chefio.atlassian.net/wiki/display/ENG/Release+Announcements+and+Security+Alerts](https://chefio.atlassian.net/wiki/display/ENG/Release+Announcements+and+Security+Alerts)
+
+- [ ] Let `#cft-announce` know about the release, including a link to the Discourse post.
+
+Chef Push Jobs Client is now released.
+
+## Post Release
+
+- [ ] Relax 🎉

data/Rakefile

@@ -0,0 +1,42 @@
+#
+# Author:: Mark Anderson (<mark@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# All rights reserved
+#
+
+require 'rake'
+require 'bundler/gem_tasks'
+
+require 'rubygems/package_task'
+require 'rubygems/specification'
+
+require 'date'
+
+gemspec = eval(File.read('opscode-pushy-client.gemspec'))
+
+Gem::PackageTask.new(gemspec) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
+end
+
+Bundler::GemHelper.install_tasks
+
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.rspec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+    spec.pattern = 'spec/**/*_spec.rb'
+  end
+
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
+rescue LoadError
+  task :spec do
+    abort "RSpec is not available. (sudo) gem install rspec to run unit tests"
+  end
+end
+
+task :default => [:spec]

data/bin/print_execution_environment

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require "rubygems"
+
+require 'pp'
+
+puts "# Node name '#{ENV['CHEF_PUSH_NODE_NAME']}'"
+puts "# Running command with args: "
+pp ARGV
+puts "# As user '#{ENV['USERNAME']}'"
+puts "# In directory '#{Dir.pwd}'"
+puts "# Job file '#{ENV['CHEF_PUSH_JOB_FILE']}'"
+puts "# Job Id '#{ENV['CHEF_PUSH_JOB_ID']}'"
+puts "# Full environment"
+pp ENV
+

data/bin/push-apply

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require "rubygems"
+require 'json'
+require 'tmpdir'
+require 'pp'
+
+node = ENV['CHEF_PUSH_NODE_NAME']
+job_file = ENV['CHEF_PUSH_JOB_FILE']
+
+job_file_dir = File.dirname(job_file)
+
+jobdata = IO.read(job_file)
+
+filejson = JSON.parse(jobdata)
+
+pp :keys=>filejson.keys, :format=>filejson['format']
+
+recipe = ""
+
+case filejson['format']
+when 1
+  recipe = filejson['file']
+else
+  puts "Unsupported datatype #{filejson['format']}"
+  exit(1)
+end
+
+prefix = File.join('chef-apply-recipe-')
+recipe_path = Dir::Tmpname.create(prefix) {|p|} + ".rb"
+pp :recipe_path=>recipe_path
+
+File.open(recipe_path, 'w') do |f|
+  f.write(recipe)
+end
+
+
+puts "="*60
+puts "Running chef-apply with file #{recipe_path}"
+puts "="*60
+
+$stdout.flush
+#puts recipe
+
+exec "chef-apply #{recipe_path}"

data/bin/pushy-client

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require "rubygems"
+require_relative '../lib/pushy_client/cli'
+
+PushyClient::CLI.new.run

data/bin/pushy-service-manager

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require "rubygems"
+require 'chef'
+require 'chef/application/windows_service_manager'
+
+if Chef::Platform.windows?
+  pushy_service = {
+    :service_name => "pushy-client",
+    :service_display_name => "Pushy Client Service",
+    :service_description => "Runs Opscode Pushy Client.",
+    :service_file_path => File.expand_path(File.join(File.dirname(__FILE__), '../lib/pushy_client/windows_service.rb'))
+  }
+  Chef::Application::WindowsServiceManager.new(pushy_service).run
+else
+  puts "pushy-service-manager is only available on Windows platforms."
+end

data/jenkins/jenkins_run_tests.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+export PATH=/usr/local/bin:$PATH
+
+ruby -v;
+# remove the Gemfile.lock and try again if bundler fails.
+# This should take care of Gemfile changes that result in "bad" bundles without forcing us to rebundle every time
+bundle install --path vendor/bundle || ( rm Gemfile.lock && bundle install --path vendor/bundle )
+bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec;

data/keys/client_private.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAwxOFcrbsV7bEbqzOvW5uW5lyB23qsenlUdIGyRttqzGEaki0
+1s7X+PpYy4BLfmVVmA6A6FCbL38CzzTUFX1ap6LYQR2PbytYjBjZZMUiVnjEgl12
+Zd1JF8dsPMj2BgPggx5GaGLvCOsajZ0YCDgWWkoO/HAEbztFIx2jdSCyD0ZH0ep4
+fSGDjmkN+5XurS0dBH8J5qPeJjriA/s/RzUbULjr3gvfg49onHxr/kTKbhc78GBO
+fKSH1ftECCoWnidadW7/lfKbAZ3xiSjLsIxSKxavHMeCUSgyReDZpsFOn2Saie26
+jvLxWrGyn870yIh36wMvCvWKwUQPnluSnstJxwIDAQABAoIBAFB3R++GpryTpjkk
+zO50k87y34dS/qE+opn6cVQZHUalWUJiFT4Z+ho4YdInbHyJniHnsaKiRTD1Shpg
+Zy8qEu/dCyjo4ZZwocjAI0Qe0Mgsbpp7pO/ltFW7q9jy6BCZHs3W+iHq1UCvgbdy
+Wkxhnk7GB6J3Lk0XfLA8dIVG5EvJ798sKF4LJvnftzAjlk4L3fbbYM0odNrYZpOh
+nts0+p8teSwij2jdWAN0rsfGtHQjHaHGtFrBNpj0zAefBFplQ4lp7MW1i8WSiJOf
+UXD/ZAkhxvRrKpfml2s0fGe3hsVxMK1iIA7nVfX0IA3whBd8S14ywZ5bdK6wDIPl
+UMyj5skCgYEA73adeMll/bGEv9h9AJe+GfSxwY74UlnzUFeJcBWkwSZbFjyv/Vh3
+rzcS7cTTwNO3AF5QB/oVZLmW+w3fgNs96zyaathCvDXtKYUmmAe61b3LIzk4dqBr
+7ft/s0/OsNfNxD0cbTA45sJ+5rK1jd/X6WJGdTB4I0GvIexkDT94vIsCgYEA0Iwz
+/kBTyhMIwRpn+Ju3HaCfNvg2A9OAsAFjRLd/krpO6BdDBRIEyRlhjhdzD9heuD4v
+d9MuOAJnD1SWItvs7fOLT4KLXmRe+CjAueu5i7mwzEEGjkeeIWfD+NDdK/1SYzKH
+70bZb3cZrD+r4djmUZ54Lz3KZO4/598orDV34zUCgYEAuBMMFa9rUUrGatq1rGD4
+5ubsRYfrZxJyMQ45PgnFLhyX5E4eUrdQuUWyrUeiJxYYFJZrGtao31aysqYFav4d
+aNibMwqushMaDdKmyjMW8fsFTjxMJRRIIxYzIdl1XwdkyzbWxTBObUSRXDF/0mGB
+jYvX8XmiwCdbws3+Uxi5bOUCgYBxlhtvfLvmUQ2wl2BPsQhAc86kEvbgiJ8LvgXC
+VKuAUEdP8/OF3HWMzm0rBiyeUbvtX7lc60G+MdjOKcUIQX6/b6nN6Y1dIQ/028V0
+viY2KzJXXYdjkTBYg3ril2gPYI8yBkCxm4YsRtNN1PQaM5fmlohhOqd056sY8Jvn
+h8u/jQKBgQCDcJkaxdnLn0GTqFzTq7wLo/vfEYdwNsmE+F8onWUVT6L3rSQmzX2E
+lbrgzy7n/eUgsd7+LFRrxpSHehY3fpIr2Z/7QdtM2O0ppZHIR1tjteoWJ27osX54
+G5vZdGDsUNw54e2flS1W6ODjlTkXv1aRn+AtydZYKBfQkXg0KJjq7g==
+-----END RSA PRIVATE KEY-----

data/keys/server_public.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwLm8nRqzKICAP9LMNtpF
+5LAFbOjCRvceprp+Gs6M1xU3csU0S16ZpBUuXslIcJyOWWZtfyqW2GPb4+zNlbAQ
+lsg26ngpw+XT9e4XH2ufp8xkQpwOBiA+1uo54uUj3PSxb1fySvPzpGzuhxOuGgBP
+JUrE7EE0eQFl3lTFDz9EtRgYc9x9kmbf0CfxX+YdMLCTsWJKC+BmzYARtFtf6rJc
+mpN0EF29kBunF2AckjF3EYm6H351BnJtCZMZn2vqBF1UPt4bdnuloUdPW2xOf0Zm
+LiyfwjODDOinSTpE5E8WfU1efXST7GvYZ1CmWS41c1UZBsqjLUDDlQNM8jWmpHqb
+4QIDAQAB
+-----END PUBLIC KEY-----

data/lib/pushy_client.rb

@@ -0,0 +1,268 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, 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_relative 'pushy_client/version'
+require_relative 'pushy_client/heartbeater'
+require_relative 'pushy_client/job_runner'
+require_relative 'pushy_client/protocol_handler'
+require_relative 'pushy_client/periodic_reconfigurer'
+require_relative 'pushy_client/whitelist'
+require 'ohai'
+require 'uuidtools'
+require 'ffi-rzmq'
+require 'cgi'
+
+class PushyClient
+  def initialize(options)
+    @chef_server_url = options[:chef_server_url]
+    @client_name     = options[:client_name] || options[:node_name]
+    @client_key      = options[:client_key]
+    @node_name       = options[:node_name]
+    @whitelist       = PushyClient::Whitelist.new(options[:whitelist])
+    @hostname        = options[:hostname]
+    @file_dir        = options[:file_dir] || '/tmp/pushy'
+    @file_dir_expiry = options[:file_dir_expiry] || 86400
+
+    @allow_unencrypted = options[:allow_unencrypted] || false
+    @client_curve_pub_key, @client_curve_sec_key = ZMQ::Util.curve_keypair
+
+    Chef::Log.info("[#{@node_name}] using config file path: '#{Chef::Config[:config_file]}'")
+
+    if @chef_server_url =~ /\/organizations\/+([^\/]+)\/*/
+      @org_name = $1
+    else
+      raise "chef_server must end in /organizations/ORG_NAME"
+    end
+
+    @incarnation_id = UUIDTools::UUID.random_create
+
+    # State is global and persists across stops and starts
+    @job_runner = JobRunner.new(self)
+    @heartbeater = Heartbeater.new(self)
+    @protocol_handler = ProtocolHandler.new(self)
+    @periodic_reconfigurer = PeriodicReconfigurer.new(self)
+    @file_dir_cleaner = FileDirCleaner.new(self)
+
+    @reconfigure_lock = Mutex.new
+
+    Chef::Log.info "[#{node_name}] Using node name: #{node_name}"
+    Chef::Log.info "[#{node_name}] Using org name: #{org_name}"
+    Chef::Log.info "[#{node_name}] Using Chef server: #{chef_server_url}"
+    Chef::Log.info "[#{node_name}] Using private key: #{client_key}"
+    Chef::Log.info "[#{node_name}] Incarnation ID: #{incarnation_id}"
+    Chef::Log.info "[#{node_name}] Allowing fallback to unencrypted connection: #{allow_unencrypted}"
+  end
+
+  attr_accessor :chef_server_url
+  attr_accessor :client_name
+  attr_accessor :client_key
+  attr_accessor :org_name
+  attr_accessor :node_name
+  attr_accessor :hostname
+  attr_accessor :whitelist
+  attr_reader :incarnation_id
+  attr_reader :legacy_mode # indicate we've fallen back to 1.x
+
+  # crypto
+  attr_reader :client_curve_pub_key
+  attr_reader :client_curve_sec_key
+  attr_reader :allow_unencrypted
+  attr_reader :using_curve
+
+  #
+  attr_reader :file_dir
+  attr_reader :file_dir_expiry
+
+  attr_reader :config
+
+  def start
+    Chef::Log.info "[#{node_name}] Starting client ..."
+
+    @config = get_config
+
+    @job_runner.start
+    @protocol_handler.start
+    @heartbeater.start
+    @periodic_reconfigurer.start
+    @file_dir_cleaner.start
+
+    Chef::Log.info "[#{node_name}] Started client."
+  end
+
+  def stop
+    Chef::Log.info "[#{node_name}] Stopping client ..."
+
+    @job_runner.stop
+    @protocol_handler.stop
+    @heartbeater.stop
+    @periodic_reconfigurer.stop
+    @file_dir_cleaner.stop
+
+    Chef::Log.info "[#{node_name}] Stopped client."
+  end
+
+  def reconfigure
+    first = true
+    while !@job_runner.safe_to_reconfigure? do
+      Chef::Log.info "[#{node_name}] Job in flight, delaying reconfigure" if first
+      first = false
+      sleep 5
+    end
+
+    @reconfigure_lock.synchronize do
+      Chef::Log.info "[#{node_name}] Reconfiguring client / reloading keys ..."
+
+      @config = get_config
+
+      @job_runner.reconfigure
+      @protocol_handler.reconfigure
+      @heartbeater.reconfigure
+      @periodic_reconfigurer.reconfigure
+
+      Chef::Log.info "[#{node_name}] Reconfigured client."
+    end
+    trigger_gc
+  end
+
+  def trigger_reconfigure
+    # Many of the threads triggering a reconfigure will get destroyed DURING
+    # a reconfigure, so we need to spawn a separate thread to take care of it.
+    Thread.new do
+      begin
+        reconfigure
+      rescue
+        log_exception("Error reconfiguring", $!)
+      end
+    end
+  end
+
+  def trigger_gc
+    # We have a tendency to bloat up because GCs aren't forced; this tries to keep things a little bit saner.
+    before_stat = GC.stat()
+    GC.start()
+    after_stat = GC.stat()
+    stat = :count
+    delta = after_stat[stat] - before_stat[stat]
+    Chef::Log.info("[#{node_name}] Forced GC; Stat #{stat} changed #{delta}")
+  end
+
+  def job_state
+    @job_runner.job_state
+  end
+
+  def send_command(command, job_id, params = {})
+    @protocol_handler.send_command(command, job_id, params)
+  end
+
+  def send_heartbeat(sequence)
+    @protocol_handler.send_heartbeat(sequence)
+  end
+
+  def commit(job_id, command, opts)
+    @job_runner.commit(job_id, command, opts)
+  end
+
+  def run(job_id)
+    @job_runner.run(job_id)
+  end
+
+  def abort
+    @job_runner.abort
+  end
+
+  def heartbeat_received(incarnation_id, sequence)
+    @heartbeater.heartbeat_received(incarnation_id, sequence)
+  end
+
+  def log_exception(message, exception)
+    Chef::Log.error("[#{node_name}] #{message}: #{exception}\n#{exception.backtrace.join("\n")}")
+  end
+
+  def on_server_availability_change(&block)
+    @heartbeater.on_server_availability_change(&block)
+  end
+
+  def online?
+    @heartbeater.online?
+  end
+
+  def on_job_state_change(&block)
+    @job_runner.on_job_state_change(&block)
+  end
+
+  private
+
+  def rest
+    @rest ||= Chef::ServerAPI.new(chef_server_url, client_name: client_name, signing_key_filename: client_key)
+  end
+
+  def get_config
+    resource = "/pushy/config/#{node_name}"
+
+    Chef::Log.info "[#{node_name}] Retrieving configuration from #{chef_server_url}/#{resource}: ..."
+    esc_key = CGI::escape(@client_curve_pub_key)
+    version = PushyClient::PROTOCOL_VERSION
+    resource = "pushy/config/#{node_name}?ccpk=#{esc_key}&version=#{version}"
+
+    config = rest.get(resource)
+
+    if config.has_key?("curve_public_key")
+    # Version 2.0  or greater, we should use encryption
+      @using_curve = true
+      @legacy_mode = false
+    elsif allow_unencrypted then
+      @using_curve = false
+      @legacy_mode = true
+      Chef::Log.info "[#{node_name}] No key returned from server; falling back to 1.x protocol (no encryption)"
+    else
+      msg = "[#{node_name}] Exiting: No key returned from server; server may be using 1.x protocol. The config flag 'allow_unencrypted' disables encryption and allows use of 1.x server. Use with caution!"
+      Chef::Log.error msg
+      Kernel.abort msg
+      config = nil
+    end
+    return config
+  end
+
+  # XXX Should go in a separate file
+  class FileDirCleaner
+    def initialize(client)
+      @client = client
+      @expiration_time = client.file_dir_expiry
+      @file_dir = client.file_dir
+    end
+
+    def start
+      @thread = Thread.new { expiration_loop }
+    end
+
+    def stop
+      @thread.kill
+    end
+
+    private
+
+    def expiration_loop
+      while true do
+        files = Dir.glob(@file_dir + "/pushy_file*")
+        now = Time.now
+        old_files = files.select { |f| now - File.mtime(f) > @expiration_time}
+        File.delete(*old_files)
+        sleep @expiration_time
+      end
+    end
+  end
+end