Add customisable keyserver, fixes #5

newcastleuniversity · Feb 25, 2022 · a06a074 · a06a074
1 parent 10a26b8
commit a06a074
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/data/common.yaml b/data/common.yaml
@@ -2,6 +2,7 @@
 
 microsoft_defender_atp_agent::default_channel: prod
 microsoft_defender_atp_agent::default_manage_sources: true
+microsoft_defender_atp_agent::default_keyserver: 'hkps://keyserver.ubuntu.com:443'
 # Shouldn't need to change the below unless MS change something
 microsoft_defender_atp_agent::package_name: mdatp
 microsoft_defender_atp_agent::target_json_path: /etc/opt/microsoft/mdatp/mdatp_onboard.json

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -1,6 +1,6 @@
 # @summary Puppet module to install Microsoft Defender for Endpoint on Linux.
 #
-# @param onboarding_json_file Source (as in *file* resource attribute called *source*) of the JSON file you extracted from the onboarding package that your Defender manager gave you.
+# @param onboarding_json_file Source (as in *file* resource attribute called *source*) of the JSON file extracted from your site's Defender onboarding package.
 # @param channel The release channel you want to use.
 # @param manage_sources Allows you to manage the repository sources yourself (false) or allow this module to manage them for you (true).
 # @param distro Allows you to override the distro MS say you should state to get the right package. I calculate this for you in Hiera.
@@ -20,7 +20,8 @@
   Optional[String] $distro                                        = lookup('microsoft_defender_atp_agent::default_distro'),
   Optional[String] $version                                       = $::facts['os']['release']['major'],
   Optional[Enum['prod','insiders-fast','insiders-slow']] $channel = lookup('microsoft_defender_atp_agent::default_channel'), # prod
-  Optional[Boolean] $manage_sources                               = lookup('microsoft_defender_atp_agent::default_manage_sources') # true
+  Optional[Boolean] $manage_sources                               = lookup('microsoft_defender_atp_agent::default_manage_sources'), # true
+  Optional[String] $keyserver                                     = lookup('microsoft_defender_atp_agent::default_keyserver') # hkps://keyserver.ubuntu.com:443
 ) {
 
   # I run a lot of armhf Pis and this endpoint agent won't work on them because the

diff --git a/manifests/sources.pp b/manifests/sources.pp
@@ -19,7 +19,7 @@
         repos    => 'main',
         key      => {
           'id'     => 'BC528686B50D79E339D3721CEB3E94ADBE1229CF',
-          'server' => 'keyserver.ubuntu.com',
+          'server' => $microsoft_defender_atp_agent::keyserver,
         },
       }
 

diff --git a/spec/classes/sources_spec.rb b/spec/classes/sources_spec.rb
@@ -37,7 +37,16 @@
     on_supported_os(ubuntu).each do |_os, os_facts|
       let(:facts) { os_facts }
 
-      it { is_expected.to contain_apt__source('microsoftpackages').with('location' => %r{ubuntu}, 'release' => 'prod') }
+      it {
+        is_expected.to contain_apt__source('microsoftpackages').with(
+          'location' => %r{ubuntu},
+          'release'  => 'prod',
+          'key'      => {
+            'server' => 'hkps://keyserver.ubuntu.com:443',
+            'id'     => 'BC528686B50D79E339D3721CEB3E94ADBE1229CF',
+          },
+        )
+      }
     end
   end
 
@@ -54,7 +63,16 @@
     on_supported_os(debian).each do |_os, os_facts|
       let(:facts) { os_facts }
 
-      it { is_expected.to contain_apt__source('microsoftpackages').with('location' => %r{debian}, 'release' => 'prod') }
+      it {
+        is_expected.to contain_apt__source('microsoftpackages').with(
+          'location' => %r{debian},
+          'release'  => 'prod',
+          'key'      => {
+            'server' => 'hkps://keyserver.ubuntu.com:443',
+            'id'     => 'BC528686B50D79E339D3721CEB3E94ADBE1229CF',
+          },
+        )
+      }
     end
   end