ruby-shadow 2.2.0 → 2.3.1

data/HISTORY

@@ -1,3 +1,17 @@
+[2013/11/13]
+* Version 2.3.1
+ - Caleb Land<caleb.land@gmail.com>
+ Remove sgetspent on implementations using pwd.h
+[2013/11/13]
+* Version 2.3.0
+ - Caleb Land<caleb.land@gmail.com>
+ Merge OS X work into main gem.  Fix bugs with OS X implementation and tweak support for FreeBSD.
+ See https://github.com/caleb/ruby-shadow/commit/20d98b7d9e3bbbef0b737affd3245590096a316c
+ - Add license file to Manifest.
+[2013/02/25]
+ - Adam Palmblad<apalmblad@gmail.com>
+ Fix compilation issues with ruby 2.
+
 [2012/04/17]
 * Version 2.1.4
  - MATSUU Takuto <matsuu@gentoo.org>

data/LICENSE

@@ -0,0 +1,5 @@
+License: Free for any use with your own risk!
+
+OR
+
+The terms of the Public Domain License (http://creativecommons.org/licenses/publicdomain/)

data/MANIFEST

@@ -1,8 +1,11 @@
-depend
 extconf.rb
 HISTORY
+LICENSE
 MANIFEST
 README
 README.euc
 ruby-shadow.gemspec
-shadow.c
+pwd/shadow.c
+pwd/depend
+shadow/shadow.c
+shadow/depend

data/README

@@ -5,16 +5,20 @@ Modified at: <1999/8/19 06:47:14 by ttate>
 License: See LICENSE
 
 
+
 1. What's this
 
-This is the module which used when you access linux shadow password files.  
+This module provides tools to read, and, on Linux, append, information related to password files.
+
+Recent versions work on both Linux, Solaris, OS X and FreeBSD.
+The functions found are translated to their equivalents in libshadow.
 
-Recent versions work on both Linux and Solaris.
+Note 
 
 2. install
 
 ruby extconf.rb
-make
+make # use gmake on FreeBSD
 (make install)
 
 * Note:
@@ -22,20 +26,19 @@ make
  still present, but no promises about earlier versions of Ruby.
 
 3. Shadow::Passwd module's methods
-
-getspent
-getspnam(name)
-setspent
-endspent
-fgetspent(file)
-sgetspent(str)
-putspent(entry,file)
-lckpwdf,lock
-ulckpwdf,unlock
-lock?
-
-* Note: sgetspent is not available under Solaris and some other operating
-  systems.  In current versions, that method will be completely missing.
+____________________________________________________________
+ Method                 | Linux | Solaris | OS X  | FreeBSD
+____________________________________________________________
+ getspent               |   *   |    *    |   *   |    *
+ getspnam(name)         |   *   |    *    |   *   |    *
+ setspent               |   *   |    *    |   *   |    *
+ endspent               |   *   |    *    |   *   |    *
+ fgetspent(file)        |   *   |    *    |   N   |    N
+ sgetspent(str)         |   *   |    N    |   N   |    N
+ putspent(entry,file)   |   *   |    *    |   N   |    N
+ lckpwdf,lock           |   *   |    *    |   N   |    N
+ ulckpwdf,unlock        |   *   |    *    |   N   |    N
+ lock?                  |   *   |    *    |   N   |    N
 
 
 4. Structure
@@ -43,15 +46,16 @@ lock?
 Shadow::Passwd::Entry (Struct::PasswdEntry)
        sp_namp - pointer to null-terminated user name.
        sp_pwdp - pointer to null-terminated password.
-       sp_lstchg  -  days  since  Jan  1,  1970 password was last
-                     changed.
+       sp_lstchg - days  since  Jan  1,  1970 password was last
+                   changed.
        sp_min - days before which password may not be changed.
        sp_max - days after which password must be changed.
        sp_warn - days before password is to expire that  user  is
-       warned of pending password expiration.
+                 warned of pending password expiration.
        sp_inact  -  days  after  password expires that account is
                     considered inactive and disabled.
        sp_expire - days since Jan 1, 1970 when  account  will  be
+                   disabled
 
 
 5. Description

data/extconf.rb

@@ -5,6 +5,7 @@
 #
 
 require 'mkmf'
+require 'rbconfig'
 
 $CFLAGS = case RUBY_VERSION
           when /^1\.9/; '-DRUBY19'
@@ -12,33 +13,54 @@ $CFLAGS = case RUBY_VERSION
           else; ''
           end
 
-#$LDFLAGS = "-lshadow"
+implementation = case CONFIG['host_os']
+                 when /linux/i; 'shadow'
+                 when /sunos|solaris/i; 'shadow'
+                 when /freebsd/i; 'pwd'
+                 when /darwin/i; 'pwd'
+                 else; nil
+                   "This library works on OS X, FreeBSD, Solaris and Linux."
+                 end
 
-if( ! (ok = have_library("shadow","getspent")) )
-  $LDFLAGS = ""
-  ok = have_func("getspent")
-end
+ok = true
 
-ok &= have_func("fgetspent")
-ok &= have_func("setspent")
-ok &= have_func("endspent")
-ok &= have_func("lckpwdf")
-ok &= have_func("ulckpwdf")
+case implementation
+when 'shadow'
+  #$LDFLAGS = "-lshadow"
 
-if ok
-  if !have_func("sgetspent")
-    $CFLAGS += ' -DSOLARIS'
+  if( ! (ok &= have_library("shadow","getspent")) )
+    $LDFLAGS = ""
+    ok = have_func("getspent")
   end
-  create_makefile("shadow")
-else
-  osx_ok = have_func( "endpwent" )
-  osx_ok &= have_func( "getpwent" )
-  osx_ok &= have_func( "getpwnam" )
-  osx_ok &= have_func( "getpwnam_r" )
-  osx_ok &= have_func( "getpwuid" )
-  osx_ok &= have_func( "setpassent" )
-  osx_ok &= have_func( "setpwent" )
-  if osx_ok
-    raise "It looks like you're on OSX.  There is a branch that might help here: https://github.com/apalmblad/ruby-shadow/tree/osx"
+
+  ok &= have_func("fgetspent")
+  ok &= have_func("setspent")
+  ok &= have_func("endspent")
+  ok &= have_func("lckpwdf")
+  ok &= have_func("ulckpwdf")
+
+  if ok
+    if !have_func("sgetspent")
+      $CFLAGS += ' -DSOLARIS'
+    end
   end
+when 'pwd'
+  ok &= have_func("endpwent")
+  ok &= have_func("getpwent")
+  ok &= have_func("getpwnam")
+  ok &= have_func("getpwnam_r")
+  ok &= have_func("getpwuid")
+  ok &= have_func("setpassent")
+  ok &= have_func("setpwent")
+
+  have_header("uuid/uuid.h")
+  have_header("uuid.h")
+else
+  ok = false
 end
+
+if ok
+  create_makefile("shadow", implementation)
+else
+  raise "You are missing some of the required functions from either shadow.h on Linux/Solaris, or pwd.h on FreeBSD/OS X."
+end

data/pwd/shadow.c

@@ -0,0 +1,125 @@
+/*
+ * shadow.c
+ *
+ * Ruby extention module for using FreeBSD/OS X pwd.h.
+ *
+ * Copyright (C) 1998-1999 by Takaaki.Tateishi(ttate@jaist.ac.jp)
+ * License: Free for any use with your own risk!
+ */
+#include <sys/types.h>
+#include <pwd.h>
+#include <time.h>
+#ifdef HAVE_UUID_UUID_H
+#include <uuid/uuid.h>
+#elif HAVE_UUID_H
+#include <uuid.h>
+#endif
+#define PWTYPE  struct passwd
+
+#include "ruby.h"
+#ifdef RUBY19
+#include <ruby/io.h>
+#else
+#include "rubyio.h"
+#endif
+
+#ifdef RUBY19
+#define file_ptr(x) (x)->stdio_file
+#else
+#define file_ptr(x) (x)->f
+#endif
+
+static VALUE rb_mShadow;
+static VALUE rb_mPasswd;
+static VALUE rb_sPasswdEntry;
+static VALUE rb_mGroup;
+static VALUE rb_sGroupEntry;
+static VALUE rb_eFileLock;
+
+
+static VALUE
+rb_shadow_setspent(VALUE self)
+{
+  setpassent(1);
+  return Qnil;
+}
+
+
+static VALUE
+rb_shadow_endspent(VALUE self)
+{
+  endpwent();
+  return Qnil;
+}
+
+static VALUE convert_pw_struct( struct passwd *entry )
+{
+  return rb_struct_new(rb_sPasswdEntry,
+         rb_tainted_str_new2(entry->pw_name),
+         rb_tainted_str_new2(entry->pw_passwd),
+         Qnil, /* date when the password was last changed (in days since Jan 1, 1970) */
+         Qnil, /* days that password must stay same */
+         Qnil, /* days until password changes. */
+         Qnil, /* days before expiration where user is warned */
+         Qnil, /* days after password expiration that account becomes inactive */
+            INT2FIX(difftime(entry->pw_change, 0) / (24*60*60)),
+            INT2FIX(difftime(entry->pw_expire, 0) / (24*60*60)),
+         Qnil, /* sp_flag */
+         NULL);
+}
+
+static VALUE
+rb_shadow_getspent(VALUE self)
+{
+  PWTYPE *entry;
+  VALUE result;
+  entry = getpwent();
+
+  if( entry == NULL )
+    return Qnil;
+
+  result = convert_pw_struct( entry );
+  return result;
+}
+
+static VALUE
+rb_shadow_getspnam(VALUE self, VALUE name)
+{
+  PWTYPE *entry;
+  VALUE result;
+
+  if( TYPE(name) != T_STRING )
+    rb_raise(rb_eException,"argument must be a string.");
+  entry = getpwnam(StringValuePtr(name));
+
+  if( entry == NULL )
+    return Qnil;
+
+  result = convert_pw_struct( entry );
+  return result;
+}
+
+void
+Init_shadow()
+{
+  rb_sPasswdEntry = rb_struct_define("PasswdEntry",
+                                     "sp_namp","sp_pwdp","sp_lstchg",
+                                     "sp_min","sp_max","sp_warn",
+                                     "sp_inact","pw_change",
+                                     "sp_expire","sp_flag", NULL);
+  rb_sGroupEntry = rb_struct_define("GroupEntry",
+                                    "sg_name","sg_passwd",
+                                    "sg_adm","sg_mem",NULL);
+
+  rb_mShadow = rb_define_module("Shadow");
+  rb_eFileLock = rb_define_class_under(rb_mShadow,"FileLock",rb_eException);
+  rb_mPasswd = rb_define_module_under(rb_mShadow,"Passwd");
+  rb_define_const(rb_mPasswd,"Entry",rb_sPasswdEntry);
+  rb_mGroup = rb_define_module_under(rb_mShadow,"Group");
+  rb_define_const(rb_mGroup,"Entry",rb_sGroupEntry);
+
+  rb_define_module_function(rb_mPasswd,"setspent",rb_shadow_setspent,0);
+  rb_define_module_function(rb_mPasswd,"endspent",rb_shadow_endspent,0);
+  rb_define_module_function(rb_mPasswd,"getspent",rb_shadow_getspent,0);
+  rb_define_module_function(rb_mPasswd,"getspnam",rb_shadow_getspnam,1);
+}

data/ruby-shadow.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
                                 'Remi Broemeling',
                                 'Takaaki Tateishi']
 
-  spec.description           = 'This module provides access to shadow passwords on Linux and Solaris'
+  spec.description           = 'This module provides access to shadow passwords on Linux, OSX, FreeBSD, and Solaris'
   spec.email                 = ['adam.palmblad@teampages.com']
   spec.extensions            = ['extconf.rb']
   spec.files                 = []
@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.name                  = 'ruby-shadow'
   spec.required_ruby_version = ['>= 1.8']
   spec.summary               = '*nix Shadow Password Module'
-  spec.version               = '2.2.0'
+  spec.version               = '2.3.1'
   spec.license  = "Public Domain License"
 end

data/shadow/depend

@@ -0,0 +1,9 @@
+ifneq (,$(findstring 1.9,$(ruby_version)))
+	io_lib=$(hdrdir)/ruby/ruby/io.h
+	hdr=$(hdrdir)/ruby/ruby.h
+else
+	io_lib=$(hdrdir)/ruby/rubyio.h
+	hdr=$(hdrdir)/ruby.h
+endif
+	
+shadow.o: shadow.c $(hdr) $(io_lib)

data/{shadow.c → shadow/shadow.c}

@@ -5,7 +5,6 @@
  *
  * Copyright (C) 1998-1999 by Takaaki.Tateishi(ttate@jaist.ac.jp)
  * License: Free for any use with your own risk!
- * Modified at: <1999/8/19 06:48:18 by ttate>
  */
 
 #include <shadow.h>
@@ -17,11 +16,13 @@
 #endif
 
 #ifdef RUBY19
-#define file_ptr(x) (x)->stdio_file
+#define file_ptr(x) rb_io_stdio_file(x)
 #else
 #define file_ptr(x) (x)->f
 #endif
 
+#define NUM_FIELDS 10
+
 static VALUE rb_mShadow;
 static VALUE rb_mPasswd;
 static VALUE rb_sPasswdEntry;
@@ -69,6 +70,7 @@ rb_shadow_sgetspent(VALUE self, VALUE str)
 		      INT2FIX(entry->sp_max),
 		      INT2FIX(entry->sp_warn),
 		      INT2FIX(entry->sp_inact),
+                      Qnil, /* used by BSD, pw_change, date when the password expires, in days since Jan 1, 1970 */
 		      INT2FIX(entry->sp_expire),
 		      INT2FIX(entry->sp_flag),
 		      NULL);
@@ -85,7 +87,6 @@ rb_shadow_fgetspent(VALUE self, VALUE file)
 
   if( TYPE(file) != T_FILE )
     rb_raise(rb_eTypeError,"argument must be a File.");
-
   entry = fgetspent( file_ptr( (RFILE(file)->fptr) ) );
 
   if( entry == NULL )
@@ -99,6 +100,7 @@ rb_shadow_fgetspent(VALUE self, VALUE file)
 		      INT2FIX(entry->sp_max),
 		      INT2FIX(entry->sp_warn),
 		      INT2FIX(entry->sp_inact),
+                      Qnil, /* used by BSD, pw_change, date when the password expires, in days since Jan 1, 1970 */
 		      INT2FIX(entry->sp_expire),
 		      INT2FIX(entry->sp_flag),
 		      NULL);
@@ -124,6 +126,7 @@ rb_shadow_getspent(VALUE self)
 		      INT2FIX(entry->sp_max),
 		      INT2FIX(entry->sp_warn),
 		      INT2FIX(entry->sp_inact),
+		      Qnil, /* used by BSD, pw_change, date when the password expires, in days since Jan 1, 1970 */
 		      INT2FIX(entry->sp_expire),
 		      INT2FIX(entry->sp_flag),
 		      NULL);
@@ -152,6 +155,7 @@ rb_shadow_getspnam(VALUE self, VALUE name)
 		      INT2FIX(entry->sp_max),
 		      INT2FIX(entry->sp_warn),
 		      INT2FIX(entry->sp_inact),
+                      Qnil, /* used by BSD, pw_change, date when the password expires, in days since Jan 1, 1970 */
 		      INT2FIX(entry->sp_expire),
 		      INT2FIX(entry->sp_flag),
 		      NULL);
@@ -164,14 +168,18 @@ rb_shadow_putspent(VALUE self, VALUE entry, VALUE file)
 {
   struct spwd centry;
   FILE* cfile;
-  VALUE val[9];
+  VALUE val[NUM_FIELDS];
   int i;
   int result;
 
-  for(i=0; i<=8; i++)
+  if( TYPE(file) != T_FILE )
+    rb_raise(rb_eTypeError,"argument must be a File.");
+
+  for(i=0; i<NUM_FIELDS; i++)
     val[i] = RSTRUCT_PTR( entry )[i]; //val[i] = RSTRUCT(entry)->ptr[i];
   cfile = file_ptr( RFILE(file)->fptr );
 
+
   centry.sp_namp = StringValuePtr(val[0]);
   centry.sp_pwdp = StringValuePtr(val[1]);
   centry.sp_lstchg = FIX2INT(val[2]);
@@ -179,8 +187,8 @@ rb_shadow_putspent(VALUE self, VALUE entry, VALUE file)
   centry.sp_max = FIX2INT(val[4]);
   centry.sp_warn = FIX2INT(val[5]);
   centry.sp_inact = FIX2INT(val[6]);
-  centry.sp_expire = FIX2INT(val[7]);
-  centry.sp_flag = FIX2INT(val[8]);
+  centry.sp_expire = FIX2INT(val[8]);
+  centry.sp_flag = FIX2INT(val[9]);
 
   result = putspent(&centry,cfile);
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shadow
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Adam Palmblad
@@ -13,9 +14,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies: []
-description: This module provides access to shadow passwords on Linux and Solaris
+description: This module provides access to shadow passwords on Linux, OSX, FreeBSD,
+  and Solaris
 email:
 - adam.palmblad@teampages.com
 executables: []
@@ -24,35 +26,40 @@ extensions:
 extra_rdoc_files: []
 files:
 - extconf.rb
-- depend
 - HISTORY
+- LICENSE
 - MANIFEST
 - README
 - README.euc
 - ruby-shadow.gemspec
-- shadow.c
+- pwd/shadow.c
+- pwd/depend
+- shadow/shadow.c
+- shadow/depend
 homepage: https://github.com/apalmblad/ruby-shadow
 licenses:
 - Public Domain License
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
-summary: '*nix Shadow Password Module'
+specification_version: 3
+summary: ! '*nix Shadow Password Module'
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e6a1653f5597ff8d3d7766345624bac5a391bf0c
-  data.tar.gz: c0b3f349395f0a66f86aef57580044cd47cf7e3f
-SHA512:
-  metadata.gz: c5e7fb7ad3d9f82d84be27c0e21fb476b6b530e15b2d0fe49e9d88cd89e3c848cc45512db1eae38606ace6a8efa33e9897346196bcf3d6b90541ac10282bc964
-  data.tar.gz: adfff1ae1f2cfc6096baa0aab23cb467fca95561020c610bb417a8c1fe5c09229893142383e2131f2a929f2c1bea4c7d575b42f89c97c7f47e9b4fd6332b67cd