Project

General

Profile

« Previous | Next » 

Revision bb8da765

Added by Romain Vrignaud over 10 years ago

fixes #3658 - support smart proxy's chef proxy feature

View differences:

app/controllers/concerns/foreman/controller/smart_proxy_auth.rb
# Permits registered puppetmasters or a user with permission
def require_puppetmaster_or_login
if !Setting[:restrict_registered_puppetmasters] or auth_smart_proxy(SmartProxy.puppet_proxies, Setting[:require_ssl_puppetmasters])
if !Setting[:restrict_registered_puppetmasters] or auth_smart_proxy(SmartProxy.puppet_proxies+SmartProxy.chefproxy_proxies, Setting[:require_ssl_puppetmasters])
set_admin_user
return true
end

Also available in: Unified diff