from-scratch 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fecc9619a3c03891cb931d42dbada9d76d11546
-  data.tar.gz: 354a0f61a77ac2a23608afcdfde4eb3966caf491
+  metadata.gz: 3fd33f498a44da3fa69a159e08ed8cb5abce737b
+  data.tar.gz: 85835eb65547f0d5c037ef56c8d253ce46c6ba20
 SHA512:
-  metadata.gz: 38b9f37053254444604c73f57e56bb5d776be4d8ee13e40a86eaf9ce4598aba5c5f49b014b2e7a3a7036ed25db7cce17163f073f536300b87ed19cff31bcd330
-  data.tar.gz: 4f3f887a9d83e37c73fc1f2d7c004c1290c1a2d3512e8afe8afb1ba667fbb87d2930a45479f3b5f7e0cad7eb43333ca727b58728a40eabb9cd13a4db2c6577d1
+  metadata.gz: 8515f8f2f281f214e96bea5c97b55b90ec131785ae8c22144963a87990bd9add9319b57696bde6f7e41602c930dab0768e465a66008d869a31ca9ff71d951308
+  data.tar.gz: d8daa090fdecaf523cec1b095ddb7497689e65164d9931a0a6979da206d141e859e0b4620c0161fb4e49de6db6df9261cb24aab2a85c7cf7e6212477b6159b14

data/Berksfile

@@ -7,7 +7,7 @@ metadata
 
 cookbook 'user'
 cookbook 'rvm', github: 'fnichol/chef-rvm'
-cookbook 'postgresql'
+cookbook 'postgresql', github: 'sandrew/postgresql', branch: 'develop'
 
 # cookbook 'dpkg_packages', git: "https://gitlab.acid.cl/acidlabs/chef-dpkg-packages.git"
 # cookbook 'nginx',         git: "https://gitlab.acid.cl/acidlabs/chef-nginx.git"

data/Berksfile.lock

@@ -1,5 +1,8 @@
 DEPENDENCIES
   postgresql
+    git: git://github.com/sandrew/postgresql.git
+    revision: a1f3ce3e2e22515bc175011a3e3faa0af98dd8db
+    branch: develop
   rvm
     git: git://github.com/fnichol/chef-rvm.git
     revision: 08ec265f277e112a5a2e4b201bd32ddfe1bb968c
@@ -14,12 +17,12 @@ GRAPH
   chef-sugar (3.1.1)
   chef_gem (0.1.0)
   java (1.35.0)
-  openssl (4.0.0)
-    chef-sugar (>= 0.0.0)
-  postgresql (3.4.20)
+  openssl (4.4.0)
+    chef-sugar (>= 3.1.1)
+  postgresql (3.4.21)
     apt (>= 1.9.0)
     build-essential (>= 0.0.0)
-    openssl (~> 4.0.0)
+    openssl (~> 4.0)
   rvm (0.10.1)
     chef_gem (>= 0.0.0)
     java (>= 0.0.0)

data/cookbooks/openssl/CHANGELOG.md

@@ -2,13 +2,54 @@ openssl Cookbook CHANGELOG
 ==========================
 This file is used to list changes made in each version of the openssl cookbook.
 
-v4.0.0 (2014-02-19)
+v4.4.0 (2015-08-28)
+-------------------
+- NEW: x509 certificates are now signed via SHA-256 instead of SHA-1
+- FIX: gen_dhparam error now correctly fails with TypeError instead of ArgumentError if Generator argument isn't an integer
+
+v4.3.2 (2015-08-01)
+-------------------
+- FIX: Updated changelog
+
+v4.3 (2015-08-01)
+-------------------
+- NEW: Add rsa_key lwrp
+- FIX: dhparam lwrp now correctly honors the generator parameter
+
+v4.2 (2015-06-23)
+-------------------
+- NEW: Add dhparam lwrp
+- FIX: x509 lwrp now updates resource count correctly
+
+v4.1.2 (2015-06-20)
+-------------------
+- Add Serverspec suite
+- Removed update suite from .kitchen.yml
+- Add explicit license to test cookbook recipes
+- Add Whyrun support to x509 LWRP
+- Expand Chefspec tests for x509 LWRP to step_into LWRP
+- Add helper library
+- Update x509 LWRP to verify existing keys, if specified
+
+v4.1.1 (2015-06-11)
+-------------------
+- README.md fixes
+
+v4.1.0 (2015-06-11)
+-------------------
+- Add new random_password Mixin (Thanks, Seth!)
+- Rewritten README.md
+- Refactor specs
+- Clear Rubocop violations
+
+v4.0.0 (2015-02-19)
 -------------------
 - Reverting to Opscode module namespace
 
-v3.0.2 (2014-12-30)
+v3.0.2 (2015-12-18)
 -------------------
 - Accidently released 2.0.2 as 3.0.2
+- Re-namespaced `Opscode::OpenSSL::Password` module as `Chef::OpenSSL::Password`
 
 v2.0.2 (2014-12-30)
 -------------------

data/cookbooks/openssl/README.md

@@ -1,105 +1,199 @@
-openssl Cookbook
+OpenSSL Cookbook
 ================
+[![Build Status](https://travis-ci.org/opscode-cookbooks/openssl.svg?branch=master)](https://travis-ci.org/opscode-cookbooks/openssl)
 
-This cookbook provides a library method to generate secure random passwords in recipes using the Ruby OpenSSL library.
-
-It also provides an attribute-driven recipe for upgrading OpenSSL packages.
+This cookbook provides tools for working with the Ruby OpenSSL library. It includes:
+- A library method to generate secure random passwords in recipes, using the Ruby SecureRandom library.
+- An LWRP for generating RSA private keys.
+- An LWRP for generating x509 certificates.
+- An LWRP for generating dhparam.pem files.
+- An attribute-driven recipe for upgrading OpenSSL packages.
 
 Requirements
 ------------
 
-The `secure_password` works on any platform with OpenSSL Ruby bindings installed, which are a requirement for Chef anyway.
+The `random_password` mixin works on any platform with the Ruby SecureRandom module. This module is already included with Chef.
+
+The `openssl_x509`, `openssl_rsa_key` and `openssl_dhparam` LWRPs work on any platform with the OpenSSL Ruby bindings installed. These bindings are already included with Chef.
 
-The upgrade recipe works on the following tested platforms:
+The `upgrade` recipe has been tested on the following platforms:
 
 * Ubuntu 12.04, 14.04
 * Debian 7.4
 * CentOS 6.5
 
-It may work on other platforms or versions of the above platforms with or without modification.
+The recipe may work on other platforms or different versions of the above platforms, but this has not been tested.
+
+Dependencies
+------------
 
-[Chef Sugar](https://github.com/sethvargo/chef-sugar) was introduced as a dependency to provide helpers that make the default attribute settings (see Attributes) easier to reason about.
+This cookbook depends on the [Chef Sugar](http://supermarket.chef.io/cookbooks/chef-sugar/) cookbook. [Chef Sugar](http://supermarket.chef.io/cookbooks/chef-sugar/) is used to make the default attribute settings easier to reason about. (See [Attributes](#attributes))
 
 Attributes
 ----------
 
-* `node['openssl']['packages']` - An array of packages of openssl. The default attributes attempt to be smart about which packages are the default, but this may need to be changed by users of the `openssl::upgrade` recipe.
-* `node['openssl']['restart_services']` - An array of service resources that use the `node['openssl']['packages']`. This is empty by default as Chef has no reliably reasonable way to detect which applications or services are compiled against these packages. *Note* These each need to be "`service`" resources specified somewhere in the recipes in the node's run list.
+* `node['openssl']['packages']` - An array of packages required to use openssl. The default attributes attempt to be smart about which packages are the default, but this may need to be changed by users of the `openssl::upgrade` recipe.
+* `node['openssl']['restart_services']` - An array of service resources that depend on the packages listed in the `node['openssl']['packages']` attribute. This array is empty by default, as Chef has no reasonable way to detect which applications or services are compiled against these packages. *Note* Each service listed in this array should represent a "`service`" resource specified in the recipes of the node's run list.
 
 Recipes
 -------
 
+### default
+
+An empty placeholder recipe. Takes no action.
+
 ### upgrade
 
-The upgrade recipe iterates over the list of packages in the `node['openssl']['packages']` attribute and manages them with the `:upgrade` action. Each package will send `:restart` notification to service resources named by the `node['openssl']['restart_services']` attribute.
+The upgrade recipe iterates over the list of packages in the `node['openssl']['packages']` attribute, and manages them with the `:upgrade` action. Each package will send a `:restart` notification to service resources named in the `node['openssl']['restart_services']` attribute.
 
-Usage
------
+#### Example Usage
 
-Most often this will be used to generate a secure password for an attribute. In a recipe:
+In this example, assume the node is running the `stats_collector` daemon, which depends on the openssl library. Imagine that a new openssl vulnerability has been disclosed, and the operating system vendor has released an update to openssl to address this vulnerability. In order to protect the node, an administrator crafts this recipe:
 
 ```ruby
-::Chef::Recipe.send(:include, Chef::OpenSSL::Password)
-node.set_unless[:my_password] = secure_password
+node.default['openssl']['restart_services'] = ['stats_collector']
+
+# other recipe code here...
+service 'stats_collector' do
+  action [:enable, :start]
+end
+
+include_recipe 'openssl::upgrade'
 ```
 
-To use the `openssl::upgrade` recipe, set the attributes as mentioned above. For example, we have a "stats_collector" service that uses openssl. It has a recipe that looks like this:
+When executed, this recipe will ensure that openssl is upgraded to the latest version, and that the `stats_collector` service is restarted to pick up the latest security fixes released in the openssl package.
 
-LWRP
-==== 
+Libraries & LWRPs
+-----------------
 
-This cookbook includes an LWRP for generating Self Signed Certificates
+There are two mixins packaged with this cookbook.
 
-## openssl_x509
-generate a pem formatted x509 cert + key  
+### random_password (`OpenSSLCookbook::RandomPassword`)
 
-### Attributes
-`common_name` A String representing the `CN` ssl field
-`org` A String representing the `O` ssl field
-`org_unit` A String representing the `OU` ssl field
-`country` A String representing the `C` ssl field
-`expire` A Fixnum reprenting the number of days from _now_ to expire the cert
-`key_file` Optional A string to the key file to use. If no key is present it will generate and store one. 
-`key_pass` A String that is the key's passphrase
-`key_length` A Fixnum reprenting your desired Bit Length _Default: 2048_
-`owner` The owner of the files _Default: "root"_
-`group` The group of the files _Default: "root"_
-`mode`  The mode to store the files in _Default: "0400"_
+The `RandomPassword` mixin can be used to generate secure random passwords in Chef cookbooks, usually for assignment to a variable or an attribute. `random_password` uses Ruby's SecureRandom library and is customizable.
 
-### Example usage
+#### Example Usage
+```ruby
+Chef::Recipe.send(:include, OpenSSLCookbook::RandomPassword)
+node.set['my_secure_attribute'] = random_password
+node.set_unless['my_secure_attribute'] = random_password
+node.set['my_secure_attribute'] = random_password(length: 50)
+node.set['my_secure_attribute'] = random_password(length: 50, mode: :base64)
+node.set['my_secure_attribute'] = random_password(length: 50, mode: :base64, encoding: 'ASCII')
+```
 
-    openssl_x509 "/tmp/mycert.pem" do
-      common_name "www.f00bar.com"
-      org "Foo Bar"
-      org_unit "Lab"
-      country "US"
-    end
+Note that node attributes are widely accessible. Storing unencrypted passwords in node attributes, as in this example, carries risk.
 
-    
-License and Author
-==================
+### ~~secure_password (`Opscode::OpenSSL::Password`)~~
 
-Author:: Jesse Nelson (<spheromak@gmail.com>)
-Author:: Joshua Timberman (<joshua@chef.io>)
-=======
+This library should be considered deprecated and will be removed in a future version. Please use `OpenSSLCookbook::RandomPassword` instead. The documentation is kept here for historical reasons.
+
+#### ~~Example Usage~~
+```ruby
+::Chef::Recipe.send(:include, Opscode::OpenSSL::Password)
+node.set_unless['my_password'] = secure_password
+```
 
+~~Note that node attributes are widely accessible. Storing unencrypted passwords in node attributes, as in this example, carries risk.~~
+
+### openssl_x509
+
+This LWRP generates self-signed, PEM-formatted x509 certificates. If no existing key is specified, the LWRP will automatically generate a passwordless key with the certificate.
+
+#### Attributes
+| Name  | Type | Description |
+| ----- | ---- | ------------ |
+| `common_name`  | String (Required)  | Value for the `CN` certificate field. |
+| `org` | String (Required) | Value for the `O` certificate field. |
+| `org_unit` | String (Required) | Value for the `OU` certificate field. |
+| `country` | String (Required) | Value for the `C` ssl field. |
+| `expire` | Fixnum (Optional) | Value representing the number of days from _now_ through which the issued certificate cert will remain valid. The certificate will expire after this period. |
+| `key_file` | String (Optional) | The path to a certificate key file on the filesystem. If the `key_file` attribute is specified, the LWRP will attempt to source a key from this location. If no key file is found, the LWRP will generate a new key file at this location. If the `key_file` attribute is not specified, the LWRP will generate a key file in the same directory as the generated certificate, with the same name as the generated certificate.
+| `key_pass` | String (Optional) | The passphrase for an existing key's passphrase  
+| `key_length` | Fixnum (Optional) | The desired Bit Length of the generated key. _Default: 2048_ |
+| `owner` | String (optional) | The owner of all files created by the LWRP. _Default: "root"_ |
+| `group` | String (optional) | The group of all files created by the LWRP. _Default: "root"_ |
+| `mode` | String or Fixnum (Optional) | The permission mode of all files created by the LWRP.  _Default: "0400"_ |
+
+#### Example Usage
+
+In this example, an administrator wishes to create a self-signed x509 certificate for use with a web server. In order to create the certificate, the administrator crafts this recipe:
 
 ```ruby
-node.default['openssl']['restart_services'] = ['stats_collector']
+openssl_x509 '/etc/httpd/ssl/mycert.pem' do
+  common_name 'www.f00bar.com'
+  org 'Foo Bar'
+  org_unit 'Lab'
+  country 'US'
+end
+```
 
-# other recipe code here...
-service 'stats_collector' do
-  action [:enable, :start]
+When executed, this recipe will generate a key certificate at `/etc/httpd/ssl/mycert.key`. It will then use that key to generate a new certificate file at `/etc/httpd/ssl/mycert.pem`.
+
+### openssl_dhparam
+
+This LWRP generates dhparam.pem files. If a valid dhparam.pem file is found at the specified location, no new file will be created. If a file is found at the specified location but it is not a valid dhparam file, it will be overwritten.
+
+#### Attributes
+| Name  | Type | Description |
+| ----- | ---- | ------------ |
+| `key_length` | Fixnum (Optional) | The desired Bit Length of the generated key. _Default: 2048_ |
+| `generator` | Fixnum (Optional) | The desired Diffie-Hellmann generator. Can be _2_ or _5_. |
+| `owner` | String (optional) | The owner of all files created by the LWRP. _Default: "root"_ |
+| `group` | String (optional) | The group of all files created by the LWRP. _Default: "root"_ |
+| `mode` | String or Fixnum (Optional) | The permission mode of all files created by the LWRP.  _Default: "0644"_ |
+
+#### Example Usage
+
+In this example, an administrator wishes to create a dhparam.pem file for use with a web server. In order to create the .pem file, the administrator crafts this recipe:
+
+```ruby
+openssl_dhparam '/etc/httpd/ssl/dhparam.pem' do
+  key_length 2048 
+  generator 2
 end
+```
 
-include_recipe 'openssl::upgrade'
+When executed, this recipe will generate a dhparam file at `/etc/httpd/ssl/dhparam.pem`.
+
+### openssl_rsa_key
+
+This LWRP generates rsa key files. If a valid rsa key file can be opened at the specified location, no new file will be created. If the RSA key file cannot be opened, either because it does not exist or because the password to the RSA key file does not match the password in the recipe, it will be overwritten.
+
+#### Attributes
+| Name  | Type | Description |
+| ----- | ---- | ------------ |
+| `key_length` | Fixnum (Optional) | The desired Bit Length of the generated key. _Default: 2048_ |
+| `key_pass` | String (Optional) | The desired passphrase for the key. |
+| `owner` | String (optional) | The owner of all files created by the LWRP. _Default: "root"_ |
+| `group` | String (optional) | The group of all files created by the LWRP. _Default: "root"_ |
+| `mode` | String or Fixnum (Optional) | The permission mode of all files created by the LWRP.  _Default: "0644"_ |
+
+#### Example Usage
+
+In this example, an administrator wishes to create a new RSA private key file in order to generate other certificates and public keys. In order to create the key file, the administrator crafts this recipe:
+
+```ruby
+openssl_rsa_key '/etc/httpd/ssl/server.key' do
+  key_length 2048 
+end
 ```
 
-This will ensure that openssl is upgraded to the latest version so the `stats_collector` service won't be exploited (hopefully!).
+When executed, this recipe will generate a passwordless RSA key file at `/etc/httpd/ssl/server.key`.
+
+
+License and Author
+------------------
+
+Author:: Jesse Nelson (<spheromak@gmail.com>)  
+Author:: Seth Vargo (<sethvargo@gmail.com>)  
+Author:: Charles Johnson (<charles@chef.io>)  
+Author:: Joshua Timberman (<joshua@chef.io>)
+
+=======
 
 ```text
-Copyright:: 2009-2011, Chef Software, Inc
-Copyright:: 2014, Chef Software, Inc <legal@chef.io>
+Copyright:: 2009-2015, Chef Software, Inc <lega@chef.io>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/cookbooks/openssl/libraries/helpers.rb

@@ -0,0 +1,60 @@
+module OpenSSLCookbook
+  # Helper functions for the OpenSSL cookbook.
+  module Helpers
+    def self.included(_base)
+      require 'openssl' unless defined?(OpenSSL)
+    end
+
+    # Path helpers
+    def get_key_filename(cert_filename)
+      cert_file_path, cert_filename = ::File.split(cert_filename)
+      cert_filename = ::File.basename(cert_filename, ::File.extname(cert_filename))
+      cert_file_path + ::File::SEPARATOR + cert_filename + '.key'
+    end
+
+    # Validation helpers
+    def key_length_valid?(number)
+      number >= 1024 && number & (number - 1) == 0
+    end
+
+    def dhparam_pem_valid?(dhparam_pem_path)
+      # Check if the dhparam.pem file exists
+      # Verify the dhparam.pem file contains a key
+      return false unless File.exist?(dhparam_pem_path)
+      dhparam = OpenSSL::PKey::DH.new File.read(dhparam_pem_path)
+      dhparam.params_ok?
+    end
+
+    def key_file_valid?(key_file_path, key_password = nil)
+      # Check if the key file exists
+      # Verify the key file contains a private key
+      return false unless File.exist?(key_file_path)
+      key = OpenSSL::PKey::RSA.new File.read(key_file_path), key_password
+      key.private?
+    end
+
+    # Generators
+    def gen_dhparam(key_length, generator)
+      fail ArgumentError, 'Key length must be a power of 2 greater than or equal to 1024' unless key_length_valid?(key_length)
+      fail TypeError, 'Generator must be an integer' unless generator.is_a?(Integer)
+
+      OpenSSL::PKey::DH.new(key_length, generator)
+    end
+
+    def gen_rsa_key(key_length)
+      fail ArgumentError, 'Key length must be a power of 2 greater than or equal to 1024' unless key_length_valid?(key_length)
+
+      OpenSSL::PKey::RSA.new(key_length)
+    end
+
+    # Key manipulation helpers
+    # Returns a pem string
+    def encrypt_rsa_key(rsa_key, key_password)
+      fail TypeError, 'rsa_key must be a Ruby OpenSSL::PKey::RSA object' unless rsa_key.is_a?(OpenSSL::PKey::RSA)
+      fail TypeError, 'RSA key password must be a string' unless key_password.is_a?(String)
+
+      cipher = OpenSSL::Cipher::Cipher.new('des3')
+      rsa_key.to_pem(cipher, key_password)
+    end
+  end
+end

data/cookbooks/openssl/libraries/matchers.rb

@@ -0,0 +1,13 @@
+if defined?(ChefSpec)
+  def create_x509_certificate(name)
+    ChefSpec::Matchers::ResourceMatcher.new(:openssl_x509, :create, name)
+  end
+
+  def create_dhparam_pem(name)
+    ChefSpec::Matchers::ResourceMatcher.new(:openssl_dhparam, :create, name)
+  end
+
+  def create_rsa_key(name)
+    ChefSpec::Matchers::ResourceMatcher.new(:openssl_rsa_key, :create, name)
+  end
+end

data/cookbooks/openssl/libraries/random_password.rb

@@ -0,0 +1,82 @@
+#
+# Cookbook Name:: openssl
+# Library:: random_password
+# Author:: Seth Vargo <sethvargo@gmail.com>
+#
+# Copyright 2015, Seth Vargo
+#
+# 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.
+# rubocop:disable UnusedMethodArgument, Style/RaiseArgs
+
+module OpenSSLCookbook
+  module RandomPassword
+    # Override the included method to require securerandom if it is not defined.
+    # This avoids the need to load the class on each Chef run unless the user is
+    # explicitly requiring it.
+    def self.included(base)
+      require 'securerandom' unless defined?(SecureRandom)
+    end
+
+    class InvalidPasswordMode < StandardError
+      def initialize(given, acceptable)
+        super <<-EOH
+The given password mode '#{given}' is not valid. Valid password modes are :hex,
+:base64, and :random_bytes!
+EOH
+      end
+    end
+
+    #
+    # Generates a random password using {SecureRandom}.
+    #
+    # @example Generating a random (hex) password (of 20 characters)
+    #   random_password #=> "1930e99aa035083bdd93d1d8f11cb7ac8f625c9c"
+    #
+    # @example Generating a random base64 password that is 50 characters
+    #   random_password(mode: :base64, length: 50) #=> "72o5oVbKHHEVYj1nOgFB2EijnzZfnrbfasVuF+oRH8wMgb0QWoYZF/OkrQricp1ENoI="
+    #
+    # @example Generate a password with a forced encoding
+    #   random_password(encoding: "ASCII")
+    #
+    # @param [Hash] options
+    # @option options [Fixnum] :length
+    #   the number of bits to use in the password
+    # @option options [Symbol] :mode
+    #   the type of random password to generate - valid values are
+    #   `:hex`, `:base64`, or `:random_bytes`
+    # @option options [String, Symbol, Constant] :encoding
+    #   the encoding to force (default is "UTF-8")
+    #
+    # @return [String]
+    #
+    def random_password(options = {})
+      length   = options[:length] || 20
+      mode     = options[:mode] || :hex
+      encoding = options[:encoding] || 'UTF-8'
+
+      # Convert to a "proper" length, since the size is actually in bytes
+      length = case mode
+               when :hex
+                 length / 2
+               when :base64
+                 length * 3 / 4
+               when :random_bytes
+                 length
+               else
+                 fail InvalidPasswordMode.new(mode)
+               end
+
+      SecureRandom.send(mode, length).force_encoding(encoding)
+    end
+  end
+end