opennebula 4.8.0 → 4.9.80.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6fa857703d3467963c8695ce0b2fa13a395b98b
-  data.tar.gz: 1f8e477fd663688db8e3dfc0c42294b2c487a78f
+  metadata.gz: 42545275d236ad905c7717b1927435e9a488a90f
+  data.tar.gz: 816f67281352c3d865624c23192837ebb5f37fa6
 SHA512:
-  metadata.gz: ecca11cfc987315d5b9920da0b3149246306e28148ccce3d4dd88d6f711b55cc93f9a025892022ffb756e6e1b1b5ec730a7c1f2cc5e347c46809ccb6fb40a688
-  data.tar.gz: 6294197a08dc4c6a1c0951caba175e4daf6d325a7cfd2d9e87c5b00f5335b421c33d81d0cc0c89f6d665695c68fb9fa7b568f44f8bc892455052a9c1695075af
+  metadata.gz: c4ae1c7e5d8165a72102eb2aaca7c483b7cf14b5fba21a7397c8fe0ccf429b492b729e259bdf33aa4087b7f9a7f08a2ff0dbbbbabd8a8c63996f47a45e3a5491
+  data.tar.gz: ba6fecc6ab0d1aa568196d10e23a6c4e8ef9940f62934ebb77405c44eeed2093b5d7ce9204cacbd4ae9d0d7539a5a7b8542460ed9d7bfd19cefe5d407da1557f

data/NOTICE

@@ -1,6 +1,6 @@
 OpenNebula Open Source Project
 --------------------------------------------------------------------------------
-Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs
+Copyright 2002-2014, OpenNebula Project, OpenNebula Systems (formerly C12G Labs)
 --------------------------------------------------------------------------------
 
 You can find  more information about the project, release notes and

data/lib/opennebula.rb

@@ -56,5 +56,5 @@ require 'opennebula/system'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '4.8.0'
+    VERSION = '4.9.80'
 end

data/lib/opennebula/ldap_auth.rb

@@ -15,22 +15,39 @@
 # ---------------------------------------------------------------------------- #
 
 require 'rubygems'
+require 'opennebula'
 require 'net/ldap'
+require 'yaml'
+
+if !defined?(ONE_LOCATION)
+    ONE_LOCATION=ENV["ONE_LOCATION"]
+end
+
+if !ONE_LOCATION
+    VAR_LOCATION="/var/lib/one/"
+else
+    VAR_LOCATION=ONE_LOCATION+"/var/"
+end
 
 module OpenNebula; end
 
 class OpenNebula::LdapAuth
     def initialize(options)
         @options={
-            :host => 'localhost',
-            :port => 389,
-            :user => nil,
-            :password => nil,
-            :base => nil,
-            :auth_method => :simple,
-            :user_field => 'cn',
-            :user_group_field => 'dn',
-            :group_field => 'member'
+            :host               => 'localhost',
+            :port               => 389,
+            :user               => nil,
+            :password           => nil,
+            :base               => nil,
+            :auth_method        => :simple,
+            :user_field         => 'cn',
+            :user_group_field   => 'dn',
+            :group_field        => 'member',
+            :mapping_generate   => true,
+            :mapping_timeout    => 300,
+            :mapping_filename   => 'server1.yaml',
+            :mapping_key        => 'GROUP_DN',
+            :mapping_default    => 1
         }.merge(options)
 
         ops={}
@@ -47,9 +64,61 @@ class OpenNebula::LdapAuth
         ops[:port]=@options[:port].to_i if @options[:port]
         ops[:encryption]=@options[:encryption] if @options[:encryption]
 
+        @options[:mapping_file_path] = VAR_LOCATION + @options[:mapping_filename]
+        generate_mapping if @options[:mapping_generate]
+        load_mapping
+
         @ldap=Net::LDAP.new(ops)
     end
 
+    def generate_mapping
+        file=@options[:mapping_file_path]
+        generate = false
+
+        if File.exists?(file)
+            stat = File.stat(file)
+            age = Time.now.to_i - stat.mtime.to_i
+            generate = true if age > @options[:mapping_timeout]
+        else
+            generate = true
+        end
+
+        return if !generate
+
+        client = OpenNebula::Client.new
+        group_pool = OpenNebula::GroupPool.new(client)
+        group_pool.info
+
+        groups = group_pool.to_hash['']
+        groups=[group_pool.get_hash['GROUP_POOL']['GROUP']].flatten
+
+        yaml={}
+
+        groups.each do |group|
+            if group['TEMPLATE'] && group['TEMPLATE'][@options[:mapping_key]]
+                yaml[group['TEMPLATE'][@options[:mapping_key]]] = group['ID']
+            end
+        end
+
+        File.open(file, 'w') do |f|
+            f.write(yaml.to_yaml)
+        end
+    end
+
+    def load_mapping
+        file=@options[:mapping_file_path]
+
+        @mapping = {}
+
+        if File.exists?(file)
+            @mapping = YAML.load(File.read(file))
+        end
+
+        if @mapping.class != Hash
+            @mapping = {}
+        end
+    end
+
     def find_user(name)
         begin
             result=@ldap.search(
@@ -57,12 +126,14 @@ class OpenNebula::LdapAuth
                 :filter => "#{@options[:user_field]}=#{name}")
 
             if result && result.first
-                [result.first.dn, result.first[@options[:user_group_field]]]
+                @user = result.first
+                [@user.dn, @user[@options[:user_group_field]]]
             else
                 result=@ldap.search(:base => name)
 
                 if result && result.first
-                    [name, result.first[@options[:user_group_field]]]
+                    @user = result.first
+                    [name, @user[@options[:user_group_field]]]
                 else
                     [nil, nil]
                 end
@@ -99,5 +170,20 @@ class OpenNebula::LdapAuth
             false
         end
     end
+
+    def get_groups
+        groups = []
+
+        [@user['memberOf']].flatten.each do |group|
+            if @mapping[group]
+                groups << @mapping[group]
+            else
+                groups << @options[:mapping_default]
+            end
+        end
+
+        groups.delete(false)
+        groups.compact
+    end
 end
 

data/lib/opennebula/ssh_auth.rb

@@ -26,8 +26,6 @@ module OpenNebula; end
 # as auth method is defined. It also holds some helper methods to be used
 # by oneauth command
 class OpenNebula::SshAuth
-    LOGIN_PATH = ENV['HOME']+'/.one/one_ssh'
-
     # Initialize SshAuth object
     #
     # @param [Hash] default options for path
@@ -66,35 +64,13 @@ class OpenNebula::SshAuth
         @public_key_rsa = OpenSSL::PKey::RSA.new(Base64::decode64(@public_key))
     end
 
-    # Creates the login file for ssh authentication at ~/.one/one_ssh.
+    # Creates a login token for ssh authentication.
     # By default it is valid for 1 hour but it can be changed to any number
     # of seconds with expire parameter (in seconds)
-    def login(user, expire=3600)
+    def login_token(user, expire=3600)
         expire ||= 3600
 
-        # Init proxy file path and creates ~/.one directory if needed
-        proxy_dir = File.dirname(LOGIN_PATH)
-
-        begin
-            FileUtils.mkdir_p(proxy_dir)
-        rescue Errno::EEXIST
-        end
-
-        # Generate security token
-        time = Time.now.to_i + expire.to_i
-
-        secret_plain   = "#{user}:#{time}"
-        secret_crypted = encrypt(secret_plain)
-
-        proxy = "#{user}:#{secret_crypted}"
-
-        file = File.open(LOGIN_PATH, "w")
-        file.write(proxy)
-        file.close
-
-        File.chmod(0600,LOGIN_PATH)
-
-        secret_crypted
+        return encrypt("#{user}:#{Time.now.to_i + expire.to_i}")
     end
 
     # Returns a valid password string to create a user using this auth driver.

data/lib/opennebula/user.rb

@@ -33,7 +33,8 @@ module OpenNebula
             :delgroup => "user.delgroup",
             :update   => "user.update",
             :chauth   => "user.chauth",
-            :quota    => "user.quota"
+            :quota    => "user.quota",
+            :login    => "user.login"
         }
 
         SELF      = -1
@@ -185,6 +186,19 @@ module OpenNebula
             return rc
         end
 
+        # Sets the LOGIN_TOKEN for the user
+        #
+        # @param username [String] of the user
+        # @param token [String] the login token, if empty OpenNebula will
+        #   generate one
+        # @param expire [String] valid period of the token in secs. If <= 0
+        #   the token will be reset
+        # @return [String, OpenNebula::Error] token in case of success, Error
+        #   otherwise
+        def login(username, token, expire)
+            return @client.call(USER_METHODS[:login], username, token, expire)
+        end
+
         #######################################################################
         # Helpers to get User information
         #######################################################################

data/lib/opennebula/virtual_machine.rb

@@ -202,9 +202,9 @@ module OpenNebula
         # @return [String] The USER_TEMPLATE
         def user_template_xml
             if NOKOGIRI
-                @xml.xpath('TEMPLATE').to_s
+                @xml.xpath('USER_TEMPLATE').to_s
             else
-                @xml.elements['TEMPLATE'].to_s
+                @xml.elements['USER_TEMPLATE'].to_s
             end
         end
 
@@ -224,7 +224,11 @@ module OpenNebula
         def deploy(host_id, enforce=false, ds_id=-1)
             enforce ||= false
             ds_id ||= -1
-            return call(VM_METHODS[:deploy], @pe_id, host_id.to_i, enforce, ds_id.to_i)
+            return call(VM_METHODS[:deploy],
+                        @pe_id,
+                        host_id.to_i,
+                        enforce,
+                        ds_id.to_i)
         end
 
         # Shutdowns an already deployed VM
@@ -587,6 +591,11 @@ module OpenNebula
             self['GID'].to_i
         end
 
+        # Returns the deploy_id of the VirtualMachine (numeric value)
+        def deploy_id
+            self['DEPLOY_ID']
+        end
+
     private
         def action(name)
             return Error.new('ID not defined') if !@pe_id

data/lib/opennebula/x509_auth.rb

@@ -34,8 +34,6 @@ class OpenNebula::X509Auth
         ETC_LOCATION      = ENV["ONE_LOCATION"] + "/etc"
     end
 
-    LOGIN_PATH = ENV['HOME']+'/.one/one_x509'
-
     X509_AUTH_CONF_PATH = ETC_LOCATION + "/auth/x509_auth.conf"
 
     X509_DEFAULTS = {
@@ -79,13 +77,6 @@ class OpenNebula::X509Auth
     # Client side
     ###########################################################################
 
-    # Creates the login file for x509 authentication at ~/.one/one_x509.
-    # By default it is valid as long as the certificate is valid. It can
-    # be changed to any number of seconds with expire parameter (sec.)
-    def login(user, expire=0)
-        write_login(login_token(user,expire))
-    end
-
     # Returns a valid password string to create a user using this auth driver.
     # In this case the dn of the user certificate.
     def password
@@ -95,8 +86,10 @@ class OpenNebula::X509Auth
     # Generates a login token in the form:
     # user_name:x509:user_name:time_expires:cert_chain
     #   - user_name:time_expires is encrypted with the user certificate
-    #   - user_name:time_expires:cert_chain is base64 encoded
-    def login_token(user, expire)
+    #   - user_name:time_expires:cert_chain is base64 encoded.
+    # By default it is valid as long as the certificate is valid. It can
+    # be changed to any number of seconds with expire parameter (sec.)
+    def login_token(user, expire=0)
         if expire != 0
             expires = Time.now.to_i + expire.to_i
         else
@@ -107,13 +100,9 @@ class OpenNebula::X509Auth
         signed_text  = encrypt(text_to_sign)
 
         certs_pem = @cert_chain.collect{|cert| cert.to_pem}.join(":")
-
         token     = "#{signed_text}:#{certs_pem}"
-        token64   = Base64::encode64(token).strip.delete("\n")
 
-        login_out = "#{user}:#{token64}"
-
-        login_out
+        return Base64::encode64(token).strip.delete("\n")
     end
 
     ###########################################################################
@@ -150,25 +139,6 @@ class OpenNebula::X509Auth
     end
 
 private
-    # Writes a login_txt to the login file as defined in LOGIN_PATH
-    # constant
-    def write_login(login_txt)
-        # Inits login file path and creates ~/.one directory if needed
-        # Set instance variables
-        login_dir = File.dirname(LOGIN_PATH)
-
-        begin
-            FileUtils.mkdir_p(login_dir)
-        rescue Errno::EEXIST
-        end
-
-        file = File.open(LOGIN_PATH, "w")
-        file.write(login_txt)
-        file.close
-
-        File.chmod(0600,LOGIN_PATH)
-    end
-
     # Load class options form a configuration file (yaml syntax)
     def load_options(conf_file)
         if File.readable?(conf_file)

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.9.80.beta
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Libraries needed to talk to OpenNebula
@@ -44,6 +44,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- NOTICE
 - lib/opennebula.rb
 - lib/opennebula/acl.rb
 - lib/opennebula/acl_pool.rb
@@ -63,9 +65,14 @@ files:
 - lib/opennebula/host_pool.rb
 - lib/opennebula/image.rb
 - lib/opennebula/image_pool.rb
+- lib/opennebula/ldap_auth.rb
+- lib/opennebula/ldap_auth_spec.rb
 - lib/opennebula/oneflow_client.rb
 - lib/opennebula/pool.rb
 - lib/opennebula/pool_element.rb
+- lib/opennebula/server_cipher_auth.rb
+- lib/opennebula/server_x509_auth.rb
+- lib/opennebula/ssh_auth.rb
 - lib/opennebula/system.rb
 - lib/opennebula/template.rb
 - lib/opennebula/template_pool.rb
@@ -75,19 +82,12 @@ files:
 - lib/opennebula/virtual_machine_pool.rb
 - lib/opennebula/virtual_network.rb
 - lib/opennebula/virtual_network_pool.rb
+- lib/opennebula/x509_auth.rb
 - lib/opennebula/xml_element.rb
 - lib/opennebula/xml_pool.rb
 - lib/opennebula/xml_utils.rb
 - lib/opennebula/zone.rb
 - lib/opennebula/zone_pool.rb
-- lib/opennebula/ldap_auth.rb
-- lib/opennebula/ldap_auth_spec.rb
-- lib/opennebula/server_cipher_auth.rb
-- lib/opennebula/server_x509_auth.rb
-- lib/opennebula/ssh_auth.rb
-- lib/opennebula/x509_auth.rb
-- NOTICE
-- LICENSE
 homepage: http://opennebula.org
 licenses: []
 metadata: {}
@@ -97,17 +97,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OpenNebula Client API