right_agent 2.7.0 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74c2e07823dff52a0a487855918d9fe020f4509b
-  data.tar.gz: b9fc140fd85dc787e63a04880e3b195024ca0f42
+  metadata.gz: 100645d31290fa736c6f19228c9b4734d0669d21
+  data.tar.gz: b1dde62a9adf3fa76e78e1e5e236c5e12b7634d7
 SHA512:
-  metadata.gz: a17751f1a016b2e81cdebb0281449c90db0be2cf4e8c17062d54ce36ee29d1517c4d2c1686debf81f75c34f4ae054d109ff9b3f45453b9db27070affb3df7f9b
-  data.tar.gz: f5720ae5a981c8b54a6d3d811fc8f35e8c0ea8c02d573c29fc78e9011c28fbf33aa7d9d089c0337f2a653f250f120cc94fa0403337a23b98681f6728f3037a70
+  metadata.gz: 138aa3b2f6242e7ae7b0b01118d41e204a40035924b382f86da63185141571290437562789420933469e4cd0c999e76cd7986213de677517edc9587ef4d089d0
+  data.tar.gz: d1565bec72373642246386dd4911aaabafe6d41a57bda81d352816622e98e4954c5329e1096bd4985710db420a762bd290620b6abd1cd474672064d843b4fa48

data/lib/right_agent/core_payload_types/login_policy.rb

@@ -1,3 +1,5 @@
+require 'digest/sha2'
+
 #
 # Copyright (c) 2009-2011 RightScale Inc
 #
@@ -44,6 +46,30 @@ module RightScale
       [ @audit_id, @created_at.to_i, @exclusive, @users ]
     end
 
+    # Compute a cryptographic hash of the information in this policy; helps
+    # callers compare two policies to see if they are equivalent.
+    # @see https://github.com/rightscale/cmaro/domain/login_policy.go
+    def fingerprint
+      h = Digest::SHA2.new
+      h << (self.exclusive ? 'true' : 'false')
+
+      users = self.users.sort { |a, b| a.uuid <=> b.uuid }
+      users.each do |u|
+        h << format(",(%d,%s,%s,%d,%s",
+                    u.uuid, u.common_name,
+                    (u.superuser ? 'true' : 'false'),
+                    (u.expires_at ? u.expires_at.to_i : 0),
+                    u.username)
+
+        u.public_key_fingerprints.each do |fp|
+          h << "," << fp
+        end
+        h << ')'
+      end
+
+      h.hexdigest
+    end
+
     # Utility method to parse an SSH2-format public key and return a 4-tuple consisting
     # of its constituent parts:
     #  * leading comment (optional)

data/lib/right_agent/error_tracker.rb

@@ -99,7 +99,7 @@ module RightScale
     # @param [Exception, String] exception raised
     # @param [Packet, Hash] packet associated with exception
     # @param [Object] agent object reporting error
-    # @param [String] component or service area where error occurred
+    # @param [String,Object] component or service area where error occurred
     #
     # @return [TrueClass] always true
     def notify(exception, packet = nil, agent = nil, component = nil)
@@ -117,6 +117,8 @@ module RightScale
           params = uuid = nil
         end
 
+        component = component.class.name unless component.is_a?(String)
+
         n = Airbrake.build_notice(
           exception,
           { component: component, action: action },

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.7.0'
-  spec.date      = '2016-05-20'
+  spec.version   = '2.7.2'
+  spec.date      = '2016-07-25'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'

data/spec/core_payload_types/login_policy_spec.rb

@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2009-2011 RightScale Inc
+#
+# 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.
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'right_agent', 'core_payload_types'))
+
+describe RightScale::LoginPolicy do
+  describe '#fingerprint' do
+    let(:finger0) { 'abd8e6410457ad1681123bc5997de6efc8dd3c2f' }
+
+    let(:finger1) { '21fdda62b604e30ef36f8af3b42eb74832492808' }
+
+    let(:golang) { '0f4bba48af7f56e72cb00bfe5551f3f8a796f946fb10ad925459b7d4e6ff45f8' }
+
+    let(:u0) do
+      RightScale::LoginUser.new(1, 'alice', 'ssh-rsa aaa', 'alice@initech.com', false, nil, nil, nil, [finger0])
+    end
+
+    let(:u1) do
+      ea = Time.at(2147483647)
+      RightScale::LoginUser.new(2, 'bob', 'ssh-rsa bbb', 'bob@initech.com', false, ea, nil, nil, [finger1])
+    end
+
+    let(:policy) do
+      RightScale::LoginPolicy.new(0, nil, false, [u0, u1])
+    end
+
+    it 'should interoperate with golang' do
+      policy.fingerprint.should == golang
+    end
+  end
+end

data/spec/core_payload_types/login_user_spec.rb

@@ -46,6 +46,26 @@ module LoginUserSpec
 end
 
 describe RightScale::LoginUser do
+  context '.fingerprint' do
+    # Shared with CMARO specs. See https://github.com/rightscale/cmaro/domain/login_policy_test.go
+    let(:keys) {
+      [
+        'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDW5pCQxyHOX/GoBtCypA312KPW4xGG9KgYueU11AH+s3NnhNWRxV0NFxyBpS9ti5trgRQtz96nslbhv3xwOMhxi6phHr3RM1gFsP2KCzmWrVtwnivL/EEP4exT8ksnS6tM0o4YcK35R+pqCcef6zvu0+36PeUCMxPMXui37Q2DH8VW2oAtv4yXgaZKIPf+6T86Nl1lfXYwSa49RVWIugcCZ1hlOWxTA7Qp1zmP1VQsl10o7NlK5ftOhgZkvu8KBPmL8qqD9YzoQgHpAx77cquV1if3ZcZIDCCbzo5mD60uEiBzNssE38aMilc9XtRR4b0Wb+/ousfzbOe8lB0hGRfZ alice@initech.com',
+        'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMJRT7/ESoJwmMY5pD5cXcHU24pXnBYv9hSaYcowshuSTRtCYr+7RRcxtGy7vSI6IFiA1+8fp0RXMN0XwGC1wx2ndOWFW4pHNy7wNr8CDJDnl4wyL90XK6MJQBqpmHL+NMA9YyVixzPYrW/foaRUyP/uTr5fVnTySvfQHSmqwDD5NcwJqt4Gz4w47hNKwlCwXq1DG5+KyR5n2SdpcdIkZLB9H8luvTLucv4ozoibi7JNYkJ+mR1oumcXrvUDDO24cvIBYyoVLGIFXcP5jvshijcEzmRz8/lzeJ0fzJXIN+rs7fuunJkuC/85fHwroeae5RB82HLOHWapGX6taevrBp bob@initech.com'
+      ]
+    }
+    let(:fingerprints) do
+      [
+        'abd8e6410457ad1681123bc5997de6efc8dd3c2f',
+        '21fdda62b604e30ef36f8af3b42eb74832492808'
+      ]
+    end
+
+    it 'interoperates with golang' do
+      described_class.fingerprint(keys[0]).should == fingerprints[0]
+      described_class.fingerprint(keys[1]).should == fingerprints[1]
+    end
+  end
 
   # ensures that the serialization downgrade case works.
   def test_serialization_downgrade(user, public_key)

data/spec/error_tracker_spec.rb

@@ -35,7 +35,7 @@ describe RightScale::ErrorTracker do
     @agent_name = "test_agent"
     @shard_id = 9
     @endpoint = "https://airbrake.com"
-    @api_key = "secret"
+    @api_key = '1'
     @trace_level = RightScale::Agent::TRACE_LEVEL
     @tracker = RightScale::ErrorTracker.instance
     @log = flexmock(RightScale::Log)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.2
 platform: ruby
 authors:
 - Lee Kirchhoff
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
@@ -330,6 +330,7 @@ files:
 - spec/core_payload_types/dev_repositories_spec.rb
 - spec/core_payload_types/dev_repository_spec.rb
 - spec/core_payload_types/executable_bundle_spec.rb
+- spec/core_payload_types/login_policy_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