fog-proxmox 0.13.0 → 0.14.0

data/lib/fog/proxmox/auth/token/access_ticket.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Tristan Robert
+
+# This file is part of Fog::Proxmox.
+
+# Fog::Proxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Fog::Proxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
+
+require 'fog/json'
+require 'fog/proxmox/variables'
+require 'fog/proxmox/json'
+
+module Fog
+    module Proxmox
+        # Core module
+        module Auth
+            module Token
+                class AccessTicket
+                    include Fog::Proxmox::Auth::Token
+
+                    NAME = 'access_ticket'
+
+                    attr_reader :csrf_token
+
+                    class URIError < RuntimeError; end
+
+                    EXPIRATION_DELAY = 2 * 60 * 60
+
+                    def auth_method
+                        'POST'
+                    end
+
+                    def auth_path(params = {})
+                        '/access/ticket'
+                    end
+
+                    def auth_body(params = {})
+                        raise URIError, 'URI params is required' if params.nil? || params.empty?
+                        raise URIError, 'proxmox_username is required' if params[:proxmox_username].nil? || params[:proxmox_username].empty?
+                        raise URIError, 'proxmox_password is required' if params[:proxmox_password].nil? || params[:proxmox_password].empty?
+                        URI.encode_www_form(username: params[:proxmox_username], password: params[:proxmox_password])
+                    end
+
+                    def headers(method = 'GET', params = {}, additional_headers = {})
+                        headers_hash = {}
+                        @data ||= {}
+                        unless @data.empty?
+                            headers_hash.store('Cookie', "PVEAuthCookie=#{@data['ticket']}")
+                            if %w[PUT POST DELETE].include? method
+                            headers_hash.store('CSRFPreventionToken', @data['CSRFPreventionToken'])
+                            end
+                        end
+                        headers_hash.merge! additional_headers
+                        headers_hash
+                    end
+
+                    def build_credentials(proxmox_options, data)
+                        @token = data['ticket']
+                        @expires = Time.now.utc.to_i + EXPIRATION_DELAY
+                        @userid = data['username']
+                        @csrf_token = data['CSRFPreventionToken']
+                    end
+
+                    def missing_credentials(options)
+                        missing_credentials = []
+                        missing_credentials << :proxmox_username unless options[:proxmox_username]
+                        missing_credentials << :proxmox_password unless options[:proxmox_password]
+                        raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
+                    end
+                end
+            end
+        end
+    end
+end

data/lib/fog/proxmox/auth/token/user_token.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Tristan Robert
+
+# This file is part of Fog::Proxmox.
+
+# Fog::Proxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Fog::Proxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
+
+require 'fog/json'
+require 'fog/proxmox/variables'
+require 'fog/proxmox/json'
+
+module Fog
+    module Proxmox
+        # Core module
+        module Auth
+            module Token
+                class UserToken
+                    include Fog::Proxmox::Auth::Token
+
+                    NAME = 'user_token'
+
+                    attr_reader :token_id
+
+                    class URIError < RuntimeError; end
+
+                    def auth_method
+                        'GET'
+                    end
+
+                    def auth_path(params = {})
+                        raise URIError, 'URI params are required' if params.nil? || params.empty?
+                        raise URIError, 'proxmox_userid is required' if params[:proxmox_userid].nil? || params[:proxmox_userid].empty?
+                        raise URIError, 'proxmox_tokenid is required' if params[:proxmox_tokenid].nil? || params[:proxmox_tokenid].empty?
+                        "/access/users/#{URI.encode_www_form_component(params[:proxmox_userid])}/token/#{params[:proxmox_tokenid]}"
+                    end
+
+                    def auth_body(params = {})
+                        ''
+                    end        
+                    
+                    def no_token?(params)
+                        (params.respond_to?(:proxmox_token) || params[:proxmox_token].nil? || params[:proxmox_token].empty?) && (@token.nil? || @token.empty?)
+                    end
+
+                    def set_credentials(params)
+                        token = @token
+                        token = params[:proxmox_token] if token.empty?
+                        token_id = @token_id
+                        token_id = params[:proxmox_tokenid] if token_id.empty? 
+                        userid = @userid
+                        userid = params[:proxmox_userid] if userid.empty?
+                        {userid: userid, token_id: token_id, token: token }
+                    end
+
+                    def headers(method = 'GET', params = {}, additional_headers = {})
+                        raise URIError, 'User token is required' if no_token?(params)
+                        credentials = set_credentials(params)
+                        headers_hash = {}
+                        headers_hash.store('Authorization', "PVEAPIToken=#{credentials[:userid]}!#{credentials[:token_id]}=#{credentials[:token]}")
+                        headers_hash.merge! additional_headers
+                        headers_hash
+                    end
+
+                    def build_credentials(proxmox_options, data)
+                        @expires = data['expire']
+                        @token = proxmox_options[:proxmox_token]
+                        @token_id = proxmox_options[:proxmox_tokenid]
+                        @userid = proxmox_options[:proxmox_userid]
+                    end
+
+                    def missing_credentials(options)
+                        missing_credentials = []
+                        missing_credentials << :proxmox_userid unless options[:proxmox_userid]
+                        missing_credentials << :proxmox_tokenid unless options[:proxmox_tokenid]
+                        missing_credentials << :proxmox_token unless options[:proxmox_token]
+                        raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
+                    end
+                end
+            end
+        end
+    end
+end

data/lib/fog/{compute/proxmox.rb → proxmox/compute.rb}

@@ -23,13 +23,11 @@ module Fog
   module Proxmox
     # Proxmox compute service
     class Compute < Fog::Service
-      requires :pve_url
-      recognizes :pve_ticket, :pve_path, :pve_ticket_expires,
-                 :pve_csrftoken, :persistent, :current_user, :pve_username,
-                 :pve_password, :pve_deadline
+      requires :proxmox_url, :proxmox_auth_method
+      recognizes :proxmox_token, :proxmox_tokenid, :proxmox_userid, :persistent, :proxmox_username, :proxmox_password
 
       # Models
-      model_path 'fog/compute/proxmox/models'
+      model_path 'fog/proxmox/compute/models'
       model :node
       collection :nodes
       model :server
@@ -49,7 +47,7 @@ module Fog
       collection :snapshots
 
       # Requests
-      request_path 'fog/compute/proxmox/requests'
+      request_path 'fog/proxmox/compute/requests'
 
       # Manage nodes cluster
       request :list_nodes
@@ -102,8 +100,14 @@ module Fog
         attr_reader :config
 
         def initialize(options = {})
-          @pve_uri = URI.parse(options[:pve_url])
-          @pve_path = @pve_uri.path
+          @proxmox_uri = URI.parse(options[:proxmox_url])
+          @proxmox_auth_method = options[:proxmox_auth_method]
+          @proxmox_tokenid = options[:proxmox_tokenid]
+          @proxmox_userid = options[:proxmox_userid]
+          @proxmox_username = options[:proxmox_username]
+          @proxmox_password = options[:proxmox_password]
+          @proxmox_token = options[:proxmox_token]
+          @proxmox_path = @proxmox_uri.path
           @config = options
         end
       end
@@ -111,14 +115,25 @@ module Fog
       # Real class
       class Real
         include Fog::Proxmox::Core
-        def initialize(options = {})
-          initialize_identity(options)
-          @connection_options = options[:connection_options] || {}
-          @path_prefix = URI.parse(options[:pve_url]).path
-          authenticate
-          @persistent = options[:persistent] || false
-          url = "#{@scheme}://#{@host}:#{@port}"
-          @connection = Fog::Core::Connection.new(url, @persistent, @connection_options.merge(path_prefix: @path_prefix))
+
+        def self.not_found_class
+          Fog::Proxmox::Compute::NotFound
+        end
+
+        def config
+          self
+        end
+
+        def config_service?
+          true
+        end
+
+        private
+
+        def configure(source)
+          source.instance_variables.each do |v|
+            instance_variable_set(v, source.instance_variable_get(v))
+          end
         end
       end
     end

data/lib/fog/{compute/proxmox → proxmox/compute}/models/disk.rb

@@ -18,6 +18,7 @@
 # frozen_string_literal: true
 
 require 'fog/proxmox/helpers/disk_helper'
+require 'fog/proxmox/helpers/controller_helper'
 
 module Fog
   module Proxmox
@@ -56,11 +57,23 @@ module Fog
         end
 
         def mount_point?
-          id.match(/(mp)(\d+)/)
+          Fog::Proxmox::DiskHelper.mount_point?(id)
         end
 
         def controller?
-          id.match(/(scsi|ide|sata|virtio)(\d+)/)
+          Fog::Proxmox::DiskHelper.server_disk?(id)
+        end
+
+        def cloud_init?
+          id != 'ide2' && media == 'cdrom'
+        end
+
+        def hard_disk?
+          controller? && !cdrom? && !cloud_init?
+        end
+
+        def template?
+          Fog::Proxmox::DiskHelper.template?(volid)
         end
 
         def flatten

data/lib/fog/{compute/proxmox → proxmox/compute}/models/disks.rb

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
 
-require 'fog/compute/proxmox/models/disk'
+require 'fog/proxmox/compute/models/disk'
 
 module Fog
   module Proxmox
@@ -45,6 +45,10 @@ module Fog
         def rootfs
           find(&:rootfs?)
         end
+
+        def cloudinit
+          find(&:cloud_init?)
+        end
       end
     end
   end

data/lib/fog/{compute/proxmox → proxmox/compute}/models/interface.rb

@@ -26,6 +26,7 @@ module Fog
       class Interface < Fog::Model
         identity  :id
         attribute :macaddr
+        attribute :hwaddr
         attribute :model
         attribute :name
         attribute :ip
@@ -38,6 +39,9 @@ module Fog
         attribute :rate
         attribute :queues
         attribute :tag
+        attribute :mtu
+        attribute :trunks
+        attribute :type
 
         def flatten
           Fog::Proxmox::NicHelper.flatten(attributes)

data/lib/fog/{compute/proxmox → proxmox/compute}/models/interfaces.rb

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
 
-require 'fog/compute/proxmox/models/interface'
+require 'fog/proxmox/compute/models/interface'
 require 'fog/proxmox/helpers/controller_helper'
 
 module Fog

data/lib/fog/{compute/proxmox → proxmox/compute}/models/nodes.rb

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
 
-require 'fog/compute/proxmox/models/node'
+require 'fog/proxmox/compute/models/node'
 
 module Fog
   module Proxmox

data/lib/fog/{compute/proxmox → proxmox/compute}/models/server.rb

@@ -228,7 +228,7 @@ module Fog
           volumes
         end
 
-        protected 
+        protected
 
         def initialize_config(new_attributes = {})
           options = { service: service, vmid: vmid }
@@ -247,7 +247,7 @@ module Fog
 
         def node
           Fog::Proxmox::Compute::Node.new(service: service, node: node_id)
-        end 
+        end
       end
     end
   end

data/lib/fog/{compute/proxmox → proxmox/compute}/models/server_config.rb

@@ -69,6 +69,14 @@ module Fog
         attribute :unprivileged
         attribute :interfaces
         attribute :disks
+        attribute :ciuser
+        attribute :cipassword
+        attribute :cicustom
+        attribute :citype
+        attribute :ipconfigs
+        attribute :sshkeys
+        attribute :searchdomain
+        attribute :nameserver
 
         def initialize(new_attributes = {})
           prepare_service_value(new_attributes)

data/lib/fog/{compute/proxmox → proxmox/compute}/models/servers.rb

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
 
-require 'fog/compute/proxmox/models/server'
+require 'fog/proxmox/compute/models/server'
 
 module Fog
   module Proxmox

data/lib/fog/{compute/proxmox → proxmox/compute}/models/snapshots.rb

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
 
-require 'fog/compute/proxmox/models/snapshot'
+require 'fog/proxmox/compute/models/snapshot'
 
 module Fog
   module Proxmox

data/lib/fog/{compute/proxmox → proxmox/compute}/models/storages.rb

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
 
-require 'fog/compute/proxmox/models/storage'
+require 'fog/proxmox/compute/models/storage'
 
 module Fog
   module Proxmox

data/lib/fog/{compute/proxmox → proxmox/compute}/models/tasks.rb

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
 
-require 'fog/compute/proxmox/models/task'
+require 'fog/proxmox/compute/models/task'
 
 module Fog
   module Proxmox

data/lib/fog/{compute/proxmox → proxmox/compute}/models/volume.rb

@@ -26,6 +26,8 @@
 
 # frozen_string_literal: true
 
+require 'fog/proxmox/helpers/disk_helper'
+
 module Fog
   module Proxmox
     class Compute
@@ -55,6 +57,10 @@ module Fog
         def restore(vmid, options = {})
           service.create_server(node_id, options.merge(archive: volid, storage: storage_id, vmid: vmid))
         end
+
+        def template?
+          Fog::Proxmox::DiskHelper.template?(volid)
+        end
       end
     end
   end