nub 0.0.134 → 0.0.136

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8202cbd6a49793c08e975943cf7d8e80ec1345628e77fe323df81a2338883a7
-  data.tar.gz: c226fce75f1440932e151ac6b78f600be86c58ba85003fe1e314bcde8ed0c815
+  metadata.gz: bc637d2de51ea4c4473d8659baae4e93f479e210825735eac4810ac504a802a6
+  data.tar.gz: 244953131f4c7bf9e89f9f6f5320d18691f1fb6db134c40de79388cb1a86800e
 SHA512:
-  metadata.gz: de93ba1fe7f36ba854949fd118683d2a2acc6dfc91944cf0c7c598aab4893605edcbf2bed990c31aa326dae7fab8e3111edb4d8f5fb9920f200bc6f9e513b261
-  data.tar.gz: a0e4512271c10503a7c9bd3a98addd4808318b42610c3ed0c6c9d129d0d0b2d65ed1c0b9c5e019c9d8b3358af2be808770bf2f18c0d1fc290e6f108f8839c767
+  metadata.gz: f6f526accb8fdfad3a18c5ac1b1f4a709f468d620560fcfa2ac545f2057fc4b93ad1c8b88f406f85381846b4cba1ae91f48092945d4054cbac0fb044c2842c41
+  data.tar.gz: 6d64c6c44ff233cc4dd781837eef8bad11ce2944804ee27623c914778d2d851630d82fa22231064182a065b2fc6bab39dc9b39a4d85eb49226f6233d1896ad6d

data/README.md

@@ -3,7 +3,7 @@ Collection of ruby utils I've used in several of my projects and wanted re-usabl
 
 [![Build Status](https://travis-ci.org/phR0ze/ruby-nub.svg)](https://travis-ci.org/phR0ze/ruby-nub?branch=master)
 [![Gem Version](https://badge.fury.io/rb/nub.svg)](https://badge.fury.io/rb/nub)
-[![Coverage Status](https://coveralls.io/repos/github/phR0ze/ruby-nub/badge.svg?branch=master)](https://coveralls.io/github/phR0ze/ruby-nub?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/phR0ze/ruby-nub/badge.svg?branch=master&service=github)](https://coveralls.io/github/phR0ze/ruby-nub?branch=master&service=github)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 ### Table of Contents

data/lib/nub/user.rb

@@ -26,43 +26,66 @@ require 'etc'
 module User
   extend self
 
+  # Check if the current user has root privileges
+  def root?
+    return Process.uid.zero?
+  end
+
+  # Get the real user taking into account sudo priviledges
+  def name
+    return Process.uid.zero? ? Etc.getpwuid(ENV['SUDO_UID'].to_i).name : ENV['USER']
+  end
+
+  # Correctly and permanently drops privileges
+  # http://timetobleed.com/5-things-you-dont-know-about-user-ids-that-will-destroy-you/
+  # requires you drop the group before the user and use a safe solution
+  def drop_privileges!
+    if Process.uid.zero?
+      nobody = Etc.getpwnam('nobody')
+      Process::Sys.setresgid(nobody.gid, nobody.gid, nobody.gid)
+      Process::Sys.setresuid(nobody.uid, nobody.uid, nobody.uid)
+    end
+  end
+
   # Drop root privileges to original user
-  # Only affects ruby commands not system commands
-  # @returns [uid, gid] of root user
-  def drop_privileges()
+  # @param [Proc] optional block to execut in context of user
+  # @returns [uid, gid] or result
+  def drop_privileges
+    result = nil
     uid = gid = nil
 
+    # Drop privileges
     if Process.uid.zero?
       uid, gid = Process.uid, Process.gid
-      sudo_uid, sudo_gid = ENV['SUDO_UID'].to_i, ENV['SUDO_GID'].to_i
-      Process::Sys.seteuid(sudo_uid)
-      Process::Sys.setegid(sudo_gid)
+      user_uid = ENV['SUDO_UID'].to_i
+      user_gid = ENV['SUDO_GID'].to_i
+      Process::GID.grant_privilege(user_gid)
+      Process::UID.grant_privilege(user_uid)
     end
 
-    return uid, gid
+    # Execute block if given
+    begin
+      result = Proc.new.call
+      self.raise_privileges(uid, gid)
+    rescue ArgumentError
+      # No block given just return ids
+      result = [uid, gid]
+    rescue
+      self.raise_privileges(uid, gid)
+    end
+
+    return result
   end
 
   # Raise privileges if dropped earlier
-  # Only affects ruby commands not system commands
   # @param uid [String] uid of user to assume
   # @param gid [String] gid of user to assume
   def raise_privileges(uid, gid)
     if uid and gid
-      Process::Sys.seteuid(uid)
-      Process::Sys.setegid(gid)
+      Process::UID.grant_privilege(uid)
+      Process::GID.grant_privilege(gid)
     end
   end
-
-
-  # Check if the current user has root privileges
-  def root?
-    return Process.uid.zero?
-  end
-
-  # Get the current user taking into account sudo priviledges
-  def name
-    return Process.uid.zero? ? Etc.getpwuid(ENV['SUDO_UID'].to_i).name : ENV['USER']
-  end
 end
 
 # vim: ft=ruby:ts=2:sw=2:sts=2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nub
 version: !ruby/object:Gem::Version
-  version: 0.0.134
+  version: 0.0.136
 platform: ruby
 authors:
 - Patrick Crummett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize