pangdudu-robots 0.2.2 → 0.2.3

data/config/org.robots.service.conf

@@ -1,21 +1,5 @@
  <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
  <busconfig>
-   <policy user="root">
-      <allow own="org.robots.Service" />
-      <allow own="org.ruby.Service" />
-   </policy>
-   <policy group="netdev">
-      <allow own="org.robots.Service" />
-      <allow own="org.ruby.Service" />
-   </policy>
-   <policy group="robots">
-      <allow own="org.robots.Service" />
-      <allow own="org.ruby.Service" />
-   </policy>
-   <policy at_console="true">
-      <allow own="org.robots.Service" />
-      <allow own="org.ruby.Service" />
-    </policy>
    <policy context="default">
       <allow send_destination="org.robots.Service"/>
       <allow receive_sender="org.robots.Service"/>

data/config/remote.session.dbus.conf

@@ -1,7 +1,3 @@
-<!-- This configuration file controls the per-user-login-session message bus.
-     Add a session-local.conf and edit that rather than changing this 
-     file directly. -->
-
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
@@ -10,15 +6,13 @@
 
   <!-- If we fork, keep the user's original umask to avoid affecting
        the behavior of child processes. -->
-  <keep_umask/>
+  <!-- <keep_umask/> -->
   
   <!-- Listen to everything on tcp! -->
   <listen>tcp:host=0.0.0.0,port=2687,family=ipv4</listen>
   <!-- Listen on socket at this file location -->
-  <listen>unix:path=/tmp/robots_session_bus_socket</listen>
+  <!-- <listen>unix:path=/tmp/robots_session_bus_socket</listen> -->
   
-  <standard_session_servicedirs /> 
-
   <policy context="default">
     <!-- Allow everything to be sent -->
     <allow send_destination="*" eavesdrop="true"/>
@@ -32,10 +26,4 @@
        further restrict the above policy for specific services. -->
   <include>org.robots.service.conf</include>
 
-  <!-- raise the service start timeout to 40 seconds as it can timeout
-       on the live cd on slow machines -->
-  <limit name="service_start_timeout">60000</limit>
-
-  <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
-
 </busconfig>

data/config/start_dbus_session.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-dbus-daemon --config-file=remote.session.dbus.conf
+dbus-daemon --config-file=$HOME/.robots/config/remote.session.dbus.conf

data/funky-examples/visualizer-agent/visualizer_agent.rb

@@ -67,7 +67,7 @@ class VisualizerAgent
     @gui.resize(@width, @height)
     @gui.show()
     #just because it's fun
-    add_dbug_agents
+    #add_dbug_agents
     @app.exec()
   end
   
@@ -92,9 +92,9 @@ Thread.new do
   loop do 
     sleep 1
     #send an xml message over the system
-    #alive_msg = va.create_xml_alive_msg
-    #dlog "alive_msg: #{alive_msg.to_s}"
-    #va.send_msg alive_msg
+    alive_msg = va.create_xml_alive_msg
+    dlog "alive_msg: #{alive_msg.to_s}"
+    va.send_msg alive_msg
   end
 end
 

data/lib/robots_agent.rb

@@ -13,24 +13,23 @@ class Robot
   
   def initialize
     dlog "new Robot initialized."
-    @hostname = Socket.gethostname
-    @sessiontype = "system" #could be session,system or robots (use robots, if you want it to work over multiple hosts)
-    @daemonconfig = "~/.robots/config/remote.session.dbus.conf" #listens on path and tcp
-    @dbusdaemon = nil #we'll start our own dbus-daemon if we have to
-    @dbussession = nil #get_bus will get one for us
-    @coreservice = nil #the service we use to export objects with
+    @localhost = Socket.gethostname
+    @daemonhost = "127.0.0.1"
+    @remote = false #if you want to connect remotely, change this value
+    @sessiontype = "robots" #could be session,system or robots (use robots, if you want it to work over multiple hosts)
+    @daemonconfig = "~/.robots/config/remote.session.dbus.conf" #listens on tcp
+    @robots_socket_name = "tcp:host=#{@daemonhost},port=2687,family=ipv4" #look at: ~/.robots/config/remote.session.dbus.conf
     @robotsservice = "org.robots.Service"
     @emitterpath = "/org/robots/Service/Emitter"
-    @emitterinterface = "org.ruby.Service.EmitterInterface"
-    @listeners = [] # listeners for incoming messages are here
-    @emitters = {} #holds emitters we use
-    @infrastructure = {} #holds infrastructure objects
+    @emitterinterface = "org.robots.Service.EmitterInterface"
+    @coreservice, @dbussession, @dbusdaemon = nil,nil,nil
+    @listeners,@emitters,@infrastructure = [],{},{}
     @servicetypes = fill_servicetypes #refer to robots_infrastructure.rb
   end
   
   #start the mojo
   def run
-    check_for_dbus_daemon if @sessiontype.eql? "robots" #will start a daemon if necessary
+    check_for_dbus_daemon if @sessiontype.eql? "robots" #will start a dbus-daemon if necessary
     setup_robots_service
     register_callbacks
     #test_messages; #main_loop;
@@ -56,22 +55,24 @@ class Robot
  
   #check if a dbus-daemon suitable for robots is running, otherwise start one
   def check_for_dbus_daemon
-    @daemonconfig = File.expand_path(@daemonconfig) #dbus-daemon won't accept otherwise
-    #ok, no config file, not good!
-    unless File.exist? @daemonconfig
-      wlog "no daemon config: #{@daemonconfig}!"
-      wlog "will sleep for 5 seconds,..."
-      sleep 5 #give the user time to realize
-    end
-    #if the config file is there
-    if File.exist? @daemonconfig  
-      @dbusdaemon = DbusDaemon.new @daemonconfig
-      got_twins = @dbusdaemon.got_twin_daemon? #check if a daemon like this is already running
-      ilog "custom dbus-daemon is already running." if got_twins #inform user
-      unless got_twins #no suitable dbus-daemon running, start one
-        @dbusdaemon.start_daemon
-        ilog "custom dbus-daemon started and running, check \"ps x | grep \"dbus-daemon\", if plan a CTRL-C."
-        #@dbusdaemon.stop_daemon #must get called sometimes, super nasty, use " ps x | grep "dbus-daemon" "
+    unless @remote
+      @daemonconfig = File.expand_path(@daemonconfig) #dbus-daemon won't accept otherwise
+      #ok, no config file, not good!
+      unless File.exist? @daemonconfig
+        wlog "no daemon config: #{@daemonconfig}!"
+        wlog "will sleep for 5 seconds,..."
+        sleep 5 #give the user time to realize
+      end
+      #if the config file is there
+      if File.exist? @daemonconfig  
+        @dbusdaemon = DbusDaemon.new @daemonconfig
+        got_twins = @dbusdaemon.got_twin_daemon? #check if a daemon like this is already running
+        ilog "custom dbus-daemon is already running." if got_twins #inform user
+        unless got_twins #no suitable dbus-daemon running, start one
+          @dbusdaemon.start_daemon
+          ilog "custom dbus-daemon started and running, check \"ps x | grep \"dbus-daemon\", if plan a CTRL-C."
+          #@dbusdaemon.stop_daemon #must get called sometimes, super nasty, use " ps x | grep "dbus-daemon" "
+        end
       end
     end
   end
@@ -127,11 +128,16 @@ class Robot
   def register_callbacks
     #setup callbacks for infrastructure emitters
     @emitters.each { |name,emitter| register_emitter_callback name,emitter }
-    #setup service browser
-    bus = DBus::SystemBus.instance #needs to be the system bus for the avahi stuff
-    proxy = bus.introspect("org.freedesktop.Avahi","/")
-    @avahi = proxy["org.freedesktop.Avahi.Server"]  
-    @servicetypes.each { |name,type| register_service_callback name,type }
+    #old systems sometimes don't have avahi
+    if DBus::SystemBus.instance.proxy.ListNames[0].include? "org.freedesktop.Avahi"
+      #setup service browser
+      bus = DBus::SystemBus.instance #needs to be the system bus for the avahi stuff
+      proxy = bus.introspect("org.freedesktop.Avahi","/")
+      @avahi = proxy["org.freedesktop.Avahi.Server"]  
+      @servicetypes.each { |name,type| register_service_callback name,type }
+    else
+      wlog "Sorry, no Avahi service running, no magic service discovery."
+    end
   end
   
   #register an emitter callback
@@ -212,9 +218,8 @@ class Robot
       @dbussession = DBus::SystemBus.instance if @sessiontype.eql? "system"
       @dbussession = DBus::SessionBus.instance if @sessiontype.eql? "session"
       if @sessiontype.eql? "robots"
-       #i somehow feel bad for doing it like this with ENV[]:
-       @robots_socket_name = "unix:path=/tmp/robots_session_bus_socket" #look at: config/remote.session.dbus.conf
        DBus.const_set("SessionSocketName", @robots_socket_name) #overwrite the modules constant
+       evil_hack_remote_cookie if @remote #i need not say more,...
        @dbussession = DBus::SessionBus.instance
       end
     end
@@ -226,6 +231,27 @@ class Robot
     return @dbussession
   end
 
+  #because dbus remote auth still betrays us, we need to hack it
+  def evil_hack_remote_cookie
+    if @robots_socket_name.include? "tcp:"
+      af, port, daemon_name, daemon_addr = (Socket::getaddrinfo(@daemonhost, 2687)).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
+
 #functions used by the module end here 
   
   #dbus main loop

data/lib/robots_xml.rb

@@ -27,9 +27,9 @@ module RobotsXml
   
   #create an alive message
   def create_xml_alive_msg
-    @hostname = "localhost" if @hostname.nil? #more fun with hostname
+    @localhost = "localhost" if @localhost.nil? #more fun with hostname
     @roboname = "Nameless" if @roboname.nil? #at least it's nameless
-    robotsid = "#{@hostname}.#{@roboname.gsub(" ","_")}" #looks cooler
+    robotsid = "#{@localhost}.#{@roboname.gsub(" ","_")}" #looks cooler
     msg = create_xml_msg { |b| b.info("#{@roboname} alive","alive"=>"#{robotsid}","timestamp" => "#{Time.now}") }
     return msg
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pangdudu-robots
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - pangdudu
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-17 00:00:00 -07:00
+date: 2009-07-27 00:00:00 -07:00
 default_executable: robots
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: pangdudu-ruby-dbus-daemon
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: pangdudu-ruby-dbus
   type: :runtime
@@ -61,6 +71,7 @@ files:
 - funky-examples/memory-agent/memory_generator_agent.rb
 has_rdoc: true
 homepage: http://github.com/pangdudu/robots
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -81,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: http://github.com/pangdudu/robots
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: more robots!