vines-services 0.1.0 → 0.1.1

data/README

@@ -11,6 +11,8 @@ defined as: platform is 'mac_os_x' and platform_version starts with '10.7'.
 As machines update to Lion, they will join this service automatically and may
 be managed as one group.
 
+Additional documentation can be found at www.getvines.com.
+
 == Usage
 
 1. gem install vines-services
@@ -19,11 +21,10 @@ be managed as one group.
 
 == Dependencies
 
-* bcrypt-ruby >= 3.0.0
-* blather >= 0.5.4
+* bcrypt-ruby >= 3.0.1
+* blather >= 0.5.8
 * citrus >= 2.4.0
 * eventmachine >= 0.12.10
-* nokogiri >= 1.4.4
 * sqlite3 >= 1.3.4
 * ruby >= 1.9.2
 
@@ -32,8 +33,7 @@ $ sudo apt-get install build-essential ruby1.9.1 ruby1.9.1-dev libxml2-dev libxs
 
 == Contact
 
-* David Graham  <david@negativecode.com>
-* Chris Johnson <chris@negativecode.com>
+* David Graham <david@negativecode.com>
 
 == License
 

data/Rakefile

@@ -5,10 +5,11 @@ require 'rubygems/package_task'
 require 'nokogiri'
 require_relative 'lib/vines/services/version'
 
+CLOBBER.include('pkg', 'web/javascripts', 'web/stylesheets/app.css')
+
 spec = Gem::Specification.new do |s|
   s.name    = "vines-services"
   s.version = Vines::Services::VERSION
-  s.date    = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = "An XMPP component that broadcasts shell commands to many agents."
   s.description = "Vines Services are dynamically updated groups of systems based
@@ -16,17 +17,16 @@ on criteria like hostname, installed software, operating system, etc. Send a
 command to the service and it runs on every system in the group. Services, files
 and permissions are managed via the bundled web application."
 
-  s.authors      = ["David Graham", "Chris Johnson"]
-  s.email        = %w[david@negativecode.com chris@negativecode.com]
+  s.authors      = ["David Graham"]
+  s.email        = %w[david@negativecode.com]
   s.homepage     = "http://www.getvines.com"
 
-  s.files        = FileList['[A-Z]*', '{bin,lib,conf,web}/**/*']
   s.test_files   = FileList["test/**/*"]
   s.executables  = %w[vines-services]
   s.require_path = "lib"
 
-  s.add_dependency "bcrypt-ruby", "~> 3.0.0"
-  s.add_dependency "blather", "~> 0.5.4"
+  s.add_dependency "bcrypt-ruby", "~> 3.0.1"
+  s.add_dependency "blather", "~> 0.5.8"
   s.add_dependency "citrus", "~> 2.4.0"
   s.add_dependency "couchrest_model", "~> 1.1.2"
   s.add_dependency "em-http-request", "~> 0.3.0"
@@ -39,8 +39,12 @@ and permissions are managed via the bundled web application."
   s.required_ruby_version = '>= 1.9.2'
 end
 
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
+# Set gem file list after CoffeeScripts have been compiled, so web/javascripts/
+# is included in the gem.
+task :gemprep do
+  spec.files = FileList['[A-Z]*', '{bin,lib,conf,web}/**/*']
+  Gem::PackageTask.new(spec).define
+  Rake::Task['gem'].invoke
 end
 
 Rake::TestTask.new(:test) do |test|
@@ -116,7 +120,6 @@ task :compile do
 
   sh %{coffee -c -b -o web/javascripts web/coffeescripts/*.coffee}
   sh %{cat #{js_files} | uglifyjs -nc > web/javascripts/app.js}
-
   sh %{cat #{css_files} > web/stylesheets/app.css}
 end
 
@@ -126,5 +129,4 @@ task :cleanup do
   File.delete('/tmp/index.html')
 end
 
-
-task :default => [:clobber, :test, :compile, :gem, :cleanup]
+task :default => [:clobber, :test, :compile, :gemprep, :cleanup]

data/bin/vines-services

@@ -90,6 +90,5 @@ rescue SystemExit
   # do nothing
 rescue Exception => e
   puts e.message
-  puts e.backtrace
   exit(1)
 end

data/lib/vines/services/command/init.rb

@@ -5,77 +5,96 @@ module Vines
     module Command
       class Init
         def run(opts)
-          raise 'vines-services init [domain]' unless opts[:args].size == 1
-          @domain = opts[:args].first.dup
-          dir = File.expand_path(@domain)
-          @component_password = Kit.generate_password
-          create_directories
-          initialize_server
-          initialize_component
-          initialize_agent
-          puts "Initialized service, agent, and server directories: #{@domain}"
+          raise 'vines-services init <domain>' unless opts[:args].size == 1
+          @domain = opts[:args].first.downcase
+          base = File.expand_path(@domain)
+          raise "Directory already initialized: #{@domain}" if File.exists?(base)
+          raise "Agent gem required: gem install vines-agent" unless agent_gem_installed?
+
+          EM.run do
+            Fiber.new do
+              @db = find_db
+              create_views
+              user = save_user(ask_for_jid, ask_for_password)
+              create_services(user)
+              @token = Kit.auth_token
+
+              Dir.mkdir(base)
+              %w[server services agent].each do |sub|
+                dir = File.expand_path(sub, base)
+                Dir.mkdir(dir)
+                Dir.chdir(dir) { send("init_#{sub}") }
+              end
+              puts "Initialized server, agent, and services directories: #{@domain}"
+              puts "Login at http://localhost:5280/"
+              EM.stop
+            end.resume
+          end
         end
 
         private
 
-        def initialize_server
-          Dir.chdir(File.join(@domain, "server"))
+        def init_server
           `vines init #{@domain}`
-          configure_database
-          FileUtils.mv Dir.glob("#{@domain}/*"), "./"
+          FileUtils.mv(Dir.glob("#{@domain}/*"), '.')
           FileUtils.remove_dir(@domain)
+          FileUtils.remove_dir('data/users')
+          web = File.expand_path("../../../../../web", __FILE__)
+          FileUtils.cp_r(Dir.glob("#{web}/*"), 'web')
+          update_server_config('conf/config.rb')
           `vines start -d`
-          FileUtils.cp_r(File.expand_path("../../../../../web/index.html", __FILE__), File.join("web", "index.html"))
-          FileUtils.cp_r(File.expand_path("../../../../../web/javascripts", __FILE__), File.join("web", "javascripts"))
-          FileUtils.cp_r(File.expand_path("../../../../../web/stylesheets", __FILE__), File.join("web", "stylesheets"))
-          FileUtils.cp_r(File.expand_path("../../../../../web/images", __FILE__), File.join("web", "images"))
-          FileUtils.cp_r(File.expand_path("../../../../../web/coffeescripts", __FILE__), File.join("web", "coffeescripts"))
+          puts "Started vines server: vines start -d"
         end
 
-        def initialize_agent
-          Dir.chdir("../agent/")
+        def init_agent
           `vines-agent init #{@domain}`
-          FileUtils.cp("../server/conf/certs/#{@domain}.crt", File.join("#{@domain}", "conf", "certs"))
-          agent_password = Kit.generate_password
-          jid = Vines::JID.new(fqdn, @domain).bare
-          id = "user:#{jid}"
-          Fiber.new do
-            user = Vines::Services::CouchModels::User.new(id: id)
-            user.name = jid
-            user.system = true
-            user.password = agent_password
-            if user.valid?
-              user.save
-              log.debug("Saving user: #{user}")
-            end
-          end.resume
-          update_agent_config(File.join("#{@domain}", "conf", "config.rb"), agent_password)
-          FileUtils.mv Dir.glob("#{@domain}/*"), "./"
+          FileUtils.mv(Dir.glob("#{@domain}/*"), '.')
           FileUtils.remove_dir(@domain)
+          FileUtils.cp("../server/conf/certs/#{@domain}.crt", 'conf/certs')
+          require File.expand_path('conf/config.rb')
+          token = Vines::Agent::Config.instance.domain.password
+          save_user(Vines::JID.new(fqdn, @domain), token, true)
           `vines-agent start -d`
+          puts "Started vines agent: vines-agent start -d"
         end
 
-        # Coordinate all the configuration required for the service
-        def initialize_component
-          Dir.chdir("../services/")
-          %w[conf].each do |sub|
-            FileUtils.cp_r(File.expand_path("../../../../../#{sub}", __FILE__), File.join("."))
-          end
-          log, pid = %w[log pid data data/index].map do |sub|
-            File.join(sub).tap {|subdir| Dir.mkdir(subdir) }
-          end
-          update_config(File.join("conf", "config.rb"))
+        def init_services
+          %w[log pid data data/index data/upload].each {|sub| Dir.mkdir(sub) }
+          %w[data data/index data/upload].each {|dir| File.chmod(0700, dir) }
+          FileUtils.cp_r(File.expand_path("../../../../../conf", __FILE__), '.')
+          File.chmod(0600, 'conf/config.rb')
+          update_services_config('conf/config.rb')
           `vines-services start -d`
+          puts "Started vines services component: vines-services start -d"
         end
 
-        #create all the directories for the server, agent, and service
-        def create_directories
-          Dir.mkdir(@domain)
-          %w[server services agent].each do |sub|
-            Dir.mkdir(File.join(@domain, sub))
+        def agent_gem_installed?
+          require 'vines/agent'
+        rescue LoadError
+          false
+        end
+
+        def create_views
+          url = "http://#{@db[:host]}:#{@db[:port]}"
+          CouchRest::Model::Base.database = CouchRest::Server.new(url).database(@db[:name])
+          CouchRest::Model::Base.subclasses.each do |klass|
+            klass.save_design_doc! if klass.respond_to?(:save_design_doc!)
           end
         end
 
+        def find_db
+          host, port = 'localhost', 5984
+          db = @domain.downcase.gsub('.', '_')
+          until create_db(host, port, db)
+            puts "CouchDB connection failed"
+            $stdout.write('CouchDB Host: ')
+            host = $stdin.gets.chomp
+            $stdout.write('CouchDB Port: ')
+            port = $stdin.gets.chomp
+          end
+          {host: host, port: port, name: db}
+        end
+
         def create_db(host, port, db)
           url = "http://#{host}:#{port}/#{db}"
           begin
@@ -88,122 +107,120 @@ module Vines
           false
         end
 
-        # This will attempt to create a new couch database. If one exists
-        # by the name generated, it will not be deleted. This will loop until
-        # it gets a valid couch db address and port
-        def configure_database
-          server, port = "127.0.0.1", 5984
-          db_name = @domain.gsub(".", "_").downcase()
-          until create_db(server, port, db_name)
-            puts "Unable to connect."
-            $stdout.write('CouchDB Server: ')
-            server = $stdin.gets.chomp
-            $stdout.write('CouchDB Port: ')
-            port = $stdin.gets.chomp
-          end
-          @couch_server = server
-          @couch_port = port
-          @couch_db = db_name
-          update_config(File.join(@domain, "conf", "config.rb"))
-          @storage = Vines::Services::Storage::CouchDB.new do
-            host server
-            port port
-            database db_name
-            index_dir '.'
-          end
-          create_user
+        def save_user(jid, password, system=false)
+          user = Vines::Services::CouchModels::User.new.tap do |u|
+            u.id = "user:#{jid}"
+            u.plain_password = password
+            u.system = system
+            u.admin! unless system
+          end.save
+          puts "Created user: #{jid}"
+          user
         end
 
-        #Create a new vines user object in the couch database
-        def create_user
-          jid, password = nil, nil
+        def ask_for_jid
+          jid = nil
           until jid
             $stdout.write('JID: ')
             if node = $stdin.gets.chomp.split('@').first
               jid = Vines::JID.new(node, @domain) rescue nil
             end
           end
+          jid
+        end
 
+        def ask_for_password
+          password = nil
           until password
             $stdout.write('Password: ')
             `stty -echo`
             password = $stdin.gets.chomp
             password = nil if password.empty?
             `stty echo`
+            puts
+          end
+          password
+        end
+
+        # Return the fully qualified domain name for this machine. This is used
+        # to determine the agent's JID.
+        def fqdn
+          ohai.fqdn.downcase
+        end
+
+        def ohai
+          require 'ohai'
+          @ohai ||= Ohai::System.new.tap do |system|
+            system.require_plugin('os')
+            system.require_plugin('hostname')
+            system.require_plugin('network')
+            system.require_plugin('platform')
           end
-          puts "\nCreated #{jid}"
-
-          id = "user:#{jid}"
-          Fiber.new do
-            user = Vines::Services::CouchModels::User.new(id: id)
-            user.name = jid
-            user.password = password
-            if user.valid?
-              user.save
-              log.debug("\nSaving user: #{user}")
-            end
-          end.resume
         end
 
-        # Set the agents password to the one we generated in this initialization
-        def update_agent_config(config, password)
+        # Create some default services based on this system's information. This
+        # gives the user some examples from which to build.
+        def create_services(user)
+          require 'etc'
+          ip = ohai.ipaddress.match(/(\d*\.\d*\.\d*)\.\d*/)[1]
+          platform = case ohai.platform
+            when 'mac_os_x' then 'Mac OS X'
+            else ohai.platform.capitalize
+          end
+          {
+            "All Systems" => "uptime_seconds > 0",
+            "#{ohai.kernel['name']} Systems" => "kernel.name is '#{ohai.kernel['name']}'",
+            "Domain: #{ohai.domain}" => "domain is '#{ohai.domain}'",
+            "#{platform} Systems" => "platform is '#{ohai.platform}'",
+            "Network: #{ip}.x" => "ipaddress starts with '#{ip}.'"
+          }.each do |name, code|
+            Vines::Services::CouchModels::Service.new(
+              name: name,
+              jid: to_jid(name),
+              code: code,
+              users: [user.jid],
+              accounts: [Etc.getlogin]).save
+          end
+        end
+
+        def to_jid(name)
+          Blather::JID.new(CGI.escape(name), "vines.#{@domain}").to_s.downcase
+        end
+
+        def update_services_config(config)
           text = File.read(config)
           File.open(config, 'w') do |f|
-            f.write(text.gsub(/password.*/, "password '#{password}'"))
+            replaced = text
+              .gsub('wonderland.lit', @domain.downcase)
+              .gsub('secr3t', @token)
+              .gsub("host 'localhost'", "host '#{@db[:host]}'")
+              .gsub("port 5984", "port #{@db[:port]}")
+              .gsub("database 'xmpp'", "database '#{@db[:name]}'")
+            f.write(replaced)
           end
         end
 
-        # Return the fully qualified domain name for this machine. This is used
-        # to determine the agent's JID.
-        def fqdn
-          require 'ohai'
-          system = Ohai::System.new
-          system.require_plugin('os')
-          system.require_plugin('hostname')
-          system.fqdn.downcase
-        end
-
-        # Change the config file to contain the values we generated or validated.
-        def update_config(config)
-# FIXME vines.local
-          orig_config = """
-  host 'vines.local' do
-    cross_domain_messages false
-    private_storage false
-    storage 'fs' do
-      dir 'data/users'
-    end
-    # components 'tea'  => 'secr3t',
-    #            'cake' => 'passw0rd'
-  end"""
-          new_config = """
-  host '#{@domain}' do
-    cross_domain_messages false
-    private_storage true
-    storage 'couchdb' do
-      host '#{@couch_server}'
-      port #{@couch_port}
-      database '#{@couch_db}'
-      tls false
-      username ''
-      password ''
-    end
-    components 'vines'  => '#{@component_password}'
-  end"""
+        def update_server_config(config)
+          replacement = %Q{
+            storage 'couchdb' do
+              host '#{@db[:host]}'
+              port #{@db[:port]}
+              database '#{@db[:name]}'
+              tls false
+              username ''
+              password ''
+            end
+            components 'vines' => '#{@token}'
+          }
           text = File.read(config)
-          text = text.gsub(orig_config, new_config)
-          text = text.gsub("host 'vines.wonderland.lit'", "host 'vines.#{@domain}'")
-          text = text.gsub("secr3t", "#{@component_password}")
-          text = text.gsub("host 'localhost'", "host '#{@couch_server}'")
-          text = text.gsub("port 5984", "port #{@couch_port}")
-          text = text.gsub("database 'xmpp'", "database '#{@couch_db}'")
           File.open(config, 'w') do |f|
-            f.write(text)
+            replaced = text
+              .gsub('Vines::Config.configure do', "require 'vines/services/roster'\n\nVines::Config.configure do")
+              .gsub(/\s{4}storage 'fs' do.*\s{4}end/m, replacement)
+            f.write(replaced)
           end
         end
       end
     end
   end
 end
-
-

data/lib/vines/services/controller/messages_controller.rb

@@ -19,18 +19,23 @@ module Vines
         private
 
         # Forward the agent's response message to the user that sent it the
-        # command.
+        # command. Tag the message with a jid element, identifying the agent
+        # returning the command's output, like:
+        # <jid xmlns="http://getvines.com/protocol">
+        #   www01.wonderland.lit@wonderland.lit/vines
+        # </jid>.
         def forward_to_user
           jid = node.xpath('/message/ns:jid', 'ns' => NS).first
           return unless jid
-          jid.remove
+          agent = node.from
           node.from = node.to
           node.to = jid.content
+          jid.content = agent
           stream.write(node)
         end
 
         # Forward the user's message to the members of the service. Tag the
-        # message with a jid element, identifying the user executing the command
+        # message with a jid element, identifying the user executing the command,
         # like: <jid xmlns="http://getvines.com/protocol">alice@wonderland.lit/tea</jid>
         # When the agent receives a message from one of its services, it checks
         # this jid element for the user permissions with which to run the command.

data/lib/vines/services/controller/users_controller.rb

@@ -39,28 +39,29 @@ module Vines
             raise 'user already exists' if User.find(id)
             User.new(id: id).tap do |u|
               u.system = system
-              u.password = password1
+              u.plain_password = password1
             end
           else # existing user
             User.get!("user:%s" % Vines::JID.new(jid)).tap do |u|
               raise "record found, but is a #{u.system ? 'system' : 'user'}" unless u.system == system
               if system
-                u.password = password1 unless password1.empty?
+                u.plain_password = password1 unless password1.empty?
               else # humans
-                u.change_password(password1, password2) unless password1.empty? || password2.empty?
+                if u.jid == current_user.jid
+                  u.change_password(password1, password2) unless password1.empty? || password2.empty?
+                else
+                  u.plain_password = password1 unless password1.empty?
+                end
               end
             end
           end
 
           unless system
             user.name = name
-            if user.jid == current_user.jid && !current_user.manage_services
-              if obj['permissions']['systems'] == true
-                user.valid = false
-                send_error('not-acceptable')
-              end
+            # users can't set their own permissions
+            unless user.jid == current_user.jid
+              user.permissions = obj['permissions']
             end
-            user.permissions = obj['permissions']
           end
 
           if user.valid?
@@ -85,8 +86,7 @@ module Vines
         end
 
         def save_services(user, services)
-          return if user.system?
-          return unless user.permissions['manage_services']
+          return if user.system? || !user.manage_services?
           current = user.services.map {|s| s.id }
           members = []
 

data/lib/vines/services/indexer.rb

@@ -35,7 +35,7 @@ module Vines
       # index, these tasks may be delayed by query tasks.
       def <<(doc)
         @tasks.push({
-          priority: -Time.now.to_f,
+          priority: Time.now.to_f,
           type: :index,
           doc: doc
         })

data/lib/vines/services/priority_queue.rb

@@ -6,7 +6,7 @@ module Vines
     # Behaves just like EM::Queue with the exception that items added to the queue
     # are sorted and popped from the queue by their priority. The optional comparator
     # block passed in the constructor determines element priority, with items sorted
-    # highest to lowest. If no block is provided, the elements' natural ordering,
+    # lowest to highest. If no block is provided, the elements' natural ordering,
     # via <=>, is used.
     #
     # @example
@@ -14,15 +14,15 @@ module Vines
     #  q = PriorityQueue.new do |a, b|
     #    a[:priority] <=> b[:priority]
     #  end
-    #  q.push({:priority => 1, :msg => 'one'})
-    #  q.push({:priority => 2, :msg => 'two'})
     #  q.push({:priority => 3, :msg => 'three'})
+    #  q.push({:priority => 2, :msg => 'two'})
+    #  q.push({:priority => 1, :msg => 'one'})
     #  3.times do
     #    q.pop {|item| puts item[:msg] }
     #  end
-    #  #=> "three"
+    #  #=> "one"
     #  #   "two"
-    #  #   "one"
+    #  #   "three"
     #
     class PriorityQueue < EM::Queue
       def initialize(&comparator)
@@ -30,7 +30,7 @@ module Vines
         @items = Heap.new(&comparator)
       end
 
-      # A binary max heap implementation for efficient storage of queue items. This
+      # A binary min heap implementation for efficient storage of queue items. This
       # class implements the Array methods called by EM::Queue so that it may
       # replace the +@items+ instance variable. Namely, +push+ +shift+, +size+, and
       # +empty?+ are implemented.
@@ -42,7 +42,7 @@ module Vines
         end
 
         def push(*items)
-          items.flatten.each do |item|
+          items.each do |item|
             @heap << item
             move_up(@heap.size - 1)
           end
@@ -73,17 +73,17 @@ module Vines
           left  = 2 * k + 1
           right = 2 * k + 2
           return if left > (@heap.size - 1)
-          larger = (right < @heap.size && @comp[@heap[right], @heap[left]] > 0) ? right : left
-          if @comp[@heap[k], @heap[larger]] < 0
-            @heap[k], @heap[larger] = @heap[larger], @heap[k]
-            move_down(larger)
+          smaller = (right < @heap.size && @comp[@heap[right], @heap[left]] < 0) ? right : left
+          if @comp[@heap[k], @heap[smaller]] > 0
+            @heap[k], @heap[smaller] = @heap[smaller], @heap[k]
+            move_down(smaller)
           end
         end
 
         def move_up(k)
           return if k == 0
           parent = (k - 1) / 2
-          if @comp[@heap[k], @heap[parent]] > 0
+          if @comp[@heap[k], @heap[parent]] < 0
             @heap[k], @heap[parent] = @heap[parent], @heap[k]
             move_up(parent)
           end