rbus 0.1.2 → 0.2.0

data/CHANGELOG.txt

@@ -1,5 +1,8 @@
 =CHANGELOG
 
+  R-Bus 0.2.0  2007-05-05
+  * Now works on winDBus, thanks to Cezar Sá Espinola!
+
   R-Bus 0.1.2  2007-05-04
   * Added patch from Bug #10536 from Cezar Espinola to fix bugs in the state
     machine.

data/Manifest.txt

@@ -23,6 +23,7 @@ lib/rbus/auth/auth.rb
 lib/rbus/auth/dbus_cookie_sha1.rb
 lib/rbus/auth/dummy.rb
 lib/rbus/auth/external.rb
+lib/rbus/auth/external_win.rb
 lib/rbus/auth/state_machine.rb
 lib/rbus/bus/bus.rb
 lib/rbus/bus/proxy.rb

data/lib/rbus/auth/external_win.rb

@@ -0,0 +1,129 @@
+#--
+# 
+# R-Bus is a native Ruby implementation of the D-Bus protocol.
+# Copyright (C) 2007 Cezar Sá Espinola (cezarsa@gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+#
+#++
+#
+
+# This file replaces Process.uid on Windows machines, to make it possible
+# to authenticate.
+
+# If we are not on Windows the whole file should be ignored.
+catch(:not_windows) do
+  
+  throw :not_windows if RUBY_PLATFORM.split("-")[1] != 'mswin32'
+
+  require 'Win32API'
+
+  module RBus
+    module Auth
+      # Used to access Win32API and grab a ATOM to be used in replace of 
+      # Process.uid in the EXTERNAL authentication mechanism.
+      class WinUid
+        @@ERROR_INSUFFICIENT_BUFFER = 122
+        @@TOKEN_QUERY = 0x0008
+        @@TokenUser = 1
+        def win_error_msg(msg)
+          "#{msg} GetLastError()=#{@GetLastError.call}"
+        end
+        def initialize
+          @GetLastError = Win32API.new('kernel32', 'GetLastError', [], 'L')
+          @GetCurrentProcess = Win32API.new('kernel32', 'GetCurrentProcess', [], 'L')
+          @CloseHandle = Win32API.new('kernel32', 'CloseHandle', ['L'], 'L')
+          @GlobalAddAtom = Win32API.new('kernel32', 'GlobalAddAtom', ['L'], 'L')
+          @LocalFree = Win32API.new('kernel32', 'LocalFree', ['L'], 'L')
+
+          @OpenProcessToken = Win32API.new('advapi32', 'OpenProcessToken', ['L','L','P'], 'L')
+          @GetTokenInformation = Win32API.new('advapi32', 'GetTokenInformation', ['L','P','P','L','P'], 'L')
+          @IsValidSid = Win32API.new('advapi32', 'IsValidSid', ['L'], 'L')
+          @ConvertSidToStringSid = Win32API.new('advapi32', 'ConvertSidToStringSid', ['L','P'], 'L')
+        end
+        def uid
+          process_token_long = nil
+          sid_ptr_long = nil
+          process_token = "\0" * 4
+          length = "\0" * 4
+
+          begin
+            current_process = @GetCurrentProcess.call()
+
+            result = @OpenProcessToken.call(current_process, @@TOKEN_QUERY, process_token)
+            if result == 0
+              raise win_error_msg('OpenProcessToken')
+            end
+
+            process_token_long = process_token.unpack('L')[0]
+
+            result = @GetTokenInformation.call(process_token_long, @@TokenUser, 0, 0, length)
+            if result == 0 && @GetLastError.call != @@ERROR_INSUFFICIENT_BUFFER
+              raise win_error_msg('GetTokenInformation')
+            end
+
+            length_long = length.unpack('L')[0]
+            token_user = "\0" * length_long
+
+            result = @GetTokenInformation.call(process_token_long, @@TokenUser, token_user, length_long, length)
+            if result == 0
+              raise win_error_msg('GetTokenInformation(2)')
+            end
+
+            psid = token_user.unpack('L')[0]
+
+            result = @IsValidSid.call(psid)
+            if result == 0
+              raise win_error_msg('IsValidSid')
+            end
+
+            sid_ptr = "\0" * 4
+            result = @ConvertSidToStringSid.call(psid, sid_ptr)
+            if result == 0
+              raise win_error_msg('ConvertSidToStringSid')
+            end
+            sid_ptr_long = sid_ptr.unpack('L')[0]
+
+            atom = @GlobalAddAtom.call(sid_ptr_long)
+
+            if atom == 0
+              raise win_error_msg('GlobalAddAtom')
+            end
+          ensure
+            if not process_token_long.nil?
+              @CloseHandle.call(process_token_long)
+            end
+
+            if not sid_ptr_long.nil?
+              @LocalFree.call(sid_ptr_long)
+            end
+          end
+          # Insure ATOM is only 2 bytes
+          atom & 0xffff
+        end
+      end
+    end
+  end
+
+  # Override Process.uid with windows version.
+  module Process
+    def self.uid
+      RBus::Auth::WinUid.new.uid
+    end
+  end
+  
+end

data/lib/rbus/etc/blankslate.rb

@@ -1,3 +1,26 @@
+#--
+# 
+# R-Bus is a native Ruby implementation of the D-Bus protocol.
+# Copyright (C) 2007 Kristoffer Lundén (kristoffer.lunden@gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+#
+#++
+#
 module RBus
   # BlankSlate is a superclass that empties (almost) all instance methods
   # from it's subclasses.

data/lib/rbus/etc/version.rb

@@ -26,8 +26,8 @@ module RBus #:nodoc:
     PROTOCOL = 1
   
     MAJOR = 0
-    MINOR = 1
-    TINY  = 2
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rbus
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-05-04 00:00:00 +02:00
+  version: 0.2.0
+date: 2007-05-06 00:00:00 +02:00
 summary: A native implementation of the D-Bus protocol.
 require_paths: 
 - lib
@@ -54,6 +54,7 @@ files:
 - lib/rbus/auth/dbus_cookie_sha1.rb
 - lib/rbus/auth/dummy.rb
 - lib/rbus/auth/external.rb
+- lib/rbus/auth/external_win.rb
 - lib/rbus/auth/state_machine.rb
 - lib/rbus/bus/bus.rb
 - lib/rbus/bus/proxy.rb