right_agent 0.14.0 → 0.16.2

data/spec/serialize/secure_serializer_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009-2011 RightScale Inc
+# Copyright (c) 2009-2013 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -38,65 +38,94 @@ describe RightScale::SecureSerializer do
   include RightScale::SpecHelper
 
   before(:all) do
-    @certificate, @key = issue_cert
-    @store = RightScale::StaticCertificateStore.new(@certificate, @certificate)
-    @identity = "id"
+    @dump_cert, @dump_key = issue_cert
+    @load_cert, @load_key = issue_cert
+    @dump_store = RightScale::StaticCertificateStore.new(@dump_cert, @dump_key, @load_cert, @load_cert)
+    @load_store = RightScale::StaticCertificateStore.new(@load_cert, @load_key, @dump_cert, @dump_cert)
+    @dump_id = RightScale::AgentIdentity.new("rs", "dump_agent", 1).to_s
+    @load_id = RightScale::AgentIdentity.new("rs", "load_agent", 1).to_s
   end
 
-  it 'should raise when not initialized' do
-    data = RightScale::Result.new("token", "to", "from", ["results"])
-    lambda { RightScale::SecureSerializer.dump(data) }.should raise_error
+  it "must be initialized before use" do
+    data = RightScale::Result.new("token", "to", ["results"], "from")
+    lambda { RightScale::SecureSerializer.dump(data) }.should raise_error(Exception, "Secure serializer not initialized")
   end
 
-  it 'should raise when data not serialized with MessagePack or JSON' do
-    data = RightScale::Result.new("token", "to", "from", ["results"])
-    RightScale::SecureSerializer.init(RightScale::Serializer.new, @identity, @certificate, @key, @store, false)
-    lambda { RightScale::SecureSerializer.load(Marshal.dump(data)) }.should raise_error(RightScale::Serializer::SerializationError)
-    lambda { RightScale::SecureSerializer.load(YAML.dump(data)) }.should raise_error(RightScale::Serializer::SerializationError)
+  it "must specify agent identity" do
+    lambda { RightScale::SecureSerializer.init(RightScale::Serializer.new, nil, @load_store, false) }.
+        should raise_error(Exception, "Missing local agent identity")
   end
 
-  describe "using MessagePack" do
-
-    before(:each) do
-      flexmock(JSON).should_receive(:dump).never
-      flexmock(JSON).should_receive(:load).never
-      @data = RightScale::Result.new("token", "to", "from", ["results"], nil, nil, nil, nil, [12, 12])
-    end
-
-    it 'should unserialize signed data' do
-      RightScale::SecureSerializer.init(RightScale::Serializer.new, @identity, @certificate, @key, @store, false)
-      data = RightScale::SecureSerializer.dump(@data)
-      RightScale::SecureSerializer.load(data).should == @data
-    end
-
-    it 'should unserialize encrypted data' do
-      RightScale::SecureSerializer.init(RightScale::Serializer.new, @identity, @certificate, @key, @store, true)
-      data = RightScale::SecureSerializer.dump(@data)
-      RightScale::SecureSerializer.load(data).should == @data
-    end
-
+  it "must specify a credentials store" do
+    lambda { RightScale::SecureSerializer.init(RightScale::Serializer.new, @load_id, nil, false) }.
+        should raise_error(Exception, "Missing credentials store")
   end
 
-  describe "using JSON" do
-
-    before(:each) do
-      flexmock(MessagePack).should_receive(:dump).never
-      flexmock(MessagePack).should_receive(:load).never
-      @data = RightScale::Result.new("token", "to", "from", ["results"], nil, nil, nil, nil, [11, 11])
-    end
+  it "certificate store must contain certificate and key for agent" do
+    flexmock(@load_store).should_receive(:get_receiver).and_return([nil, nil]).once
+    lambda { RightScale::SecureSerializer.init(RightScale::Serializer.new, @load_id, @load_store, false) }.
+        should raise_error(Exception, "Missing local agent public certificate")
+  end
 
-    it 'should unserialize signed data' do
-      RightScale::SecureSerializer.init(RightScale::Serializer.new, @identity, @certificate, @key, @store, false)
-      data = RightScale::SecureSerializer.dump(@data)
-      RightScale::SecureSerializer.load(data).should == @data
-    end
+  it "data must be serialized with MessagePack or JSON" do
+    data = RightScale::Result.new("token", "to", ["results"], "from")
+    RightScale::SecureSerializer.init(RightScale::Serializer.new, @load_id, @load_store, false)
+    lambda { RightScale::SecureSerializer.load(Marshal.dump(data)) }.should raise_error(RightScale::Serializer::SerializationError)
+    lambda { RightScale::SecureSerializer.load(YAML.dump(data)) }.should raise_error(RightScale::Serializer::SerializationError)
+  end
 
-    it 'should unserialize encrypted data' do
-      RightScale::SecureSerializer.init(RightScale::Serializer.new, @identity, @certificate, @key, @store, true)
-      data = RightScale::SecureSerializer.dump(@data)
-      RightScale::SecureSerializer.load(data).should == @data
+  # Test with protocol version 11 and 12 since that is the boundary where msgpack was first supported
+  [[:msgpack, 12, JSON], [:json, 11, MessagePack]].each do |type, version, other_class|
+
+    context "using #{type.inspect}" do
+
+      before(:each) do
+        flexmock(other_class).should_receive(:dump).never
+        flexmock(other_class).should_receive(:load).never
+        @data = RightScale::Result.new("token", "to", ["results"], "from", nil, nil, nil, nil, [version, version])
+        @serializer = RightScale::Serializer.new(type)
+      end
+
+      it "unserializes signed data" do
+        RightScale::SecureSerializer.init(@serializer, @dump_id, @dump_store, false)
+        data = RightScale::SecureSerializer.dump(@data)
+        RightScale::SecureSerializer.init(@serializer, @load_id, @load_store, false)
+        RightScale::SecureSerializer.load(data).should == @data
+      end
+
+      it "unserializes encrypted data" do
+        RightScale::SecureSerializer.init(@serializer, @dump_id, @dump_store, true)
+        data = RightScale::SecureSerializer.dump(@data)
+        @serializer.load(data)["encrypted"].should be_true
+        RightScale::SecureSerializer.init(@serializer, @load_id, @load_store, false)
+        RightScale::SecureSerializer.load(data).should == @data
+      end
+
+      it "encrypt option on initialization overrides dump option" do
+        RightScale::SecureSerializer.init(@serializer, @dump_id, @dump_store, true)
+        data = RightScale::SecureSerializer.dump(@data, false)
+        @serializer.load(data)["encrypted"].should be_true
+      end
+
+      it "uses id when supplied to choose credentials" do
+        RightScale::SecureSerializer.init(@serializer, @dump_id, @dump_store, true)
+        data = RightScale::SecureSerializer.dump(@data)
+        RightScale::SecureSerializer.init(@serializer, @load_id, @load_store, false)
+        flexmock(@load_store).should_receive(:get_receiver).with("id").and_return([@load_cert, @load_key]).once
+        RightScale::SecureSerializer.load(data, "id").should == @data
+      end
+
+      it "must be able to retrieve certificate and key to decrypt message" do
+        RightScale::SecureSerializer.init(@serializer, @dump_id, @dump_store, true)
+        data = RightScale::SecureSerializer.dump(@data)
+        RightScale::SecureSerializer.init(@serializer, @dump_id, @load_store, false)
+        flexmock(@load_store).should_receive(:get_receiver).with("id").and_return([nil, @load_key], [@load_cert, nil]).twice
+        lambda { RightScale::SecureSerializer.load(data, "id") }.
+            should raise_error(RightScale::SecureSerializer::MissingCertificate, /Could not find a certificate/)
+        lambda { RightScale::SecureSerializer.load(data, "id") }.
+            should raise_error(RightScale::SecureSerializer::MissingPrivateKey, /Could not find a private key/)
+      end
     end
-
   end
 
 end

data/spec/serialize/serializer_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009-2011 RightScale Inc
+# Copyright (c) 2009-2013 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -133,7 +133,7 @@ describe RightScale::Serializer do
 
     it "should cascade through available serializers" do
       serializer = RightScale::Serializer.new
-      flexmock(serializer).should_receive(:cascade_serializers).with(:load, "olleh", [JSON, MessagePack]).once
+      flexmock(serializer).should_receive(:cascade_serializers).with(:load, "olleh", [JSON, MessagePack], nil).once
       serializer.load("olleh")
     end
 
@@ -159,6 +159,25 @@ describe RightScale::Serializer do
       RightScale::Serializer.new(:json).load(serialized)
     end
 
+    it "should pass optional id to SecureSerializer" do
+      object = [1, 2, 3]
+      serialized = "securely serialized"
+      flexmock(RightScale::SecureSerializer).should_receive(:load).with(serialized, "id").and_return(object).once
+      RightScale::Serializer.new(:secure).load(serialized, "id")
+    end
+
+    it "should not pass optional id to MessagePack serializer" do
+      object = [1, 2, 3]
+      serialized = object.to_msgpack
+      RightScale::Serializer.new(:msgpack).load(serialized, "id").should == object
+    end
+
+    it "should not pass optional id to JSON serializer" do
+      object = [1, 2, 3]
+      serialized = object.to_json
+      RightScale::Serializer.new(:json).load(serialized, "id").should == object
+    end
+
     it "should raise SerializationError if packet could not be unserialized" do
       flexmock(MessagePack).should_receive(:load).with("olleh").and_raise(StandardError).once
       flexmock(JSON).should_receive(:load).with("olleh").and_raise(StandardError).once

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_agent
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.14.0
+  hash: 91
+  prerelease: false
+  segments: 
+  - 0
+  - 16
+  - 2
+  version: 0.16.2
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -12,91 +17,131 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-01 00:00:00 Z
+date: 2013-07-17 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: right_support
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 2
+        - 4
+        - 1
         version: 2.4.1
     - - <
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
         version: "3.0"
+  requirement: *id001
   type: :runtime
+  name: right_support
   prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: right_amqp
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 4
         version: "0.4"
+  requirement: *id002
   type: :runtime
+  name: right_amqp
   prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
         version: "1.4"
+    - - <=
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 7
+        - 6
+        version: 1.7.6
+  requirement: *id003
   type: :runtime
+  name: json
   prerelease: false
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
     - - <
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
+  requirement: *id004
   type: :runtime
+  name: eventmachine
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: right_popen
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.11
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: msgpack
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 4
+        - 4
         version: 0.4.4
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
+  requirement: *id005
   type: :runtime
+  name: msgpack
   prerelease: false
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
+  requirement: *id006
   type: :runtime
+  name: net-ssh
   prerelease: false
-  version_requirements: *id007
 description: |
   RightAgent provides a foundation for running an agent on a server to interface
   in a secure fashion with other agents in the RightScale system. A RightAgent
@@ -217,6 +262,7 @@ files:
 - spec/agent_config_spec.rb
 - spec/agent_identity_spec.rb
 - spec/agent_spec.rb
+- spec/agent_tag_manager_spec.rb
 - spec/command/agent_manager_commands_spec.rb
 - spec/command/command_io_spec.rb
 - spec/command/command_parser_spec.rb
@@ -226,7 +272,9 @@ files:
 - spec/core_payload_types/dev_repository_spec.rb
 - spec/core_payload_types/executable_bundle_spec.rb
 - spec/core_payload_types/login_user_spec.rb
+- spec/core_payload_types/recipe_instantiation_spec.rb
 - spec/core_payload_types/right_script_attachment_spec.rb
+- spec/core_payload_types/right_script_instantiation_spec.rb
 - spec/core_payload_types/spec_helper.rb
 - spec/dispatched_cache_spec.rb
 - spec/dispatcher_spec.rb
@@ -263,6 +311,7 @@ files:
 - spec/spec.win32.opts
 - spec/spec_helper.rb
 - spec/tracer_spec.rb
+has_rdoc: true
 homepage: https://github.com/rightscale/right_agent
 licenses: []
 
@@ -279,20 +328,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3875448509254431952
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Agent for interfacing server with RightScale system