yakg 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 127ade833bfbd5de2d5daf072a7f4a7a9c488af8
-  data.tar.gz: 1579155cc8ad1c017c37622c45a884cf7c06aef8
+  metadata.gz: f4a3fdb56682bf5c6c5601f5e07d96eba5817530
+  data.tar.gz: b95abb3237d99b44d77897ceeb2785a0dd4a0507
 SHA512:
-  metadata.gz: 0be512de5dd7492963caa1b8b965c27bc3057ba17340602c6cdc27cd743a9bbb3f88589b18e43ec0178c8ba82b28b4833d88ca3575f3737c387acc2b7106572b
-  data.tar.gz: 7cb52fcd6fc187058e0fa9f2f0dac21534fa239b69d84f5171bcb51eecaafe6b847e720ff82e153c5c8e390ca68cd06ef254a944c4c869c67e02ba1b0a9c55b2
+  metadata.gz: 4aab0652ab2e61d982212f0b8fdf5678126e6d682c952af25492492708571de403d96335c607a074e0dd16ace2bc930dd5e5e29839682754107cb7566586f211
+  data.tar.gz: 88cc7d0dd9bd48d7d8457d5a27923b5984f1a6ba2d875e202402438734573799e5e6c6e60229fd0ff505cc2f00833964798d21b71f05cc4a01d83db9fd09b7e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yakg (0.0.8)
+    yakg (0.0.9)
 
 GEM
   remote: https://rubygems.org/
@@ -13,7 +13,7 @@ GEM
     ffi (1.8.1)
     highline (1.6.18)
     netrc (0.7.7)
-    rake (10.0.4)
+    rake (10.1.0)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/yakg/backend/dbus-secret-service.rb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'dbus'
+
+bus = DBus::SystemBus.instance

data/lib/yakg/backend/macos-keychain.rb

@@ -68,10 +68,11 @@ class Yakg
         pw_length = FFI::MemoryPointer.new :uint32
         pw_val = FFI::MemoryPointer.new :pointer
         item_ref = FFI::MemoryPointer.new :pointer
-        raise_error? SecKeychainFindGenericPassword(NULL, svc.length, svc,
-                                                    acct.length, acct,
-                                                    pw_length, pw_val,
-                                                    item_ref)
+        retval = SecKeychainFindGenericPassword(NULL, svc.length, svc,
+                                                acct.length, acct,
+                                                pw_length, pw_val,
+                                                item_ref)
+        return nil unless 0 == retval
         raise_error? SecKeychainItemFreeContent(NULL, pw_val.read_pointer)
         raise_error? SecKeychainItemDelete(item_ref.read_pointer)
         CFRelease item_ref.read_pointer

data/lib/yakg/backend/win32-dpapi.rb

@@ -0,0 +1,150 @@
+require "ffi"
+require "win32/registry"
+
+class Yakg
+  module Backend
+    module Win32DPAPI
+
+      REG_KEY_PREFIX="Software\\Yakg\\"
+      
+      def set acct, value, svc
+        Win32::Registry::HKEY_CURRENT_USER.create("#{REG_KEY_PREFIX}\\#{svc}") do |reg|
+          reg.write_bin acct, DPAPI.encrypt(value).data
+        end
+      end
+
+      def get acct, svc
+        Win32::Registry::HKEY_CURRENT_USER.open("#{REG_KEY_PREFIX}\\#{svc}") do |reg|
+          DPAPI.decrypt(reg.read_bin acct)
+        end
+      end
+
+      def unset acct, svc
+        Win32::Registry::HKEY_CURRENT_USER.delete_key "#{REG_KEY_PREFIX}\\#{svc}\\#{acct}"
+      end
+
+      def list svc
+        Win32::Registry::HKEY_CURRENT_USER.open("#{REG_KEY_PREFIX}\\#{svc}").keys
+      end
+
+
+      # Minimal wrapper around Microsoft's DPAPI
+      #
+      # struct & function definitions cribbed from...
+      # http://msdn.microsoft.com/en-us/library/ms995355.aspx
+      module DPAPI
+        extend FFI::Library
+        ffi_lib 'crypt32'
+
+        class EncryptError < StandardError; end
+        class DecryptError < StandardError; end
+        
+=begin
+        typedef struct _CRYPTOAPI_BLOB {
+            DWORD cbData;
+            BYTE  *pbData;
+          } DATA_BLOB;
+=end
+
+        class DataBlob < FFI::Struct
+          layout :cbData, :uint32,
+          :pbData, :pointer
+
+          def initialize blob=nil
+            super nil
+            self.data = blob unless blob.nil?
+          end
+          
+          def data
+            self[:pbData].get_bytes(0, self[:cbData])
+          end
+
+          def data= blob
+            self[:pbData] = FFI::MemoryPointer.from_string blob
+            self[:cbData] = blob.bytesize
+          end
+
+        end
+
+        # http://www.pinvoke.net/default.aspx/Enums/CryptProtectFlags.html
+        # dwFlags is a bitvector with the following values...
+        UI_FORBIDDEN = 0x1
+        LOCAL_MACHINE = 0x4
+        CRED_SYNC = 0x8
+        AUDIT = 0x10
+        NO_RECOVERY = 0x20
+        VERIFY_PROTECTION = 0x40
+        
+=begin
+      BOOL WINAPI CryptProtectData(
+                     _In_      DATA_BLOB *pDataIn,
+                     _In_      LPCWSTR szDataDescr,
+                     _In_      DATA_BLOB *pOptionalEntropy,
+                     _In_      PVOID pvReserved,
+                     _In_opt_  CRYPTPROTECT_PROMPTSTRUCT *pPromptStruct,
+                     _In_      DWORD dwFlags,
+                     _Out_     DATA_BLOB *pDataOut
+       );
+=end
+        
+        attach_function :CryptProtectData,
+        [:pointer, :string, :pointer, :pointer, :pointer, :uint32, :pointer],
+        :int32
+
+        def encrypt plaintext, entropy=nil, flags = []
+          ciphertext_blob = DataBlob.new
+
+          desc = nil
+          if(plaintext.class == "String") and plaintext.respond_to? "encoding"
+            desc = FFI::MemoryPointer.from_string(plaintext.encoding.to_s)
+          end
+          
+          CryptProtectData(DataBlob.new plaintext,
+                           desc,
+                           entropy.nil? ? nil : DataBlob.new(entropy),
+                           nil,
+                           nil,
+                           flags.reduce(0, :|)
+                           ciphertext_blob) or
+            raise EncryptErorr
+          
+          ciphertext_blob.data
+        end
+        
+=begin
+      BOOL WINAPI CryptUnprotectData(
+                     _In_        DATA_BLOB *pDataIn,
+                     _Out_opt_   LPWSTR *ppszDataDescr,
+                     _In_opt_    DATA_BLOB *pOptionalEntropy,
+                     _Reserved_  PVOID pvReserved,
+                     _In_opt_    CRYPTPROTECT_PROMPTSTRUCT *pPromptStruct,
+                     _In_        DWORD dwFlags,
+                     _Out_       DATA_BLOB *pDataOut
+      );
+=end
+        attach_function :CryptUnprotectData,
+        [:pointer, :pointer, :pointer, :pointer, :pointer, :uint32, :pointer],
+        :int32
+
+        def decrypt ciphertext, entropy=nil, flags=[]
+          plaintext_blob  = DataBlob.new
+          desc = FFI::MemoryPointer.new(:pointer, 256)
+
+          CryptUnprotectData(DataBlob.new ciphertext,
+                             desc,
+                             DataBlob.new entropy,
+                             nil,
+                             nil,
+                             flags.reduce(0, :|),
+                             plaintext_blob) or
+            raise DecryptError
+
+          encoding = desc.read_pointer.nil? ? 'BINARY' : desc.read_pointer.read_string
+
+          plaintext_blob.data.force_encoding encoding
+        end
+
+      end
+    end
+  end
+end

data/lib/yakg/backend.rb

@@ -3,6 +3,9 @@ class Yakg
     if RUBY_PLATFORM.match("-darwin")
       require "yakg/backend/macos-keychain"
       extend Yakg::Backend::MacosKeychain
+    elsif RUBY_PLATFORM.match("win32")
+      require "yakg/backend/win32-dpapi"
+      extend Yakg::Backend::Win32DPAPI
     else
       require "yakg/backend/netrc-fallback"
       extend Yakg::Backend::NetrcFallback

data/lib/yakg.rb

@@ -1,9 +1,18 @@
 class Yakg
   module Misc
-    rv = RUBY_VERSION.match(/^1.8/) ? "1.8" : "1.9.1"
+    def self.get_abi
+      if RUBY_VERSION.match /^1.8/
+        "1.8"
+      elsif RUBY_VERSION.match /^1.9/
+        "1.9.1"
+      elsif RUBY_VERSION.match /^2.0/
+        "2.0.0"
+      end
+    end
+
     VENDOR_GEM_DIR =
       File.expand_path(File.join(File.dirname(__FILE__),
-                                 "..", "vendor", "gems", "ruby", rv))
+                                 "..", "vendor", "gems", "ruby", get_abi))
   end
 end
 

data/spec/yakg_spec.rb

@@ -34,5 +34,9 @@ describe Yakg do
     Yakg.unset(pw_name).should be_true
     Yakg.get(pw_name).should be_nil
   end
+
+  it "has unset return nil for nonexistent keys" do
+    Yakg.unset(SecureRandom.hex(8)).should be_nil
+  end
   
 end

data/vendor/gems/.gitignore

@@ -0,0 +1 @@
+openssl

data/vendor/gems/README.md

@@ -0,0 +1,49 @@
+Yo dog, I hear you like vendoring...
+====================================
+
+While yakg itself is pure Ruby, it does rely on ffi (a native gem) to
+call into Apple Keychain and Microsoft's DPAPI & Registry.  Heroku
+Toolkit for Windows vendors in ffi, but we don't for MacOS X doesn't,
+and it's kinda sucky to require people to install XCode/gcc just for
+one gem.  The corefoundation gem is also included, because it has an
+explicit ffi dependency.
+
+Consequently, yakg itself vendors in ffi, including the ffi_c.bundle
+shared object. Versions are included for Ruby ABIs 1.8, 1.9.1
+(includes 1.9.2 & 1.9.3), and 2.0.0. All are compiled as universal
+binaries. `installit.sh` is the helper script, but only does them one
+at a time. Given how long each ruby compile takes, and how everyone's
+rbenv & homebrew installs are their own beautiful unique snowflake,
+I'm reluctant to script this out too much, but my notes are at the
+bottom.
+
+If you already have a compiler and ffi installed, the gem load path
+evil that I do in `lib/yakg.rb` should be using that instead.
+
+Doing the same thing for Windows is left as an exercise to the reader.
+
+ffi_c.bundle recompilation notes
+================================
+
+```
+$ rbenv global system
+$ ./installit.sh
+$ CC="xcrun cc" CPP="xcrun cc -E" \
+  RUBY_CONFIGURE_OPTS="--with-arch=x86_64,i386" \
+  rbenv install 1.9.3-p392
+... stuff happens ...
+$ rbenv global 1.9.3-p392
+$ ./installit.sh
+# this sucks - Mountain Lion ships with openssl 0.9.8, which is both
+# old and doesn't work with ruby 2.0.0
+$ brew install openssl
+# and then we have to recompile it as a fat binary to make
+# 2.0.0 compile-able as a fat binary...
+$ ./build_openssl_dylib.sh
+$ CC="xcrun cc" CPP="xcrun cc -E" \
+  RUBY_CONFIGURE_OPTS="--with-arch=x86_64,i386 --with-openssl-dir=/usr/local/opt/openssl" \
+  rbenv install 2.0.0-p0
+... stuff happens ...
+$ rbenv global 2.0.0-p0
+$ ./installit.sh
+```

data/vendor/gems/installit.sh

@@ -1,37 +1,65 @@
 #!/bin/bash -x
 
-if [ "x$1" = "appleruby" ]; then
-    export PATH="/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin:/usr/local/sbin"
-fi
-DIR="$( cd "$( dirname "$0" )" && pwd )" ; cd $DIR
-
-if ! [ -r `basename $0 2>/dev/null` ]; then
-    echo "FAIL! can't cd to the parent of $0"
-    exit 1
-fi
-
-export RUBY_VERSION=`ruby --version | cut -d \  -f 2 | cut -d . -f 1-2`
-ruby --version
-
-if [ "x${RUBY_VERSION}" = "x" ]; then
-    echo "FAIL!  can't figure out ruby version"
-    exit 2
-fi
-
-rm -rf Gemfile.lock "ruby/${RUBY_VERSION}"
-bundle install --path `pwd`
-
-FFI_C=`find ruby -type f -name ffi_c.bundle | head -n 1`
-if [ "x${FFI_C}" = "x" ]; then
-    echo "FAIL!  Couldn't install ffi"
-    exit 3
-fi
-
-CFRB=`find ruby -type f -name corefoundation.rb | head -n 1`
-if [ "x${CFRB}" = "x" ]; then
-    echo "FAIL!  Couldn't install corefoundation"
-    exit 4
-fi
-
-rm -rf ./ruby/*/gems/ffi-*/{ext,spec}
-rm -rf ./ruby/*/cache
+export R18="system"
+export R191="1.9.3-p448"
+export R200="2.0.0-p195"
+
+export FFI_VER="1.9.0"
+
+export GEM_CMD="gem install --no-ri --no-rdoc ffi corefoundation"
+
+cd ${HOME}/heroku/yakg/vendor/gems/ruby && rm -rf *
+mkdir -p 1.8 x86_64/1.9.1 x86_64/2.0.0 i386/1.9.1 1.8 i386/2.0.0
+
+pushd ${HOME}/.rbenv/versions
+rm ${R191} ${R200}
+ln -sf x86_64-${R191} ${R191}
+ln -sf x86_64-${R200} ${R200}
+popd
+
+echo ${R18} > ${HOME}/.rbenv/version
+${GEM_CMD} -i ./1.8
+
+pushd x86_64
+
+echo ${R191} > ${HOME}/.rbenv/version
+${GEM_CMD} -i ./1.9.1
+
+echo ${R200} > ${HOME}/.rbenv/version
+${GEM_CMD} -i ./2.0.0
+
+popd
+
+pushd ${HOME}/.rbenv/versions
+rm ${R191} ${R200}
+ln -sf i386-${R191} ${R191}
+ln -sf i386-${R200} ${R200}
+popd
+
+pushd i386
+
+echo ${R191} > ${HOME}/.rbenv/version
+${GEM_CMD} -i ./1.9.1
+
+echo ${R200} > ${HOME}/.rbenv/version
+${GEM_CMD} -i ./2.0.0
+
+popd
+
+mv x86_64/{2.0.0,1.9.1} .
+
+lipo i386/1.9.1/gems/ffi-*/lib/ffi_c.bundle 1.9.1/gems/ffi-*/lib/ffi_c.bundle \
+    -create -output 1.9.1/gems/ffi-${FFI_VER}/lib/ffi_c_universal.bundle
+lipo i386/2.0.0/gems/ffi-*/lib/ffi_c.bundle 2.0.0/gems/ffi-*/lib/ffi_c.bundle \
+    -create -output 2.0.0/gems/ffi-${FFI_VER}/lib/ffi_c_universal.bundle
+
+rm {2.0.0,1.9.1}/gems/ffi-*/lib/ffi_c.bundle
+
+pushd 2.0.0/gems/ffi-*/lib
+mv ffi_c_universal.bundle ffi_c.bundle
+popd
+pushd 1.9.1/gems/ffi-*/lib
+mv ffi_c_universal.bundle ffi_c.bundle
+popd
+
+rm -rf i386 x86_64 */{cache,doc} */gems/*/{spec,ext,libtest}

data/vendor/gems/ruby/{1.9.1/gems/ffi-1.8.1 → 1.8/gems/ffi-1.9.0}/Rakefile

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rubygems/package_task'
 require 'rubygems/tasks'
 require 'rbconfig'
+require 'rake/clean'
 
 USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
 if USE_RAKE_COMPILER
@@ -197,7 +198,7 @@ if USE_RAKE_COMPILER
 
     task "copy:ffi_c:x64-mingw32:#{ruby_version}" do |t|
       if File.exists?("#{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so")
-        sh "x86_64-w64-mingw32-strip -S #{dir}/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
+        sh "x86_64-w64-mingw32-strip -S #{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
       end
     end
   end

data/vendor/gems/ruby/1.8/gems/ffi-1.9.0/lib/ffi/version.rb

@@ -0,0 +1,4 @@
+module FFI
+  VERSION = '1.9.0'
+end
+