siriproxy 0.4.1

data/Gemfile

@@ -0,0 +1,25 @@
+source 'https://rubygems.org'
+
+gemspec
+
+# load plugins
+require 'yaml'
+require 'ostruct'
+
+if !File.exists?(File.expand_path('~/.siriproxy/config.yml'))
+  $stderr.puts "config.yml not found. Copy config.example.yml to config.yml, then modify it."
+  exit 1
+end
+
+gem 'cora', '0.0.4'
+
+config = OpenStruct.new(YAML.load_file(File.expand_path('~/.siriproxy/config.yml')))
+if config.plugins
+  config.plugins.each do |plugin|
+    if plugin.is_a? String
+      gem "siriproxy-#{plugin.downcase}"
+    else
+      gem "siriproxy-#{plugin['gem'] || plugin['name'].downcase}", :path => plugin['path'], :git => plugin['git'], :branch => plugin['branch'], :require => plugin['require']
+    end
+  end
+end

data/README.md

@@ -0,0 +1,262 @@
+Siri Proxy
+==========
+
+About
+-----
+Siri Proxy is a proxy server for Apple's Siri "assistant." The idea is to allow for the creation of custom handlers for different actions. This can allow developers to easily add functionality to Siri. 
+
+The main example I provide is a plugin to control [my thermostat](http://www.radiothermostat.com/latestnews.html#advanced) with Siri. It responds to commands such as, "What's the status of the thermostat?", or "Set the thermostat to 68 degrees", or even "What's the inside temperature?"
+
+Notice About Plugins
+--------------------
+
+We recently changed the way plugins work very significantly. That being the case, your old plugins won't work. 
+
+New plugins should be independent Gems. Take a look at the included [example plugin](https://github.com/plamoni/SiriProxy/tree/master/plugins/siriproxy-example) for some inspiration. We will try to keep that file up to date with the latest features. 
+
+The State of This Project
+------------------------- 
+
+Please remember that this project is super-pre-alpha right now. If you're not a developer with a good bit of experience with networks, you're probably not even going to get the proxy running. But if you do (we are willing to help to an extent, check the IRC chat and my Twitter feed [@plamoni](http://www.twitter.com/plamoni)), then test out building a plugin. It's very easy to do and takes almost no time at all for most experienced developers. Check the demo videos and other plugins below for inspiration!
+
+
+Find us on IRC
+--------------
+
+We now have an IRC channel. Check out the #SiriProxy channel on irc.freenode.net.
+
+Demo Video
+-----------
+
+See the system in action here: [http://www.youtube.com/watch?v=AN6wy0keQqo](http://www.youtube.com/watch?v=AN6wy0keQqo)
+
+More Demo Videos and Other Plugins
+----------------------------------
+
+For a list of current plugins and some more demo videos, check the [Plugins page](https://github.com/plamoni/SiriProxy/wiki/Plugins) on the wiki.  
+
+Set-up Instructions
+-------------------
+
+**Video of a complete installation on Ubuntu 11.10**
+
+[http://www.youtube.com/watch?v=GQXyJR6mOk0](http://www.youtube.com/watch?v=GQXyJR6mOk0)
+
+This is a video of a complete start-to-finish installation on a fresh install of Ubuntu 11.10. 
+
+The commands used in the video can be found at [https://gist.github.com/1428474](https://gist.github.com/1428474).
+
+**Set up DNS**
+
+Before you can use SiriProxy, you must set up a DNS server on your network to forward requests for guzzoni.apple.com to the computer running the proxy (siriproxy uses Google's public DNS servers to resolve guzzoni.apple.com, so it may use your forwarding DNS server). I recommend dnsmasq for this purpose. It's easy to get running and can easily handle this sort of behavior. ([http://www.youtube.com/watch?v=a9gO4L0U59s](http://www.youtube.com/watch?v=a9gO4L0U59s))
+
+**Set up RVM and Ruby 1.9.3**
+
+If you don't already have Ruby 1.9.3 installed through RVM, please do so in order to make sure you can follow the steps later. Experts can ignore this. If you're unsure, follow these directions carefully:
+
+1. Download and install RVM (if you don't have it already):
+	* Download/install RVM:  
+		`bash < <(curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer)`  
+	* Activate RVM:  
+		`[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"`  
+	* (optional, but useful) Add RVM to your .bash_profile:  
+		`echo '[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function' >> ~/.bash_profile`   
+2. Install Ruby 1.9.3 (if you don't have it already):   
+	`rvm install 1.9.3`  
+3. Set RVM to use/default to 1.9.3:   
+	`rvm use 1.9.3 --default`
+	
+**Set up SiriProxy**
+
+Clone this repo locally, then navigate into the SiriProxy directory (the root of the repo). Then follow these instructions carefully. Note that nothing needs to be (or should be) done as root until you launch the server:
+
+1. Install Rake and Bundler:  
+	`rvmsudo gem install rake bundler`  
+2. Install SiriProxy gem (do this from your SiriProxy directory):  
+	`rake install`  
+3. Make .siriproxy directory:  
+	`mkdir ~/.siriproxy`  
+4. Move default config file to .siriproxy (if you need to make configuration changes, do that now by editing the config.yml):  
+	`cp ./config.example.yml ~/.siriproxy/config.yml`  
+5. Generate certificates:  
+	`siriproxy gencerts`
+6. Install `~/.siriproxy/ca.pem` on your phone. This can easily be done by emailing the file to yourself and clicking on it in the iPhone email app. Follow the prompts.
+7. Bundle SiriProxy (this should be done every time you change the config.yml):  
+	`siriproxy bundle`
+8. Start SiriProxy (must start as root because it uses a port < 1024):  
+	`rvmsudo siriproxy server`
+9. Test that the server is running by saying "Test Siri Proxy" to your phone.
+
+Note: on some machines, rvmsudo changes "`~`" to "`/root/`". This means that you may need to symlink your "`.siriproxy`" directory to "`/root/`" in order to get the application to work:  
+
+	sudo ln -s ~/.siriproxy /root/.siriproxy
+
+**Updating SiriProxy**
+
+Once you're up and running, if you modify the code, or you want to grab the latest code from GitHub, you can do that easily using the "siriproxy update" command. Here's a couple of examples:
+
+	siriproxy update  
+	
+Installs the latest code from the [master] branch on GitHub.
+	
+	siriproxy update /path/to/SiriProxy  
+
+Installs the code from /path/to/SiriProxy
+	
+	siriproxy update -b dev 
+
+Installs the latest code from the development branch (called "dev") on GitHub.
+	
+
+FAQ
+---
+
+**Will this let me run Siri on my iPhone 4, iPod Touch, iPhone 3G, Microwave, etc?**
+
+No. Please stop asking. 
+
+**What is your opinion on h1siri, public SiriProxy servers, and other Siri "ports"?**
+
+Glad you asked! Watch this: [http://youtu.be/Y_Q6PfxBSbA](http://youtu.be/Y_Q6PfxBSbA)
+
+**How do I generate the certificate?**
+
+Certificates can now be easily generated using `siriproxy gencerts` once you install the SiriProxy gem. See the instructions above.
+
+**How do I set up a DNS server to forward Guzzoni.apple.com traffic to my computer?**
+
+Check out my video on this: 
+
+[http://www.youtube.com/watch?v=a9gO4L0U59s](http://www.youtube.com/watch?v=a9gO4L0U59s)
+
+**Will this work outside my home network?**
+
+No, it won't. But, as suggested by STBullard on YouTube, you COULD VPN into your home network from outside your house in order to make this work. That would not require a jailbreak. Of course, it also means ALL your traffic gets funneled through your home network. The nice thing about adding an entry to your /etc/hosts file (on a jailbroken phone) is that it funnels only Siri traffic through your home network, and not all your traffic.
+
+**Can you provide me with an iPhone 4S UDID?**
+
+No. Don't even ask.
+
+**I'm getting a bunch of "[Info - Guzzoni] Object: SessionValidationFailed" messages. What's wrong?!**
+
+You're probably not using an iPhone 4S. You need to be using an iPhone 4S (or have a UDID you can sub in) in order to make use of SiriProxy. Sorry, this is not designed to be a way around that limitation. (Thanks to [@brownie545](http://www.twitter.com/brownie545) for providing information on what happens when you use a non-iPhone 4S)
+
+**How do I remove the certificate from my iPhone when I'm done?**
+
+Just go into your phone's Settings app, then go to "General->Profiles." Your CA will probably be the only thing listed under "Configuration Profiles." It will be listed as "SiriProxyCA" Just click it and click "Remove" and it will be removed. (Thanks to [@tidegu](http://www.twitter.com/tidegu) for asking!)
+
+**Does this require a jailbreak?**
+
+No. The only action you need to take on the phone is to install the root CA's public key.
+
+**Using Siri causes a whole bunch of the following messages, followed by SiriProxy crashing!**
+
+	Create server for iPhone connection
+	start conn #<SiriProxy::Connection::Iphone:0x966a400 @signature=880, @processed_headers=false, @output_buffer="", @input_buffer="", @unzipped_input="", @unzipped_output="", @unzip_stream=#<Zlib::Inflate:0x9669640>, @zip_stream=#<Zlib::Deflate:0x96695dc>, @consumed_ace=false, @name="iPhone", @ssled=false>
+	[Info - Plugin Manager] Plugins loaded: [#<SiriProxy::Plugin::Example:0x968a818 @manager=#<SiriProxy::PluginManager:0x9685750 @plugins=[...]>>]
+	
+This is actually really common (but can be tricky to fix). The problem is that your SiriProxy server is using your tainted DNS server. So what happens is this:
+
+1. Your iPhone connects to your server, thinking it's `guzzoni.apple.com`
+2. Your server connects to *itself*, thinking that *it's* `guzzoni.apple.com`
+3. Your server thinks another iPhone has connected, and repeats step 2.
+
+This goes on forever, or at least a second or two before the server up and dies. The trick is that you need to make sure your server isn't connecting to itself when it requests a connection to `guzzoni.apple.com`. This is actually the default behavior, but many people accidentally mess things up by either (1) setting up their server to use itself as a DNS server (while using dnsmasq to taint the entry for `guzzoni.apple.com`), or (2) putting their server on a network where the DNS server issued by DHCP is tainted to point to the wrong `guzzoni.apple.com`.
+
+So the fix for this varies based on your setup, but one possible fix for scenario 1 (above) on many *NIX machines is to edit `/etc/resolve.conf` and change the `nameserver` entry to `8.8.8.8` (one of Google's public DNS servers). Do this and then restart networking (or just restart the computer) and things should start working.
+
+Your network setup may be different. This is THE most complex part of setting up SiriProxy (getting DNS set up correctly). So once you have this working, you are probably home free. Keep with it, good luck, and have fun!
+
+
+Running SiriProxy as an unprivileged user
+-----------------------------------------
+
+Given that SiriProxy is a bit of a hack and very unstable, it's probably a good idea to not run it as root. This is especially true if you're allowing access to your server from outside your network. Doing this isn't actually that hard, as SiriProxy doesn't need access to anything privileged.
+
+The only trick is that Siri expects the server to be running on port 443, and only privileged users can open ports below 1024 on *NIX operating systems. So I work around this by running SiriProxy on port 2000 and redirecting traffic to that port using iptables.
+
+**Step 1: Set up an account**
+
+I just set up an account called "siriproxy". I made sure it wasn't a "sudoer" (on my computer, that means keep it out of the "sudo" group). I also think it's a good idea to refrain from giving it login privileges. But do as I say on that one, not as I do.
+
+**Step 2: Set up iptables/ufw**
+
+I run UFW on my machine, which is pretty much a wrapper on iptables. I tossed in the following at the top of my `/etc/ufw/before.rules`:
+
+	*nat
+	:PREROUTING ACCEPT [0:0]
+	-A PREROUTING --dst 10.0.0.3 -p tcp --dport 443 -j REDIRECT --to-port 2000
+	COMMIT
+
+The IP referenced (10.0.0.3) is the IP of the computer running SiriProxy. Since this computer is being used as a wireless AP, it's important to only redirect traffic targeted directly at the server, otherwise all traffic to 443/tcp on my wifi network would be incorrectly redirected.
+
+I also made sure to open up 2000/tcp to allow traffic:
+
+    sudo ufw allow 2000/tcp
+    
+**Step 3: Set up upstart script**
+
+The full explanation of this is shown below. It's a handy thing to do by itself. It allows me to have SiriProxy start on boot and also allows me to easily control it using commands like `start siriproxy` and `stop siriproxy`.
+
+Running SiriProxy via Upstart
+-----------------------------
+
+Here's the upstart script I created for my home SiriProxy server. It respawns on a crash because SiriProxy is delicate and likes to crash. My server is running BackTrack 5 (a derivative of Ubuntu 10.04, I believe) and I use it as my wireless access point, making it an obvious location for SiriProxy:
+
+	description	"SiriProxy server"
+	
+	#Not sure if this is right, but it seems to work.
+	start on (started networking
+			  and filesystem)
+	
+	stop on runlevel [!023456]
+	
+	respawn
+	
+	exec start-stop-daemon --start --chuid siriproxy --exec /home/siriproxy/src/SiriProxy/siriproxy2000.sh
+
+Here are the contents of `siriproxy2000.sh` (as referenced above):
+
+	#!/bin/bash
+	
+	#make sure that rvm is set up
+	[[ -s "/home/siriproxy/.rvm/scripts/rvm" ]] && . "/home/siriproxy/.rvm/scripts/rvm"
+	
+	#feel free to insert logging if needed.
+	siriproxy server --port 2000 > /dev/null 2>&1 
+	
+Note that I run my server on port 2000 as the siriproxy user. See the comments above about running as an unprivileged user.
+
+
+Acknowledgements
+----------------
+I really can't give enough credit to [Applidium](http://applidium.com/en/news/cracking_siri/) and the [tools they created](https://github.com/applidium/Cracking-Siri). While I've been toying with Siri for a while, their proof of concept for intercepting and interpreting the Siri protocol was invaluable. Although all the code included in the project (so far) is my own, much of the base logic behind my code is based on the sample code they provided. They do great work.
+
+I also want to give a shout-out to [Arch Reactor](http://www.archreactor.org) - my local Hackerspace. Hackerspaces are a fantastic place to go learn about stuff like this. I was able to get some help from folks there, and more importantly, I got encouragement to do stuff like this. Check [Hackerspaces.org](http://www.hackerspaces.org) for a hackerspace in your area and make sure to check it out! 
+
+Regarding Licensing
+-------------------
+
+It's a pain. MIT seems nice. Go hunt through the commit history if you're interested in knowing about SiriProxy's long and frustrating licensing history.
+
+License (MIT)
+-------------
+
+SiriProxy - A tampering proxy server for the Siri (Ace) Protocol.
+Copyright (c) 2013 Pete Lamonica
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Disclaimer
+----------
+I'm not affiliated with Apple in any way. They don't endorse this application. They own all the rights to Siri (and all associated trademarks). 
+
+This software is provided as-is with no warranty whatsoever. Apple could do things to block this kind of behavior if they want. Also, if you cause problems (by sending lots of trash to the Guzzoni servers or anything), I fully support Apple's right to ban your UDID (making your phone unable to use Siri). They can, and I wouldn't blame them if they do.
+
+I'm a huge fan of Apple and the work that they do. Siri is a very cool feature and I'm pretty excited to explore it and add functionality. Please refrain from using this software for anything malicious.
+
+Also, this is my first project done in Ruby. Please don't be too critical of my code.

data/Rakefile

@@ -0,0 +1,9 @@
+require 'rake'
+require 'rake/testtask'
+require "bundler/gem_tasks"
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*.rb']
+  t.verbose = true
+end

data/bin/siriproxy

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'siriproxy/command_line'
+
+SiriProxy::CommandLine.new

data/config.example.yml

@@ -0,0 +1,30 @@
+listen: 0.0.0.0
+port: 443
+log_level: 1
+plugins:
+    # NOTE: run bundle after changing plugin configurations to update required gems
+
+    - name: 'Example'
+      path: './plugins/siriproxy-example'
+
+    # - name: 'Thermostat'
+    #   git: 'git://github.com/plamoni/SiriProxy-Thermostat.git'
+    #   host: '192.168.2.71' 
+
+    # - name: 'Twitter'
+    #   path: './plugins/siriproxy-twitter' # path works just like specifing in gemfile 
+    #   consumer_key: "YOUR_KEY" 
+    #   consumer_secret: "YOUR_SECRET"
+    #   oauth_token: "YOUR_TOKEN" 
+    #   oauth_token_secret: "YOUR_TOKEN_SECRET"
+
+    # Note: Eliza should not be run with other plugins
+    # - name: 'Eliza'
+    #   path: './plugins/siriproxy-eliza' # path works just like specifing in gemfile 
+
+    # Below are not actual plugins, just further example of config options
+
+    # - SimplePlugin # simple syntax for plugins that are in rubygems and have no config 
+
+    # - name: 'AnotherPlugin'
+    #   git: 'git://github.com/netpro2k/SiriProxy-AnotherPlugin.git' # git works just like specifying in Gemfile

data/lib/siri_objects.rb

@@ -0,0 +1,331 @@
+require 'rubygems'
+require 'uuidtools'
+
+def generate_siri_utterance(ref_id, text, speakableText=text, listenAfterSpeaking=false)
+  object = SiriAddViews.new
+  object.make_root(ref_id)
+  object.views << SiriAssistantUtteranceView.new(text, speakableText, "Misc#ident", listenAfterSpeaking)
+  return object.to_hash
+end
+
+def generate_request_completed(ref_id, callbacks=nil)
+  object = SiriRequestCompleted.new()
+  object.callbacks = callbacks if callbacks != nil
+  object.make_root(ref_id)
+  return object.to_hash
+end
+
+class SiriObject
+  attr_accessor :klass, :group, :properties
+  
+  def initialize(klass, group)
+    @klass = klass
+    @group = group
+    @properties = {}
+  end
+  
+  #watch out for circular references!
+  def to_hash
+    hash = {
+      "class" => self.klass,
+      "group" => self.group,
+      "properties" => {}
+    }
+    
+    (hash["refId"] = ref_id) rescue nil
+    (hash["aceId"] = ace_id) rescue nil
+    
+    properties.each_key { |key|
+      if properties[key].class == Array
+        hash["properties"][key] = []
+        self.properties[key].each { |val| hash["properties"][key] << (val.to_hash rescue val) }
+      else
+        hash["properties"][key] = (properties[key].to_hash rescue properties[key])
+      end
+    }
+
+    hash
+  end
+  
+  def make_root(ref_id=nil, ace_id=nil)
+    self.extend(SiriRootObject)
+  
+    self.ref_id = (ref_id || random_ref_id) 
+    self.ace_id = (ace_id || random_ace_id)
+  end
+end
+
+def add_property_to_class(klass, prop)
+  klass.send(:define_method, (prop.to_s + "=").to_sym) { |value|
+    self.properties[prop.to_s] = value
+  }
+  
+  klass.send(:define_method, prop.to_s.to_sym) {
+    self.properties[prop.to_s]
+  }
+end
+
+module SiriRootObject
+  attr_accessor :ref_id, :ace_id
+  
+  def random_ref_id
+    UUIDTools::UUID.random_create.to_s.upcase
+  end
+  
+  def random_ace_id
+    UUIDTools::UUID.random_create.to_s
+  end
+end
+
+class SiriAddViews < SiriObject
+  def initialize(scrollToTop=false, temporary=false, dialogPhase="Completion", views=[])
+    super("AddViews", "com.apple.ace.assistant")
+    self.scrollToTop = scrollToTop
+    self.views = views
+    self.temporary = temporary
+    self.dialogPhase = dialogPhase
+  end
+end
+add_property_to_class(SiriAddViews, :scrollToTop)
+add_property_to_class(SiriAddViews, :views)
+add_property_to_class(SiriAddViews, :temporary)
+add_property_to_class(SiriAddViews, :dialogPhase)
+
+#####
+# VIEWS
+#####
+
+class SiriAssistantUtteranceView < SiriObject
+  def initialize(text="", speakableText=text, dialogIdentifier="Misc#ident", listenAfterSpeaking=false)
+    super("AssistantUtteranceView", "com.apple.ace.assistant")
+    self.text = text
+    self.speakableText = speakableText
+    self.dialogIdentifier = dialogIdentifier
+    self.listenAfterSpeaking = listenAfterSpeaking
+  end
+end
+add_property_to_class(SiriAssistantUtteranceView, :text)
+add_property_to_class(SiriAssistantUtteranceView, :speakableText)
+add_property_to_class(SiriAssistantUtteranceView, :dialogIdentifier)
+add_property_to_class(SiriAssistantUtteranceView, :listenAfterSpeaking)
+
+class SiriMapItemSnippet < SiriObject
+  def initialize(userCurrentLocation=true, items=[])
+    super("MapItemSnippet", "com.apple.ace.localsearch")
+    self.userCurrentLocation = userCurrentLocation
+    self.items = items
+  end
+end
+add_property_to_class(SiriMapItemSnippet, :userCurrentLocation)
+add_property_to_class(SiriMapItemSnippet, :items)
+
+class SiriButton < SiriObject
+  def initialize(text="Button Text", commands=[])
+    super("Button", "com.apple.ace.assistant")
+    self.text = text
+    self.commands = commands
+  end
+end
+add_property_to_class(SiriButton, :text)
+add_property_to_class(SiriButton, :commands)
+
+class SiriAnswerSnippet < SiriObject
+  def initialize(answers=[], confirmationOptions=nil)
+    super("Snippet", "com.apple.ace.answer")
+    self.answers = answers
+
+    if confirmationOptions
+      # need to figure out good way to do API for this
+      self.confirmationOptions = confirmationOptions
+    end
+
+  end
+end
+add_property_to_class(SiriAnswerSnippet, :answers)
+add_property_to_class(SiriAnswerSnippet, :confirmationOptions)
+
+#####
+# Items
+#####
+
+class SiriMapItem < SiriObject
+  def initialize(label="Apple Headquarters", location=SiriLocation.new, detailType="BUSINESS_ITEM")
+    super("MapItem", "com.apple.ace.localsearch")
+    self.label = label
+    self.detailType = detailType
+    self.location = location
+  end
+end
+add_property_to_class(SiriMapItem, :label)
+add_property_to_class(SiriMapItem, :detailType)
+add_property_to_class(SiriMapItem, :location)
+
+#####
+# Commands
+#####
+
+class SiriSendCommands < SiriObject
+  def initialize(commands=[])
+    super("SendCommands", "com.apple.ace.system")
+    self.commands=commands
+  end
+end
+add_property_to_class(SiriSendCommands, :commands)
+
+class SiriConfirmationOptions < SiriObject
+  def initialize(submitCommands=[], cancelCommands=[], denyCommands=[], confirmCommands=[], denyText="Cancel", cancelLabel="Cancel", submitLabel="Send", confirmText="Send", cancelTrigger="Deny")
+    super("ConfirmationOptions", "com.apple.ace.assistant")
+
+    self.submitCommands = submitCommands
+    self.cancelCommands = cancelCommands
+    self.denyCommands = denyCommands
+    self.confirmCommands = confirmCommands
+
+    self.denyText = denyText 
+    self.cancelLabel = cancelLabel 
+    self.submitLabel = submitLabel 
+    self.confirmText = confirmText 
+    self.cancelTrigger = cancelTrigger 
+  end
+end
+add_property_to_class(SiriConfirmationOptions, :submitCommands)
+add_property_to_class(SiriConfirmationOptions, :cancelCommands)
+add_property_to_class(SiriConfirmationOptions, :denyCommands)
+add_property_to_class(SiriConfirmationOptions, :confirmCommands)
+add_property_to_class(SiriConfirmationOptions, :denyText)
+add_property_to_class(SiriConfirmationOptions, :cancelLabel)
+add_property_to_class(SiriConfirmationOptions, :submitLabel)
+add_property_to_class(SiriConfirmationOptions, :confirmText)
+add_property_to_class(SiriConfirmationOptions, :cancelTrigger)
+
+class SiriConfirmSnippetCommand < SiriObject
+  def initialize(request_id = "")
+    super("ConfirmSnippet", "com.apple.ace.assistant")
+    self.request_id = request_id
+  end
+end
+add_property_to_class(SiriConfirmSnippetCommand, :request_id)
+
+class SiriCancelSnippetCommand < SiriObject
+  def initialize(request_id = "")
+    super("ConfirmSnippet", "com.apple.ace.assistant")
+    self.request_id = request_id
+  end
+end
+add_property_to_class(SiriCancelSnippetCommand, :request_id)
+
+#####
+# Objects
+#####
+
+class SiriLocation < SiriObject
+  def initialize(label="Apple", street="1 Infinite Loop", city="Cupertino", stateCode="CA", countryCode="US", postalCode="95014", latitude=37.3317031860352, longitude=-122.030089795589)
+    super("Location", "com.apple.ace.system")
+    self.label = label
+    self.street = street
+    self.city = city
+    self.stateCode = stateCode
+    self.countryCode = countryCode
+    self.postalCode = postalCode
+    self.latitude = latitude
+    self.longitude = longitude
+  end
+end
+add_property_to_class(SiriLocation, :label)
+add_property_to_class(SiriLocation, :street)
+add_property_to_class(SiriLocation, :city)
+add_property_to_class(SiriLocation, :stateCode)
+add_property_to_class(SiriLocation, :countryCode)
+add_property_to_class(SiriLocation, :postalCode)
+add_property_to_class(SiriLocation, :latitude)
+add_property_to_class(SiriLocation, :longitude)
+
+class SiriAnswer < SiriObject
+  def initialize(title="", lines=[])
+    super("Object", "com.apple.ace.answer")
+    self.title = title
+    self.lines = lines
+  end
+end
+add_property_to_class(SiriAnswer, :title)
+add_property_to_class(SiriAnswer, :lines)
+
+class SiriAnswerLine < SiriObject
+  def initialize(text="", image="")
+    super("ObjectLine", "com.apple.ace.answer")
+    self.text = text
+    self.image = image
+  end
+end
+add_property_to_class(SiriAnswerLine, :text)
+add_property_to_class(SiriAnswerLine, :image)
+
+#####
+# Guzzoni Commands (commands that typically come from the server side)
+#####
+
+class SiriGetRequestOrigin < SiriObject
+  def initialize(desiredAccuracy="HundredMeters", searchTimeout=8.0, maxAge=1800)
+    super("GetRequestOrigin", "com.apple.ace.system")
+    self.desiredAccuracy = desiredAccuracy
+    self.searchTimeout = searchTimeout
+    self.maxAge = maxAge
+  end
+end
+add_property_to_class(SiriGetRequestOrigin, :desiredAccuracy)
+add_property_to_class(SiriGetRequestOrigin, :searchTimeout)
+add_property_to_class(SiriGetRequestOrigin, :maxAge)
+
+class SiriRequestCompleted < SiriObject
+  def initialize(callbacks=[])
+    super("RequestCompleted", "com.apple.ace.system")
+    self.callbacks = callbacks
+  end
+end
+add_property_to_class(SiriRequestCompleted, :callbacks)
+
+#####
+# iPhone Responses (misc meta data back to the server)
+#####
+
+class SiriStartRequest < SiriObject
+  def initialize(utterance="Testing", handsFree=false, proxyOnly=false)
+    super("StartRequest", "com.apple.ace.system")
+    self.utterance = utterance
+    self.handsFree = handsFree
+    if proxyOnly # dont send local when false since its non standard
+      self.proxyOnly = proxyOnly
+    end
+  end
+end
+add_property_to_class(SiriStartRequest, :utterance)
+add_property_to_class(SiriStartRequest, :handsFree)
+add_property_to_class(SiriStartRequest, :proxyOnly)
+
+
+class SiriSetRequestOrigin < SiriObject
+  def initialize(longitude=-122.030089795589, latitude=37.3317031860352, desiredAccuracy="HundredMeters", altitude=0.0, speed=1.0, direction=1.0, age=0, horizontalAccuracy=50.0, verticalAccuracy=10.0)
+    super("SetRequestOrigin", "com.apple.ace.system")
+    self.horizontalAccuracy = horizontalAccuracy
+    self.latitude = latitude
+    self.desiredAccuracy = desiredAccuracy
+    self.altitude = altitude
+    self.speed = speed
+    self.longitude = longitude
+    self.verticalAccuracy = verticalAccuracy
+    self.direction = direction
+    self.age = age
+  end
+end
+add_property_to_class(SiriSetRequestOrigin, :horizontalAccuracy)
+add_property_to_class(SiriSetRequestOrigin, :latitude)
+add_property_to_class(SiriSetRequestOrigin, :desiredAccuracy)
+add_property_to_class(SiriSetRequestOrigin, :altitude)
+add_property_to_class(SiriSetRequestOrigin, :speed)
+add_property_to_class(SiriSetRequestOrigin, :longitude)
+add_property_to_class(SiriSetRequestOrigin, :verticalAccuracy)
+add_property_to_class(SiriSetRequestOrigin, :direction)
+add_property_to_class(SiriSetRequestOrigin, :age)
+
+
+