chef 14.15.6-universal-mingw32 → 15.0.293-universal-mingw32

data/lib/chef/resource/openssl_ec_private_key.rb

@@ -1,93 +1,92 @@
-#
-# Copyright:: Copyright 2018, Chef Software Inc.
-# Author:: Julien Huon
-# 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 "chef/resource"
-
-class Chef
-  class Resource
-    class OpensslEcPrivateKey < Chef::Resource
-      require "chef/mixin/openssl_helper"
-      include Chef::Mixin::OpenSSLHelper
-
-      preview_resource true
-      resource_name :openssl_ec_private_key
-
-      description "Use the openssl_ec_private_key resource to generate an elliptic curve (EC) private key file. If a valid EC key file can be opened at the specified location, no new file will be created. If the EC key file cannot be opened, either because it does not exist or because the password to the EC key file does not match the password in the recipe, then it will be overwritten."
-      introduced "14.4"
-
-      property :path, String,
-               description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
-               name_property: true
-
-      property :key_curve, String,
-               equal_to: %w{secp384r1 secp521r1 prime256v1 secp224r1 secp256k1},
-               description: "The desired curve of the generated key (if key_type is equal to 'ec'). Run openssl ecparam -list_curves to see available options.",
-               default: "prime256v1"
-
-      property :key_pass, String,
-               description: "The desired passphrase for the key."
-
-      property :key_cipher, String,
-               equal_to: OpenSSL::Cipher.ciphers,
-               validation_message: "key_cipher must be a cipher known to openssl. Run `openssl list-cipher-algorithms` to see available options.",
-               description: "The designed cipher to use when generating your key. Run `openssl list-cipher-algorithms` to see available options.",
-               default: "des3"
-
-      property :owner, String,
-               description: "The owner applied to all files created by the resource."
-
-      property :group, String,
-               description: "The group ownership applied to all files created by the resource."
-
-      property :mode, [Integer, String],
-               description: "The permission mode applied to all files created by the resource.",
-               default: "0600"
-
-      property :force, [TrueClass, FalseClass],
-               description: "Force creation of the key even if the same key already exists on the node.",
-               default: false, desired_state: false
-
-      action :create do
-        description "Generate the ec private key"
-
-        unless new_resource.force || priv_key_file_valid?(new_resource.path, new_resource.key_pass)
-          converge_by("Create an EC private key #{new_resource.path}") do
-            log "Generating an #{new_resource.key_curve} "\
-                "EC key file at #{new_resource.path}, this may take some time"
-
-            if new_resource.key_pass
-              unencrypted_ec_key = gen_ec_priv_key(new_resource.key_curve)
-              ec_key_content = encrypt_ec_key(unencrypted_ec_key, new_resource.key_pass, new_resource.key_cipher)
-            else
-              ec_key_content = gen_ec_priv_key(new_resource.key_curve).to_pem
-            end
-
-            file new_resource.path do
-              action :create
-              owner new_resource.owner unless new_resource.owner.nil?
-              group new_resource.group unless new_resource.group.nil?
-              mode new_resource.mode
-              sensitive true
-              content ec_key_content
-            end
-          end
-        end
-      end
-    end
-  end
-end
+#
+# Copyright:: Copyright 2018, Chef Software Inc.
+# Author:: Julien Huon
+# 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 "../resource"
+
+class Chef
+  class Resource
+    class OpensslEcPrivateKey < Chef::Resource
+      require_relative "../mixin/openssl_helper"
+      include Chef::Mixin::OpenSSLHelper
+
+      resource_name :openssl_ec_private_key
+
+      description "Use the openssl_ec_private_key resource to generate an elliptic curve (EC) private key file. If a valid EC key file can be opened at the specified location, no new file will be created. If the EC key file cannot be opened, either because it does not exist or because the password to the EC key file does not match the password in the recipe, then it will be overwritten."
+      introduced "14.4"
+
+      property :path, String,
+               description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
+               name_property: true
+
+      property :key_curve, String,
+               equal_to: %w{secp384r1 secp521r1 prime256v1 secp224r1 secp256k1},
+               description: "The desired curve of the generated key (if key_type is equal to 'ec'). Run openssl ecparam -list_curves to see available options.",
+               default: "prime256v1"
+
+      property :key_pass, String,
+               description: "The desired passphrase for the key."
+
+      property :key_cipher, String,
+               equal_to: OpenSSL::Cipher.ciphers,
+               validation_message: "key_cipher must be a cipher known to openssl. Run `openssl list-cipher-algorithms` to see available options.",
+               description: "The designed cipher to use when generating your key. Run `openssl list-cipher-algorithms` to see available options.",
+               default: "des3"
+
+      property :owner, [String, Integer],
+               description: "The owner applied to all files created by the resource."
+
+      property :group, [String, Integer],
+               description: "The group ownership applied to all files created by the resource."
+
+      property :mode, [Integer, String],
+               description: "The permission mode applied to all files created by the resource.",
+               default: "0600"
+
+      property :force, [TrueClass, FalseClass],
+               description: "Force creation of the key even if the same key already exists on the node.",
+               default: false, desired_state: false
+
+      action :create do
+        description "Generate the ec private key"
+
+        unless new_resource.force || priv_key_file_valid?(new_resource.path, new_resource.key_pass)
+          converge_by("Create an EC private key #{new_resource.path}") do
+            log "Generating an #{new_resource.key_curve} "\
+                "EC key file at #{new_resource.path}, this may take some time"
+
+            if new_resource.key_pass
+              unencrypted_ec_key = gen_ec_priv_key(new_resource.key_curve)
+              ec_key_content = encrypt_ec_key(unencrypted_ec_key, new_resource.key_pass, new_resource.key_cipher)
+            else
+              ec_key_content = gen_ec_priv_key(new_resource.key_curve).to_pem
+            end
+
+            file new_resource.path do
+              action :create
+              owner new_resource.owner unless new_resource.owner.nil?
+              group new_resource.group unless new_resource.group.nil?
+              mode new_resource.mode
+              sensitive true
+              content ec_key_content
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/resource/openssl_ec_public_key.rb

@@ -1,75 +1,74 @@
-#
-# Copyright:: Copyright 2018, Chef Software Inc.
-# Author:: Julien Huon
-# 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 "chef/resource"
-
-class Chef
-  class Resource
-    class OpensslEcPublicKey < Chef::Resource
-      require "chef/mixin/openssl_helper"
-      include Chef::Mixin::OpenSSLHelper
-
-      preview_resource true
-      resource_name :openssl_ec_public_key
-
-      description "Use the openssl_ec_public_key resource to generate elliptic curve (EC) public key files from a given EC private key."
-      introduced "14.4"
-
-      property :path, String,
-               description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
-               name_property: true
-
-      property :private_key_path, String,
-               description: "The path to the private key file."
-
-      property :private_key_content, String,
-               description: "The content of the private key including new lines. This property is used in place of private_key_path in instances where you want to avoid having to first write the private key to disk"
-
-      property :private_key_pass, String,
-               description: "The passphrase of the provided private key."
-
-      property :owner, String,
-               description: "The owner applied to all files created by the resource."
-
-      property :group, String,
-               description: "The group ownership applied to all files created by the resource."
-
-      property :mode, [Integer, String],
-               description: "The permission mode applied to all files created by the resource.",
-               default: "0640"
-
-      action :create do
-        description "Generate the ec public key from a private key"
-
-        raise ArgumentError, "You cannot specify both 'private_key_path' and 'private_key_content' properties at the same time." if new_resource.private_key_path && new_resource.private_key_content
-        raise ArgumentError, "You must specify the private key with either 'private_key_path' or 'private_key_content' properties." unless new_resource.private_key_path || new_resource.private_key_content
-        raise "#{new_resource.private_key_path} not a valid private EC key or password is invalid" unless priv_key_file_valid?((new_resource.private_key_path || new_resource.private_key_content), new_resource.private_key_pass)
-
-        ec_key_content = gen_ec_pub_key((new_resource.private_key_path || new_resource.private_key_content), new_resource.private_key_pass)
-
-        file new_resource.path do
-          action :create
-          owner new_resource.owner unless new_resource.owner.nil?
-          group new_resource.group unless new_resource.group.nil?
-          mode new_resource.mode
-          content ec_key_content
-        end
-      end
-    end
-  end
-end
+#
+# Copyright:: Copyright 2018, Chef Software Inc.
+# Author:: Julien Huon
+# 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 "../resource"
+
+class Chef
+  class Resource
+    class OpensslEcPublicKey < Chef::Resource
+      require_relative "../mixin/openssl_helper"
+      include Chef::Mixin::OpenSSLHelper
+
+      resource_name :openssl_ec_public_key
+
+      description "Use the openssl_ec_public_key resource to generate elliptic curve (EC) public key files from a given EC private key."
+      introduced "14.4"
+
+      property :path, String,
+               description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
+               name_property: true
+
+      property :private_key_path, String,
+               description: "The path to the private key file."
+
+      property :private_key_content, String,
+               description: "The content of the private key including new lines. This property is used in place of private_key_path in instances where you want to avoid having to first write the private key to disk"
+
+      property :private_key_pass, String,
+               description: "The passphrase of the provided private key."
+
+      property :owner, [String, Integer],
+               description: "The owner applied to all files created by the resource."
+
+      property :group, [String, Integer],
+               description: "The group ownership applied to all files created by the resource."
+
+      property :mode, [Integer, String],
+               description: "The permission mode applied to all files created by the resource.",
+               default: "0640"
+
+      action :create do
+        description "Generate the ec public key from a private key"
+
+        raise ArgumentError, "You cannot specify both 'private_key_path' and 'private_key_content' properties at the same time." if new_resource.private_key_path && new_resource.private_key_content
+        raise ArgumentError, "You must specify the private key with either 'private_key_path' or 'private_key_content' properties." unless new_resource.private_key_path || new_resource.private_key_content
+        raise "#{new_resource.private_key_path} not a valid private EC key or password is invalid" unless priv_key_file_valid?((new_resource.private_key_path || new_resource.private_key_content), new_resource.private_key_pass)
+
+        ec_key_content = gen_ec_pub_key((new_resource.private_key_path || new_resource.private_key_content), new_resource.private_key_pass)
+
+        file new_resource.path do
+          action :create
+          owner new_resource.owner unless new_resource.owner.nil?
+          group new_resource.group unless new_resource.group.nil?
+          mode new_resource.mode
+          content ec_key_content
+        end
+      end
+    end
+  end
+end

data/lib/chef/resource/openssl_rsa_private_key.rb

@@ -1,91 +1,91 @@
-#
-# Copyright:: Copyright 2009-2018, Chef Software 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 "chef/resource"
-
-class Chef
-  class Resource
-    class OpensslRsaPrivateKey < Chef::Resource
-      require "chef/mixin/openssl_helper"
-      include Chef::Mixin::OpenSSLHelper
-
-      resource_name :openssl_rsa_private_key
-      provides(:openssl_rsa_private_key) { true }
-      provides(:openssl_rsa_key) { true } # legacy cookbook resource name
-
-      description "Use the openssl_rsa_private_key resource to generate RSA private 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."
-      introduced "14.0"
-
-      property :path, String,
-               description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
-               name_property: true
-
-      property :key_length, Integer,
-               equal_to: [1024, 2048, 4096, 8192],
-               validation_message: "key_length (bits) must be 1024, 2048, 4096, or 8192!",
-               description: "The desired bit length of the generated key.",
-               default: 2048
-
-      property :key_pass, String,
-               description: "The desired passphrase for the key."
-
-      property :key_cipher, String,
-               equal_to: OpenSSL::Cipher.ciphers,
-               validation_message: "key_cipher must be a cipher known to openssl. Run `openssl list-cipher-algorithms` to see available options.",
-               description: "The designed cipher to use when generating your key. Run `openssl list-cipher-algorithms` to see available options.",
-               default: "des3"
-
-      property :owner, String,
-               description: "The owner applied to all files created by the resource."
-
-      property :group, String,
-               description: "The group ownership applied to all files created by the resource."
-
-      property :mode, [Integer, String],
-               description: "The permission mode applied to all files created by the resource.",
-               default: "0600"
-
-      property :force, [TrueClass, FalseClass],
-               description: "Force creation of the key even if the same key already exists on the node.",
-               default: false, desired_state: false
-
-      action :create do
-        description "Create the RSA private key."
-
-        return if new_resource.force || priv_key_file_valid?(new_resource.path, new_resource.key_pass)
-
-        converge_by("create #{new_resource.key_length} bit RSA key #{new_resource.path}") do
-          if new_resource.key_pass
-            unencrypted_rsa_key = gen_rsa_priv_key(new_resource.key_length)
-            rsa_key_content = encrypt_rsa_key(unencrypted_rsa_key, new_resource.key_pass, new_resource.key_cipher)
-          else
-            rsa_key_content = gen_rsa_priv_key(new_resource.key_length).to_pem
-          end
-
-          file new_resource.path do
-            action :create
-            owner new_resource.owner unless new_resource.owner.nil?
-            group new_resource.group unless new_resource.group.nil?
-            mode new_resource.mode
-            sensitive true
-            content rsa_key_content
-          end
-        end
-      end
-    end
-  end
-end
+#
+# Copyright:: Copyright 2009-2018, Chef Software 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 "../resource"
+
+class Chef
+  class Resource
+    class OpensslRsaPrivateKey < Chef::Resource
+      require_relative "../mixin/openssl_helper"
+      include Chef::Mixin::OpenSSLHelper
+
+      resource_name :openssl_rsa_private_key
+      provides(:openssl_rsa_private_key) { true }
+      provides(:openssl_rsa_key) { true } # legacy cookbook resource name
+
+      description "Use the openssl_rsa_private_key resource to generate RSA private 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."
+      introduced "14.0"
+
+      property :path, String,
+               description: "An optional property for specifying the path to write the file to if it differs from the resource block's name.",
+               name_property: true
+
+      property :key_length, Integer,
+               equal_to: [1024, 2048, 4096, 8192],
+               validation_message: "key_length (bits) must be 1024, 2048, 4096, or 8192!",
+               description: "The desired bit length of the generated key.",
+               default: 2048
+
+      property :key_pass, String,
+               description: "The desired passphrase for the key."
+
+      property :key_cipher, String,
+               equal_to: OpenSSL::Cipher.ciphers,
+               validation_message: "key_cipher must be a cipher known to openssl. Run `openssl list-cipher-algorithms` to see available options.",
+               description: "The designed cipher to use when generating your key. Run `openssl list-cipher-algorithms` to see available options.",
+               default: "des3"
+
+      property :owner, [String, Integer],
+               description: "The owner applied to all files created by the resource."
+
+      property :group, [String, Integer],
+               description: "The group ownership applied to all files created by the resource."
+
+      property :mode, [Integer, String],
+               description: "The permission mode applied to all files created by the resource.",
+               default: "0600"
+
+      property :force, [TrueClass, FalseClass],
+               description: "Force creation of the key even if the same key already exists on the node.",
+               default: false, desired_state: false
+
+      action :create do
+        description "Create the RSA private key."
+
+        return if new_resource.force || priv_key_file_valid?(new_resource.path, new_resource.key_pass)
+
+        converge_by("create #{new_resource.key_length} bit RSA key #{new_resource.path}") do
+          if new_resource.key_pass
+            unencrypted_rsa_key = gen_rsa_priv_key(new_resource.key_length)
+            rsa_key_content = encrypt_rsa_key(unencrypted_rsa_key, new_resource.key_pass, new_resource.key_cipher)
+          else
+            rsa_key_content = gen_rsa_priv_key(new_resource.key_length).to_pem
+          end
+
+          file new_resource.path do
+            action :create
+            owner new_resource.owner unless new_resource.owner.nil?
+            group new_resource.group unless new_resource.group.nil?
+            mode new_resource.mode
+            sensitive true
+            content rsa_key_content
+          end
+        end
+      end
+    end
+  end
+end