shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

bug: Ozones can not use ":plain:" to not to hash passwords.

Browse Source
This commit is contained in:
Ruben S. Montero 2011-09-02 15:33:17 +02:00
parent ef22ca4782
commit 9ac5a9d490
6 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/oca/ruby/OpenNebula.rb
View File

@ -85,7 +85,7 @@ module OpenNebula
XMLPARSER=false
end
def initialize(secret=nil, endpoint=nil)
def initialize(secret=nil, endpoint=nil, hash=true)
if secret
one_secret = secret
elsif ENV["ONE_AUTH"] and !ENV["ONE_AUTH"].empty? and File.file?(ENV["ONE_AUTH"])
@ -101,7 +101,12 @@ module OpenNebula
if tokens.length > 2
@one_auth = one_secret
elsif tokens.length == 2
@one_auth = "#{tokens[0]}:#{Digest::SHA1.hexdigest(tokens[1])}"
if hash
pass = Digest::SHA1.hexdigest(tokens[1])
else
pass = tokens[1]
end
@one_auth = "#{tokens[0]}:#{pass}"
else
raise "Authorization file malformed"
end

12
src/ozones/Client/bin/onezone
View File

@ -40,39 +40,39 @@ cmd=CommandParser::CmdParser.new(ARGV) do
case args[1]
when "host"
aux_helper = OneHostHelper.new(
zone['onename'] + ":plain:" + zone['onepass'],
zone['onename'] + ":" + zone['onepass'],
zone['endpoint'])
aux_helper.list_pool(options)
when "vm"
aux_helper = OneVMHelper.new(
zone['onename'] + ":plain:" + zone['onepass'],
zone['onename'] + ":" + zone['onepass'],
zone['endpoint'])
aux_helper.list_pool(options)
when "image"
aux_helper = OneImageHelper.new(
zone['onename'] + ":plain:" + zone['onepass'],
zone['onename'] + ":" + zone['onepass'],
zone['endpoint'])
aux_helper.list_pool(options)
when "vn"
aux_helper = OneVNetHelper.new(
zone['onename'] + ":plain:" + zone['onepass'],
zone['onename'] + ":" + zone['onepass'],
zone['endpoint'])
aux_helper.list_pool(options)
when "template"
aux_helper = OneTemplateHelper.new(
zone['onename'] + ":plain:" + zone['onepass'],
zone['onename'] + ":" + zone['onepass'],
zone['endpoint'])
aux_helper.list_pool(options)
when "user"
aux_helper = OneUserHelper.new(
zone['onename'] + ":plain:" + zone['onepass'],
zone['onename'] + ":" + zone['onepass'],
zone['endpoint'])
aux_helper.list_pool(options)

7
src/ozones/Server/lib/OZones/AggregatedPool.rb
View File

@ -35,8 +35,9 @@ module OZones
zone_pool_hash = zone.to_hash["ZONE"]
client = OpenNebula::Client.new(
zone.onename + ":plain:" + zone.onepass,
zone.endpoint)
zone.onename + ":" + zone.onepass,
zone.endpoint,
false)
pool = factory(client)
@ -64,4 +65,4 @@ module OZones
end
end
end
end

17
src/ozones/Server/models/OCAInteraction.rb
View File

@ -21,8 +21,9 @@ class OCAInteraction
# Creates a VDC (user, group, hosts)
def create_vdc_in_zone(zone,vdc,adminname, adminpass)
# Create a new client to interact with the zone
client = OpenNebula::Client.new(zone.onename + ":plain:" + zone.onepass,
zone.endpoint)
client = OpenNebula::Client.new(zone.onename + ":" + zone.onepass,
zone.endpoint,
false)
# Create a group in the zone with the VDC name
group = OpenNebula::Group.new(OpenNebula::Group.build_xml, client)
@ -87,8 +88,9 @@ class OCAInteraction
zone= OZones::Zones.get(vdc.zones_id)
# Create a new client to interact with the zone
client = OpenNebula::Client.new(zone.onename + ":plain:" + zone.onepass,
zone.endpoint)
client = OpenNebula::Client.new(zone.onename + ":" + zone.onepass,
zone.endpoint,
false)
# Get the id of vdcadmin
vdcgroupid = OpenNebulaHelper::OneHelper.id_to_name(vdc.name,
@ -126,8 +128,9 @@ class OCAInteraction
# Creates a VDC (user, group, hosts)
def check_oneadmin(oneadminname, oneadminpass, endpoint)
# Create a new client to interact with the zone
client = OpenNebula::Client.new(oneadminname + ":plain:" + oneadminpass,
endpoint)
client = OpenNebula::Client.new(oneadminname + ":" + oneadminpass,
endpoint,
false)
hostpool=OpenNebula::HostPool.new(client)
result = hostpool.info
@ -200,4 +203,4 @@ class OCAInteraction
}
end
end

5
src/ozones/Server/models/OzonesServer.rb
View File

@ -77,8 +77,9 @@ class OzonesServer
if kind == "zone"
client = OpenNebula::Client.new(
resource.onename + ":plain:" + resource.onepass,
resource.endpoint)
resource.onename + ":" + resource.onepass,
resource.endpoint,
false)
simple_pool = case aggkind
when "host" then OpenNebulaJSON::HostPoolJSON.new(client)

2
src/ozones/test/spec/VDCManagement_spec.rb
View File

@ -114,4 +114,4 @@ module OZones
end
end
end
end