netsoul 1.9.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40ae5cdd054a7d3eb6d72265a45714d49367e18f
-  data.tar.gz: 6046d54fe9e388c0dd33ffde354d69205c1bc062
+  metadata.gz: c3867b9a41505375037c2a9dab38d767b1ff3fec
+  data.tar.gz: accfa0351a8f3702a6b528d09c5871ea5cd3e8bf
 SHA512:
-  metadata.gz: e4937e3a77f5d7a3fdd3cf916a5d1d235c05baaf2622ebdcd9d68741f136f97d00d0b39f815b72eef8346e0c6bb9d426ed450edc4978273c1ee6313616014830
-  data.tar.gz: 87271293e474120ff9d712135250b2bcd166bf22c45dbc7a37b60298601ba98c4a7e83de32bf8d483e6ad360293675775d8d41ec21ec4060855fbdb1e2b02740
+  metadata.gz: b9d49424ebfdb9417801d8307190b02f9c433d789863f9c5106471ee36df2d17a5c769a3ffe78d52de7d7f98a8eab390d875d446573a4540f4d36d133f5fad6c
+  data.tar.gz: f0f98ab4eede97c75ea6b44c95369a998b98397c90ed8b2c4cb2765a41e48168a189e4217e4b337ce39e7afb7eea36cca9fa0f09057774ee1bf35fa931359bb6

data/bin/netsoul-ruby

@@ -22,7 +22,7 @@ OptionParser.new do |opts|
     options[:user_opts] = YAML.load_file(file) if File.file?(file)
   end
 
-  opts.on('-h', '--help', 'Display this screen') do
+  opts.on('-h'.freeze, '--help', 'Display this screen'.freeze) do
     puts opts
     exit 42
   end
@@ -30,7 +30,7 @@ end.parse!
 
 if options.empty? || options[:user_opts].size == 0
   unless ENV.to_a.count { |k, _v| %w(NETSOUL_LOGIN NETSOUL_SOCKS_PASSWORD NETSOUL_LOGIN NETSOUL_UNIX_PASSWORD NETSOUL_AUTH_METHOD).include?(k) } >= 2
-    puts '[ERROR] You have to specify a configuration file or environment variables'
+    puts '[ERROR] You have to specify a configuration file or environment variables'.freeze
     exit 42
   end
 end
@@ -45,14 +45,14 @@ begin
     retry_count = 10
     retry_wait_time = 1.0
     loop do
-      res = c.sock_get
-      c.sock_send res if res.to_s.match(/^ping.*/)
+      res = c.get
+      c.send res if res.to_s.match(/^ping.*/)
       sleep 1
     end
   end
 rescue Interrupt
   begin c.disconnect; end
-  puts '!!! [SIGINT] !!!'
+  puts '!!! [SIGINT] !!!'.freeze
   exit 42
 rescue => e
   puts "[ERROR]: #{e}"
@@ -61,7 +61,8 @@ rescue => e
   if retry_count > 0
     retry_count -= 1
     retry_wait_time *= RETRY_WAIT_FACTOR
-    sleep(retry_wait_time) && retry
+    sleep(retry_wait_time)
+    retry
   end
   exit 42
 end

data/lib/netsoul/client.rb

@@ -15,31 +15,31 @@ module Netsoul
     end
 
     def auth_ag
-      sock_send(Message.auth_ag)
-      fail Netsoul::IdentificationError, 'Identification failed.'.freeze unless sock_get.split(' ')[1] == '002'.freeze
+      send(Message.auth_ag)
+      fail Netsoul::IdentificationError, 'Identification failed.'.freeze unless get.split(' ')[1] == '002'.freeze
     end
     private :auth_ag
 
     def auth_method
       if @config.auth_method == :krb5
-        sock_send(Message.kerberos_auth(@config))
+        send(Message.kerberos_auth(@config))
       else
-        sock_send(Message.standard_auth(@config))
+        send(Message.standard_auth(@config))
       end
-      fail Netsoul::AuthenticationError, 'Authentication failed. See your config file or environment variables'.freeze unless sock_get.split(' ')[1] == '002'
+      fail Netsoul::AuthenticationError, 'Authentication failed. See your config file or environment variables'.freeze unless get.split(' ')[1] == '002'
     end
     private :auth_method
 
     def auth_status
-      sock_send(Message.attach)
-      sock_send(Message.user_state(@config.state, Time.now.to_i))
+      send(Message.attach)
+      send(Message.user_state(@config.state, Time.now.to_i))
     end
     private :auth_status
 
     def connect
-      @sock = TCPSocket.new(@config.server_host, @config.server_port)
-      fail Netsoul::SocketError, 'Could not open a socket. Connection is unavailable.'.freeze unless @sock
-      _cmd, _socket_num, md5_hash, client_ip, client_port, _server_timestamp = sock_get.split
+      @socket = TCPSocket.new(@config.server_host, @config.server_port)
+      fail Netsoul::SocketError, 'Could not open a socket. Connection is unavailable.'.freeze unless @socket
+      _cmd, _socket_num, md5_hash, client_ip, client_port, _server_timestamp = get.split
 
       @config.build_user_connection_info md5_hash: md5_hash, client_ip: client_ip, client_port: client_port
 
@@ -51,29 +51,29 @@ module Netsoul
     end
 
     def disconnect
-      sock_send(Message.ns_exit)
+      send(Message.ns_exit)
     ensure
-      sock_close
+      close
     end
 
-    def sock_send(str)
-      _, sock = IO.select(nil, [@sock], nil, SOCKET_WRITE_TIMEOUT)
+    def send(str)
+      _, sock = IO.select(nil, [@socket], nil, SOCKET_WRITE_TIMEOUT)
       fail Netsoul::SocketError, 'Timeout or fail on write socket' if sock.nil? || sock.empty?
       sock.first.puts str
       log :info, "[send] #{str.chomp}"
     end
 
-    def sock_get
-      sock, = IO.select([@sock], nil, nil, SOCKET_READ_TIMEOUT)
+    def get
+      sock, = IO.select([@socket], nil, nil, SOCKET_READ_TIMEOUT)
       fail Netsoul::SocketError, 'Timeout or fail on read socket' if sock.nil? || sock.empty?
       res = sock.first.gets
       log :info, "[get ] #{res.chomp}" if res
       res || ''
     end
 
-    def sock_close
+    def close
       @started = false
-      @sock.close
+      @socket.close
     rescue
       nil
     end

data/lib/netsoul/config.rb

@@ -43,7 +43,7 @@ module Netsoul
       @user_group = ENV['NETSOUL_USER_GROUP'] || opts.fetch(:user_group, 'ETNA_2008'.freeze)
       @user_connection_info = {}
 
-      @client_name = ENV['NETSOUL_CLIENT_NAME'] || opts.fetch(:client_name, '(Netsoul-Ruby) -> { Christian Kakesa, since 2009}'.freeze)
+      @client_name = ENV['NETSOUL_CLIENT_NAME'] || opts.fetch(:client_name, "(Netsoul-Ruby v#{Netsoul::VERSION}) -> { Christian Kakesa, since 2009}".freeze)
     end
 
     def build_user_connection_info(opts = {})

data/lib/netsoul/message.rb

@@ -2,8 +2,6 @@ require 'base64'
 require 'digest/md5'
 require 'uri'
 
-require_relative 'location'
-
 module Netsoul
   class Message
     class << self
@@ -119,4 +117,54 @@ module Netsoul
       end
     end
   end
+
+  class Location
+    class << self
+      def get(ip)
+        locations.each do |key, val|
+          return "#{key}".freeze if ip.match(/^#{val}/)
+        end
+        'ext'.freeze
+      end
+
+      # rubocop:disable all
+      def locations
+        @locations ||= {
+            :'lab-cisco-mid-sr' => '10.251.'.freeze,
+            etna: '10.245.'.freeze,
+            lse: '10.227.42.'.freeze,
+            :'sda-1' => '10.227.4.'.freeze,
+            lab: '10.227.'.freeze,
+            :'lab-tcom' => '10.226.7.'.freeze,
+            :'lab-acu' => '10.226.6.'.freeze,
+            :'lab-console' => '10.226.5.'.freeze,
+            :'lab-mspe' => '10.226.'.freeze,
+            epitanim: '10.225.19.'.freeze,
+            epidemic: '10.225.18.'.freeze,
+            :'sda-2' => '10.225.10.'.freeze,
+            cycom: '10.225.8.'.freeze,
+            epx: '10.225.7.'.freeze,
+            prologin: '10.225.6.'.freeze,
+            nomad: '10.225.2.'.freeze,
+            assos: '10.225.'.freeze,
+            sda: '10.224.14.'.freeze,
+            www: '10.223.106.'.freeze,
+            episport: '10.223.104.'.freeze,
+            epicom: '10.223.103.'.freeze,
+            :'bde-epita' => '10.223.100.'.freeze,
+            omatis: '10.223.42.'.freeze,
+            ipsa: '10.223.15.'.freeze,
+            lrde: '10.223.13.'.freeze,
+            cvi: '10.223.7.'.freeze,
+            epi: '10.223.1.'.freeze,
+            pasteur: '10.223.'.freeze,
+            bocal: '10.42.42.'.freeze,
+            sm: '10.42.'.freeze,
+            vpn: '10.10.'.freeze,
+            adm: '10.1.'.freeze,
+            epita: '10.'.freeze
+        }
+      end
+    end
+  end
 end

data/lib/netsoul/version.rb

@@ -1,3 +1,3 @@
 module Netsoul
-  VERSION = '1.9.3'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/netsoul.rb

@@ -1,6 +1,5 @@
 require_relative 'netsoul/config'
 require_relative 'netsoul/errors'
-require_relative 'netsoul/location'
 require_relative 'netsoul/logging'
 require_relative 'netsoul/message'
 require_relative 'netsoul/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netsoul
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Christian Kakesa
@@ -156,7 +156,6 @@ files:
 - lib/netsoul/client.rb
 - lib/netsoul/config.rb
 - lib/netsoul/errors.rb
-- lib/netsoul/location.rb
 - lib/netsoul/logging.rb
 - lib/netsoul/message.rb
 - lib/netsoul/version.rb

data/lib/netsoul/location.rb

@@ -1,51 +0,0 @@
-module Netsoul
-  class Location
-    class << self
-      def get(ip)
-        locations.each do |key, val|
-          return "#{key}".freeze if ip.match(/^#{val}/)
-        end
-        'ext'.freeze
-      end
-
-      # rubocop:disable all
-      def locations
-        {
-          :'lab-cisco-mid-sr' => '10.251.'.freeze,
-          etna: '10.245.'.freeze,
-          lse: '10.227.42.'.freeze,
-          :'sda-1' => '10.227.4.'.freeze,
-          lab: '10.227.'.freeze,
-          :'lab-tcom' => '10.226.7.'.freeze,
-          :'lab-acu' => '10.226.6.'.freeze,
-          :'lab-console' => '10.226.5.'.freeze,
-          :'lab-mspe' => '10.226.'.freeze,
-          epitanim: '10.225.19.'.freeze,
-          epidemic: '10.225.18.'.freeze,
-          :'sda-2' => '10.225.10.'.freeze,
-          cycom: '10.225.8.'.freeze,
-          epx: '10.225.7.'.freeze,
-          prologin: '10.225.6.'.freeze,
-          nomad: '10.225.2.'.freeze,
-          assos: '10.225.'.freeze,
-          sda: '10.224.14.'.freeze,
-          www: '10.223.106.'.freeze,
-          episport: '10.223.104.'.freeze,
-          epicom: '10.223.103.'.freeze,
-          :'bde-epita' => '10.223.100.'.freeze,
-          omatis: '10.223.42.'.freeze,
-          ipsa: '10.223.15.'.freeze,
-          lrde: '10.223.13.'.freeze,
-          cvi: '10.223.7.'.freeze,
-          epi: '10.223.1.'.freeze,
-          pasteur: '10.223.'.freeze,
-          bocal: '10.42.42.'.freeze,
-          sm: '10.42.'.freeze,
-          vpn: '10.10.'.freeze,
-          adm: '10.1.'.freeze,
-          epita: '10.'.freeze
-        }
-      end
-    end
-  end
-end