Merge pull request puppetlabs#141 from michaeltlombardi/ticket/master/MODULES-6144-add-site-limits

(MODULES-6144) Add Limits to IIS Site Type and Provider

Author: jpogran

lib/puppet/provider/iis_site/webadministration.rb

@@ -45,6 +45,8 @@ def update
 
     cmd << self.class.ps_script_content('logproperties', @resource)
 
+    cmd << self.class.ps_script_content('limitsproperty', @resource)
+
     cmd << self.class.ps_script_content('serviceautostartprovider', @resource)
 
 
@@ -139,6 +141,7 @@ def self.instances
         binding.delete('certificatehash') unless binding['protocol'] == 'https'
         binding.delete('certificatestorename') unless binding['protocol'] == 'https'
       end
+      site['limits'] = {} if site['limits'].nil?
 
       site_hash[:ensure]               = site['state'].downcase
       site_hash[:name]                 = site['name']
@@ -147,6 +150,7 @@ def self.instances
       site_hash[:serverautostart]      = to_bool(site['serverautostart'])
       site_hash[:enabledprotocols]     = site['enabledprotocols']
       site_hash[:bindings]             = site['bindings']
+      site_hash[:limits]               = site['limits']
       site_hash[:logpath]              = site['logpath']
       site_hash[:logperiod]            = site['logperiod']
       site_hash[:logtruncatesize]      = site['logtruncatesize']

lib/puppet/provider/templates/iisadministration/_getwebsites.ps1.erb

@@ -16,6 +16,11 @@ Get-IISSite | %{
         certificatestorename = [string]$_.certificateStoreName
       }
     })
+    limits               = New-Object -TypeName PSObject -Property @{
+      maxbandwidth       = [int64]$_.limits.maxbandwidth
+      maxconnections     = [int64]$_.limits.maxconnections
+      connectiontimeout  = [int]$_.limits.connectiontimeout.totalseconds
+    }
     logformat            = [string]$_.LogFile.logFormat
     logpath              = [string]$_.LogFile.directory
     logperiod            = [string]$_.LogFile.period

lib/puppet/provider/templates/webadministration/_getwebsites.ps1.erb

@@ -24,6 +24,11 @@ Get-WebSite | % {
         certificatestorename = [string]$_.certificateStoreName
       }
     })
+    limits               = New-Object -TypeName PSObject -Property @{
+      maxbandwidth       = [int64]$_.limits.maxbandwidth
+      maxconnections     = [int64]$_.limits.maxconnections
+      connectiontimeout  = [int]$_.limits.connectiontimeout.totalseconds
+    }
     logformat            = [string]$_.LogFile.logFormat
     logpath              = [string]$_.LogFile.directory
     logperiod            = [string]$_.LogFile.period

lib/puppet/provider/templates/webadministration/limitsproperty.ps1.erb

@@ -0,0 +1,10 @@
+<%- if resource[:limits] -%>
+$website = Get-WebConfiguration -Filter '/system.applicationHost/sites/site' | Where-Object -FilterScript {$_.Name -eq '<%= resource[:name] %>' }
+  <%- resource[:limits].each do |limit_name,limit_setting| -%>
+    <%- if limit_name == 'connectiontimeout' -%>
+Set-WebConfiguration -Filter "$($website.ItemXPath)/limits/@<%= limit_name %>" -Value (New-Timespan -Seconds <%= limit_setting %>)
+    <%- else -%>
+Set-WebConfiguration -Filter "$($website.ItemXPath)/limits/@<%= limit_name %>" -Value <%= limit_setting %>
+    <%- end -%>
+  <%- end -%>
+<%- end -%>

lib/puppet/type/iis_site.rb

@@ -294,6 +294,26 @@ def insync?(is)
     end
   end
 
+  newproperty(:limits) do
+    desc 'Configure limits for an IIS Site'
+    valid_limits = ['connectiontimeout', 'maxbandwidth', 'maxconnections']
+    validate do |value|
+      fail "#{self.name.to_s} should be a Hash" unless value.is_a? ::Hash
+      value.each do |key, limit|
+        fail("Invalid iis site limit key '#{key}'. Should be one of: #{valid_limits}") unless valid_limits.include? key
+        fail("Invalid value '#{limit}' for #{key}. Must be an integer") unless limit.is_a? Integer
+        if key != 'connectiontimeout' and (limit < 1 or limit > 4294967295)
+          fail("Invalid value '#{limit} for #{key}'. Cannot be less than 1 or greater than 4294967295")
+        end
+      end
+    end
+    def insync?(is)
+      should.select do |k,v|
+        is[k] != v
+      end.empty?
+    end
+  end
+
   autorequire(:iis_application_pool) { self[:applicationpool] }
 
   validate do

spec/acceptance/iis_site_spec.rb

@@ -65,6 +65,11 @@
               #   'sslflags'             => 1,
               # },
               ],
+              limits               => {
+                connectiontimeout => 120,
+                maxbandwidth      => 4294967200,
+                maxconnections    => 4294967200,
+              },
               logflags             => ['ClientIP', 'Date', 'Time', 'UserName'],
               logformat            => 'W3C',
               loglocaltimerollover => false,

spec/unit/puppet/type/iis_site_spec.rb

@@ -104,6 +104,32 @@
       }
     end
   end
+  context "property :limits" do
+    it "requires a hash" do
+      expect {
+        resource[:limits] = "hi"
+      }.to raise_error(Puppet::Error, /Hash/)
+      expect {
+        resource[:limits] = ["hi"]
+      }.to raise_error(Puppet::Error, /Hash/)
+    end
+    it "accepts only valid limits as keys" do
+      expect {
+        resource[:limits] = {'invalid' => 'setting'}
+    }.to raise_error(Puppet::Error, /Invalid iis site limit key/)
+    end
+    it "rejects invalid limits values" do
+      expect {
+        resource[:limits] = { 'maxconnections' => "string"}
+      }.to raise_error(Puppet::Error, /integer/)
+      expect {
+        resource[:limits] = { 'maxbandwidth' => 0 }
+      }.to raise_error(Puppet::Error, /Cannot be less than 1 or greater than 4294967295/)
+      expect {
+        resource[:limits] = { 'maxbandwidth' => 4294967296 }
+      }.to raise_error(Puppet::Error, /Cannot be less than 1 or greater than 4294967295/)
+    end
+  end
   context "parameter :applicationpool" do
     it "should not allow nil" do
       expect {