lib/maestrano.rb in maestrano-1.0.0 vs lib/maestrano.rb in maestrano-1.0.1

- old
+ new

@@ -19,11 +19,10 @@ require 'maestrano/saml/request' require 'maestrano/saml/attribute_value' require 'maestrano/saml/response' require 'maestrano/saml/settings' require 'maestrano/saml/validation_error' -require 'maestrano/saml/metadata' # SSO require 'maestrano/sso' require 'maestrano/sso/base_user' require 'maestrano/sso/base_group' @@ -120,52 +119,10 @@ # Maestrano['preset'].param('api.key') def self.param(parameter) (self.configs[preset] || Configuration.new).param(parameter) end - # Return a hash describing the current - # Maestrano configuration. The metadata - # will be remotely fetched by Maestrano - # Exclude any info containing an api key - def self.to_metadata - hash = {} - hash['environment'] = self.param('environment') - - config_groups = ['app','api','sso','webhook'] - blacklist = ['api.key','api.token'] - - config_groups.each do |cgroup_name| - cgroup = self.configs[preset].send(cgroup_name) - - attr_list = cgroup.attributes.map(&:to_s) - attr_list += Configuration::EVT_CONFIG[hash['environment']].keys.select { |k| k =~ Regexp.new("^#{cgroup_name}\.") }.map { |k| k.gsub(Regexp.new("^#{cgroup_name}\."),'') } - attr_list.uniq! - - attr_list.each do |first_lvl| - if cgroup.send(first_lvl).is_a?(OpenStruct) - c2group = cgroup.send(first_lvl) - c2group.attributes.each do |secnd_lvl| - full_param = [cgroup_name,first_lvl,secnd_lvl].join('.') - unless blacklist.include?(full_param) - hash[cgroup_name.to_s] ||= {} - hash[cgroup_name.to_s][first_lvl.to_s] ||= {} - hash[cgroup_name.to_s][first_lvl.to_s][secnd_lvl.to_s] = self.param(full_param) - end - end - else - full_param = [cgroup_name,first_lvl].join('.') - unless blacklist.include?(full_param) - hash[cgroup_name.to_s] ||= {} - hash[cgroup_name.to_s][first_lvl.to_s] = self.param(full_param) - end - end - end - end - - return hash - end - def self.auto_configure(config_file_path = nil) AutoConfigure.get_marketplace_configurations(config_file_path) rescue => e raise "Error while fetching dynamic configuration: #{e}. Backtrace: #{e.backtrace}" end @@ -289,35 +246,21 @@ end end EVT_CONFIG ||= { 'local' => { - 'api.host' => 'http://application.maestrano.io', + 'api.host' => 'http://localhost:3001', 'api.base' => '/api/v1/', 'connec.enabled' => true, 'connec.host' => 'http://connec.maestrano.io', 'connec.base_path' => '/api/v2', 'connec.v2_path' => '/v2', 'connec.reports_path' => '/reports', 'connec.timeout' => 60, - 'sso.idp' => 'http://application.maestrano.io', + 'sso.idp' => 'http://localhost:3001', 'sso.name_id_format' => Maestrano::Saml::Settings::NAMEID_PERSISTENT, 'sso.x509_fingerprint' => '01:06:15:89:25:7d:78:12:28:a6:69:c7:de:63:ed:74:21:f9:f5:36', 'sso.x509_certificate' => "-----BEGIN CERTIFICATE-----\nMIIDezCCAuSgAwIBAgIJAOehBr+YIrhjMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD\nVQQGEwJBVTEMMAoGA1UECBMDTlNXMQ8wDQYDVQQHEwZTeWRuZXkxGjAYBgNVBAoT\nEU1hZXN0cmFubyBQdHkgTHRkMRYwFAYDVQQDEw1tYWVzdHJhbm8uY29tMSQwIgYJ\nKoZIhvcNAQkBFhVzdXBwb3J0QG1hZXN0cmFuby5jb20wHhcNMTQwMTA0MDUyMjM5\nWhcNMzMxMjMwMDUyMjM5WjCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEP\nMA0GA1UEBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQG\nA1UEAxMNbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVz\ndHJhbm8uY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVkIqo5t5Paflu\nP2zbSbzxn29n6HxKnTcsubycLBEs0jkTkdG7seF1LPqnXl8jFM9NGPiBFkiaR15I\n5w482IW6mC7s8T2CbZEL3qqQEAzztEPnxQg0twswyIZWNyuHYzf9fw0AnohBhGu2\n28EZWaezzT2F333FOVGSsTn1+u6tFwIDAQABo4HuMIHrMB0GA1UdDgQWBBSvrNxo\neHDm9nhKnkdpe0lZjYD1GzCBuwYDVR0jBIGzMIGwgBSvrNxoeHDm9nhKnkdpe0lZ\njYD1G6GBjKSBiTCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEPMA0GA1UE\nBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQGA1UEAxMN\nbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVzdHJhbm8u\nY29tggkA56EGv5giuGMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCc\nMPgV0CpumKRMulOeZwdpnyLQI/NTr3VVHhDDxxCzcB0zlZ2xyDACGnIG2cQJJxfc\n2GcsFnb0BMw48K6TEhAaV92Q7bt1/TYRvprvhxUNMX2N8PHaYELFG2nWfQ4vqxES\nRkjkjqy+H7vir/MOF3rlFjiv5twAbDKYHXDT7v1YCg==\n-----END CERTIFICATE-----" - }, - 'test' => { - 'api.host' => 'http://api-sandbox.maestrano.io', - 'api.base' => '/api/v1/', - 'connec.enabled' => true, - 'connec.host' => 'http://api-sandbox.maestrano.io', - 'connec.base_path' => '/connec/api/v2', - 'connec.v2_path' => '/v2', - 'connec.reports_path' => '/reports', - 'connec.timeout' => 60, - 'sso.idp' => 'https://maestrano.com', - 'sso.name_id_format' => Maestrano::Saml::Settings::NAMEID_PERSISTENT, - 'sso.x509_fingerprint' => '01:06:15:89:25:7d:78:12:28:a6:69:c7:de:63:ed:74:21:f9:f5:36', - 'sso.x509_certificate' => "-----BEGIN CERTIFICATE-----\nMIIDezCCAuSgAwIBAgIJAOehBr+YIrhjMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD\nVQQGEwJBVTEMMAoGA1UECBMDTlNXMQ8wDQYDVQQHEwZTeWRuZXkxGjAYBgNVBAoT\nEU1hZXN0cmFubyBQdHkgTHRkMRYwFAYDVQQDEw1tYWVzdHJhbm8uY29tMSQwIgYJ\nKoZIhvcNAQkBFhVzdXBwb3J0QG1hZXN0cmFuby5jb20wHhcNMTQwMTA0MDUyMjM5\nWhcNMzMxMjMwMDUyMjM5WjCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEP\nMA0GA1UEBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQG\nA1UEAxMNbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVz\ndHJhbm8uY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVkIqo5t5Paflu\nP2zbSbzxn29n6HxKnTcsubycLBEs0jkTkdG7seF1LPqnXl8jFM9NGPiBFkiaR15I\n5w482IW6mC7s8T2CbZEL3qqQEAzztEPnxQg0twswyIZWNyuHYzf9fw0AnohBhGu2\n28EZWaezzT2F333FOVGSsTn1+u6tFwIDAQABo4HuMIHrMB0GA1UdDgQWBBSvrNxo\neHDm9nhKnkdpe0lZjYD1GzCBuwYDVR0jBIGzMIGwgBSvrNxoeHDm9nhKnkdpe0lZ\njYD1G6GBjKSBiTCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEPMA0GA1UE\nBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQGA1UEAxMN\nbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVzdHJhbm8u\nY29tggkA56EGv5giuGMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCc\nMPgV0CpumKRMulOeZwdpnyLQI/NTr3VVHhDDxxCzcB0zlZ2xyDACGnIG2cQJJxfc\n2GcsFnb0BMw48K6TEhAaV92Q7bt1/TYRvprvhxUNMX2N8PHaYELFG2nWfQ4vqxES\nRkjkjqy+H7vir/MOF3rlFjiv5twAbDKYHXDT7v1YCg==\n-----END CERTIFICATE-----", }, 'uat' => { 'api.host' => 'https://uat.maestrano.io', 'api.base' => '/api/v1/', 'connec.enabled' => true,