Fixes #34887 - userdata controller should be able to look up host by …

…MAC address
theforeman · Jun 8, 2022 · 46ca3e7 · 46ca3e7
1 parent 97ec33f
commit 46ca3e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/controllers/userdata_controller.rb b/app/controllers/userdata_controller.rb
@@ -55,6 +55,8 @@ def find_host
       ip: request.remote_ip,
     }
 
+    query_params[:mac_list] = Foreman::UnattendedInstallation::MacListExtractor.new.extract_from_env(request.env, params: params)
+
     @host = Foreman::UnattendedInstallation::HostFinder.new(query_params: query_params).search
 
     return true if @host

diff --git a/config/routes.rb b/config/routes.rb
@@ -463,8 +463,8 @@
   # get for all unattended scripts
   get 'unattended/(:kind/(:id(:format)))', controller: 'unattended', action: 'host_template', format: 'text'
 
-  get 'userdata/meta-data', controller: 'userdata', action: 'metadata', format: 'text'
-  get 'userdata/user-data', controller: 'userdata', action: 'userdata', format: 'text'
+  get 'userdata/(:mac)/user-data', controller: 'userdata', action: 'userdata', format: 'text'
+  get 'userdata/(:mac)/meta-data', controller: 'userdata', action: 'metadata', format: 'text'
 
   resources :tasks, only: [:show]