Merge 00eca15 into da7d12d

lib/openvas.rb

@@ -13,11 +13,16 @@
 module Openvas
   extend self
 
+  class OpenvasError < StandardError; end
+  class ConfigError < OpenvasError; end
+  class AuthError < OpenvasError; end
+  class QueryError < OpenvasError; end
+
   def configure
     block_given? ? yield(Config) : Config
     %w[url username password].each do |key|
       next unless Openvas::Config.instance_variable_get("@#{key}").nil?
-      raise Openvas::Config::RequiredOptionMissing,
+      raise ConfigError,
             "Configuration parameter missing: '#{key}'. " \
             'Please add it to the Openvas.configure block'
     end

lib/openvas/auth.rb

@@ -8,8 +8,8 @@ class InvalidLogin < StandardError; end
 
     # Do Login
     def self.login
-      raise InvalidLogin, 'Please configure the username' unless Openvas::Config.username
-      raise InvalidLogin, 'Please configure the password' unless Openvas::Config.password
+      raise ConfigError, 'Username not configured' unless Openvas::Config.username
+      raise ConfigError, 'Password not configured' unless Openvas::Config.password
 
       content = Nokogiri::XML::Builder.new do |xml|
         xml.authenticate do
@@ -20,7 +20,11 @@ def self.login
         end
       end
 
-      query(content)
+      begin
+        query(content)
+      rescue QueryError
+        raise AuthError, 'Invalid login or password'
+      end
 
       true
     end

lib/openvas/client.rb

@@ -6,33 +6,40 @@
 
 module Openvas
   class Client
-    class InvalidUrlConfigError < StandardError; end
-    class QueryError < StandardError; end
-
     # buffer size for socket
     BLOCK_SIZE = 1024 * 16
 
     # Connect the websocket
     def self.connect
       # Retrieve URI
-      raise InvalidUrlConfigError, 'Please Configure the client before' unless Openvas::Config.url
+      raise ConfigError, 'URL not configured' unless Openvas::Config.url
 
-      uri = URI.parse(Openvas::Config.url)
+      begin
+        uri = URI.parse(Openvas::Config.url)
 
-      plain_socket = TCPSocket.open(uri.host, uri.port)
-      self.socket = OpenSSL::SSL::SSLSocket.new(plain_socket, OpenSSL::SSL::SSLContext.new)
+        plain_socket = TCPSocket.open(uri.host, uri.port)
+        self.socket = OpenSSL::SSL::SSLSocket.new(plain_socket, OpenSSL::SSL::SSLContext.new)
 
-      # Enable to close socket and SSL layer together
-      socket.sync_close = true
-      socket.connect
+        # Enable to close socket and SSL layer together
+        socket.sync_close = true
+        socket.connect
+      rescue Errno::ECONNREFUSED, OpenSSL::SSL::SSLError, SocketError,
+             URI::InvalidURIErro => e
+        raise ConfigError, e
+      end
 
       true
     end
 
     def self.disconnect
       return unless socket
-      socket.close
-      self.socket = nil
+
+      begin
+        socket.close
+        self.socket = nil
+      rescue SocketError => e
+        raise ConfigError, e
+      end
     end
 
     def self.version