boxen-linux 2.7.6 → 2.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be8374e7b08b7564045c4e533b49ac2c02349473
-  data.tar.gz: 649f600117e2ea95b3e7ecae1ee2a3caf3c119ab
+  metadata.gz: baea85246dc667baf0cda296a36147eb266c16bb
+  data.tar.gz: 8753de721944c194938fe451d32ec3b8e7959649
 SHA512:
-  metadata.gz: 9624129e368ac6df5021151256a0b1a4f7063131c44d638041abda57bd5e60335a0447ae5050043eb352bcbfeb5c2d8fc0b4bcb520c9e7709a80dd393480ae35
-  data.tar.gz: 4744d0b1054d85cfba5e2f46c76580da88e9ba1414f4ca8d765a52f9773aa2d615fce68e16789beef6606993ad7b59a2764078805c9cbb1b0317a7053b9359d1
+  metadata.gz: 0838f3581fd5716cc276dc0b077d4571a34cef6d28e7f65789ef3631f33fd976616d843680a1545931b02fdf71578786fa183b57d6cbd28b786bc0c59c14ea30
+  data.tar.gz: 8bcd15870867d512cf0e3cdd39ca1b69c058389e596e757f791094c6357b00bbd1d798f9267e9d1ed55350f80a803b24abf3f7d658438163a3c1b5291bcd260a

data/.gitignore

@@ -1,11 +1,12 @@
 /.bundle
 /.env.local.rb
+/.project
 /.projects
 /.rbenv-version
+/.ruby-version
 /Gemfile.lock
 /bin
 /boxen-*.gem
 /log
 /puppet
 /script/Boxen.dSYM
-/.ruby-version

data/boxen.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "boxen-linux"
-  gem.version       = "2.7.6"
+  gem.version       = "2.7.8"
   gem.authors       = ["John Barnette", "Will Farrington", "David Goodlad", "Max Klein"]
   gem.email         = ["jbarnette@github.com", "wfarr@github.com", "dgoodlad@github.com", "mklein@jhu.edu"]
   gem.description   = "Manage Mac and Linux development boxes with love (and Puppet)."

data/lib/boxen/keychain.rb

@@ -1,3 +1,4 @@
+require "etc"
 require "shellwords"
 
 module Boxen
@@ -8,7 +9,8 @@ module Boxen
     if (/darwin/ =~ RUBY_PLATFORM) != nil
       HELPER = File.expand_path "../../../script/Boxen", __FILE__
     else
-      HELPER = File.expand_path "../../../script/Boxen-linux", __FILE__
+      HELPER_ENV = File.expand_path "../../../script/keyring-env", __FILE__
+      HELPER = File.expand_path "../../../script/Boxen-keyring", __FILE__
     end
 
     # The service name to use when loading/saving passwords.
@@ -39,16 +41,45 @@ module Boxen
 
     def get(service)
       cmd = shellescape(HELPER, service, login)
-      
-      result = `#{cmd}`.strip
-      $?.success? ? result : nil
+      if (/darwin/ =~ RUBY_PLATFORM) != nil
+        result = `#{cmd}`.strip
+      else
+        # have to run gnome-keyring commands as user, running as root causes error
+        if ENV['USER'] == login
+          result = `#{cmd}`.strip
+        elsif ENV['USER'] == 'root'
+          # dbus env variable has to be set in order to talk to gnome-keyring
+          cmd_env = shellescape(HELPER_ENV)
+          ENV['DBUS_SESSION_BUS_ADDRESS'] = `#{cmd_env}`.strip
+          result = backticks_as_user(login, cmd).strip
+        else
+          raise Boxen::Error, "User id is set to #{ENV['USER']}, but have to be self or root in order to interact with the keyring."  
+        end
+      end
+      $?.success? ? result : nil 
     end
 
     def set(service, token)
       cmd = shellescape(HELPER, service, login, token)
-
-      unless system *cmd
-        raise Boxen::Error, "Can't save #{service} in the keychain."
+      if (/darwin/ =~ RUBY_PLATFORM) != nil
+        unless system *cmd
+          raise Boxen::Error, "Can't save #{service} in the keychain."
+        end
+      else
+        # have to run gnome-keyring commands as user, running as root causes errors
+        if ENV['USER'] == login
+          result = system *cmd
+        elsif ENV['USER'] == 'root'
+          # dbus env variable has to be set in order to talk to gnome-keyring
+          cmd_env = shellescape(HELPER_ENV)
+          ENV['DBUS_SESSION_BUS_ADDRESS'] = `#{cmd_env}`.strip
+          result = system_as_user(login, cmd)
+        else
+          raise Boxen::Error, "User id is set to #{ENV['USER']}, but have to be self or root in order to interact with the keyring."
+        end
+        unless result
+          raise Boxen::Error, "Can't save #{service} in the keyring."
+        end
       end
 
       token
@@ -57,5 +88,42 @@ module Boxen
     def shellescape(*args)
       args.map { |s| Shellwords.shellescape s }.join " "
     end
+    
+    def system_as_user(user, cmd)
+      # Find the user in the password database.
+      u = (user.is_a? Integer) ? Etc.getpwuid(user) : Etc.getpwnam(user)
+
+      # Fork the child process. Process.fork will run a set of tokens as a bash command
+      # in the child process.
+      Process.fork do
+        # We're in the child. Set the process's user ID.
+        #Process.uid = u.uid
+        Process::Sys.setuid(u.uid)
+        # Invoke the caller's bash tokens
+        system *cmd
+      end
+      Process.wait
+      $?.exitstatus
+    end
+    
+    def backticks_as_user(user, cmd)
+      u = (user.is_a? Integer) ? Etc.getpwuid(user) : Etc.getpwnam(user)
+
+      # may the armpits of the ruby and gnome devs be infested with the fleas of a thousand camels!
+      # all of the IO.pipe stuff is so that the parent and child forks can talk to each other
+      rd, wr = IO.pipe
+      Process.fork do
+        rd.close
+        Process::Sys.setuid(u.uid)
+        result = `#{cmd}`
+        wr.write result
+        wr.close
+      end
+      wr.close
+      result = rd.read
+      rd.close
+      Process.wait
+      result
+    end
   end
 end

data/script/build-keyring-helper

@@ -6,4 +6,4 @@
 set -e
 
 cd $(dirname "$0")/..
-cc -g -O2 -Wall `pkg-config --cflags glib-2.0 gnome-keyring-1`-o script/Boxen-linux src/keyring-helper.c `pkg-config --libs glib-2.0 gnome-keyring-1`
+cc -g -O2 -Wall `pkg-config --cflags glib-2.0 gnome-keyring-1`-o script/Boxen-keyring src/keyring-helper.c `pkg-config --libs glib-2.0 gnome-keyring-1`

data/script/keyring-env

@@ -0,0 +1,43 @@
+#!/bin/bash
+# set up user environment so that the gnome-keyring stuff will actually work. 
+# if running this script directly, run with `source keyring-env` so that the export statement works correctly
+
+# if dbus is already running get its environment variables. if it's not running start it
+# some of this is taken from http://ubuntuforums.org/showthread.php?t=1059023
+DBUS_PID=$(pidof -s dbus-daemon)
+if [[ "${DBUS_PID}" != "" ]]; then
+    # Search these processes for the session variable 
+    # (they are run as the current user and have the DBUS session variable set)
+    compatiblePrograms=( nautilus kdeinit kded4 pulseaudio trackerd )
+    
+    # Attempt to get a program pid
+    for index in ${compatiblePrograms[@]}; do
+        PID=$(pidof -s ${index})
+        if [[ "${PID}" != "" ]]; then
+            break
+        fi
+    done
+    if [[ "${PID}" == "" ]]; then
+        echo "keyring-env could not detect active login session" 1>&2
+        return 1
+    fi
+    
+    QUERY_ENVIRON="$(tr '\0' '\n' < /proc/${PID}/environ | grep "DBUS_SESSION_BUS_ADDRESS" | cut -d "=" -f 2-)"
+    if [[ "${QUERY_ENVIRON}" != "" ]]; then
+        export DBUS_SESSION_BUS_ADDRESS="${QUERY_ENVIRON}"
+        echo "${DBUS_SESSION_BUS_ADDRESS}"
+    else
+        echo "keyring-env could not find dbus session ID in user environment." 1>&2
+        return 1
+    fi
+else
+    : # put stuff to start dbus and get environment vars here
+fi
+
+# make sure that the gnome-keyring-daemon is actually running, and start it if it's not
+GNOME_KEYRING_PID=$(pidof -s gnome-keyring-daemon)
+if [[ "${GNOME_KEYRING_PID}" != "" ]]; then
+    : # gnome-keyring-daemon is running, so we don't need to do anything
+else
+    : # put stuff to start gnome-keyring-daemon here
+fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxen-linux
 version: !ruby/object:Gem::Version
-  version: 2.7.6
+  version: 2.7.8
 platform: ruby
 authors:
 - John Barnette
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -197,10 +197,11 @@ files:
 - lib/facter/boxen.rb
 - lib/system_timer.rb
 - script/Boxen
-- script/Boxen-linux
+- script/Boxen-keyring
 - script/bootstrap
 - script/build-keychain-helper
 - script/build-keyring-helper
+- script/keyring-env
 - script/release
 - script/tests
 - src/keychain-helper.c