fingerpoken 0.2.20110104190832 → 0.3.0

data/bin/fingerpoken.rb

@@ -28,6 +28,8 @@ end
 
 def main(args)
   targets = []
+  passphrase = nil
+
   opts = OptionParser.new do |opts|
     opts.banner = "Usage: #{$0} [options]"
 
@@ -49,6 +51,10 @@ def main(args)
         targets << [:Tivo, { :host => target.host }]
       end
     end
+
+    opts.on("--passphrase PASSPHRASE", "Passphrase for verifying client calls") do |val|
+      passphrase = val
+    end
   end
   opts.parse(args)
 
@@ -62,8 +68,9 @@ def main(args)
     channel = EventMachine::Channel.new
 
     targets.each do |klass, args|
-      args.merge!({ :channel => channel })
+      args.merge!({ :channel => channel, :passphrase => passphrase })
       target = FingerPoken::Target.const_get(klass).new(args)
+
       target.register
     end # targets.each
 
@@ -84,4 +91,4 @@ def main(args)
   end # EventMachine::run
 end
 
-exit(main(ARGV))
+main(ARGV)

data/lib/fingerpoken/target.rb

@@ -1,17 +1,67 @@
+require "rubygems"
 require "logger"
+require "hmac-md5"
 
 class FingerPoken::Target
   def initialize(config)
     @channel = config[:channel]
     @logger = Logger.new(STDERR)
     @logger.level = ($DEBUG ? Logger::DEBUG: Logger::WARN)
+    @passphrase = config[:passphrase] # OK if this is nil
+
+    @last_sequence = -1
   end
 
+  def verify(request, callback)
+    if !request["signature"]
+      # TODO(sissel): Send callback saying "passphrase required"
+      @logger.warn("Message with no signature")
+      return false
+    end
+
+    if request["sequence"] < @last_sequence
+      # Reject out of sequence or replayed messages
+      # TODO(sissel): Report replay attack detected
+      @logger.warn("Sequence #{request["sequence"]} < #{@last_sequence} "\
+                   "(last sequence). Replay attack or bug?")
+      return false
+    end
+
+    hmac = HMAC::MD5.new(@passphrase)
+    hmac.update(request["sequence"].to_s)
+    digest_bytes = hmac.digest.bytes.to_a
+    if request["signature"] == digest_bytes
+      return true
+    else
+      # TODO(sissel): Report verification failed
+      @logger.warn("Signature verify failed. Server:#{digest_bytes.inspect}, Client:#{request["signature"].inspect}")
+      return false
+    end
+  end # def verify
+
   def register
+    if @registered
+      @logger.warn("Ignoring extra call to #{self.class.name}#register. Trace:\n#{caller[0..3].join("\n")}")
+      return
+    end
+
+    @registered = true
+    @logger.debug(:register => self.class.name)
     @channel.subscribe do |obj|
       request = obj[:request]
       callback = obj[:callback]
-      @logger.debug(request)
+      @logger.debug(:request => request)
+
+      if @passphrase
+        verified = verify(request, callback)
+        if !verified
+          @logger.warn("Dropping corrupt/forged request")
+          next
+        end
+      end
+
+      @last_sequence = request["sequence"].to_i
+
       response = case request["action"]
         when "mousemove_relative"
           mousemove_relative(request["rel_x"], request["rel_y"])
@@ -36,8 +86,8 @@ class FingerPoken::Target
       if response.is_a?(Hash)
         callback.call(response)
       end
-    end
-  end
+    end # @channel.subscribe
+  end # def register
 
   # Subclasses should implement this.
   def mousemove_relative(x, y)

data/lib/fingerpoken/vnc.rb

@@ -16,6 +16,7 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     @password = (config[:password] or config[:user])
     @host = config[:host]
     @port = (config[:port] or 5900)
+    @ready = false
     @recenter = config[:recenter]
 
     # For eventmachine-vnc
@@ -31,7 +32,11 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     @buttonmask = 0
   end
 
-  def update
+  def update_mouse
+    if !@ready
+      @logger.warn("VNC connection is not ready. Ignoring update.")
+      return { "action" => "status", "status" => "VNC connection not ready, yet" }
+    end
     @vnc.pointerevent(@x, @y, @buttonmask)
 
     # TODO(sissel): Hack to make it work in TF2.
@@ -43,10 +48,15 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     end
   end
 
+  def ready
+    @ready = true
+    return { "action" => "status", "status" => "VNC READY!" }
+  end
+
   def mousemove_relative(x, y)
     @x += x
     @y += y
-    update
+    update_mouse
     return nil
   end
 
@@ -56,7 +66,7 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     ybuf = @screen_y * 0.1
     @x = (((@screen_x + xbuf) * px) - (xbuf / 2)).to_i
     @y = (((@screen_y + ybuf) * py) - (ybuf / 2)).to_i
-    update
+    update_mouse
     return nil
   end
 
@@ -64,7 +74,7 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     button = (1 << (button.to_i - 1))
     return if @buttonmask & button != 0
     @buttonmask |= button
-    update
+    update_mouse
     return nil
   end
 
@@ -72,13 +82,46 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     button = (1 << (button.to_i - 1))
     return if @buttonmask & button == 0
     @buttonmask &= (~button)
-    update
+    update_mouse
     return nil
   end
 
   # TODO(sissel): Add keyboard support.
   # VNC uses the same keysym values as X11, so that's a win. We can likely
   # leverage xdo's char-to-keysym magic with VNC.
+  def keypress(key)
+    puts "Got key: #{key} (#{key.class})"
+    if key.is_a?(String)
+      if key.length == 1
+        # Assume letter
+        @vnc.keyevent(key.chr, true)
+        @vnc.keyevent(key.chr, false)
+      else
+        # Assume keysym
+        puts "I don't know how to type '#{key}'"
+        return { :action => "status", :status => "I don't know how to type '#{key}'" }
+      end
+    else
+      # type printables, key others.
+      if 32.upto(127).include?(key)
+        @vnc.keyevent(key, true)
+        @vnc.keyevent(key, false)
+      else
+        case key
+          when 8 
+            @vnc.keyevent(0xff08, true)
+            @vnc.keyevent(0xff08, false)
+          when 13
+            @vnc.keyevent(0xff0D, true)
+            @vnc.keyevent(0xff0D, false)
+          else
+            puts "I don't know how to type web keycode '#{key}'"
+            return { :action => "status", :status => "I don't know how to type '#{key}'" }
+          end # case key
+      end # if 32.upto(127).include?(key)
+    end # if key.is_a?String
+    return nil
+  end # def keypress
 
   class VNCClient < EventMachine::Connection
     include EventMachine::Protocols::VNC::Client
@@ -93,7 +136,7 @@ class FingerPoken::Target::VNC < FingerPoken::Target
       @target.buttonmask = 0
       @target.x = (@screen_width / 2).to_i
       @target.y = (@screen_height / 2).to_i
-      @target.register
+      @target.ready()
     end
   end # class VNCClient
 end

data/public/js/2.2.0-crypto-md5.js

@@ -0,0 +1,11 @@
+if(typeof Crypto=="undefined"||!Crypto.util)(function(){var n=window.Crypto={},o=n.util={rotl:function(g,i){return g<<i|g>>>32-i},rotr:function(g,i){return g<<32-i|g>>>i},endian:function(g){if(g.constructor==Number)return o.rotl(g,8)&16711935|o.rotl(g,24)&4278255360;for(var i=0;i<g.length;i++)g[i]=o.endian(g[i]);return g},randomBytes:function(g){for(var i=[];g>0;g--)i.push(Math.floor(Math.random()*256));return i},bytesToWords:function(g){for(var i=[],h=0,a=0;h<g.length;h++,a+=8)i[a>>>5]|=g[h]<<24-
+a%32;return i},wordsToBytes:function(g){for(var i=[],h=0;h<g.length*32;h+=8)i.push(g[h>>>5]>>>24-h%32&255);return i},bytesToHex:function(g){for(var i=[],h=0;h<g.length;h++){i.push((g[h]>>>4).toString(16));i.push((g[h]&15).toString(16))}return i.join("")},hexToBytes:function(g){for(var i=[],h=0;h<g.length;h+=2)i.push(parseInt(g.substr(h,2),16));return i},bytesToBase64:function(g){if(typeof btoa=="function")return btoa(p.bytesToString(g));for(var i=[],h=0;h<g.length;h+=3)for(var a=g[h]<<16|g[h+1]<<
+8|g[h+2],b=0;b<4;b++)h*8+b*6<=g.length*8?i.push("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(a>>>6*(3-b)&63)):i.push("=");return i.join("")},base64ToBytes:function(g){if(typeof atob=="function")return p.stringToBytes(atob(g));g=g.replace(/[^A-Z0-9+\/]/ig,"");for(var i=[],h=0,a=0;h<g.length;a=++h%4)a!=0&&i.push(("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(g.charAt(h-1))&Math.pow(2,-2*a+8)-1)<<a*2|"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(g.charAt(h))>>>
+6-a*2);return i}};n.mode={};n=n.charenc={};n.UTF8={stringToBytes:function(g){return p.stringToBytes(unescape(encodeURIComponent(g)))},bytesToString:function(g){return decodeURIComponent(escape(p.bytesToString(g)))}};var p=n.Binary={stringToBytes:function(g){for(var i=[],h=0;h<g.length;h++)i.push(g.charCodeAt(h)&255);return i},bytesToString:function(g){for(var i=[],h=0;h<g.length;h++)i.push(String.fromCharCode(g[h]));return i.join("")}}})();
+(function(){var n=Crypto,o=n.util,p=n.charenc,g=p.UTF8,i=p.Binary,h=n.MD5=function(a,b){var j=o.wordsToBytes(h._md5(a));return b&&b.asBytes?j:b&&b.asString?i.bytesToString(j):o.bytesToHex(j)};h._md5=function(a){if(a.constructor==String)a=g.stringToBytes(a);var b=o.bytesToWords(a),j=a.length*8;a=1732584193;for(var d=-271733879,e=-1732584194,c=271733878,f=0;f<b.length;f++)b[f]=(b[f]<<8|b[f]>>>24)&16711935|(b[f]<<24|b[f]>>>8)&4278255360;b[j>>>5]|=128<<j%32;b[(j+64>>>9<<4)+14]=j;j=h._ff;var k=h._gg,l=
+h._hh,m=h._ii;for(f=0;f<b.length;f+=16){var q=a,r=d,s=e,t=c;a=j(a,d,e,c,b[f+0],7,-680876936);c=j(c,a,d,e,b[f+1],12,-389564586);e=j(e,c,a,d,b[f+2],17,606105819);d=j(d,e,c,a,b[f+3],22,-1044525330);a=j(a,d,e,c,b[f+4],7,-176418897);c=j(c,a,d,e,b[f+5],12,1200080426);e=j(e,c,a,d,b[f+6],17,-1473231341);d=j(d,e,c,a,b[f+7],22,-45705983);a=j(a,d,e,c,b[f+8],7,1770035416);c=j(c,a,d,e,b[f+9],12,-1958414417);e=j(e,c,a,d,b[f+10],17,-42063);d=j(d,e,c,a,b[f+11],22,-1990404162);a=j(a,d,e,c,b[f+12],7,1804603682);c=
+j(c,a,d,e,b[f+13],12,-40341101);e=j(e,c,a,d,b[f+14],17,-1502002290);d=j(d,e,c,a,b[f+15],22,1236535329);a=k(a,d,e,c,b[f+1],5,-165796510);c=k(c,a,d,e,b[f+6],9,-1069501632);e=k(e,c,a,d,b[f+11],14,643717713);d=k(d,e,c,a,b[f+0],20,-373897302);a=k(a,d,e,c,b[f+5],5,-701558691);c=k(c,a,d,e,b[f+10],9,38016083);e=k(e,c,a,d,b[f+15],14,-660478335);d=k(d,e,c,a,b[f+4],20,-405537848);a=k(a,d,e,c,b[f+9],5,568446438);c=k(c,a,d,e,b[f+14],9,-1019803690);e=k(e,c,a,d,b[f+3],14,-187363961);d=k(d,e,c,a,b[f+8],20,1163531501);
+a=k(a,d,e,c,b[f+13],5,-1444681467);c=k(c,a,d,e,b[f+2],9,-51403784);e=k(e,c,a,d,b[f+7],14,1735328473);d=k(d,e,c,a,b[f+12],20,-1926607734);a=l(a,d,e,c,b[f+5],4,-378558);c=l(c,a,d,e,b[f+8],11,-2022574463);e=l(e,c,a,d,b[f+11],16,1839030562);d=l(d,e,c,a,b[f+14],23,-35309556);a=l(a,d,e,c,b[f+1],4,-1530992060);c=l(c,a,d,e,b[f+4],11,1272893353);e=l(e,c,a,d,b[f+7],16,-155497632);d=l(d,e,c,a,b[f+10],23,-1094730640);a=l(a,d,e,c,b[f+13],4,681279174);c=l(c,a,d,e,b[f+0],11,-358537222);e=l(e,c,a,d,b[f+3],16,-722521979);
+d=l(d,e,c,a,b[f+6],23,76029189);a=l(a,d,e,c,b[f+9],4,-640364487);c=l(c,a,d,e,b[f+12],11,-421815835);e=l(e,c,a,d,b[f+15],16,530742520);d=l(d,e,c,a,b[f+2],23,-995338651);a=m(a,d,e,c,b[f+0],6,-198630844);c=m(c,a,d,e,b[f+7],10,1126891415);e=m(e,c,a,d,b[f+14],15,-1416354905);d=m(d,e,c,a,b[f+5],21,-57434055);a=m(a,d,e,c,b[f+12],6,1700485571);c=m(c,a,d,e,b[f+3],10,-1894986606);e=m(e,c,a,d,b[f+10],15,-1051523);d=m(d,e,c,a,b[f+1],21,-2054922799);a=m(a,d,e,c,b[f+8],6,1873313359);c=m(c,a,d,e,b[f+15],10,-30611744);
+e=m(e,c,a,d,b[f+6],15,-1560198380);d=m(d,e,c,a,b[f+13],21,1309151649);a=m(a,d,e,c,b[f+4],6,-145523070);c=m(c,a,d,e,b[f+11],10,-1120210379);e=m(e,c,a,d,b[f+2],15,718787259);d=m(d,e,c,a,b[f+9],21,-343485551);a=a+q>>>0;d=d+r>>>0;e=e+s>>>0;c=c+t>>>0}return o.endian([a,d,e,c])};h._ff=function(a,b,j,d,e,c,f){a=a+(b&j|~b&d)+(e>>>0)+f;return(a<<c|a>>>32-c)+b};h._gg=function(a,b,j,d,e,c,f){a=a+(b&d|j&~d)+(e>>>0)+f;return(a<<c|a>>>32-c)+b};h._hh=function(a,b,j,d,e,c,f){a=a+(b^j^d)+(e>>>0)+f;return(a<<c|a>>>
+32-c)+b};h._ii=function(a,b,j,d,e,c,f){a=a+(j^(b|~d))+(e>>>0)+f;return(a<<c|a>>>32-c)+b};h._blocksize=16;h._digestsize=16})();

data/public/js/2.2.0-hmac-min.js

@@ -0,0 +1 @@
+(function(){var f=Crypto,j=f.util,g=f.charenc,h=g.UTF8,k=g.Binary;f.HMAC=function(b,c,a,d){if(c.constructor==String)c=h.stringToBytes(c);if(a.constructor==String)a=h.stringToBytes(a);if(a.length>b._blocksize*4)a=b(a,{asBytes:true});var i=a.slice(0);a=a.slice(0);for(var e=0;e<b._blocksize*4;e++){i[e]^=92;a[e]^=54}b=b(i.concat(b(a.concat(c),{asBytes:true})),{asBytes:true});return d&&d.asBytes?b:d&&d.asString?k.bytesToString(b):j.bytesToHex(b)}})();

data/public/js/CRYPTO_JS_LICENSE

@@ -0,0 +1,9 @@
+Files:
+  2.2.0-crypto-md5.js
+  2.2.0-hmac-min.js
+
+Source:
+  http://code.google.com/p/crypto-js/
+
+License:
+  New BSD

data/public/js/fingerpoken.js

@@ -1,10 +1,95 @@
 (function() {
   /* TODO(sissel): This could use some serious refactoring. */
 
+    /* From http://alastairc.ac/2010/03/detecting-touch-based-browsing/ */
+  function isTouchDevice() {
+    var el = document.createElement('div');
+    el.setAttribute('ongesturestart', 'return;');
+    if (typeof el.ongesturestart == "function"){
+      return true;
+    } else {
+      return false;
+    }
+  };
+  var TOUCH_SUPPORTED = isTouchDevice;
+
+  var Fingerpoken = function() {
+    this.x = -1;
+    this.y = -1;
+    this.moving = false;
+    this.dragging = false;
+    this.width = window.innerWidth;
+    this.height = window.innerHeight;
+    this.key = undefined; /* TODO(sissel) = unused? */
+    this.keyboard = false;
+    this.touchpad_active = false;
+    this.mouse = { };
+    this.scroll = {
+      y: 0
+    };
+    this.sequence = Math.floor(Math.random() * 10000);
+  };
+
+  Fingerpoken.prototype.send = function(obj) {
+    this.sign(obj);
+    this.websocket.send(JSON.stringify(obj))
+  };
+
+  Fingerpoken.prototype.sign = function(obj) {
+    var passphrase = this.config("fingerpoken/passphrase");
+    obj.sequence = this.sequence;
+    this.sequence += 1;
+
+    console.log("Passphrase: " + passphrase);
+    console.log("Sequence: " + this.sequence);
+    obj.signature = Crypto.HMAC(Crypto.MD5, "" + obj.sequence, passphrase, { asBytes: true });
+  };
+
+  Fingerpoken.prototype.connect = function() {
+    if (this.status === undefined) {
+      this.status = $("#status");
+    }
+    this.status.html("connecting...");
+    var websocket = new WebSocket("ws://" + document.location.hostname + ":5001");
+    var self = this;
+    websocket.onopen = function(event) {
+      self.status.html("websocket ready");
+    }
+
+    websocket.onclose = function(event) {
+      self.status.html("Closed, trying to reopen.");
+      setTimeout(function() {
+        self.connect();
+      }, 1000);
+    }
+
+    websocket.onmessage = function(event) {
+      var request = JSON.parse(event.data);
+      fingerpoken.message_callback(request)
+    }
+
+    this.websocket = websocket;
+  };
+
+  Fingerpoken.prototype.config = function(key, value, default_value) {
+    if (value) {
+      this.status.html("config[" + key + "] = " + value);
+      //alert(key + " => " + value);
+      
+      window.localStorage[key] = value
+      return value
+    } else {
+      return window.localStorage[key] || default_value
+    }
+  };
+
   $(document).ready(function() {
     var status = $("#status");
     var keyboard = $('#keyboard');
     var keyboard_button = keyboard.prev('a');
+    var fingerpoken = new Fingerpoken();
+    fingerpoken.status = status;
+
     keyboard.width(keyboard_button.width());
     keyboard.height(keyboard_button.height());
     /* TODO(sissel): get the computed width (margin, padding, width) */
@@ -14,12 +99,12 @@
     keyboard.bind("focus", function() {
       /* move the textarea away so we don't see the caret */
       keyboard.css('margin-left', '-10000px');
-      state.keyboard = true;
+      fingerpoken.keyboard = true;
       $(window).triggerHandler("resize");
     });
     keyboard.bind("blur", function(){
       keyboard.css('margin-left', '-' + keyboard_button.width() + 'px');
-      state.keyboard = false;
+      fingerpoken.keyboard = false;
       $(window).triggerHandler("resize");
     });
     keyboard.bind("keypress", function(event) {
@@ -28,14 +113,14 @@
       if (!key) {
         key = (e.keyCode ? e.keyCode : e.which);
       }
-      state.websocket.send(JSON.stringify({ 
+      fingerpoken.send(JSON.stringify({ 
         action: "log",
         shift: e.shiftKey,
         char: e.charCode,
         ctrl: e.ctrlKey,
         meta: e.ctrlKey,
       }));
-      state.websocket.send(JSON.stringify({ 
+      fingerpoken.send(JSON.stringify({ 
         action: "keypress",
         key: key,
         shift: e.shiftKey,
@@ -52,7 +137,7 @@
         return;
       }
 
-      state.websocket.send(JSON.stringify({ 
+      fingerpoken.send(JSON.stringify({ 
         action: "type",
         string: keyboard.val(),
       }));
@@ -63,7 +148,7 @@
 
     keyboard.bind("keyup", function(event) {
       var e = event.originalEvent;
-      state.websocket.send(JSON.stringify({ 
+      fingerpoken.send(JSON.stringify({ 
         action: "log",
         shift: e.shiftKey,
         char: e.charCode,
@@ -78,7 +163,7 @@
         return;
       }
 
-      state.websocket.send(JSON.stringify({ 
+      fingerpoken.send(JSON.stringify({ 
         action: "keypress",
         key: key,
         shift: e.shiftKey,
@@ -87,35 +172,7 @@
       event.preventDefault();
     });
 
-    var config = function (key, value, default_value) {
-      if (value) {
-        status.html("config[" + key + "] = " + value);
-        //alert(key + " => " + value);
-        
-        window.localStorage[key] = value
-        return value
-      } else {
-        return window.localStorage[key] || default_value
-      }
-    };
-
-    var state = {
-      x: -1,
-      y: -1,
-      moving: false,
-      dragging: false,
-      width: window.innerWidth,
-      height: window.innerHeight,
-      key: undefined, /* TODO(sissel): unused? */
-      keyboard: false,
-      touchpad_active: false,
-      mouse: { },
-      scroll: {
-        y: 0,
-      }
-    };
-
-    state.message_callback = function(request) {
+    fingerpoken.message_callback = function(request) {
       action = request["action"];
       switch (action) {
         case "status":
@@ -131,17 +188,22 @@
     /* Sync configuration elements */
 
     /* Mouse movement */
-    console.log(config("fingerpoken/mouse/movement"));
+    console.log(fingerpoken.config("fingerpoken/mouse/movement"));
     $("input[name = \"mouse-config\"]")
       .bind("change", function(event) {
-        config("fingerpoken/mouse/movement", event.target.value);
-      }).filter("[value = \"" + config("fingerpoken/mouse/movement") + "\"]")
+        fingerpoken.config("fingerpoken/mouse/movement", event.target.value);
+      }).filter("[value = \"" + fingerpoken.config("fingerpoken/mouse/movement") + "\"]")
       .attr("checked", "checked").click()
     
     $("input[name = \"mouse-acceleration\"]")
       .bind("change", function(event) {
-        config("fingerpoken/mouse/acceleration", parseInt(event.target.value));
-      }).val(config("fingerpoken/mouse/acceleration")).change();
+        fingerpoken.config("fingerpoken/mouse/acceleration", parseInt(event.target.value));
+      }).val(fingerpoken.config("fingerpoken/mouse/acceleration")).change();
+
+    $("input[name = \"fingerpoken-passphrase\"]")
+      .bind("change", function(event) {
+        fingerpoken.config("fingerpoken/passphrase", event.target.value);
+      }).val(fingerpoken.config("fingerpoken/passphrase")).change();
 
     /* Changing orientation sometimes leaves the viewport
      * not starting at 0,0. Fix it with this hack.
@@ -162,7 +224,7 @@
       /* TODO(sissel): Make this special handling only for iphones.
        * http://developer.apple.com/library/safari/#documentation/appleapplications/reference/safariwebcontent/UsingtheViewport/UsingtheViewport.html
        */
-      if (state.keyboard) {
+      if (fingerpoken.keyboard) {
         if (window.orientation == 90 || window.orientation == -90) {
           content_height -= 162; /* landscape orientation keyboard */
           content_height -= 32; /* "form assistant" aka FormFill, this height is undocumented. */
@@ -171,57 +233,36 @@
           content_height -= 44; /* "form assistant" aka FormFill */
         }
       }
-      status.html("Resize / " + window.orientation + " / " + state.keyboard + " / " + content_height);
+      status.html("Resize / " + window.orientation + " / " + fingerpoken.keyboard + " / " + content_height);
       content.height(content_height);
     });
 
-    var connect = function(state) {
-      status.html("connecting...");
-      var websocket = new WebSocket("ws://" + document.location.hostname + ":5001");
-      websocket.onopen = function(event) {
-        status.html("websocket ready");
-      }
 
-      websocket.onclose = function(event) {
-        status.html("Closed, trying to reopen.");
-        setTimeout(function() {
-          connect(state);
-        }, 1000);
-      }
-
-      websocket.onmessage = function(event) {
-        var request = JSON.parse(event.data);
-        state.message_callback(request)
-      }
-
-      state.websocket = websocket;
-    }
-
-    connect(state);
+    fingerpoken.connect();
 
     /* This will track orientation/motion changes with the accelerometer and
      * gyroscope. Not sure how useful this would be... */
     //$(window).bind("devicemotion", function(event) {
       //var e = event.originalEvent;
-      //state.accel = e.accelerationIncludingGravity;
+      //fingerpoken.accel = e.accelerationIncludingGravity;
 
       /* Trim shakes */
-      //if (Math.abs(state.accel.x) < 0.22 && Math.abs(state.accel.y) < 0.22) {
+      //if (Math.abs(fingerpoken.accel.x) < 0.22 && Math.abs(fingerpoken.accel.y) < 0.22) {
         //return;
       //}
-      //status.html("Motion: \nx: " + state.accel.x + "\ny: " + state.accel.y + "\nz: " + state.accel.z);
-      //state.websocket.send(JSON.stringify({
+      //status.html("Motion: \nx: " + fingerpoken.accel.x + "\ny: " + fingerpoken.accel.y + "\nz: " + fingerpoken.accel.z);
+      //fingerpoken.send({
         //action: "move",
-        //rel_x: Math.ceil(state.accel.x) * -1,
-        //rel_y: Math.ceil(state.accel.y) * -1,
-      //}));
+        //rel_x: Math.ceil(fingerpoken.accel.x) * -1,
+        //rel_y: Math.ceil(fingerpoken.accel.y) * -1,
+      //});
     //});
     
 
     /* TODO(sissel): add mousedown/mousemove/mouseup support */
     $("#area").bind("touchstart mousedown", function(event) {
       var e = event.originalEvent;
-      state.touchpad_active = true;
+      fingerpoken.touchpad_active = true;
       /* if no 'touches', use the event itself, one finger/mouse */
       var touches = e.touches || [ e ];
       var output = "Start: " + touches[0].clientX + "," + touches[0].clientY + "\n";
@@ -229,84 +270,85 @@
       status.html(output);
 
       /* number of fingers == mouse button */
-      state.fingers = touches.length;
-      switch (state.fingers) {
-        case 1: state.button = 1; break;
-        case 2: state.button = 3; break;
-        case 3: state.button = 2; break;
+      fingerpoken.fingers = touches.length;
+      switch (fingerpoken.fingers) {
+        case 1: fingerpoken.button = 1; break;
+        case 2: fingerpoken.button = 3; break;
+        case 3: fingerpoken.button = 2; break;
       }
 
       var now = (new Date()).getTime();
-      if ((now - state.last_click) < 170) {
+      if ((now - fingerpoken.last_click) < 170) {
         /* Start dragging */
-        state.websocket.send(JSON.stringify({
+        fingerpoken.send({
           action: "mousedown",
-          button: state.button,
-        }))
-        state.dragging = true;
+          button: fingerpoken.button,
+        })
+        fingerpoken.dragging = true;
       }
       event.preventDefault();
     }).bind("touchend mouseup", function(event) { /* $("#touchpadsurface").bind("touchend" ...  */
       var e = event.originalEvent;
       var touches = e.touches || [ e ];
 
-      if (state.mouse.vectorTimer) {
-        clearInterval(state.mouse.vectorTimer);
-        state.mouse.vectorTimer = null;
+      if (fingerpoken.mouse.vectorTimer) {
+        clearInterval(fingerpoken.mouse.vectorTimer);
+        fingerpoken.mouse.vectorTimer = null;
       }
 
-      if (state.dragging) {
-        state.websocket.send(JSON.stringify({
+      if (fingerpoken.dragging) {
+        fingerpoken.send({
           action: "mouseup",
-          button: state.button,
-        }));
-        state.dragging = false;
+          button: fingerpoken.button,
+        });
+        fingerpoken.dragging = false;
       } else {
-        if (state.moving && !state.scrolling) {
-          var e = state.last_move;
+        if (fingerpoken.moving && !fingerpoken.scrolling) {
+          var e = fingerpoken.last_move;
           var r = e.rotation;
           if (r < 0) {
             r += 360;
           }
 
           status.html(r);
-        } else if (state.scrolling) {
+        } else if (fingerpoken.scrolling) {
           /* nothing for now */
         } else {
           /* No movement, click! */
           status.html("Click!");
-          state.websocket.send(JSON.stringify({ 
+          console.log("click");
+          fingerpoken.send({
             action: "click",
-            button: state.button,
-          }));
-          state.last_click = (new Date()).getTime();
+            button: fingerpoken.button,
+          });
+          fingerpoken.last_click = (new Date()).getTime();
         }
       }
       if (touches.length == 0 || !e.touches) {
-        state.moving = false;
-        state.scrolling = false;
-        state.touchpad_active = false;
+        fingerpoken.moving = false;
+        fingerpoken.scrolling = false;
+        fingerpoken.touchpad_active = false;
       }
       event.preventDefault();
     }).bind("touchmove mousemove", function(event) { /* $("#touchpadsurface").bind("touchmove" ... */
       var e = event.originalEvent;
       var touches = e.touches || [ e ];
 
-      //if (!state.touchpad_active) {
+      //if (!fingerpoken.touchpad_active) {
         //event.preventDefault();
         //return;
       //}
 
-      if (!state.moving) {
+      if (!fingerpoken.moving) {
         /* Start calculating delta offsets now */
-        state.moving = true;
-        state.start_x = state.x = touches[0].clientX;
-        state.start_y = state.y = touches[0].clientY;
+        fingerpoken.moving = true;
+        fingerpoken.start_x = fingerpoken.x = touches[0].clientX;
+        fingerpoken.start_y = fingerpoken.y = touches[0].clientY;
         /* Skip this event */
         return;
       }
 
-      state.last_move = e;
+      fingerpoken.last_move = e;
 
       var output = "";
       for (var i in touches) {
@@ -322,8 +364,8 @@
 
       var x = touches[0].clientX;
       var y = touches[0].clientY;
-      var delta_x = (x - state.x);
-      var delta_y = (y - state.y);
+      var delta_x = (x - fingerpoken.x);
+      var delta_y = (y - fingerpoken.y);
 
       /* Apply acceleration */
       var sign_x = (delta_x < 0 ? -1 : 1);
@@ -331,15 +373,15 @@
 
       /* jQuery Mobile or HTML 'range' inputs don't support floating point.
        * Hack around it by using larger numbers and compensating. */
-      var accel = config("fingerpoken/mouse/acceleration", null, 150) / 100.0;
+      var accel = fingerpoken.config("fingerpoken/mouse/acceleration", null, 150) / 100.0;
       output += "Accel: " + accel + "\n";
 
       var delta_x = Math.ceil(Math.pow(Math.abs(delta_x), accel) * sign_x);
       var delta_y = Math.ceil(Math.pow(Math.abs(delta_y), accel) * sign_y);
       output += "Delta: " + delta_x + ", " + delta_y + "\n";
 
-      state.x = x;
-      state.y = y;
+      fingerpoken.x = x;
+      fingerpoken.y = y;
 
       /* TODO(sissel): Make this a config option */
       if (e.rotation < -10 || e.rotation > 10) {
@@ -352,48 +394,49 @@
         return;
       }
 
-      if (touches.length > 1 && !state.dragging) {
+      if (touches.length > 1 && !fingerpoken.dragging) {
         /* Multifinger movement, probably should scroll? */
         if (Math.abs(delta_y) > 0) {
           /* Scroll */
-          state.scroll.y += delta_y;
+          fingerpoken.scroll.y += delta_y;
 
           /* Don't scroll every time we move, wait until we move enough
            * that it is more than 10 pixels. */
           /* TODO(sissel): Make this a config option */
-          if (Math.abs(state.scroll.y) > 10) {
-            state.scrolling = true;
-            state.moving = false;
-            state.scroll.y  = 0;
-            state.websocket.send(JSON.stringify({
+          if (Math.abs(fingerpoken.scroll.y) > 10) {
+            fingerpoken.scrolling = true;
+            fingerpoken.moving = false;
+            /* TODO(sissel): Support horizontal scrolling (buttons 6 and 7) */
+            fingerpoken.scroll.y = 0;
+            fingerpoken.send({
               action: "click",
               button: (delta_y < 0) ? 4 : 5,
-            }))
+            });
           }
         } /* if (Math.abs(delta_y) > 0) */
       } else {
         /* Only 1 finger, and we aren't dragging. So let's move! */
         /* TODO(sissel): Refactor these in to fumctions */
-        var movement = config("fingerpoken/mouse/movement");
+        var movement = fingerpoken.config("fingerpoken/mouse/movement");
         if (movement == "relative") {
-          state.websocket.send(JSON.stringify({
+          fingerpoken.send({
             action: "mousemove_relative",
             rel_x: delta_x,
             rel_y: delta_y
-          }));
+          });
         } else if (movement == "absolute") {
           /* Send absolute in terms of percentages. */
           var content = $(".content:visible");
-          state.websocket.send(JSON.stringify({
+          fingerpoken.send({
             action: "mousemove_absolute",
             percent_x: x / content.innerWidth(),
             percent_y: y / content.innerHeight(),
-          }));
+          });
         } else if (movement == "vector") {
-          if (!state.mouse.vectorTimer) {
-            state.mouse.vectorTimer = setInterval(function() {
-              var rx = state.x - state.start_x;
-              var ry = state.y - state.start_y;
+          if (!fingerpoken.mouse.vectorTimer) {
+            fingerpoken.mouse.vectorTimer = setInterval(function() {
+              var rx = fingerpoken.x - fingerpoken.start_x;
+              var ry = fingerpoken.y - fingerpoken.start_y;
               if (rx == 0 || ry == 0) {
                 return;
               }
@@ -407,13 +450,13 @@
               ry = Math.ceil(Math.pow(Math.abs(ry), vector_accel) * sign_ry);
               output += "rx2,ry2 = " + rx + ", " + ry + "\n"; 
 
-              state.websocket.send(JSON.stringify({
+              fingerpoken.send({
                 action: "mousemove_relative",
                 rel_x: rx,
                 rel_y: ry
-              }));
+              });
             }, 15);
-          } /* if (!state.mouse.vectorTimer) */
+          } /* if (!fingerpoken.mouse.vectorTimer) */
         } /* mouse vector movement */
         status.html(output)
       } /* finger movement */
@@ -428,22 +471,38 @@
      * Mouse click
      * <a class="command" data-action="click" data-button="button to click">
      */
-    $("a.command").bind("touchstart", function(event) {
-      state.touchelement = this;
-    }).bind("mousedown", function(event) {
-      state.touchelement = this;
-      event.preventDefault();
-    }).bind("touchmove mousemove", function(event) {
+
+    var cmd = $("a.command")
+    cmd.bind("touchstart", function(event) {
+      fingerpoken.touchelement = this;
+    }).bind("touchmove", function(event) {
       event.preventDefault();
-    }).bind("touchend mouseup", function(event) {
-      if (state.touchelement == this) {
-        state.websocket.send(JSON.stringify({ 
+    }).bind("touchend", function(event) {
+      if (fingerpoken.touchelement == this) {
+        fingerpoken.send({
           action: $(this).attr("data-action"),
           key: $(this).attr("data-key"),
           button: parseInt($(this).attr("data-button")),
-        }));
+        });
       }
     });
 
+    if (!TOUCH_SUPPORTED) {
+      cmd.bind("mousedown", function(event) {
+        fingerpoken.touchelement = this;
+        event.preventDefault();
+      }).bind("mousemove", function(event) {
+        event.preventDefault();
+      }).bind("touchend", function(event) {
+        if (fingerpoken.touchelement == this) {
+          fingerpoken.send({
+            action: $(this).attr("data-action"),
+            key: $(this).attr("data-key"),
+            button: parseInt($(this).attr("data-button")),
+          });
+        }
+      });
+    } /* if !TOUCH_SUPPORTED */
+
   }); /* $(document).ready */
 })();

data/views/index.haml

@@ -15,6 +15,8 @@
     %script{ :src => "/js/jquery.mobile-1.0a2.min.js",
              :type => "text/javascript" }
 
+    %script{ :src => "/js/2.2.0-crypto-md5.js", :type => "text/javascript" }
+    %script{ :src => "/js/2.2.0-hmac-min.js", :type => "text/javascript" }
   %body
     / touchpad
     %div{"data-role" => "page", "data-theme" => "a", "id" => "touchpad"}
@@ -71,5 +73,9 @@
         / Mouse acceleration
         %label{:for => "mouse-acceleration"} Acceleration
         %input{:type => "range", :name => "mouse-acceleration", :id => "mouse-acceleration", :min => 1, :max => 300, :step => "any"}
+        / Crypto passphrase
+        %br
+        %label{:for => "fingerpoken-passphrase"} Passphrase
+        %input{:type => "text", :name => "fingerpoken-passphrase", :id => "fingerpoken-passphrase"}
 
     %script{ :src => "/js/fingerpoken.js" }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fingerpoken
 version: !ruby/object:Gem::Version 
-  hash: 40220208381687
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 20110104190832
-  version: 0.2.20110104190832
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -08:00
+date: 2011-04-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine-vnc
+  name: ffi
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ffi
+  name: ruby-hmac
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -60,6 +60,62 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: em-websocket
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: async_sinatra
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: eventmachine-vnc
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 description: fingerpoken - turns your ipad/itouch/iphone into a remote touchpad, keyboard, etc
 email: jls@semicomplete.com
 executables: 
@@ -69,25 +125,28 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/fingerpoken/xdo.rb
 - lib/fingerpoken/target.rb
-- lib/fingerpoken/tivo.rb
 - lib/fingerpoken/vnc.rb
-- public/reset.css
+- lib/fingerpoken/tivo.rb
+- lib/fingerpoken/xdo.rb
+- public/js/jquery.mobile-1.0a2.min.js
+- public/js/CRYPTO_JS_LICENSE
 - public/js/fingerpoken.js
 - public/js/jquery.min.js
-- public/js/jquery.mobile-1.0a2.min.js
-- public/images/form-radio-on.png
+- public/js/2.2.0-hmac-min.js
+- public/js/2.2.0-crypto-md5.js
+- public/jquery.mobile-1.0a2.min.css
+- public/reset.css
 - public/images/form-check-on.png
-- public/images/icons-36-white.png
+- public/images/form-radio-off.png
 - public/images/icons-36-black.png
-- public/images/icon-search-black.png
 - public/images/icons-18-white.png
+- public/images/form-radio-on.png
 - public/images/ajax-loader.png
-- public/images/form-radio-off.png
-- public/images/icons-18-black.png
+- public/images/icon-search-black.png
+- public/images/icons-36-white.png
 - public/images/form-check-off.png
-- public/jquery.mobile-1.0a2.min.css
+- public/images/icons-18-black.png
 - views/style.sass
 - views/index.haml
 - bin/fingerpoken.rb