Skip to content

Certserver hardening #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rimasgo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Certserver hardening #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
526a5ba
added certificitate_server_protocol function to onpenshift_helper lib…
rimasgo Oct 1, 2019
7f97c01
NetworkManager dispatcher sciprt updated to add additional nameserver…
rimasgo Oct 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions files/default/99-origin-dns.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,14 @@ BASH
if ! grep -q '99-origin-dns.sh' /etc/resolv.conf; then
echo "# nameserver updated by /etc/NetworkManager/dispatcher.d/99-origin-dns.sh" >> ${NEW_RESOLV_CONF}
fi
sed -e '/^nameserver.*$/d' /etc/resolv.conf >> ${NEW_RESOLV_CONF}
echo "nameserver "${def_route_ip}"" >> ${NEW_RESOLV_CONF}
sed -e "/^nameserver.*${def_route_ip}$/d" /etc/resolv.conf >> ${NEW_RESOLV_CONF}
# Add nameserver rather than replace if existing != def_route_ip. Fix for nip.io in kitchen environment
# Pods always uses first nameserver entry from /etc/resolv.conf therefore adding default route IP as first nameserver
if grep -q '^nameserver.*$' ${NEW_RESOLV_CONF}; then
sed -in "0,/^nameserver.*$/s/^nameserver.*$/nameserver ${def_route_ip}\n&/" ${NEW_RESOLV_CONF}
else
echo "nameserver "${def_route_ip}"" >> ${NEW_RESOLV_CONF}
fi
if ! grep -q 'search.*cluster.local' ${NEW_RESOLV_CONF}; then
sed -i '/^search/ s/$/ cluster.local/' ${NEW_RESOLV_CONF}
fi
Expand Down
4 changes: 4 additions & 0 deletions libraries/openshift_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ def check_certificate_server_etcd
ca_exist && !dir_exist
end

def certificate_server_protocol
node['cookbook-openshift3']['httpd_secure'] ? 'https' : 'http'
end

def get_nodevar(var)
if node_servers.any? { |server_node| server_node['fqdn'] == node['fqdn'] && server_node.key?(var) }
node_servers.find { |server_node| server_node['fqdn'] == node['fqdn'] }[var.to_s]
Expand Down
4 changes: 3 additions & 1 deletion recipes/adhoc_migrate_etcd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
is_certificate_server = server_info.on_certificate_server?
is_control_plane_server = server_info.on_control_plane_server?
etcd_servers = server_info.etcd_servers
certificate_server_protocol = server_info.certificate_server_protocol

include_recipe 'cookbook-openshift3::services'

Expand Down Expand Up @@ -178,7 +179,8 @@

remote_file "Retrieve ETCD SystemD Drop-in from Certificate Server[#{certificate_server['fqdn']}]" do
path "/etc/systemd/system/#{node['cookbook-openshift3']['etcd_service_name']}.service.d/etcd-dropin"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/migration/etcd-#{node['fqdn']}"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/migration/etcd-#{node['fqdn']}"
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
notifies :run, 'execute[daemon-reload]', :immediately
retries 120
retry_delay 5
Expand Down
9 changes: 9 additions & 0 deletions recipes/etcd_certificates.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

server_info = OpenShiftHelper::NodeHelper.new(node)
etcd_servers = server_info.etcd_servers + server_info.new_etcd_servers
master_servers = server_info.master_servers
is_certificate_server = server_info.on_certificate_server?

if node['cookbook-openshift3']['encrypted_file_password']['data_bag_name'] && node['cookbook-openshift3']['encrypted_file_password']['data_bag_item_name']
Expand Down Expand Up @@ -81,6 +82,14 @@
variables(servers: etcd_servers)
end

template "#{node['cookbook-openshift3']['etcd_generated_ca_dir']}/.htaccess" do
owner 'apache'
group 'apache'
source 'access-htaccess.erb'
notifies :run, 'ruby_block[Modify the AllowOverride options]', :immediately
variables(servers: etcd_servers + master_servers)
end

remote_file '/var/www/html/etcd/ca.crt' do
owner 'apache'
group 'apache'
Expand Down
7 changes: 5 additions & 2 deletions recipes/etcd_cluster.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
is_new_etcd_server = server_info.on_new_etcd_server?
is_master_server = server_info.on_master_server?
etcd_healthy = helper.checketcd_healthy?
certificate_server_protocol = server_info.certificate_server_protocol

if node['cookbook-openshift3']['encrypted_file_password']['data_bag_name'] && node['cookbook-openshift3']['encrypted_file_password']['data_bag_item_name']
secret_file = node['cookbook-openshift3']['encrypted_file_password']['secret_file'] || nil
Expand Down Expand Up @@ -73,19 +74,21 @@
end

remote_file "#{node['cookbook-openshift3']['etcd_conf_dir']}/ca.crt" do
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/ca.crt"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/ca.crt"
retries ::Mixlib::ShellOut.new("systemctl is-enabled #{node['cookbook-openshift3']['etcd_service_name']}").run_command.error? ? 180 : 60
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
retry_delay 5
sensitive true
action :create_if_missing
end

remote_file "Retrieve ETCD certificates from Certificate Server[#{certificate_server['fqdn']}]" do
path "#{node['cookbook-openshift3']['etcd_conf_dir']}/etcd-#{node['fqdn']}.tgz.enc"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/generated_certs/etcd-#{node['fqdn']}.tgz.enc"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/generated_certs/etcd-#{node['fqdn']}.tgz.enc"
action :create_if_missing
notifies :run, 'execute[Un-encrypt etcd certificate tgz files]', :immediately
notifies :run, 'execute[Extract certificate to ETCD folder]', :immediately
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
retries 60
retry_delay 5
end
Expand Down
4 changes: 3 additions & 1 deletion recipes/etcd_recovery.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
is_certificate_server = server_info.on_certificate_server?
etcd_servers = server_info.etcd_servers
etcd_healthy = helper.checketcd_healthy?
certificate_server_protocol = server_info.certificate_server_protocol

if is_certificate_server && etcd_healthy && ::File.file?(node['cookbook-openshift3']['adhoc_recovery_etcd_certificate_server'])
file node['cookbook-openshift3']['adhoc_recovery_etcd_certificate_server'] do
Expand Down Expand Up @@ -87,9 +88,10 @@

remote_file "Retrieve ETCD SystemD Drop-in from Certificate Server[#{certificate_server['fqdn']}]" do
path "/etc/systemd/system/#{node['cookbook-openshift3']['etcd_service_name']}.service.d/etcd-dropin"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/recovery/etcd-#{node['fqdn']}"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/recovery/etcd-#{node['fqdn']}"
notifies :run, 'execute[daemon-reload]', :immediately
notifies :delete, "directory[#{node['cookbook-openshift3']['etcd_data_dir']}/member]", :immediately
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
retries 120
retry_delay 5
end
Expand Down
4 changes: 3 additions & 1 deletion recipes/etcd_scaleup.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
is_certificate_server = server_info.on_certificate_server?
etcds = etcd_servers.map { |srv| "https://#{srv['ipaddress']}:2379" }.join(',')
path_bin = node['cookbook-openshift3']['openshift_docker_etcd_image'].include?('coreos') ? '/usr/local/bin/etcd' : '/usr/bin/etcd'
certificate_server_protocol = server_info.certificate_server_protocol

unless new_etcd_servers.empty?
if is_certificate_server
Expand Down Expand Up @@ -60,7 +61,8 @@

remote_file "Retrieve ETCD SystemD Drop-in from Certificate Server[#{certificate_server['fqdn']}]" do
path "/etc/systemd/system/#{node['cookbook-openshift3']['etcd_service_name']}.service.d/etcd-dropin"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/scaleup/etcd-#{node['fqdn']}"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/scaleup/etcd-#{node['fqdn']}"
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
action :create_if_missing
notifies :run, 'execute[daemon-reload]', :immediately
notifies :start, 'service[etcd-service]', :immediately
Expand Down
10 changes: 7 additions & 3 deletions recipes/master_cluster.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
master_servers = server_info.master_servers
etcd_servers = server_info.etcd_servers
certificate_server = server_info.certificate_server
certificate_server_protocol = server_info.certificate_server_protocol

ose_major_version = node['cookbook-openshift3']['deploy_containerized'] == true ? node['cookbook-openshift3']['openshift_docker_image_version'] : node['cookbook-openshift3']['ose_major_version']

Expand Down Expand Up @@ -60,7 +61,8 @@

remote_file "Retrieve ETCD client certificate from Certificate Server[#{certificate_server['fqdn']}]" do
path "#{node['cookbook-openshift3']['openshift_master_config_dir']}/openshift-master-#{node['fqdn']}.tgz.enc"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/master/generated_certs/openshift-master-#{node['fqdn']}.tgz.enc"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/master/generated_certs/openshift-master-#{node['fqdn']}.tgz.enc"
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
action :create_if_missing
notifies :run, 'execute[Un-encrypt etcd certificates tgz files]', :immediately
notifies :run, 'execute[Extract etcd certificates to Master folder]', :immediately
Expand All @@ -83,7 +85,8 @@

remote_file "Retrieve ETCD CA cert from Certificate Server[#{certificate_server['fqdn']}]" do
path "#{node['cookbook-openshift3']['openshift_master_config_dir']}/#{node['cookbook-openshift3']['master_etcd_cert_prefix']}ca.crt"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/ca.crt"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/ca.crt"
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
owner 'root'
group 'root'
mode '0600'
Expand All @@ -95,7 +98,8 @@

remote_file "Retrieve master certificates from Certificate Server[#{certificate_server['fqdn']}]" do
path "#{node['cookbook-openshift3']['openshift_master_config_dir']}/openshift-#{node['fqdn']}.tgz.enc"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/master/generated_certs/openshift-#{node['fqdn']}.tgz.enc"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/master/generated_certs/openshift-#{node['fqdn']}.tgz.enc"
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
action :create_if_missing
notifies :run, 'execute[Un-encrypt master certificates master tgz files]', :immediately
notifies :run, 'execute[Extract master certificates to Master folder]', :immediately
Expand Down
7 changes: 5 additions & 2 deletions recipes/ng_etcd_cluster.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
user_id = node['cookbook-openshift3']['openshift_etcd_static_pod'] ? 'root' : 'etcd'
group_id = node['cookbook-openshift3']['openshift_etcd_static_pod'] ? 'root' : 'etcd'
etcd_ipaddress = etcd_servers.find { |etcd| etcd['fqdn'] == node['fqdn'] }['ipaddress']
certificate_server_protocol = server_info.certificate_server_protocol

if node['cookbook-openshift3']['encrypted_file_password']['data_bag_name'] && node['cookbook-openshift3']['encrypted_file_password']['data_bag_item_name']
secret_file = node['cookbook-openshift3']['encrypted_file_password']['secret_file'] || nil
Expand Down Expand Up @@ -68,7 +69,8 @@
end

remote_file "#{node['cookbook-openshift3']['etcd_conf_dir']}/ca.crt" do
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/ca.crt"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/ca.crt"
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
retries 60
retry_delay 5
sensitive true
Expand All @@ -77,7 +79,8 @@

remote_file "Retrieve ETCD certificates from Certificate Server[#{certificate_server['fqdn']}]" do
path "#{node['cookbook-openshift3']['etcd_conf_dir']}/etcd-#{node['fqdn']}.tgz.enc"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/generated_certs/etcd-#{node['fqdn']}.tgz.enc"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/generated_certs/etcd-#{node['fqdn']}.tgz.enc"
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
action :create_if_missing
notifies :run, 'execute[Un-encrypt etcd certificate tgz files]', :immediately
notifies :run, 'execute[Extract certificate to ETCD folder]', :immediately
Expand Down
10 changes: 7 additions & 3 deletions recipes/ng_master.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
is_certificate_server = server_info.on_certificate_server?
docker_version = node['cookbook-openshift3']['openshift_docker_image_version']
service_accounts = node['cookbook-openshift3']['openshift_common_service_accounts_additional'].any? ? node['cookbook-openshift3']['openshift_common_service_accounts'] + node['cookbook-openshift3']['openshift_common_service_accounts_additional'] : node['cookbook-openshift3']['openshift_common_service_accounts']
certificate_server_protocol = server_info.certificate_server_protocol

if is_master_server
node['cookbook-openshift3']['enabled_firewall_rules_master_cluster'].each do |rule|
Expand Down Expand Up @@ -49,7 +50,8 @@

remote_file "Retrieve ETCD client certificate from Certificate Server[#{certificate_server['fqdn']}]" do
path "#{node['cookbook-openshift3']['openshift_master_config_dir']}/openshift-master-#{node['fqdn']}.tgz.enc"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/master/generated_certs/openshift-master-#{node['fqdn']}.tgz.enc"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/master/generated_certs/openshift-master-#{node['fqdn']}.tgz.enc"
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
action :create_if_missing
notifies :run, 'execute[Un-encrypt etcd certificates tgz files]', :immediately
notifies :run, 'execute[Extract etcd certificates to Master folder]', :immediately
Expand All @@ -72,7 +74,8 @@

remote_file "Retrieve ETCD CA cert from Certificate Server[#{certificate_server['fqdn']}]" do
path "#{node['cookbook-openshift3']['openshift_master_config_dir']}/#{node['cookbook-openshift3']['master_etcd_cert_prefix']}ca.crt"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/ca.crt"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/etcd/ca.crt"
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
owner 'root'
group 'root'
mode '0600'
Expand All @@ -84,7 +87,8 @@

remote_file "Retrieve master certificates from Certificate Server[#{certificate_server['fqdn']}]" do
path "#{node['cookbook-openshift3']['openshift_master_config_dir']}/openshift-#{node['fqdn']}.tgz.enc"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/master/generated_certs/openshift-#{node['fqdn']}.tgz.enc"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/master/generated_certs/openshift-#{node['fqdn']}.tgz.enc"
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
action :create_if_missing
notifies :run, 'execute[Un-encrypt master certificates master tgz files]', :immediately
notifies :run, 'execute[Extract master certificates to Master folder]', :immediately
Expand Down
4 changes: 3 additions & 1 deletion recipes/ng_node_join.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

server_info = OpenShiftHelper::NodeHelper.new(node)
certificate_server = server_info.certificate_server
certificate_server_protocol = server_info.certificate_server_protocol

if node['cookbook-openshift3']['encrypted_file_password']['data_bag_name'] && node['cookbook-openshift3']['encrypted_file_password']['data_bag_item_name']
secret_file = node['cookbook-openshift3']['encrypted_file_password']['secret_file'] || nil
Expand All @@ -16,7 +17,8 @@

remote_file "Retrieve certificate from Master[#{certificate_server['fqdn']}]" do
path "#{node['cookbook-openshift3']['openshift_node_config_dir']}/#{node['fqdn']}.tgz.enc"
source "http://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/node/generated-configs/#{node['fqdn']}.tgz.enc"
source "#{certificate_server_protocol}://#{certificate_server['ipaddress']}:#{node['cookbook-openshift3']['httpd_xfer_port']}/node/generated-configs/#{node['fqdn']}.tgz.enc"
headers(node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']) if node['cookbook-openshift3']['cert_server_headers'] || node.run_state['openshift3_cert_server_headers']
action :create_if_missing
notifies :run, 'execute[Un-encrypt node certificate tgz files]', :immediately
notifies :run, 'execute[Extract certificate to Node folder]', :immediately
Expand Down
Loading