sys-admin 1.7.6 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d87741306e11fa28da2582a0c3bd0ba994cbeaea92744afa894bc07e996b975
-  data.tar.gz: 2c2d445e5b58d5298741bb33e1ffdaa12b509e092ea8d5ee1c7139ff6afa84b6
+  metadata.gz: 72d00ed279d1871b324cf2819ba90432093b8063a30e0bbdc9fa66111b588538
+  data.tar.gz: 31bc4f2515a391ba43c1bc9ce0b3bdeffacd6d758b7e98a29a111ced2ab14e85
 SHA512:
-  metadata.gz: de6f1e3e923441b4be9a73c4c9a93509d75a546c7a8b0a9e0681b161fa72332f859d498aa46fee36c60ebdc01c651dca10a89f93d4c3fe198a00eb73f7865d54
-  data.tar.gz: 87375e7a062284f4713accc6e8b9ad245f9d0c66184d614789cef89b9a0e20b6ed1272b9cd8ad7e25f7d118e1100ba4d71f0c69aadead4e4e5b859fc330f84ed
+  metadata.gz: 36c4dc086a9929e998695ed02ce9cb89b5bd487cc4cb42aacccc26aab8a3fa3f62fde29a2bbb0792fd6657278fbe874e3366e3dc08a29c2ebc99e087bb1ea939
+  data.tar.gz: 3f9c593cd1b2008966524683d511c1c5e7e6ada91298516adc46afe948dd39cad7da069b426f268376493e6eb28934f020d55be60c73fca2bb756cf885d1e245

data/CHANGES.md

@@ -1,3 +1,11 @@
+## 1.8.0 - 26-Aug-2021
+* Switched from test-unit to rspec, with some tests refactored. The Rakefile
+  and gemspec files were updated accordingly.
+* The User and Group classes for the Windows implementation are now properly
+  scoped under Sys::Admin instead of just Sys.
+* Fixed a bug in the get_user and get_group methods on Winodws where the WQL
+  it generates internally might not be correct.
+
 ## 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

data/Gemfile

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

data/README.md

@@ -4,6 +4,9 @@ The sys-admin library is a unified, cross platform replacement for the Etc modul
 ## Installation
 `gem install sys-admin`
 
+## Adding the trusted cert
+`gem cert --add <(curl -Ls https://raw.githubusercontent.com/djberg96/sys-admin/main/certs/djberg96_pub.pem)`
+
 ## Synopsis
 ```ruby
 require 'sys/admin' # or sys-admin

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/clean'
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 require 'rbconfig'
 
 CLEAN.include("**/*.gem", "**/*.rbx", "**/*.rbc", "ruby.core", "**/*.lock")
@@ -9,7 +9,7 @@ namespace :gem do
   desc "Create the sys-uname gem"
   task :create => [:clean] do
     require 'rubygems/package'
-    spec = eval(IO.read('sys-admin.gemspec'))
+    spec = Gem::Specification.load('sys-admin.gemspec')
     spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
     Gem::Package.build(spec)
   end
@@ -21,27 +21,24 @@ namespace :gem do
   end
 end
 
-Rake::TestTask.new('test') do |t|
+desc "Run the specs for the sys-admin library"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/sys_admin_unix_spec.rb'
   case RbConfig::CONFIG['host_os']
   when /darwin|osx/i
-    t.libs << 'lib/darwin'
+    t.rspec_opts = '-Ilib/darwin'
   when /linux/i
-    t.libs << 'lib/linux'
+    t.rspec_opts = '-Ilib/linux'
   when /sunos|solaris/i
-    t.libs << 'lib/sunos'
+    t.rspec_opts = '-Ilib/sunos'
   when /bsd/i
-    t.libs << 'lib/bsd'
+    t.rspec_opts = '-Ilib/bsd'
   when /windows|win32|mingw|cygwin|dos/i
-    t.libs << 'lib/windows'
+    t.rspec_opts = '-Ilib/windows'
+    t.pattern = 'spec/sys_admin_windows_spec.rb'
   else
-    t.libs << 'lib/unix'
+    t.rspec_opts = '-Ilib/unix'
   end
-
-  t.warning = true
-  t.verbose = true
-
-  t.libs << 'test'
-  t.test_files = FileList['test/test_sys_admin.rb']
 end
 
-task :default => :test
+task :default => :spec

data/lib/linux/sys/admin.rb

@@ -14,7 +14,6 @@ module Sys
     attach_function :pread_c, :pread, [:int, :pointer, :size_t, :off_t], :size_t
     attach_function :close_c, :close, [:int], :int
 
-    attach_function :getlogin_r, [:pointer, :size_t], :int
     attach_function :getpwnam_r, [:string, :pointer, :pointer, :size_t, :pointer], :int
     attach_function :getpwuid_r, [:long, :pointer, :pointer, :size_t, :pointer], :int
     attach_function :getpwent_r, [:pointer, :pointer, :size_t, :pointer], :int
@@ -22,7 +21,6 @@ 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, :getpwent_r
     private_class_method :getgrent_r, :getgrnam_r, :getgrgid_r
     private_class_method :open_c, :pread_c, :close_c
 

data/lib/sys/admin.rb

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

data/lib/windows/sys/admin.rb

@@ -5,295 +5,6 @@ require 'win32/registry'
 require 'socket'
 
 module Sys
-  class Group
-    # Short description of the object.
-    attr_accessor :caption
-
-    # Description of the group.
-    attr_accessor :description
-
-    # Name of the Windows domain to which the group account belongs.
-    attr_accessor :domain
-
-    # Date the group was added.
-    attr_accessor :install_date
-
-    # Name of the Windows group account on the Group#domain specified.
-    attr_accessor :name
-
-    # Security identifier for this group.
-    attr_accessor :sid
-
-    # Current status for the group, such as "ok", "error", etc.
-    attr_accessor :status
-
-    # The group ID.
-    attr_accessor :gid
-
-    # Sets whether or not the group is local (as opposed to global).
-    attr_writer :local
-
-    # An array of members for that group. May contain SID's.
-    attr_accessor :members
-
-    # Creates and returns a new Group object.  This class encapsulates
-    # the information for a group account, whether it be global or local.
-    #
-    # Yields +self+ if a block is given.
-    #
-    def initialize
-      yield self if block_given?
-    end
-
-    # Returns whether or not the group is a local group.
-    #
-    def local?
-       @local
-    end
-
-    # Returns the type of SID (Security Identifier) as a stringified value.
-    #
-    def sid_type
-       @sid_type
-    end
-
-    # Sets the SID (Security Identifier) type to +stype+, which can be
-    # one of the following constant values:
-    #
-    # * Admin::SidTypeUser
-    # * Admin::SidTypeGroup
-    # * Admin::SidTypeDomain
-    # * Admin::SidTypeAlias
-    # * Admin::SidTypeWellKnownGroup
-    # * Admin::SidTypeDeletedAccount
-    # * Admin::SidTypeInvalid
-    # * Admin::SidTypeUnknown
-    # * Admin::SidTypeComputer
-    #
-    def sid_type=(stype)
-      if stype.kind_of?(String)
-        @sid_type = stype.downcase
-      else
-        case stype
-           when Admin::SidTypeUser
-              @sid_type = "user"
-           when Admin::SidTypeGroup
-              @sid_type = "group"
-           when Admin::SidTypeDomain
-              @sid_type = "domain"
-           when Admin::SidTypeAlias
-              @sid_type = "alias"
-           when Admin::SidTypeWellKnownGroup
-              @sid_type = "well_known_group"
-           when Admin::SidTypeDeletedAccount
-              @sid_type = "deleted_account"
-           when Admin::SidTypeInvalid
-              @sid_type = "invalid"
-           when Admin::SidTypeUnknown
-              @sid_type = "unknown"
-           when Admin::SidTypeComputer
-              @sid_type = "computer"
-           else
-              @sid_type = "unknown"
-        end
-      end
-    end
-  end
-
-  class User
-    # An account for users whose primary account is in another domain.
-    TEMP_DUPLICATE = 0x0100
-
-    # Default account type that represents a typical user.
-    NORMAL = 0x0200
-
-    # A permit to trust account for a domain that trusts other domains.
-    INTERDOMAIN_TRUST = 0x0800
-
-    # An account for a Windows NT/2000 workstation or server that is a
-    # member of this domain.
-    WORKSTATION_TRUST = 0x1000
-
-    # A computer account for a backup domain controller that is a member
-    # of this domain.
-    SERVER_TRUST = 0x2000
-
-    # Domain and username of the account.
-    attr_accessor :caption
-
-    # Description of the account.
-    attr_accessor :description
-
-    # Name of the Windows domain to which a user account belongs.
-    attr_accessor :domain
-
-    # The user's password.
-    attr_accessor :password
-
-    # Full name of a local user.
-    attr_accessor :full_name
-
-    # An array of groups to which the user belongs.
-    attr_accessor :groups
-
-    # Date the user account was created.
-    attr_accessor :install_date
-
-    # Name of the Windows user account on the domain that the User#domain
-    # property specifies.
-    attr_accessor :name
-
-    # The user's security identifier.
-    attr_accessor :sid
-
-    # Current status for the user, such as "ok", "error", etc.
-    attr_accessor :status
-
-    # The user's id (RID).
-    attr_accessor :uid
-
-    # The user's primary group ID.
-    attr_accessor :gid
-
-    # The user's home directory
-    attr_accessor :dir
-
-    # Used to set whether or not the account is disabled.
-    attr_writer :disabled
-
-    # Sets whether or not the account is defined on the local computer.
-    attr_writer :local
-
-    # Sets whether or not the account is locked out of the OS.
-    attr_writer :lockout
-
-    # Sets whether or not the password for the account can be changed.
-    attr_writer :password_changeable
-
-    # Sets whether or not the password for the account expires.
-    attr_writer :password_expires
-
-    # Sets whether or not a password is required for the account.
-    attr_writer :password_required
-
-    # Returns the account type as a human readable string.
-    attr_reader :account_type
-
-    # Creates an returns a new User object.  A User object encapsulates a
-    # user account on the operating system.
-    #
-    # Yields +self+ if a block is provided.
-    #
-    def initialize
-      yield self if block_given?
-    end
-
-    # Sets the account type for the account.  Possible values are:
-    #
-    # * User::TEMP_DUPLICATE
-    # * User::NORMAL
-    # * User::INTERDOMAIN_TRUST
-    # * User::WORKSTATION_TRUST
-    # * User::SERVER_TRUST
-    #
-    def account_type=(type)
-      case type
-        when TEMP_DUPLICATE
-          @account_type = 'duplicate'
-        when NORMAL
-          @account_type = 'normal'
-        when INTERDOMAIN_TRUST
-          @account_type = 'interdomain_trust'
-        when WORKSTATION_TRUST
-          @account_type = 'workstation_trust'
-        when SERVER_TRUST
-          @account_type = 'server_trust'
-        else
-          @account_type = 'unknown'
-      end
-    end
-
-    # Returns the SID type as a human readable string.
-    #
-    def sid_type
-      @sid_type
-    end
-
-    # Sets the SID (Security Identifier) type to +stype+, which can be
-    # one of the following constant values:
-    #
-    # * Admin::SidTypeUser
-    # * Admin::SidTypeGroup
-    # * Admin::SidTypeDomain
-    # * Admin::SidTypeAlias
-    # * Admin::SidTypeWellKnownGroup
-    # * Admin::SidTypeDeletedAccount
-    # * Admin::SidTypeInvalid
-    # * Admin::SidTypeUnknown
-    # * Admin::SidTypeComputer
-    #
-    def sid_type=(stype)
-      case stype
-        when Admin::SidTypeUser
-          @sid_type = 'user'
-        when Admin::SidTypeGroup
-          @sid_type = 'group'
-        when Admin::SidTypeDomain
-          @sid_type = 'domain'
-        when Admin::SidTypeAlias
-          @sid_type = 'alias'
-        when Admin::SidTypeWellKnownGroup
-          @sid_type = 'well_known_group'
-        when Admin::SidTypeDeletedAccount
-          @sid_type = 'deleted_account'
-        when Admin::SidTypeInvalid
-          @sid_type = 'invalid'
-        when Admin::SidTypeUnknown
-          @sid_type = 'unknown'
-        when Admin::SidTypeComputer
-          @sid_type = 'computer'
-        else
-          @sid_type = 'unknown'
-      end
-    end
-
-    # Returns whether or not the account is disabled.
-    #
-    def disabled?
-      @disabled
-    end
-
-    # Returns whether or not the account is local.
-    #
-    def local?
-      @local
-    end
-
-    # Returns whether or not the account is locked out.
-    #
-    def lockout?
-      @lockout
-    end
-
-    # Returns whether or not the password for the account is changeable.
-    #
-    def password_changeable?
-      @password_changeable
-    end
-
-    # Returns whether or not the password for the account is changeable.
-    #
-    def password_expires?
-      @password_expires
-    end
-
-    # Returns whether or not the a password is required for the account.
-    #
-    def password_required?
-      @password_required
-    end
-  end
-
   class Admin
     extend FFI::Library
 
@@ -708,10 +419,18 @@ module Sys
         end
       }
 
-      if usr.kind_of?(Integer)
-        query << " and sid like '%-#{usr}'"
+      if usr.kind_of?(Numeric)
+        if i == 0
+          query << " where sid like '%-#{usr}'"
+        else
+          query << " and sid like '%-#{usr}'"
+        end
       else
-        query << " and name = '#{usr}'"
+        if i == 0
+          query << " where name = '#{usr}'"
+        else
+          query << " and name = '#{usr}'"
+        end
       end
 
       domain = options[:domain] || host
@@ -721,7 +440,7 @@ module Sys
 
         # Because our 'like' query isn't fulproof, let's parse
         # the SID again to make sure
-        if usr.kind_of?(Integer)
+        if usr.kind_of?(Numeric)
           next if usr != uid
         end
 
@@ -890,9 +609,17 @@ module Sys
       }
 
       if grp.kind_of?(Integer)
-        query << " and sid like '%-#{grp}'"
+        if i == 0
+          query << " where sid like '%-#{grp}'"
+        else
+          query << " and sid like '%-#{grp}'"
+        end
       else
-        query << " and name = '#{grp}'"
+        if i == 0
+          query << " where name = '#{grp}'"
+        else
+          query << " and name = '#{grp}'"
+        end
       end
 
       domain = options[:domain] || host
@@ -996,5 +723,296 @@ module Sys
 
       array
     end
+
+    class User
+      # An account for users whose primary account is in another domain.
+      TEMP_DUPLICATE = 0x0100
+
+      # Default account type that represents a typical user.
+      NORMAL = 0x0200
+
+      # A permit to trust account for a domain that trusts other domains.
+      INTERDOMAIN_TRUST = 0x0800
+
+      # An account for a Windows NT/2000 workstation or server that is a
+      # member of this domain.
+      WORKSTATION_TRUST = 0x1000
+
+      # A computer account for a backup domain controller that is a member
+      # of this domain.
+      SERVER_TRUST = 0x2000
+
+      # Domain and username of the account.
+      attr_accessor :caption
+
+      # Description of the account.
+      attr_accessor :description
+
+      # Name of the Windows domain to which a user account belongs.
+      attr_accessor :domain
+
+      # The user's password.
+      attr_accessor :password
+
+      # Full name of a local user.
+      attr_accessor :full_name
+
+      # An array of groups to which the user belongs.
+      attr_accessor :groups
+
+      # Date the user account was created.
+      attr_accessor :install_date
+
+      # Name of the Windows user account on the domain that the User#domain
+      # property specifies.
+      attr_accessor :name
+
+      # The user's security identifier.
+      attr_accessor :sid
+
+      # Current status for the user, such as "ok", "error", etc.
+      attr_accessor :status
+
+      # The user's id (RID).
+      attr_accessor :uid
+
+      # The user's primary group ID.
+      attr_accessor :gid
+
+      # The user's home directory
+      attr_accessor :dir
+
+      # Used to set whether or not the account is disabled.
+      attr_writer :disabled
+
+      # Sets whether or not the account is defined on the local computer.
+      attr_writer :local
+
+      # Sets whether or not the account is locked out of the OS.
+      attr_writer :lockout
+
+      # Sets whether or not the password for the account can be changed.
+      attr_writer :password_changeable
+
+      # Sets whether or not the password for the account expires.
+      attr_writer :password_expires
+
+      # Sets whether or not a password is required for the account.
+      attr_writer :password_required
+
+      # Returns the account type as a human readable string.
+      attr_reader :account_type
+
+      # Creates an returns a new User object.  A User object encapsulates a
+      # user account on the operating system.
+      #
+      # Yields +self+ if a block is provided.
+      #
+      def initialize
+        yield self if block_given?
+      end
+
+      # Sets the account type for the account.  Possible values are:
+      #
+      # * User::TEMP_DUPLICATE
+      # * User::NORMAL
+      # * User::INTERDOMAIN_TRUST
+      # * User::WORKSTATION_TRUST
+      # * User::SERVER_TRUST
+      #
+      def account_type=(type)
+        case type
+          when TEMP_DUPLICATE
+            @account_type = 'duplicate'
+          when NORMAL
+            @account_type = 'normal'
+          when INTERDOMAIN_TRUST
+            @account_type = 'interdomain_trust'
+          when WORKSTATION_TRUST
+            @account_type = 'workstation_trust'
+          when SERVER_TRUST
+            @account_type = 'server_trust'
+          else
+            @account_type = 'unknown'
+        end
+      end
+
+      # Returns the SID type as a human readable string.
+      #
+      def sid_type
+        @sid_type
+      end
+
+      # Sets the SID (Security Identifier) type to +stype+, which can be
+      # one of the following constant values:
+      #
+      # * Admin::SidTypeUser
+      # * Admin::SidTypeGroup
+      # * Admin::SidTypeDomain
+      # * Admin::SidTypeAlias
+      # * Admin::SidTypeWellKnownGroup
+      # * Admin::SidTypeDeletedAccount
+      # * Admin::SidTypeInvalid
+      # * Admin::SidTypeUnknown
+      # * Admin::SidTypeComputer
+      #
+      def sid_type=(stype)
+        case stype
+          when Admin::SidTypeUser
+            @sid_type = 'user'
+          when Admin::SidTypeGroup
+            @sid_type = 'group'
+          when Admin::SidTypeDomain
+            @sid_type = 'domain'
+          when Admin::SidTypeAlias
+            @sid_type = 'alias'
+          when Admin::SidTypeWellKnownGroup
+            @sid_type = 'well_known_group'
+          when Admin::SidTypeDeletedAccount
+            @sid_type = 'deleted_account'
+          when Admin::SidTypeInvalid
+            @sid_type = 'invalid'
+          when Admin::SidTypeUnknown
+            @sid_type = 'unknown'
+          when Admin::SidTypeComputer
+            @sid_type = 'computer'
+          else
+            @sid_type = 'unknown'
+        end
+      end
+
+      # Returns whether or not the account is disabled.
+      #
+      def disabled?
+        @disabled
+      end
+
+      # Returns whether or not the account is local.
+      #
+      def local?
+        @local
+      end
+
+      # Returns whether or not the account is locked out.
+      #
+      def lockout?
+        @lockout
+      end
+
+      # Returns whether or not the password for the account is changeable.
+      #
+      def password_changeable?
+        @password_changeable
+      end
+
+      # Returns whether or not the password for the account is changeable.
+      #
+      def password_expires?
+        @password_expires
+      end
+
+      # Returns whether or not the a password is required for the account.
+      #
+      def password_required?
+        @password_required
+      end
+    end
+
+    class Group
+      # Short description of the object.
+      attr_accessor :caption
+
+      # Description of the group.
+      attr_accessor :description
+
+      # Name of the Windows domain to which the group account belongs.
+      attr_accessor :domain
+
+      # Date the group was added.
+      attr_accessor :install_date
+
+      # Name of the Windows group account on the Group#domain specified.
+      attr_accessor :name
+
+      # Security identifier for this group.
+      attr_accessor :sid
+
+      # Current status for the group, such as "ok", "error", etc.
+      attr_accessor :status
+
+      # The group ID.
+      attr_accessor :gid
+
+      # Sets whether or not the group is local (as opposed to global).
+      attr_writer :local
+
+      # An array of members for that group. May contain SID's.
+      attr_accessor :members
+
+      # Creates and returns a new Group object.  This class encapsulates
+      # the information for a group account, whether it be global or local.
+      #
+      # Yields +self+ if a block is given.
+      #
+      def initialize
+        yield self if block_given?
+      end
+
+      # Returns whether or not the group is a local group.
+      #
+      def local?
+         @local
+      end
+
+      # Returns the type of SID (Security Identifier) as a stringified value.
+      #
+      def sid_type
+         @sid_type
+      end
+
+      # Sets the SID (Security Identifier) type to +stype+, which can be
+      # one of the following constant values:
+      #
+      # * Admin::SidTypeUser
+      # * Admin::SidTypeGroup
+      # * Admin::SidTypeDomain
+      # * Admin::SidTypeAlias
+      # * Admin::SidTypeWellKnownGroup
+      # * Admin::SidTypeDeletedAccount
+      # * Admin::SidTypeInvalid
+      # * Admin::SidTypeUnknown
+      # * Admin::SidTypeComputer
+      #
+      def sid_type=(stype)
+        if stype.kind_of?(String)
+          @sid_type = stype.downcase
+        else
+          case stype
+             when Admin::SidTypeUser
+                @sid_type = "user"
+             when Admin::SidTypeGroup
+                @sid_type = "group"
+             when Admin::SidTypeDomain
+                @sid_type = "domain"
+             when Admin::SidTypeAlias
+                @sid_type = "alias"
+             when Admin::SidTypeWellKnownGroup
+                @sid_type = "well_known_group"
+             when Admin::SidTypeDeletedAccount
+                @sid_type = "deleted_account"
+             when Admin::SidTypeInvalid
+                @sid_type = "invalid"
+             when Admin::SidTypeUnknown
+                @sid_type = "unknown"
+             when Admin::SidTypeComputer
+                @sid_type = "computer"
+             else
+                @sid_type = "unknown"
+          end
+        end
+
+        @sid_type
+      end
+    end
   end
 end