From caed02c8bd13e9b467f07f4f9fadd2189886721e Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 13 Mar 2018 16:34:41 -0700 Subject: Add windows_adjoin resource Copied with permission from John Snow's win_ad cookbook. It's been reworked to not mess with dns servers and use powershell_out + sensitive. Some of those changes are getting pushed upstream, but the name is different and there's no expectation of compatibility here. Signed-off-by: Tim Smith --- lib/chef/resource/windows_adjoin.rb | 80 ++++++++++++++++++++++++++++++++++++ lib/chef/resources.rb | 1 + spec/unit/resource/windows_adjoin.rb | 34 +++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 lib/chef/resource/windows_adjoin.rb create mode 100644 spec/unit/resource/windows_adjoin.rb diff --git a/lib/chef/resource/windows_adjoin.rb b/lib/chef/resource/windows_adjoin.rb new file mode 100644 index 0000000000..c66aae9392 --- /dev/null +++ b/lib/chef/resource/windows_adjoin.rb @@ -0,0 +1,80 @@ +# +# Author:: John Snow () +# Copyright:: 2016-2018, John Snow +# +# 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" +require "chef/mixin/powershell_out" + +class Chef + class Resource + class WindowsAdJoin < Chef::Resource + resource_name :windows_adjoin + provides :windows_adjoin + + include Chef::Mixin::PowershellOut + + description "Use the windows_adjoin resource to join a Windows Active Directory domain." + introduced "14.0" + + property :domain_name, String, + description: "The domain name to join.", + name_property: true + + property :domain_user, String, + description: "The domain user to use to join the host to the domain.", + required: true + + property :domain_password, String, + description: "The password for the domain user.", + required: true + + property :ou_path, String, + description: "The path to the OU where you would like to place the host." + + property :restart, [TrueClass, FalseClass], + description: "Restart the system after joining the domain. This is necessary for changes to take effect.", + default: true + + # define this again so we can default it to true. Otherwise failures print the password + property :sensitive, [TrueClass, FalseClass], + default: true + + action :join do + unless on_domain? + cmd = "$pswd = ConvertTo-SecureString \'#{new_resource.domain_password}\' -AsPlainText -Force;" + cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{new_resource.domain_user}\",$pswd);" + cmd << "Add-Computer -DomainName #{new_resource.domain_name} -Credential $credential" + cmd << " -OUPath \"#{new_resource.ou_path}\"" if new_resource.ou_path + cmd << " -Restart" if new_resource.restart + cmd << " -Force" + + converge_by("join Active Directory domain #{new_resource.domain_name}") do + ps_run = powershell_out(cmd) + raise "Failed to join the domain #{new_resource.domain_name}: #{ps_run.stderr}}" if ps_run.error? + end + end + end + + action_class do + def on_domain? + node_domain = powershell_out!('(Get-WmiObject Win32_ComputerSystem).Domain') + raise "Failed to check if the system is joined to the domain #{new_resource.domain_name}: #{node_domain.stderr}}" if node_domain.error? + node_domain.stdout.downcase.strip == new_resource.domain_name.downcase + end + end + end + end +end diff --git a/lib/chef/resources.rb b/lib/chef/resources.rb index 42150ffc82..e5bff174f9 100644 --- a/lib/chef/resources.rb +++ b/lib/chef/resources.rb @@ -109,6 +109,7 @@ require "chef/resource/zypper_repository" require "chef/resource/cab_package" require "chef/resource/powershell_package" require "chef/resource/msu_package" +require "chef/resource/windows_adjoin" require "chef/resource/windows_auto_run" require "chef/resource/windows_feature" require "chef/resource/windows_feature_dism" diff --git a/spec/unit/resource/windows_adjoin.rb b/spec/unit/resource/windows_adjoin.rb new file mode 100644 index 0000000000..4ce20d5202 --- /dev/null +++ b/spec/unit/resource/windows_adjoin.rb @@ -0,0 +1,34 @@ +# +# Copyright:: Copyright 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 "spec_helper" + +describe Chef::Resource::WindowsAdJoin do + let(:resource) { Chef::Resource::WindowsAdJoin.new("example.com") } + + it "sets resource name as :windows_adjoin" do + expect(resource.resource_name).to eql(:windows_adjoin) + end + + it "sets the domain_name as its name" do + expect(resource.domain_name).to eql("example.com") + end + + it "sets the default action as :join" do + expect(resource.action).to eql([:join]) + end +end -- cgit v1.2.1