netsoul 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e2e58b89442fb6a9040b0d79d6bf4ca618d0131
-  data.tar.gz: 6d058ba823d2d325eda211680f7e5afe685dccce
+  metadata.gz: 7c87d6edb74b1dd1b82b6617944658c472f8ceff
+  data.tar.gz: 705d281ad0c3174ad5aadbfc9dbaa367e14dae8e
 SHA512:
-  metadata.gz: 9389e6a25f64b6003432a3112199ac8db11efd95b1a601eb32f7e72f4127aa66bf1ce494e033e03b3a36db5fd880964a30ceaf6caafee21684ee9d3748cdba93
-  data.tar.gz: 2d2a97bdc444a1d6adfb58b74b61a9c1c64bf8c9dc287bc0e0a447ac833ea70be2bfd432ec66ebcdbef57f39fdb3ac5a8085fd297096c3216791be693c381f2d
+  metadata.gz: 2facc495620c54c44ef89d081ce5a2e3794f39937ff96887af617a330907a42144ffb90d4f5a2c8b731332e9679bdba4c44e516bc9cdbe88f1b5037b7738b1c3
+  data.tar.gz: 3537edb9e19b2dd4048d9c744f7dd7728d8bf8bee601d514352c8124e7c80ec1c8401859cfa40c57b685509981dbf99f04ff2c726301420d189a4e0e46e15d71

data/.rubocop.yml

@@ -21,4 +21,4 @@ Style/Documentation:
 
 AllCops:
   Excludes:
-    - 'bin/**'
+    - 'bin/**/*'

data/README.md

@@ -1,4 +1,4 @@
-# Netsoul-Ruby [![Gem Version](https://badge.fury.io/rb/netsoul-ruby.svg)](http://badge.fury.io/rb/netsoul-ruby) [![Build Status](https://travis-ci.org/fenicks/netsoul-ruby.svg?branch=master)](https://travis-ci.org/fenicks/netsoul-ruby) [![Coverage Status](https://coveralls.io/repos/fenicks/netsoul-ruby/badge.svg?branch=master&service=github)](https://coveralls.io/github/fenicks/netsoul-ruby?branch=master)
+# Netsoul-Ruby [![Gem Version](https://badge.fury.io/rb/netsoul.svg)](http://badge.fury.io/rb/netsoul) [![Build Status](https://travis-ci.org/fenicks/netsoul-ruby.svg?branch=master)](https://travis-ci.org/fenicks/netsoul-ruby) [![Coverage Status](https://coveralls.io/repos/fenicks/netsoul-ruby/badge.svg?branch=master&service=github)](https://coveralls.io/github/fenicks/netsoul-ruby?branch=master)
 
 * formerly __libnetsoul-rb__
 
@@ -19,21 +19,17 @@ You can use it as a Ruby gem in order to implement your own Netsoul client in Ru
 
 ### On your desktop
 
-    ```bash
     gem install netsoul
-    ```
 
 ### In your project
 
-    ```ruby
-    # Gemfile
+#### Gemfile
+
     gem 'netsoul', '~> 0.1'
-    ```
 
-    ```ruby
-    # project.rb
+#### project.rb
+
     require 'netsoul'
-    ```
 
 ## Use the client
 

data/bin/netsoul-ruby

@@ -3,11 +3,11 @@
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
-require 'base64'
-require 'digest/md5'
-require 'netsoul'
+require 'netsoul/config'
+require 'netsoul/errors'
+require 'netsoul/logging'
+require 'netsoul/message'
 require 'socket'
-require 'uri'
 
 module Netsoul
   class Client
@@ -82,41 +82,42 @@ module Netsoul
   end
 end
 
-# if __FILE__ == $PROGRAM_NAME
-  $stderr.sync = true
-  require 'optparse'
-  require 'yaml'
-
-  options = {}
-  OptionParser.new do |opts|
-    opts.banner = 'Usage: netsoul-ruby [options]'.freeze
-    opts.separator "\nNetsoul-Ruby options:".freeze
-    opts.on('-c'.freeze, '--config FILE'.freeze, 'Configuration file in YAML'.freeze) do |file|
-      options[:config] = file
-      unless File.file?(options[:config])
-        puts '[ERROR] Configuration is not a valid file'
-        exit
-      end
-      options[:user_opts] = YAML.load_file(options[:config])
-    end
-    opts.on('-h', '--help', 'Display this screen') do
-      puts opts
+$stderr.sync = true
+require 'optparse'
+require 'yaml'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = 'Usage: netsoul-ruby [options]'.freeze
+  opts.separator ''.freeze
+  opts.separator 'Netsoul-Ruby options:'.freeze
+
+  opts.on('-c'.freeze, '--config FILE'.freeze, 'Configuration file in YAML'.freeze) do |file|
+    options[:config] = file
+    unless File.file?(options[:config])
+      puts '[ERROR] Configuration is not a valid file'
       exit
     end
-  end.parse!
+    options[:user_opts] = YAML.load_file(options[:config])
+  end
 
-  unless options.include?(:config)
-    puts '[ERROR] Configuration file is not provided'
+  opts.on('-h', '--help', 'Display this screen') do
+    puts opts
     exit
   end
+end.parse!
 
-  c = Netsoul::Client.new options[:user_opts]
-  c.connect
-  if c.started
-    loop do
-      res = c.sock_get
-      c.sock_send res if res.to_s.match(/^ping.*/)
-      sleep 1
-    end
+unless options.include?(:config)
+  puts '[ERROR] Configuration file is not provided'
+  exit
+end
+
+c = Netsoul::Client.new options[:user_opts]
+c.connect
+if c.started
+  loop do
+    res = c.sock_get
+    c.sock_send res if res.to_s.match(/^ping.*/)
+    sleep 1
   end
-# end
+end

data/ext/netsoul_kerberos/kerberos.c

@@ -17,22 +17,22 @@
 
 void	display_status(k_data_t *data)
 {
-	OM_uint32	minor, status;
-	gss_buffer_desc	msg;
+    OM_uint32	    minor, status;
+    gss_buffer_desc	msg;
 
-	gss_display_status(&minor, data->min, GSS_C_GSS_CODE, GSS_C_NO_OID, &status, &msg);
-	if (msg.value) puts(msg.value);
+    gss_display_status(&minor, data->min, GSS_C_GSS_CODE, GSS_C_NO_OID, &status, &msg);
+    if (msg.value) puts(msg.value);
 }
 
-krb5_error_code	get_new_tickets(	k_data_t *data,
-					krb5_context context,
-					krb5_principal principal,
-					krb5_ccache ccache)
+krb5_error_code	get_new_tickets(k_data_t *data,
+                                krb5_context context,
+                                krb5_principal principal,
+                                krb5_ccache ccache)
 {
-   krb5_error_code		ret;
-   krb5_get_init_creds_opt	opt;
-   krb5_creds			cred;
-//   char *			password = NULL;
+   krb5_error_code		   ret;
+   krb5_get_init_creds_opt opt;
+   krb5_creds			   cred;
+//   char                    *password = NULL;
 
    memset(&cred, 0, sizeof(cred));
    krb5_get_init_creds_opt_init (&opt);
@@ -55,16 +55,16 @@ krb5_error_code	get_new_tickets(	k_data_t *data,
       return (3);
    if (krb5_cc_store_cred(context, ccache, &cred))
       return (3);
-   //krb5_free_creds_contents(context, &cred);
+   // krb5_free_creds_contents(context, &cred);
    return (0);
 }
 
 int	my_init(k_data_t *data)
 {
-   krb5_error_code               ret;
-   krb5_context                  context;
-   krb5_ccache                   ccache;
-   krb5_principal                principal;
+   krb5_error_code ret;
+   krb5_context    context;
+   krb5_ccache     ccache;
+   krb5_principal  principal;
 
    if (krb5_init_context(&context))
       return (1);
@@ -84,62 +84,62 @@ int	my_init(k_data_t *data)
 
 void	import_name(k_data_t *data)
 {
-	OM_uint32		min;
-	OM_uint32		maj;
-	gss_buffer_desc		buf;
+    OM_uint32		min;
+    OM_uint32		maj;
+    gss_buffer_desc	buf;
 
-	buf.value = (unsigned char *) strdup(NS_SERVICE_NAME);
-	buf.length = strlen((const char*)buf.value) + 1;
-	maj = gss_import_name(&min, &buf, GSS_C_NT_HOSTBASED_SERVICE, &data->gss_name);
+    buf.value = (unsigned char *) strdup(NS_SERVICE_NAME);
+    buf.length = strlen((const char*)buf.value) + 1;
+    maj = gss_import_name(&min, &buf, GSS_C_NT_HOSTBASED_SERVICE, &data->gss_name);
 
-	if (maj != GSS_S_COMPLETE)
-	      display_status(data);
+    if (maj != GSS_S_COMPLETE)
+          display_status(data);
 }
 
 void	init_context(k_data_t *data)
 {
-	OM_uint32	maj;
-	/* gss_buffer_t	itoken      = GSS_C_NO_BUFFER; */
-	krb5_enctype	etypes[]    = { ENCTYPE_DES3_CBC_SHA1, ENCTYPE_NULL };
-	int		etype_count = sizeof(etypes) / sizeof(*etypes);
-	gss_cred_id_t	credh;
-
-	maj = gss_acquire_cred(	&data->min,
-				GSS_C_NO_NAME,
-				GSS_C_INDEFINITE,
-				GSS_C_NO_OID_SET,
-				GSS_C_INITIATE,
-				&credh,
-				NULL,
-				NULL);
-	if (maj != GSS_S_COMPLETE)
-	{
-		display_status(data);
-		return;
-	}
-	maj = gss_krb5_set_allowable_enctypes(&data->min, credh, etype_count, etypes);
-	if (maj != GSS_S_COMPLETE)
-	{
-		display_status(data);
-		return;
-	}
-	data->ctx = GSS_C_NO_CONTEXT;
-	maj = gss_init_sec_context(	&data->min,
-					credh,
-					&data->ctx,
-					data->gss_name,
-					GSS_C_NO_OID,
-					GSS_C_CONF_FLAG,
-					0,
-					GSS_C_NO_CHANNEL_BINDINGS,
-					data->itoken,
-					NULL,
-					&data->otoken,
-					NULL,
-					NULL);
-
-	if (data->maj != GSS_S_COMPLETE)
-		display_status(data);
+    OM_uint32	maj;
+    /* gss_buffer_t	itoken      = GSS_C_NO_BUFFER; */
+    krb5_enctype	etypes[]    = { ENCTYPE_DES3_CBC_SHA1, ENCTYPE_NULL };
+    int		etype_count = sizeof(etypes) / sizeof(*etypes);
+    gss_cred_id_t	credh;
+
+    maj = gss_acquire_cred(	&data->min,
+                GSS_C_NO_NAME,
+                GSS_C_INDEFINITE,
+                GSS_C_NO_OID_SET,
+                GSS_C_INITIATE,
+                &credh,
+                NULL,
+                NULL);
+    if (maj != GSS_S_COMPLETE)
+    {
+        display_status(data);
+        return;
+    }
+    maj = gss_krb5_set_allowable_enctypes(&data->min, credh, etype_count, etypes);
+    if (maj != GSS_S_COMPLETE)
+    {
+        display_status(data);
+        return;
+    }
+    data->ctx = GSS_C_NO_CONTEXT;
+    maj = gss_init_sec_context(	&data->min,
+                    credh,
+                    &data->ctx,
+                    data->gss_name,
+                    GSS_C_NO_OID,
+                    GSS_C_CONF_FLAG,
+                    0,
+                    GSS_C_NO_CHANNEL_BINDINGS,
+                    data->itoken,
+                    NULL,
+                    &data->otoken,
+                    NULL,
+                    NULL);
+
+    if (data->maj != GSS_S_COMPLETE)
+        display_status(data);
 }
 
 int	check_tokens(k_data_t *data)
@@ -162,45 +162,45 @@ int	check_tokens(k_data_t *data)
 /**
  * Encode string in base64
  */
-unsigned char * base64_encode(const unsigned char *src, size_t len, size_t *out_len)
+unsigned char* base64_encode(const unsigned char *src, size_t len, size_t *out_len)
 {
-	unsigned char *out, *pos;
-	const unsigned char *end, *in;
-	size_t olen;
-	int line_len;
-	const unsigned char base64_table[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-	olen = len * 4 / 3 + 4; /* 3-byte blocks to 4-byte */
-	out = malloc(olen);
-	if (out == NULL)
-		return NULL;
-
-	end = src + len;
-	in = src;
-	pos = out;
-	while (end - in >= 3) {
-		*pos++ = base64_table[in[0] >> 2];
-		*pos++ = base64_table[((in[0] & 0x03) << 4) | (in[1] >> 4)];
-		*pos++ = base64_table[((in[1] & 0x0f) << 2) | (in[2] >> 6)];
-		*pos++ = base64_table[in[2] & 0x3f];
-		in += 3;
-	}
-
-	if (end - in) {
-		*pos++ = base64_table[in[0] >> 2];
-		if (end - in == 1) {
-			*pos++ = base64_table[(in[0] & 0x03) << 4];
-			*pos++ = '=';
-		} else {
-			*pos++ = base64_table[((in[0] & 0x03) << 4) |
-					      (in[1] >> 4)];
-			*pos++ = base64_table[(in[1] & 0x0f) << 2];
-		}
-		*pos++ = '=';
-		line_len += 4;
-	}
-
-	if (out_len)
-		*out_len = pos - out;
-	return out;
+    unsigned char *out, *pos;
+    const unsigned char *end, *in;
+    size_t olen;
+    int line_len;
+    const unsigned char base64_table[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+    olen = len * 4 / 3 + 4; /* 3-byte blocks to 4-byte */
+    out = malloc(olen);
+    if (out == NULL)
+        return NULL;
+
+    end = src + len;
+    in = src;
+    pos = out;
+    while (end - in >= 3) {
+        *pos++ = base64_table[in[0] >> 2];
+        *pos++ = base64_table[((in[0] & 0x03) << 4) | (in[1] >> 4)];
+        *pos++ = base64_table[((in[1] & 0x0f) << 2) | (in[2] >> 6)];
+        *pos++ = base64_table[in[2] & 0x3f];
+        in += 3;
+    }
+
+    if (end - in) {
+        *pos++ = base64_table[in[0] >> 2];
+        if (end - in == 1) {
+            *pos++ = base64_table[(in[0] & 0x03) << 4];
+            *pos++ = '=';
+        } else {
+            *pos++ = base64_table[((in[0] & 0x03) << 4) |
+                          (in[1] >> 4)];
+            *pos++ = base64_table[(in[1] & 0x0f) << 2];
+        }
+        *pos++ = '=';
+        line_len += 4;
+    }
+
+    if (out_len)
+        *out_len = pos - out;
+    return out;
 }

data/ext/netsoul_kerberos/kerberos.h

@@ -21,11 +21,11 @@
 
 typedef struct k_data
 {
-	char*		login;
-	char*		unix_pass;
-	OM_uint32	min;
-	OM_uint32	maj;
-	gss_name_t	gss_name;
+	char*		    login;
+	char*		    unix_pass;
+	OM_uint32	    min;
+	OM_uint32	    maj;
+	gss_name_t	    gss_name;
 	gss_ctx_id_t	ctx;
 	gss_buffer_t	itoken;
 	gss_buffer_desc	otoken;
@@ -35,10 +35,10 @@ void
 display_status(k_data_t *data);
 
 krb5_error_code
-get_new_tickets(	k_data_t *data,
-			krb5_context context,
-			krb5_principal principal,
-			krb5_ccache ccache);
+get_new_tickets(k_data_t *data,
+			    krb5_context context,
+			    krb5_principal principal,
+			    krb5_ccache ccache);
 
 int
 my_init(k_data_t *data);

data/ext/netsoul_kerberos/netsoul_kerberos.c

@@ -14,26 +14,28 @@ VALUE cNetsoulKerberos;
 
 static VALUE k_init(VALUE self)
 {
-	rb_define_attr(cNetsoulKerberos, "login", 1, 1);
-	rb_define_attr(cNetsoulKerberos, "password", 1, 1);
-	rb_define_attr(cNetsoulKerberos, "token", 1, 0);
+	rb_define_attr(cNetsoulKerberos, "login",        1, 1);
+	rb_define_attr(cNetsoulKerberos, "password",     1, 1);
+	rb_define_attr(cNetsoulKerberos, "token",        1, 0);
 	rb_define_attr(cNetsoulKerberos, "token_base64", 1, 0);
 	return self;
 }
 
 static VALUE k_build_token(VALUE self, VALUE login, VALUE password)
 {
-	k_data_t	*data;
-	unsigned char	*token_base64;
-	unsigned char	*token;
-	size_t		elen;
+	k_data_t	  *data;
+	unsigned char *token_base64;
+	unsigned char *token;
+	size_t		  elen;
 
 	data = calloc(1, sizeof (k_data_t));
 	data->login = (char*)login;
 	data->unix_pass = (char*)password;
 	data->itoken = GSS_C_NO_BUFFER;
-	if (check_tokens(data) != 1)
-		return Qfalse;
+	if (check_tokens(data) != 1) {
+	    free(data);
+	    return Qfalse;
+	}
 
 	token = (unsigned char*)strdup(data->otoken.value);
 	token_base64 = base64_encode((const unsigned char*)data->otoken.value, data->otoken.length, &elen);

data/lib/netsoul/location.rb

@@ -3,11 +3,7 @@ module Netsoul
     class << self
       def get(ip)
         locations.each do |key, val|
-          res = ip.match(/^#{val}/)
-          if res
-            res = "#{key}"
-            return res
-          end
+          return "#{key}".freeze if ip.match(/^#{val}/)
         end
         'ext'.freeze
       end

data/lib/netsoul/message.rb

@@ -1,3 +1,9 @@
+require 'base64'
+require 'digest/md5'
+require 'uri'
+
+require_relative 'location'
+
 module Netsoul
   class Message
     class << self
@@ -9,16 +15,13 @@ module Netsoul
       end
 
       def standard_auth(config)
-        login = config.login
         client_ip = config.user_connection_info[:client_ip]
-        user_custom_location = config.location
-        location = Message.escape(Location.get(client_ip) == 'ext'.freeze ? user_custom_location : Location.get(client_ip))
+        location = Message.escape(Location.get(client_ip) == 'ext'.freeze ? config.location : Location.get(client_ip))
         client_name = Message.escape(config.client_name)
-        "ext_user_log #{login} #{_standard_auth_string(config)} #{client_name} #{location}"
+        "ext_user_log #{config.login} #{_standard_auth_string(config)} #{client_name} #{location}"
       end
 
       def _kerberos_get
-        require 'netsoul_kerberos'
         @netsoul_kerberos ||= NetsoulKerberos.new
       rescue LoadError => e
         raise Netsoul::Error, "NetsoulKerberos library not found: #{e}.".freeze
@@ -32,6 +35,8 @@ module Netsoul
       end
 
       def kerberos_auth(config)
+        require 'netsoul_kerberos'
+
         unless _kerberos_get.build_token(config.login, config.unix_password)
           fail Netsoul::Error, 'Impossible to retrieve the kerberos token.'.freeze
         end
@@ -39,7 +44,7 @@ module Netsoul
       end
 
       def auth_ag
-        'auth_ag ext_user none -'.freeze
+        'auth_ag ext_user none none'.freeze
       end
 
       def send_message(user, msg)

data/lib/netsoul/version.rb

@@ -1,3 +1,3 @@
 module Netsoul
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netsoul
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Christian Kakesa