vines-agent 0.1.0 → 0.1.1

data/README

@@ -9,6 +9,8 @@ Users may run commands as any unix account, to which they've been granted access
 on the system. While the agent runs as root, user commands run as less privileged
 accounts.
 
+Additional documentation can be found at www.getvines.com.
+
 == Usage
 
 1. gem install vines-agent
@@ -17,9 +19,8 @@ accounts.
 
 == Dependencies
 
-* blather >= 0.5.4
+* blather >= 0.5.8
 * eventmachine >= 0.12.10
-* nokogiri >= 1.4.4
 * ruby >= 1.9.2
 
 == Ubuntu setup
@@ -27,8 +28,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

@@ -7,15 +7,14 @@ require_relative 'lib/vines/agent/version'
 spec = Gem::Specification.new do |s|
   s.name    = "vines-agent"
   s.version = Vines::Agent::VERSION
-  s.date    = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = "An XMPP bot that runs shell commands on remote machines."
   s.description = "Vines Agent executes shell commands sent by users after
 authorizing them against an access control list, provided by the Vines Services
 component. Manage a server as easily as chatting with a friend."
 
-  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}/**/*']
@@ -23,10 +22,10 @@ component. Manage a server as easily as chatting with a friend."
   s.executables  = %w[vines-agent]
   s.require_path = "lib"
 
-  s.add_dependency "blather", "~> 0.5.4"
-  s.add_dependency "ohai", "~> 0.6.4"
+  s.add_dependency "blather", "~> 0.5.8"
+  s.add_dependency "ohai", "~> 0.6.8"
   s.add_dependency "session", "~> 3.1.0"
-  s.add_dependency "slave", "~> 1.2.1"
+  s.add_dependency "slave", "~> 1.3.0"
   s.add_dependency "vines", "~> 0.3"
 
   s.add_development_dependency "minitest"

data/lib/vines/agent.rb

@@ -14,6 +14,7 @@
 
   blather/client/client
 
+  vines/kit
   vines/log
   vines/daemon
 

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

@@ -37,19 +37,11 @@ module Vines
           File.open(config, 'w') do |f|
             replaced = text
               .gsub('wonderland.lit', domain.downcase)
-              .gsub('secr3t', password)
+              .gsub('secr3t', Kit.auth_token)
             f.write(replaced)
           end
         end
-
-        # Create a large, random password with which to authenticate the
-        # agent bot's JID.
-        def password
-          hash = Digest::SHA512.new
-          1024.times { hash << rand.to_s }
-          hash.hexdigest
-        end
       end
     end
   end
-end
+end

data/lib/vines/agent/config.rb

@@ -34,9 +34,13 @@ module Vines
         log.level = const
       end
 
-      def domain(name, &block)
-        raise 'multiple domains not allowed' if @domain
-        @domain = Domain.new(name, &block)
+      def domain(name=nil, &block)
+        if name
+          raise 'multiple domains not allowed' if @domain
+          @domain = Domain.new(name, &block)
+        else
+          @domain
+        end
       end
 
       def start
@@ -46,6 +50,7 @@ module Vines
       class Domain
         def initialize(name, &block)
           @name, @password, @upstream = name, nil, []
+          @conf = File.expand_path('conf')
           instance_eval(&block) if block
           validate_domain(@name)
           raise "password required" unless @password && !@password.strip.empty?
@@ -56,8 +61,12 @@ module Vines
           end
         end
 
-        def password(password)
-          @password = password
+        def password(password=nil)
+          if password
+            @password = password
+          else
+            @password
+          end
         end
 
         def download(dir)
@@ -78,7 +87,8 @@ module Vines
           base = {
             password: @password,
             domain:   @name,
-            download: @download
+            download: @download,
+            conf:     @conf
           }
           options = @upstream.map do |info|
             base.clone.tap do |opts|

data/lib/vines/agent/connection.rb

@@ -13,14 +13,15 @@ module Vines
       SYSTEMS = 'http://getvines.com/protocol/systems'.freeze
 
       def initialize(options)
-        domain, password, host, port, download =
-          *options.values_at(:domain, :password, :host, :port, :download)
+        domain, password, host, port, download, conf =
+          *options.values_at(:domain, :password, :host, :port, :download, :conf)
 
+        certs = File.expand_path('certs', conf)
         @permissions, @services, @sessions, @component = {}, {}, {}, nil
         @ready = false
 
         jid = Blather::JID.new(fqdn, domain, 'vines')
-        @stream = Blather::Client.setup(jid, password, host, port)
+        @stream = Blather::Client.setup(jid, password, host, port, certs)
 
         @stream.register_handler(:disconnected) do
           log.info("Stream disconnected, reconnecting . . .")

data/lib/vines/agent/version.rb

@@ -2,6 +2,6 @@
 
 module Vines
   module Agent
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/test/config_test.rb

@@ -43,6 +43,7 @@ class ConfigTest < MiniTest::Unit::TestCase
     end
     refute_nil config
     assert_same config, Vines::Agent::Config.instance
+    assert_equal 'secr3t', config.domain.password
   end
 
   def test_default_download_directory

metadata

@@ -1,109 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vines-agent
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - David Graham
-- Chris Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: blather
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70352868783740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.5.4
+      - !ruby/object:Gem::Version
+        version: 0.5.8
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ohai
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70352868783740
+- !ruby/object:Gem::Dependency
+  name: ohai
+  requirement: &70352868782180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.4
+      - !ruby/object:Gem::Version
+        version: 0.6.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: session
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70352868782180
+- !ruby/object:Gem::Dependency
+  name: session
+  requirement: &70352868780480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: slave
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70352868780480
+- !ruby/object:Gem::Dependency
+  name: slave
+  requirement: &70352868778940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.2.1
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: vines
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70352868778940
+- !ruby/object:Gem::Dependency
+  name: vines
+  requirement: &70352868777680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70352868777680
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70352865325120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70352865325120
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70352865324580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-description: |-
-  Vines Agent executes shell commands sent by users after
+  prerelease: false
+  version_requirements: *70352865324580
+description: ! 'Vines Agent executes shell commands sent by users after
+
   authorizing them against an access control list, provided by the Vines Services
-  component. Manage a server as easily as chatting with a friend.
-email: 
+
+  component. Manage a server as easily as chatting with a friend.'
+email:
 - david@negativecode.com
-- chris@negativecode.com
-executables: 
+executables:
 - vines-agent
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - Rakefile
 - README
@@ -125,31 +121,28 @@ files:
 - test/rake_test_loader.rb
 homepage: http://www.getvines.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An XMPP bot that runs shell commands on remote machines.
-test_files: 
+test_files:
 - test/config_test.rb
 - test/rake_test_loader.rb