pangdudu-ruby-dbus 0.2.4.1 → 0.2.4.2

data/README.rdoc

@@ -91,10 +91,32 @@ painful to use.
 The file content also get's updated every 5 minutes (when a client fails to auth etc.). 
 Making copy and paste from one shell to another very frolic.
 
-To sum it up: 
-
-Today it's acceptable to use it like this, but until next week we'll need an easy 
-auth mechanism that works on the wire. 
+=== Hackish solution from pangdudu/robots/lib/robots_agent.rb
+
+  #because dbus remote auth still betrays us, we need to hack it
+  def get_remote_cookie
+    if @config[:robots_socket_name].include? "tcp:"
+      af, port, daemon_name, daemon_addr = (Socket::getaddrinfo(@config[:daemonhost],@config[:daemonhost].to_i)).first
+      ilog "Trying to get/hack remote cookie from: #{daemon_name}."
+      begin
+        cookiepath = "#{ENV['HOME']}/.dbus-keyrings/org_freedesktop_general"
+        #oki, the scp magic only works, if you use sshkeys
+        `scp #{daemon_addr}:.dbus-keyrings/org_freedesktop_general #{cookiepath}`
+        if File.exist? cookiepath
+          cookie = File.open(cookiepath) 
+          dlog "Got cookie: #{cookie.gets}"
+        end
+      rescue
+        elog "Oops, something is wrong."
+      end
+    else
+      dlog "Nothing to hack, boring."
+    end
+  end
+
+in principle, this is ok. we can now do what we want and it is save to exchange cookies over 
+a ssh session. However I'm still not feeling comfortable doing this. I guess everything else 
+would mean touching the reference C dbus-daemon implementation. 
 
 
 more infos:

data/lib/dbus/auth.rb

@@ -6,7 +6,10 @@
 # License, version 2.1 as published by the Free Software Foundation.
 # See the file "COPYING" for the exact licensing terms.
 
+$debug = false #it's all over the state machine
+
 module DBus
+ 
   # Exception raised when authentication fails somehow.
   class AuthenticationFailed < Exception
   end
@@ -39,10 +42,12 @@ module DBus
   # Class for 'CookieSHA1' type authentication.
   # Implements the AUTH DBUS_COOKIE_SHA1 mechanism.
   class DBusCookieSHA1 < Authenticator
-    
+        
     #the autenticate method (called in stage one of authentification)    
     def authenticate
       require 'etc'
+      #number of retries we have for auth
+      @retries = 1
       return "#{hex_encode(Etc.getlogin)}" #server expects it to be binary
     end
 
@@ -61,12 +66,12 @@ module DBus
       c_challenge = Array.new(s_challenge.length/2).map{|obj|obj=rand(255).to_s}.join
       # Search cookie file for id
       path = File.join(ENV['HOME'], '.dbus-keyrings', context)
-      dlog "path: #{path.inspect}"
+      dlog "path: #{path.inspect}" #if $debug
       File.foreach(path) do |line|
         if line.index(id) == 0
           # Right line of file, read cookie
           cookie = line.split(' ')[2].chomp
-          dlog "cookie: #{cookie.inspect}"
+          dlog "cookie: #{cookie.inspect}" if $debug
           # Concatenate and encrypt
           to_encrypt = [s_challenge, c_challenge, cookie].join(':')
           sha = Digest::SHA1.hexdigest(to_encrypt)
@@ -77,7 +82,12 @@ module DBus
           return response
         end
       end
-      elog "Unable to locate cookie"
+      #a little rescue magic
+      elog "Could not auth, will now exit." unless @retries <= 0
+      elog "Unable to locate cookie, retry in 1 second."
+      @retries -= 1
+      sleep 1
+      data(hexdata)
     end  
     
     # encode plain to hex
@@ -132,7 +142,7 @@ module DBus
         raise AuthException if @auth_list.size == 0
         @authenticator = @auth_list.shift.new
         auth_msg = ["AUTH", @authenticator.name, @authenticator.authenticate]
-        dlog "auth_msg: #{auth_msg.inspect}"
+        dlog "auth_msg: #{auth_msg.inspect}" if $debug
         send(auth_msg)
       rescue AuthException
         @socket.close
@@ -154,7 +164,7 @@ module DBus
         break if data.include? crlf #crlf means line finished, the TCP socket keeps on listening, so we break 
       end
       readline = data.chomp.split(" ")
-      dlog "readline: #{readline.inspect}"
+      dlog "readline: #{readline.inspect}" if $debug
       return readline
     end
 
@@ -162,7 +172,7 @@ module DBus
     def next_state
       msg = next_msg
       if @state == :Starting
-        dlog ":Starting msg: #{msg[0].inspect}"
+        dlog ":Starting msg: #{msg[0].inspect}" if $debug
         case msg[0]
         when "OK"
           @state = :WaitingForOk    
@@ -172,15 +182,15 @@ module DBus
           @state = :WaitingForData
         end
       end
-      dlog "state: #{@state}"
+      dlog "state: #{@state}" if $debug
       case @state
       when :WaitingForData
-        dlog ":WaitingForData msg: #{msg[0].inspect}"
+        dlog ":WaitingForData msg: #{msg[0].inspect}" if $debug
         case msg[0]
         when "DATA"
           chall = msg[1]
           resp, chall = @authenticator.data(chall)
-          dlog ":WaitingForData/DATA resp: #{resp.inspect}"
+          dlog ":WaitingForData/DATA resp: #{resp.inspect}" if $debug
           case resp
           when :AuthContinue
             send("DATA", chall)
@@ -206,7 +216,7 @@ module DBus
           @state = :WaitingForData
         end
       when :WaitingForOk
-        dlog ":WaitingForOk msg: #{msg[0].inspect}"
+        dlog ":WaitingForOk msg: #{msg[0].inspect}" if $debug
         case msg[0]
         when "OK"
           send("BEGIN")
@@ -222,7 +232,7 @@ module DBus
           @state = :WaitingForOk
         end
       when :WaitingForReject
-        dlog ":WaitingForReject msg: #{msg[0].inspect}"
+        dlog ":WaitingForReject msg: #{msg[0].inspect}" if $debug
         case msg[0]
         when "REJECT"
           next_authenticator

data/lib/dbus/bus.rb

@@ -176,6 +176,7 @@ module DBus
     # "transport1:key1=value1,key2=value2;transport2:key1=value1,key2=value2"
     # e.g. "unix:path=/tmp/dbus-test" or "tcp:host=localhost,port=2687"
     def initialize(path)
+      dlog "path: #{path}"
       @path = path
       @unique_name = nil
       @buffer = ""
@@ -184,6 +185,7 @@ module DBus
       @signal_matchrules = Array.new
       @proxy = nil
       @object_root = Node.new("/")
+      @is_tcp = false
     end
 
     # Connect to the bus and initialize the connection.
@@ -203,11 +205,12 @@ module DBus
           port = para.sub("port=","").to_i if para.include? "port="
           family = para.sub("family=","") if para.include? "family="
         end
-        dlog "host,port,family : #{host},#{port},#{family}"      
+        #dlog "host,port,family : #{host},#{port},#{family}"      
         begin
           #initialize the tcp socket
           @socket = TCPSocket.new(host,port)
           init_connection
+          @is_tcp = true
         rescue
           elog "Could not establish connection to: #{@path}, will now exit."
           exit(0) #a little harsh
@@ -446,7 +449,15 @@ module DBus
     # Fill (append) the buffer from data that might be available on the
     # socket.
     def update_buffer
-      @buffer += @socket.read_nonblock(MSG_BUF_SIZE) unless @socket.nil?
+      @buffer += @socket.read_nonblock(MSG_BUF_SIZE) if @is_tcp
+      unless @is_tcp
+        begin
+          @buffer += @socket.read_nonblock(MSG_BUF_SIZE)  
+        rescue
+          wlog ".read_nonblock failed, falling back to .recv"
+          @buffer += @socket.recv(MSG_BUF_SIZE)  
+        end
+      end
     end
 
     # Get one message from the bus and remove it from the buffer.

data/lib/dbus/introspect.rb

@@ -470,6 +470,8 @@ module DBus
       if @default_iface and has_iface?(@default_iface)
         @interfaces[@default_iface].method(name).call(*args)
       else
+        dlog "interfaces: #{@interfaces.keys.inspect}"
+        dlog "default_iface: #{@default_iface}"
         raise NoMethodError
       end
     end

data/lib/dbus.rb

@@ -9,9 +9,6 @@
 # See the file "COPYING" for the exact licensing terms.
 require 'rubygems'
 require 'rofl' #http://github.com/pangdudu/rofl/tree/master makes the debug/tracing easy
-#comes from the Rofl logger/tracer module
-@logger.level = Logger::DEBUG
-
 require 'dbus/type'
 require 'dbus/introspect'
 require 'dbus/export'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pangdudu-ruby-dbus
 version: !ruby/object:Gem::Version 
-  version: 0.2.4.1
+  version: 0.2.4.2
 platform: ruby
 authors: 
 - Ruby DBUS Team, pangdudu
@@ -9,7 +9,7 @@ autorequire: dbus
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 -07:00
+date: 2009-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency