Skip to content

Commit

Permalink
Merge pull request #460 from josejulio/hawkular/add_ssl_support
Browse files Browse the repository at this point in the history 
Hawkular/add ssl support
  • Loading branch information
@mzazrivec
mzazrivec authored Mar 20, 2017
2 parents 922ce64 + 7413410 commit fe72635
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 18 deletions.
15 changes: 15 additions & 0 deletions app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,21 @@ ManageIQ.angular.app.controller('emsCommonFormController', ['$http', '$scope', '
}
};

$scope.hawkularSecurityProtocolChanged = function() {
var defaultNonSSLPort = '8080';
var defaultSSLPort = '8443';
var defaultPorts = [defaultNonSSLPort, defaultSSLPort];
if (typeof $scope.emsCommonModel.default_api_port === 'undefined' ||
$scope.emsCommonModel.default_api_port === '' ||
defaultPorts.indexOf($scope.emsCommonModel.default_api_port) != -1) {
if ($scope.emsCommonModel.default_security_protocol === 'non-ssl') {
$scope.emsCommonModel.default_api_port = defaultNonSSLPort;
} else {
$scope.emsCommonModel.default_api_port = defaultSSLPort;
}
}
};

$scope.getDefaultApiPort = function(emstype) {
if( emstype=='openstack' || emstype === 'openstack_infra') {
return '5000';
Expand Down
8 changes: 8 additions & 0 deletions app/controllers/ems_common.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,7 @@ def form_instance_vars
@vmware_cloud_api_versions = retrieve_vmware_cloud_api_versions
@emstype_display = model.supported_types_and_descriptions_hash[@ems.emstype]
@nuage_api_versions = retrieve_nuage_api_versions
@hawkular_security_protocols = retrieve_hawkular_security_protocols
end

def retrieve_provider_regions
Expand Down Expand Up @@ -768,6 +769,13 @@ def retrieve_container_security_protocols
[_('SSL without validation'), 'ssl-without-validation']]
end

def retrieve_hawkular_security_protocols
[[_('SSL'), 'ssl-with-validation'],
[_('SSL trusting custom CA'), 'ssl-with-validation-custom-ca'],
[_('SSL without validation'), 'ssl-without-validation'],
[_('Non-SSL'), 'non-ssl']]
end

# Get variables from edit form
def get_form_vars
@ems = @edit[:ems_id] ? model.find_by_id(@edit[:ems_id]) : model.new
Expand Down
32 changes: 18 additions & 14 deletions app/controllers/mixins/ems_common_angular.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,15 +292,18 @@ def ems_form_fields
:hawkular_auth_status => hawkular_auth_status.nil? ? true : hawkular_auth_status,
} if controller_name == "ems_container"

render :json => {:name => @ems.name,
:emstype => @ems.emstype,
:zone => zone,
:default_hostname => @ems.connection_configurations.default.endpoint.hostname,
:default_api_port => @ems.connection_configurations.default.endpoint.port,
:default_userid => @ems.authentication_userid ? @ems.authentication_userid : "",
:ems_controller => controller_name,
:default_auth_status => default_auth_status,
} if controller_name == "ems_middleware"
if controller_name == "ems_middleware"
render :json => {:name => @ems.name,
:emstype => @ems.emstype,
:zone => zone,
:default_hostname => @ems.connection_configurations.default.endpoint.hostname,
:default_api_port => @ems.connection_configurations.default.endpoint.port,
:default_userid => @ems.authentication_userid ? @ems.authentication_userid : "",
:default_security_protocol => default_security_protocol,
:default_tls_ca_certs => default_tls_ca_certs,
:ems_controller => controller_name,
:default_auth_status => default_auth_status}
end

render :json => {:name => @ems.name,
:emstype => @ems.emstype,
Expand Down Expand Up @@ -423,18 +426,19 @@ def set_ems_record_vars(ems, mode = nil)
if ems.kind_of?(ManageIQ::Providers::ContainerManager)
params[:cred_type] = ems.default_authentication_type if params[:cred_type] == "default"
default_endpoint = {:role => :default, :hostname => hostname, :port => port}
default_endpoint.merge!(container_security_options(ems.security_protocol, default_tls_ca_certs))
default_endpoint.merge!(endpoint_security_options(ems.security_protocol, default_tls_ca_certs))

if hawkular_hostname.blank?
default_key = params[:default_password] || ems.authentication_key
hawkular_hostname = get_hostname_from_routes(ems, default_endpoint, default_key)
end
hawkular_endpoint = {:role => :hawkular, :hostname => hawkular_hostname, :port => hawkular_api_port}
hawkular_endpoint.merge!(container_security_options(hawkular_security_protocol, hawkular_tls_ca_certs))
hawkular_endpoint.merge!(endpoint_security_options(hawkular_security_protocol, hawkular_tls_ca_certs))
end

if ems.kind_of?(ManageIQ::Providers::MiddlewareManager)
default_endpoint = {:role => :default, :hostname => hostname, :port => port}
default_endpoint.merge!(endpoint_security_options(ems.security_protocol, default_tls_ca_certs))
end

if ems.kind_of?(ManageIQ::Providers::Hawkular::DatawarehouseManager)
Expand Down Expand Up @@ -475,11 +479,11 @@ def get_hostname_from_routes(ems, endpoint_hash, token)
nil
end

def container_security_options(security_protocol, certificate_authority)
def endpoint_security_options(security_protocol, certificate_authority)
{
:security_protocol => security_protocol,
:verify_ssl => security_protocol != 'ssl-without-validation',
:certificate_authority => security_protocol == 'ssl-with-validation-custom-ca' ? certificate_authority : nil,
:verify_ssl => %w(ssl-without-validation non-ssl).exclude?(security_protocol),
:certificate_authority => security_protocol == 'ssl-with-validation-custom-ca' ? certificate_authority : nil
}
end

Expand Down
21 changes: 17 additions & 4 deletions app/views/layouts/angular-bootstrap/_endpoints_angular.html.haml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@
"emsCommonModel.emstype == 'nuage_network' || " + |
"(emsCommonModel.emstype == 'vmware_cloud' && '#{prefix}' === 'amqp') || " |
"emsCommonModel.emstype == 'scvmm' || " + |
"emsCommonModel.ems_controller == 'ems_container'"} |
"emsCommonModel.ems_controller == 'ems_container' || " + |
"emsCommonModel.emstype == 'hawkular'"} |
%label.col-md-2.control-label{"for" => "#{prefix}_security_protocol"}
= _('Security Protocol')
.col-md-8{"ng-if" => "emsCommonModel.emstype == 'openstack' || emsCommonModel.emstype == 'openstack_infra' || emsCommonModel.emstype == 'vmware_cloud'"}
Expand Down Expand Up @@ -125,6 +126,16 @@
"selectpicker-for-select-tag" => "",
"prefix" => "#{prefix}",
"reset-validation-status" => "#{prefix}_auth_status")
.col-md-8{"ng-if" => "emsCommonModel.emstype == 'hawkular'"}
= select_tag("#{prefix}_security_protocol",
options_for_select([["<#{_('Choose')}>", nil]] + @hawkular_security_protocols, "disabled" => ["<#{_('Choose')}>", nil]),
"ng-model" => "#{ng_model}.#{prefix}_security_protocol",
"checkchange" => "",
"required" => "",
"ng-change" => "hawkularSecurityProtocolChanged()",
"selectpicker-for-select-tag" => "",
"prefix" => prefix.to_s,
"reset-validation-status" => "#{prefix}_auth_status")

%div{"ng-if" => defined?(tls_verify_hide) ? false : true}
.form-group{"ng-if"=> "emsCommonModel.emstype == 'rhevm'"}
Expand All @@ -143,9 +154,11 @@
"prefix" => "#{prefix}"}

%div{"ng-if" => defined?(tls_ca_certs_hide) ? false : true}
.form-group{"ng-if"=> "emsCommonModel.emstype == 'rhevm' || " + |
"(emsCommonModel.ems_controller == 'ems_container' && " + |
" emsCommonModel.#{prefix}_security_protocol == 'ssl-with-validation-custom-ca')"} |
.form-group{"ng-if"=> "emsCommonModel.emstype == 'rhevm' || " + |
"(emsCommonModel.ems_controller == 'ems_container' && " + |
" emsCommonModel.#{prefix}_security_protocol == 'ssl-with-validation-custom-ca') || " |
"(emsCommonModel.emstype == 'hawkular' && " + |
" emsCommonModel.#{prefix}_security_protocol == 'ssl-with-validation-custom-ca')"} |
%label.col-md-2.control-label{"for" => "#{prefix}_tls_ca_certs"}
= _('Trusted CA Certificates')
.col-md-4
Expand Down

0 comments on commit fe72635

Please sign in to comment.