Merge pull request #65 from ofalk/master

Optional parameter user_agent
voxpupuli · Mar 30, 2018 · fa55928 · fa55928
2 parents 90b44a7 + 72551a2
commit fa55928
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -40,6 +40,9 @@
 # [*cookies*]
 # An optional array of cookies to add to the HTTP request for the download.
 #
+# [*user_agent*]
+# The optional user agent string to be sent when downloading.
+#
 # === Examples
 #
 # To download dotnet 4.0
@@ -67,7 +70,8 @@
   $proxy_password                    = '',
   $is_password_secure                = true,
   Optional[Integer] $timeout         = undef,
-  Optional[Array[String]] $cookies   = undef
+  Optional[Array[String]] $cookies   = undef,
+  Optional[String] $user_agent       = undef
 ) {
 
   if $destination_file {

diff --git a/spec/defines/download_file_spec.rb b/spec/defines/download_file_spec.rb
@@ -49,6 +49,7 @@
       $proxyUser = ''
       $proxyPassword = ''
 
+
       if ($proxyAddress -ne '') {
         if (!($proxyAddress.StartsWith('http://') -or $proxyAddress.StartsWith('https://'))) {
           $proxyAddress = 'http://' + $proxyAddress
@@ -116,6 +117,7 @@
       $proxyUser = ''
       $proxyPassword = ''
 
+
       if ($proxyAddress -ne '') {
         if (!($proxyAddress.StartsWith('http://') -or $proxyAddress.StartsWith('https://'))) {
           $proxyAddress = 'http://' + $proxyAddress
@@ -187,6 +189,7 @@
       $proxyUser = 'test-user'
       $proxyPassword = 'test-secure'
 
+
       if ($proxyAddress -ne '') {
         if (!($proxyAddress.StartsWith('http://') -or $proxyAddress.StartsWith('https://'))) {
           $proxyAddress = 'http://' + $proxyAddress
@@ -260,6 +263,7 @@
       $proxyUser = 'test-user'
       $proxyPassword = 'test'
 
+
       if ($proxyAddress -ne '') {
         if (!($proxyAddress.StartsWith('http://') -or $proxyAddress.StartsWith('https://'))) {
           $proxyAddress = 'http://' + $proxyAddress
@@ -309,6 +313,7 @@
       $proxyUser = ''
       $proxyPassword = ''
 
+
       if ($proxyAddress -ne '') {
         if (!($proxyAddress.StartsWith('http://') -or $proxyAddress.StartsWith('https://'))) {
           $proxyAddress = 'http://' + $proxyAddress

diff --git a/templates/download.ps1.erb b/templates/download.ps1.erb
@@ -2,6 +2,9 @@ $webclient = New-Object System.Net.WebClient
 $proxyAddress = '<%= @proxy_address %>'
 $proxyUser = '<%= @proxy_user %>'
 $proxyPassword = '<%= @proxy_password %>'
+<% if @user_agent %>
+$webclient.Headers['User-Agent'] = '<%= @user_agent %>'
+<% end %>
 
 if ($proxyAddress -ne '') {
   if (!($proxyAddress.StartsWith('http://') -or $proxyAddress.StartsWith('https://'))) {