rjp-jabber_cat 0.0.2 → 0.0.5

data/bin/jabber_cat.rb

@@ -3,19 +3,28 @@ require 'optparse'
 require 'socket'
 require 'xmpp4r'
 require 'xmpp4r/framework/bot'
+require 'xmpp4r/muc/helper/simplemucclient'
 include Jabber
 
+def log(x)
+    if $options[:verbose] then
+        puts(*x)
+    end
+end
+
 $options = {
     :host => 'localhost',
     :port => 9999,
     :whoto => nil,
     :config => ENV['HOME'] + '/.jabber_cat',
     :verbose => nil,
-    :debug => 0
+    :debug => 0,
+    :keyfile => nil,
+    :muc => nil
 }
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: twittermoo.rb [-p port] [-h host] [-w jid]"
+  opts.banner = "Usage: twittermoo.rb [-p port] [-h host] [-w jid] [-v] [-d N] [-m] [-k file]"
 
   opts.on("-p", "--port N", Integer, "irccat port") do |p|
     $options[:port] = p
@@ -41,6 +50,14 @@ OptionParser.new do |opts|
     $options[:debug] = p
   end
 
+  opts.on("-k", "--key filename", String, "Shared key file") do |p|
+    $options[:keyfile] = p
+  end
+
+  opts.on("-m", "--muc", "Treat the destination as a MUC") do |v|
+    $options[:muc] = v
+  end
+
 end.parse!
 
 if $options[:whoto].nil? then # debug = 1 if not already set
@@ -50,8 +67,16 @@ end
 # TODO handle failing here with exceptions
 config = YAML::load(open($options[:config]))
 
+# TODO this won't work at all because $options has symbols, config has strings
 unless config['options'].nil? then
-    $options.merge!(config['options'])
+    config['options'].each { |k,v|
+        $options[k.to_sym] = v
+    }
+end
+
+if $options[:keyfile] then
+    puts "loading secret key from #{$options[:keyfile]}"
+    $options[:secret_key] = File.open($options[:keyfile]).read.chomp
 end
 
 # make sure we always have a filters list
@@ -65,26 +90,44 @@ end
 
 server = TCPServer.new($options[:host], $options[:port])
 
-x = Thread.new do 
+x = Thread.new do
     loop do
         ignore = nil
         s = server.accept
 	  	line = s.gets.chomp.gsub(/\r/,'')
+        if $options[:verbose] then
+            puts "[#{line}] received"
+        end
+
+	    log "R #{line}"
+
+        if $options[:secret_key] then
+            log "K #{$options[:secret_key]}"
+            # check the line matches our secret shared key
+            match = "%/#{$options[:secret_key]}/%"
+            unless line.gsub!(%r{^#{match} }, '') then
+                log "line ignored because secret key doesn't match"
+                ignore = true
+            end
+            log "L #{line}"
+        else
+            # avoid information leakage due to misconfiguration
+            # if a line looks like it starts with a secret key, remove it
+            line.gsub!(%r{^%/.*?/% }, '')
+        end
 
         config['filters'].each { |f|
             if line =~ /#{f}/ then
                 if $options[:verbose] then
-                    puts "[#{line}] filtered by [#{f}]"
+                    log "F #{f} =~ #{line}"
                 end
                 ignore = true
             end
         }
 
+
         if ignore.nil? then
-	        if $options[:debug] > 0 then
-			    puts "got line [#{line}]"
-			    puts "sending it to #{$options[:whoto]}"
-	        end
+            log "sending it to #{$options[:whoto]}"
 	        if $options[:debug] > 0 then
 	            puts "<#{$options[:whoto]}> #{line}"
 	        else
@@ -96,67 +139,86 @@ x = Thread.new do
     end
 end
 
-if $options[:debug] > 0 then
-    puts "creating jabber connection now"
+# skip jabber entirely if we have high enough debugging
+if $options[:debug] > 3 then
+    x.join
+    exit
 end
 
-if $options[:debug] > 1 then
-    Jabber::debug = true
-end
-
-subscription_callback = lambda { |item,pres|
-  name = pres.from
-  if item != nil && item.iname != nil
-    name = "#{item.iname} (#{pres.from})"
-  end
-  case pres.type
-    when :subscribe then puts("Subscription request from #{name}")
-    when :subscribed then puts("Subscribed to #{name}")
-    when :unsubscribe then puts("Unsubscription request from #{name}")
-    when :unsubscribed then puts("Unsubscribed from #{name}")
-    else raise "The Roster Helper is buggy!!! subscription callback with type=#{pres.type}"
-  end
-    $bot.set_presence(nil, "Waiting for socket tickling...")
-}
+#### JABBER
 
 # settings
 myJID = JID.new(config['myjid'])
 myPassword = config['mypass']
 
-$bot = Jabber::Framework::Bot.new(myJID, myPassword)
-class << $bot
-  def accept_subscription_from?(jid)
-    if jid == $options[:whoto] then
-        true
-    else
-        false
-    end
-  end
-end
-
-$bot.set_presence(nil, "Waiting for socket tickling...")
-
-$bot.roster.add_update_callback { |olditem,item|
-  if [:from, :none].include?(item.subscription) && item.ask != :subscribe && item.jid == $options[:whoto]
-    if $options[:debug] > 0 then
-        puts("Subscribing to #{item.jid}")
-    end
-    item.subscribe
-  end
-}
+log "creating jabber connection now"
 
-$bot.roster.add_subscription_callback(0, nil, &subscription_callback)
+if $options[:debug] > 1 then
+    Jabber::debug = true
+end
 
-$bot.roster.groups.each { |group|
-    $bot.roster.find_by_group(group).each { |item|
-        if [:from, :none].include?(item.subscription) && item.ask != :subscribe && item.jid == $options[:whoto] then
-            if $options[:debug] > 0 then
-                puts "subscribing to #{item.jid}"
-            end
-            item.subscribe
+if $options[:muc] then # can't distinguish MUC JID from normal JID
+    cl = Jabber::Client.new(Jabber::JID.new(myJID))
+    cl.connect
+    cl.auth(myPassword)
+    m = Jabber::MUC::SimpleMUCClient.new(cl)
+    class << m
+        def send_message(junk, body)
+            say(body)
         end
-    }
-}
-
+    end
+    m.join($options[:whoto])
+    $bot = m
+else
+	subscription_callback = lambda { |item,pres|
+	  name = pres.from
+	  if item != nil && item.iname != nil
+	    name = "#{item.iname} (#{pres.from})"
+	  end
+	  case pres.type
+	    when :subscribe then puts("Subscription request from #{name}")
+	    when :subscribed then puts("Subscribed to #{name}")
+	    when :unsubscribe then puts("Unsubscription request from #{name}")
+	    when :unsubscribed then puts("Unsubscribed from #{name}")
+	    else raise "The Roster Helper is buggy!!! subscription callback with type=#{pres.type}"
+	  end
+	    $bot.set_presence(nil, "Waiting for socket tickling...")
+	}
+
+	$bot = Jabber::Framework::Bot.new(myJID, myPassword)
+	class << $bot
+	  def accept_subscription_from?(jid)
+	    if jid == $options[:whoto] then
+	        true
+	    else
+	        false
+	    end
+	  end
+	end
+
+	$bot.set_presence(nil, "Waiting for socket tickling...")
+
+	$bot.roster.add_update_callback { |olditem,item|
+	  if [:from, :none].include?(item.subscription) && item.ask != :subscribe && item.jid == $options[:whoto]
+	    if $options[:debug] > 0 then
+	        puts("Subscribing to #{item.jid}")
+	    end
+	    item.subscribe
+	  end
+	}
+
+	$bot.roster.add_subscription_callback(0, nil, &subscription_callback)
+
+	$bot.roster.groups.each { |group|
+	    $bot.roster.find_by_group(group).each { |item|
+	        if [:from, :none].include?(item.subscription) && item.ask != :subscribe && item.jid == $options[:whoto] then
+	            if $options[:debug] > 0 then
+	                puts "subscribing to #{item.jid}"
+	            end
+	            item.subscribe
+	        end
+	    }
+	}
+end
 
 x.join

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rjp-jabber_cat
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors: 
 - Rob Partington