Skip to content
This repository was archived by the owner on Aug 29, 2018. It is now read-only.

<broker> conf to allow alias under cloud domain - bug 1040257 #4401

Merged
merged 3 commits into from
Jan 28, 2014
Merged

<broker> conf to allow alias under cloud domain - bug 1040257 #4401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca8b065
<models/application.rb> standardize whitespace
sosiouxme Jan 23, 2014
77704d4
<broker> conf to allow alias under cloud domain - bug 1040257
sosiouxme Dec 26, 2013
8abd108
<broker> always prevent alias conflicts with app names
sosiouxme Jan 20, 2014
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
4 changes: 4 additions & 0 deletions broker/conf/broker.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,7 @@ HA_DNS_SUFFIX=""
#Whether to allow obsolete cartridges to be instantiated for a new application or added to an existing application
ALLOW_OBSOLETE_CARTRIDGES="false"

# Whether to allow users to create aliases that are under the cloud domain. Note:
# Aliases of the form word-word.<domain> are rejected to prevent conflicts with app names.
# Also this still will not create any DNS entry for the alias; that is an external step.
ALLOW_ALIAS_IN_DOMAIN="false"
1 change: 1 addition & 0 deletions broker/config/environments/development.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@

config.openshift = {
:domain_suffix => conf.get("CLOUD_DOMAIN", "example.com"),
:allow_alias_in_domain => conf.get_bool("ALLOW_ALIAS_IN_DOMAIN", "false"),
:default_max_domains => (conf.get("DEFAULT_MAX_DOMAINS", "10")).to_i,
:default_max_gears => (conf.get("DEFAULT_MAX_GEARS", "100")).to_i,
:default_gear_size => conf.get("DEFAULT_GEAR_SIZE", "small"),
Expand Down
1 change: 1 addition & 0 deletions broker/config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@

config.openshift = {
:domain_suffix => conf.get("CLOUD_DOMAIN", "example.com"),
:allow_alias_in_domain => conf.get_bool("ALLOW_ALIAS_IN_DOMAIN", "false"),
:default_max_domains => (conf.get("DEFAULT_MAX_DOMAINS", "10")).to_i,
:default_max_gears => (conf.get("DEFAULT_MAX_GEARS", "100")).to_i,
:default_gear_size => conf.get("DEFAULT_GEAR_SIZE", "small"),
Expand Down
1 change: 1 addition & 0 deletions broker/config/environments/test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@

config.openshift = {
:domain_suffix => conf.get("CLOUD_DOMAIN", "example.com"),
:allow_alias_in_domain => conf.get_bool("ALLOW_ALIAS_IN_DOMAIN", "false"),
:default_max_domains => (conf.get("DEFAULT_MAX_DOMAINS", "10")).to_i,
:default_max_gears => (conf.get("DEFAULT_MAX_GEARS", "100")).to_i,
:default_gear_size => conf.get("DEFAULT_GEAR_SIZE", "small"),
Expand Down
62 changes: 34 additions & 28 deletions controller/app/models/application.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def self.with_gear_counts(domains=queryable)
gear_sizes[gear_sz] ||= 0
gear_sizes[gear_sz] += gi.gears.length if gi.gears.present?
end if app.group_instances.present?
apps_info << {"_id" => app._id, "domain_id" => app.domain_id, "gear_sizes" => gear_sizes}
apps_info << {"_id" => app._id, "domain_id" => app.domain_id, "gear_sizes" => gear_sizes}
end
apps_info
end
Expand Down Expand Up @@ -625,7 +625,7 @@ def add_features(features, group_overrides=[], init_git_url=nil, user_env_vars=n
result_io = ResultIO.new
Application.run_in_application_lock(self) do
# save this app before adding the op_group, if its persisted already
# this ensures that any downloaded carts are present before the op_group with the features is added
# this ensures that any downloaded carts are present before the op_group with the features is added
self.save! if self.persisted?

op_group = AddFeaturesOpGroup.new(features: features.map(&:name), group_overrides: group_overrides, init_git_url: init_git_url,
Expand Down Expand Up @@ -1098,16 +1098,8 @@ def add_alias(fqdn, ssl_certificate=nil, private_key=nil, pass_phrase="")
# Alias to be an IP address or a host in the service domain.
# Since DNS is case insensitive, all names are downcased for
# indexing/compares.
server_alias = fqdn.downcase if fqdn
if (server_alias.nil?) or
(server_alias =~ /#{Rails.configuration.openshift[:domain_suffix]}$/) or
(server_alias.length > 255 ) or
(server_alias.length == 0 ) or
(server_alias =~ /^\d+\.\d+\.\d+\.\d+$/) or
(server_alias =~ /\A[\S]+(\.(json|xml|yml|yaml|html|xhtml))\z/) or
(not server_alias.match(/\A[a-z0-9]+([\.]?[\-a-z0-9]+)+\z/))
raise OpenShift::UserException.new("The specified alias is not allowed: '#{server_alias}'", 105, "id")
end
server_alias = validate_alias(fqdn) or
raise OpenShift::UserException.new("The specified alias is not allowed: '#{fqdn}'", 105, "id")
validate_certificate(ssl_certificate, private_key, pass_phrase)

Application.run_in_application_lock(self) do
Expand All @@ -1124,6 +1116,20 @@ def add_alias(fqdn, ssl_certificate=nil, private_key=nil, pass_phrase="")
end
end

def validate_alias(fqdn)
return false if fqdn.nil? || fqdn.length > 255 || fqdn.length == 0
fqdn.downcase!
return false if fqdn =~ /^\d+\.\d+\.\d+\.\d+$/
return false if fqdn =~ /\A[\S]+(\.(json|xml|yml|yaml|html|xhtml))\z/
return false if not fqdn =~ /\A[a-z0-9]+([\.]?[\-a-z0-9]+)+\z/
if fqdn.end_with?(cloud_domain = Rails.configuration.openshift[:domain_suffix])
return false if ! Rails.configuration.openshift[:allow_alias_in_domain]
# still exclude those that could conflict with app names.
return false if fqdn.chomp(cloud_domain) =~ /\A\w+-\w+\.\z/
end
return fqdn
end

# Removes a DNS alias for the application.
#
# == Parameters:
Expand Down Expand Up @@ -1503,9 +1509,9 @@ def run_jobs(result_io=nil)
op_group.delete
rescue Exception => e_orig
Rails.logger.error "Encountered error during execute '#{e_orig.message}'"
# don't log the error stacktrace if this exception was raised just to trigger a rollback
# don't log the error stacktrace if this exception was raised just to trigger a rollback
Rails.logger.debug e_orig.backtrace.inspect unless rollback_pending

#rollback
begin
# reload the application before a rollback
Expand Down Expand Up @@ -1612,8 +1618,8 @@ def calculate_scale_by(ginst_id, scale_by)

def calculate_remove_group_instance_ops(comp_specs, group_instance)
pending_ops = []
gear_destroy_ops = calculate_gear_destroy_ops(group_instance._id.to_s,
group_instance.gears.map{|g| g._id.to_s},
gear_destroy_ops = calculate_gear_destroy_ops(group_instance._id.to_s,
group_instance.gears.map{|g| g._id.to_s},
group_instance.addtl_fs_gb)
pending_ops.push(*gear_destroy_ops)
gear_destroy_op_ids = gear_destroy_ops.map{|op| op._id.to_s}
Expand Down Expand Up @@ -1649,8 +1655,8 @@ def calculate_gear_create_ops(ginst_id, gear_ids, deploy_gear_id, comp_specs, co
app_dns_gear_id = gear_id.to_s
end

init_gear_op = InitGearOp.new(group_instance_id: ginst_id, gear_id: gear_id,
comp_specs: comp_specs, host_singletons: host_singletons,
init_gear_op = InitGearOp.new(group_instance_id: ginst_id, gear_id: gear_id,
comp_specs: comp_specs, host_singletons: host_singletons,
app_dns: app_dns, pre_save: (not self.persisted?))
init_gear_op.prereq << prereq_op._id.to_s unless prereq_op.nil?

Expand Down Expand Up @@ -1712,8 +1718,8 @@ def calculate_gear_create_ops(ginst_id, gear_ids, deploy_gear_id, comp_specs, co
end

prereq_op_id = prereq_op._id.to_s rescue nil
ops, usage_ops = calculate_add_component_ops(comp_specs, ginst_id, deploy_gear_id, gear_id_prereqs, component_ops,
is_scale_up, (user_vars_op_id || prereq_op_id), init_git_url,
ops, usage_ops = calculate_add_component_ops(comp_specs, ginst_id, deploy_gear_id, gear_id_prereqs, component_ops,
is_scale_up, (user_vars_op_id || prereq_op_id), init_git_url,
app_dns_gear_id)
pending_ops.push(*ops)
track_usage_ops.push(*usage_ops)
Expand All @@ -1733,7 +1739,7 @@ def calculate_gear_destroy_ops(ginst_id, gear_ids, additional_filesystem_gb)
delete_gear_op = DeleteGearOp.new(gear_id: gear_id, prereq: [unreserve_uid_op._id.to_s])
track_usage_op = TrackUsageOp.new(user_id: self.domain.owner._id, parent_user_id: self.domain.owner.parent_user_id,
app_name: self.name, gear_id: gear_id, event: UsageRecord::EVENTS[:end],
usage_type: UsageRecord::USAGE_TYPES[:gear_usage],
usage_type: UsageRecord::USAGE_TYPES[:gear_usage],
prereq: [delete_gear_op._id.to_s])

ops = []
Expand All @@ -1747,7 +1753,7 @@ def calculate_gear_destroy_ops(ginst_id, gear_ids, additional_filesystem_gb)
if additional_filesystem_gb != 0
track_usage_fs_op = TrackUsageOp.new(user_id: self.domain.owner._id, parent_user_id: self.domain.owner.parent_user_id,
app_name: self.name, gear_id: gear_id, event: UsageRecord::EVENTS[:end], usage_type: UsageRecord::USAGE_TYPES[:addtl_fs_gb],
additional_filesystem_gb: additional_filesystem_gb,
additional_filesystem_gb: additional_filesystem_gb,
prereq: [delete_gear_op._id.to_s])
pending_ops.push(track_usage_fs_op)
end
Expand All @@ -1758,7 +1764,7 @@ def calculate_gear_destroy_ops(ginst_id, gear_ids, additional_filesystem_gb)
gear_ids.each do |gear_id|
pending_ops.push(TrackUsageOp.new(user_id: self.domain.owner._id, parent_user_id: self.domain.owner.parent_user_id,
app_name: self.name, gear_id: gear_id, event: UsageRecord::EVENTS[:end], cart_name: comp_spec["cart"],
usage_type: UsageRecord::USAGE_TYPES[:premium_cart],
usage_type: UsageRecord::USAGE_TYPES[:premium_cart],
prereq: [delete_gear_op._id.to_s]))
end if cartridge.is_premium?
end
Expand Down Expand Up @@ -1912,7 +1918,7 @@ def calculate_add_component_ops(comp_specs, group_instance_id, deploy_gear_id, g
if self.scalable
expose_port_prereq = []
if post_configure_op
expose_port_prereq << post_configure_op._id.to_s
expose_port_prereq << post_configure_op._id.to_s
else
expose_port_prereq << add_component_op._id.to_s
end
Expand Down Expand Up @@ -1967,8 +1973,8 @@ def calculate_ops(changes, moves=[], connections=nil, group_overrides=nil, init_
start_order, stop_order = calculate_component_orders

unless group_overrides.nil?
set_group_override_op = SetGroupOverridesOp.new(group_overrides: group_overrides,
saved_group_overrides: self.group_overrides,
set_group_override_op = SetGroupOverridesOp.new(group_overrides: group_overrides,
saved_group_overrides: self.group_overrides,
pre_save: (not self.persisted?))
pending_ops.push set_group_override_op
end
Expand Down Expand Up @@ -2057,7 +2063,7 @@ def calculate_ops(changes, moves=[], connections=nil, group_overrides=nil, init_
changed_additional_filesystem_gb = change[:to_scale][:additional_filesystem_gb]
fs_prereq = []
fs_prereq = [pending_ops.last._id.to_s] if pending_ops.present?
end_usage_op_ids = []
end_usage_op_ids = []
if change[:from_scale][:additional_filesystem_gb] != 0
group_instance.gears.each do |gear|
track_usage_old_fs_op = TrackUsageOp.new(user_id: self.domain.owner._id, parent_user_id: self.domain.owner.parent_user_id,
Expand Down Expand Up @@ -2160,7 +2166,7 @@ def calculate_ops(changes, moves=[], connections=nil, group_overrides=nil, init_
begin_usage_ops.each {|op| op.prereq += begin_usage_prereq }
pending_ops.push *begin_usage_ops
end

[pending_ops, add_gears, remove_gears]
end

Expand Down