sys-admin 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219597639587e8c6d43f3a6d638d7f3ad11de0d3ea7cb2a1754e424f939b7622
-  data.tar.gz: 8d91cbd9e39bdb7ab4dc7f9ba4dc854b093de06b02028aa5934f27d3255e4bd2
+  metadata.gz: 4d87741306e11fa28da2582a0c3bd0ba994cbeaea92744afa894bc07e996b975
+  data.tar.gz: 2c2d445e5b58d5298741bb33e1ffdaa12b509e092ea8d5ee1c7139ff6afa84b6
 SHA512:
-  metadata.gz: 4da726426d1300cf1cc0d18f3149c347d52e290542de35d81a7a0b8a036ea2724acbb5e6d22af10939ec12862ef87be46ecc473bcd83a7439f486bc5eb9b5aac
-  data.tar.gz: 494f981d6621a9f8b0fe25e9bb759e41b8ad0a3c35039ee907ce84ead9630f34f1c24e9fb3369b58756717854e1454ca9044665f1635e03096b605ade0e6e7ad
+  metadata.gz: de6f1e3e923441b4be9a73c4c9a93509d75a546c7a8b0a9e0681b161fa72332f859d498aa46fee36c60ebdc01c651dca10a89f93d4c3fe198a00eb73f7865d54
+  data.tar.gz: 87375e7a062284f4713accc6e8b9ad245f9d0c66184d614789cef89b9a0e20b6ed1272b9cd8ad7e25f7d118e1100ba4d71f0c69aadead4e4e5b859fc330f84ed

data/CHANGES.md

@@ -1,3 +1,11 @@
+## 1.7.6 - 24-Mar-2021
+* Changed the implementation for `Admin.get_login` on Linux since the
+  underlying `getlogin` C function is unreliable, especially in certain
+  virtualized environments.
+* Added win32-security back to the gemspec as a dependency for Windows.
+  I'm not sure why I removed it, and bundler definitely needs it.
+* Fixed some private access modifiers that weren't actually doing anything.
+
 ## 1.7.5 - 30-Dec-2020
 * Switched from rdoc to markdown since github isn't rendering rdoc properly.
 

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org' do
+  gemspec
+end

data/MANIFEST.md

@@ -1,9 +1,10 @@
 * sys-admin.gemspec
-* CHANGES.rdoc
+* CHANGES.md
 * LICENSE
-* MANIFEST.rdoc
+* MANIFEST.md
+* README.md
+* Gemfile
 * Rakefile
-* README.rdoc
 * certs/djberg96_pub.pem
 * examples/groups.rb
 * examples/users.rb

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rbconfig'
 
-CLEAN.include("**/*.gem", "**/*.rbx", "**/*.rbc", "ruby.core")
+CLEAN.include("**/*.gem", "**/*.rbx", "**/*.rbc", "ruby.core", "**/*.lock")
 
 namespace :gem do
   desc "Create the sys-uname gem"
@@ -11,7 +11,7 @@ namespace :gem do
     require 'rubygems/package'
     spec = eval(IO.read('sys-admin.gemspec'))
     spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
-    Gem::Package.build(spec, true)
+    Gem::Package.build(spec)
   end
 
   desc "Install the sys-uname gem"

data/lib/bsd/sys/admin.rb

@@ -6,10 +6,9 @@ require 'rbconfig'
 
 module Sys
   class Admin
-    private
-
     # :no-doc:
     BUF_MAX = 65536 # Max buffer for retry
+    private_constant :BUF_MAX
 
     # I'm making some aliases here to prevent potential conflicts
     attach_function :open_c, :open, [:string, :int], :int
@@ -22,8 +21,7 @@ module Sys
     attach_function :getgrnam_r, [:string, :pointer, :pointer, :size_t, :pointer], :int
     attach_function :getgrgid_r, [:long, :pointer, :pointer, :size_t, :pointer], :int
 
-    private_class_method :getlogin_r, :getpwnam_r, :getpwuid_r, :getgrnam_r
-    private_class_method :getgrgid_r
+    private_class_method :getlogin_r, :getpwnam_r, :getpwuid_r, :getgrnam_r, :getgrgid_r
     private_class_method :open_c, :pread_c, :close_c
 
     # struct passwd from /usr/include/pwd.h
@@ -48,6 +46,8 @@ module Sys
       layout(*fields)
     end
 
+    private_constant :PasswdStruct
+
     # struct group from /usr/include/grp.h
     class GroupStruct < FFI::Struct
       layout(
@@ -58,6 +58,8 @@ module Sys
       )
     end
 
+    private_constant :GroupStruct
+
     # I'm blending the timeval struct in directly here
     class LastlogStruct < FFI::Struct
       layout(
@@ -67,7 +69,7 @@ module Sys
       )
     end
 
-    public
+    private_constant :LastlogStruct
 
     # Returns the login for the current process.
     #
@@ -192,8 +194,6 @@ module Sys
       groups
     end
 
-    private
-
     # Takes a GroupStruct and converts it to a Group object.
     def self.get_group_from_struct(grp)
       Group.new do |g|
@@ -204,6 +204,8 @@ module Sys
       end
     end
 
+    private_class_method :get_group_from_struct
+
     # Takes a UserStruct and converts it to a User object.
     def self.get_user_from_struct(pwd)
       user = User.new do |u|
@@ -230,6 +232,8 @@ module Sys
       user
     end
 
+    private_class_method :get_user_from_struct
+
     # Get lastlog information for the given user.
     def self.get_lastlog_info(uid)
       logfile = '/var/log/lastlog'
@@ -252,5 +256,7 @@ module Sys
 
       lastlog
     end
+
+    private_class_method :get_lastlog_info
   end
 end

data/lib/darwin/sys/admin.rb

@@ -5,10 +5,9 @@ require 'sys/admin/common'
 
 module Sys
   class Admin
-    private
-
     # :no-doc:
     BUF_MAX = 65536 # Max buf size for retry.
+    private_constant :BUF_MAX
 
     attach_function :getlogin_r, [:pointer, :int], :int
     attach_function :getpwnam_r, [:string, :pointer, :pointer, :size_t, :pointer], :int
@@ -17,8 +16,8 @@ module Sys
     attach_function :getgrgid_r, [:long, :pointer, :pointer, :size_t, :pointer], :int
     attach_function :getlastlogx, [:long, :pointer], :pointer
 
-    private_class_method :getlogin_r, :getpwnam_r, :getpwuid_r, :getgrnam_r
-    private_class_method :getgrgid_r, :getlastlogx
+    private_class_method :getlogin_r, :getpwnam_r, :getpwuid_r
+    private_class_method :getgrnam_r, :getgrgid_r, :getlastlogx
 
     # struct passwd from /usr/include/pwd.h
     class PasswdStruct < FFI::Struct
@@ -36,6 +35,8 @@ module Sys
       )
     end
 
+    private_constant :PasswdStruct
+
     # struct group from /usr/include/grp.h
     class GroupStruct < FFI::Struct
       layout(
@@ -46,6 +47,8 @@ module Sys
       )
     end
 
+    private_constant :GroupStruct
+
     # I'm blending the timeval struct in directly here
     class LastlogxStruct < FFI::Struct
       layout(
@@ -56,7 +59,7 @@ module Sys
       )
     end
 
-    public
+    private_constant :LastlogxStruct
 
     # Returns the login for the current process.
     #
@@ -185,8 +188,6 @@ module Sys
       groups
     end
 
-    private
-
     # Takes a GroupStruct and converts it to a Group object.
     def self.get_group_from_struct(grp)
       Group.new do |g|
@@ -197,6 +198,8 @@ module Sys
       end
     end
 
+    private_class_method :get_group_from_struct
+
     # Takes a UserStruct and converts it to a User object.
     def self.get_user_from_struct(pwd)
       user = User.new do |u|
@@ -223,6 +226,8 @@ module Sys
       user
     end
 
+    private_class_method :get_user_from_struct
+
     # Gets lastlog information for the given user.
     def self.get_lastlog_info(uid)
       lastlog = LastlogxStruct.new
@@ -233,5 +238,7 @@ module Sys
 
       ptr.null? ? nil : lastlog
     end
+
+    private_class_method :get_lastlog_info
   end
 end

data/lib/linux/sys/admin.rb

@@ -5,10 +5,9 @@ require 'sys/admin/common'
 
 module Sys
   class Admin
-    private
-
     # :no-doc:
     BUF_MAX = 65536 # Absolute max buffer size for retry attempts.
+    private_constant :BUF_MAX
 
     # I'm making some aliases here to prevent potential conflicts
     attach_function :open_c, :open, [:string, :int], :int
@@ -40,6 +39,8 @@ module Sys
       )
     end
 
+    private_constant :PasswdStruct
+
     # struct group from /usr/include/grp.h
     class GroupStruct < FFI::Struct
       layout(
@@ -50,6 +51,8 @@ module Sys
       )
     end
 
+    private_constant :GroupStruct
+
     # I'm blending the timeval struct in directly here
     class LastlogStruct < FFI::Struct
       layout(
@@ -59,18 +62,12 @@ module Sys
       )
     end
 
-    public
+    private_constant :LastlogStruct
 
     # Returns the login for the current process.
     #
     def self.get_login
-      buf = FFI::MemoryPointer.new(:char, 256)
-
-      if getlogin_r(buf, buf.size) != 0
-        raise Error, "getlogin_r function failed: " + strerror(FFI.errno)
-      end
-
-      buf.read_string
+      get_user(geteuid()).name
     end
 
     # Returns a User object for the given name or uid. Raises an error
@@ -204,8 +201,6 @@ module Sys
       groups
     end
 
-    private
-
     # Takes a GroupStruct and converts it to a Group object.
     def self.get_group_from_struct(grp)
       Group.new do |g|
@@ -216,6 +211,8 @@ module Sys
       end
     end
 
+    private_class_method :get_group_from_struct
+
     # Takes a UserStruct and converts it to a User object.
     def self.get_user_from_struct(pwd)
       user = User.new do |u|
@@ -242,6 +239,8 @@ module Sys
       user
     end
 
+    private_class_method :get_user_from_struct
+
     # Note: it seems that Linux, or at least Ubuntu, does not track logins
     # via GDM (Gnome Display Manager) for some reason, so this may not return
     # anything useful.
@@ -269,5 +268,7 @@ module Sys
 
       lastlog
     end
+
+    private_class_method :get_lastlog_info
   end
 end

data/lib/sunos/sys/admin.rb

@@ -5,10 +5,9 @@ require 'sys/admin/common'
 
 module Sys
   class Admin
-    private
-
     # :no-doc:
     BUF_MAX = 65536 # Max buffer size for retry.
+    private_constant :BUF_MAX
 
     # I'm making some aliases here to prevent potential conflicts
     attach_function :open_c, :open, [:string, :int], :int
@@ -42,6 +41,8 @@ module Sys
       )
     end
 
+    private_constant :PasswdStruct
+
     # struct group from /usr/include/grp.h
     class GroupStruct < FFI::Struct
       layout(
@@ -52,6 +53,8 @@ module Sys
       )
     end
 
+    private_constant :GroupStruct
+
     # I'm blending the timeval struct in directly here
     class LastlogStruct < FFI::Struct
       layout(
@@ -61,7 +64,7 @@ module Sys
       )
     end
 
-    public
+    private_constant :LastlogStruct
 
     # Returns the login for the current process.
     #
@@ -194,8 +197,6 @@ module Sys
       groups
     end
 
-    private
-
     # Takes a GroupStruct and converts it to a Group object.
     def self.get_group_from_struct(grp)
       Group.new do |g|
@@ -206,6 +207,8 @@ module Sys
       end
     end
 
+    private_class_method :get_group_from_struct
+
     # Takes a UserStruct and converts it to a User object.
     def self.get_user_from_struct(pwd)
       user = User.new do |u|
@@ -232,6 +235,8 @@ module Sys
       user
     end
 
+    private_class_method :get_use_from_struct
+
     # The use of pread was necessary here because it's a sparse file. Note
     # also that while Solaris supports the getuserattr function, it doesn't
     # appear to store anything regarding login information.
@@ -257,5 +262,7 @@ module Sys
 
       lastlog
     end
+
+    private_class_method :get_lastlog_info
   end
 end

data/lib/sys/admin.rb

@@ -1,7 +1,7 @@
 module Sys
   class Admin
     # The version of the sys-admin library.
-    VERSION = '1.7.5'.freeze
+    VERSION = '1.7.6'.freeze
   end
 end
 

data/lib/sys/admin/common.rb

@@ -9,12 +9,11 @@ module Sys
     extend FFI::Library
     ffi_lib FFI::Library::LIBC
 
-    private
-
     attach_function :strerror, [:int], :string
 
     attach_function :getlogin, [], :string
     attach_function :getuid, [], :long
+    attach_function :geteuid, [], :long
     attach_function :getpwnam, [:string], :pointer
     attach_function :getpwuid, [:long], :pointer
     attach_function :getpwent, [], :pointer
@@ -27,12 +26,10 @@ module Sys
     attach_function :endgrent, [], :void
     attach_function :setgrent, [], :void
 
-    private_class_method :getlogin, :getuid, :getpwnam, :getpwuid, :getpwent
-    private_class_method :setpwent, :endpwent, :getgrgid, :getgrnam
+    private_class_method :getlogin, :getuid, :geteuid, :getpwnam, :getpwuid
+    private_class_method :getpwent, :setpwent, :endpwent, :getgrgid, :getgrnam
     private_class_method :getgrent, :endgrent, :setgrent, :strerror
 
-    public
-
     # Error typically raised if any of the Sys::Admin methods fail.
     class Error < StandardError; end
 

data/lib/unix/sys/admin.rb

@@ -5,8 +5,6 @@ require 'sys/admin/common'
 
 module Sys
   class Admin
-    private
-
     class PasswdStruct < FFI::Struct
       layout(
         :pw_name,   :string,
@@ -19,6 +17,8 @@ module Sys
       )
     end
 
+    private_constant :PasswdStruct
+
     class GroupStruct < FFI::Struct
       layout(
         :gr_name,   :string,
@@ -28,7 +28,7 @@ module Sys
       )
     end
 
-    public
+    private_constant :GroupStruct
 
     # Returns the login for the current process.
     #
@@ -133,8 +133,6 @@ module Sys
       groups
     end
 
-    private
-
     # Takes a GroupStruct and converts it to a Group object.
     def self.get_group_from_struct(grp)
       Group.new do |g|
@@ -145,6 +143,8 @@ module Sys
       end
     end
 
+    private_class_method :get_group_from_struct
+
     # Takes a UserStruct and converts it to a User object.
     def self.get_user_from_struct(pwd)
       user = User.new do |u|
@@ -159,5 +159,7 @@ module Sys
 
       user
     end
+
+    private_class_method :get_user_from_struct
   end
 end

data/lib/windows/sys/admin.rb

@@ -97,8 +97,6 @@ module Sys
               @sid_type = "unknown"
         end
       end
-
-      @sid_type
     end
   end
 
@@ -314,9 +312,8 @@ module Sys
     SidTypeUnknown        = 8
     SidTypeComputer       = 9
 
-    private
-
     HKEY = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\"
+    private_constant :HKEY
 
     # Retrieves the user's home directory. For local accounts query the
     # registry. For domain accounts use ADSI and use the HomeDirectory.
@@ -343,6 +340,8 @@ module Sys
       dir
     end
 
+    private_class_method :get_home_dir
+
     # A private method that lower cases all keys, and converts them
     # all to symbols.
     #
@@ -357,6 +356,8 @@ module Sys
       rhash
     end
 
+    private_class_method :munge_options
+
     # An internal, private method for getting a list of groups for
     # a particular user. The first member is a list of group names,
     # the second member is the primary group ID.
@@ -368,6 +369,8 @@ module Sys
       [array, adsi.PrimaryGroupId]
     end
 
+    private_class_method :get_groups
+
     # An internal, private method for getting a list of members for
     # any particular group.
     #
@@ -378,13 +381,13 @@ module Sys
       array
     end
 
+    private_class_method :get_members
+
     # Used by the get_login method
     ffi_lib :advapi32
     attach_function :GetUserNameW, [:pointer, :pointer], :bool
     private_class_method :GetUserNameW
 
-    public
-
     # Creates the given +user+. If no domain option is specified,
     # then it defaults to your local host, i.e. a local account is
     # created.

data/sys-admin.gemspec

@@ -3,7 +3,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-admin'
-  spec.version    = '1.7.5'
+  spec.version    = '1.7.6'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.cert_chain = ['certs/djberg96_pub.pem']
 
   spec.add_dependency('ffi', '~> 1.1')
+  spec.add_dependency('win32-security', '~> 0.5') if Gem.win_platform?
 
   spec.add_development_dependency('test-unit', '>= 2.5.0')
   spec.add_development_dependency('rake')

data/test/test_sys_admin.rb

@@ -14,7 +14,7 @@ end
 
 class TC_Sys_Admin_All < Test::Unit::TestCase
   test "version is set to expected value" do
-    assert_equal('1.7.5', Sys::Admin::VERSION)
+    assert_equal('1.7.6', Sys::Admin::VERSION)
   end
 
   test "version constant is frozen" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys-admin
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date:
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -90,49 +90,31 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGES.md
+- Gemfile
 - LICENSE
-- test
-- test/test_sys_admin_windows.rb
-- test/test_sys_admin.rb
-- test/test_sys_admin_unix.rb
+- MANIFEST.md
 - README.md
 - Rakefile
-- MANIFEST.md
-- certs
 - certs/djberg96_pub.pem
-- examples
-- examples/example_users.rb
+- doc/sys-admin-unix.txt
+- doc/sys-admin-windows.txt
 - examples/example_groups.rb
-- lib
-- lib/sunos
-- lib/sunos/sys
-- lib/sunos/sys/admin.rb
-- lib/bsd
-- lib/bsd/sys
+- examples/example_users.rb
 - lib/bsd/sys/admin.rb
+- lib/darwin/sys/admin.rb
+- lib/linux/sys/admin.rb
+- lib/sunos/sys/admin.rb
 - lib/sys-admin.rb
-- lib/unix
-- lib/unix/sys
-- lib/unix/sys/admin.rb
-- lib/sys
-- lib/sys/admin
+- lib/sys/admin.rb
 - lib/sys/admin/common.rb
 - lib/sys/admin/custom.rb
-- lib/sys/admin.rb
-- lib/linux
-- lib/linux/sys
-- lib/linux/sys/admin.rb
-- lib/darwin
-- lib/darwin/sys
-- lib/darwin/sys/admin.rb
-- lib/windows
-- lib/windows/sys
+- lib/unix/sys/admin.rb
 - lib/windows/sys/admin.rb
-- CHANGES.md
-- doc
-- doc/sys-admin-windows.txt
-- doc/sys-admin-unix.txt
 - sys-admin.gemspec
+- test/test_sys_admin.rb
+- test/test_sys_admin_unix.rb
+- test/test_sys_admin_windows.rb
 homepage: http://www.github.com/djberg96/sys-admin
 licenses:
 - Apache-2.0
@@ -158,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A unified, cross platform replacement for the "etc" library.