conjur-asset-policy 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a58e3e9c9b42f19ae3269559eb53c9416f735c90
-  data.tar.gz: 13ecf6c9c65fa0a96952db6fe0cc737fb3822896
+  metadata.gz: 968557e0aea9a85ef617653c52a53038b192692c
+  data.tar.gz: e6cc8fd57b8166496eac893ba606057cef724335
 SHA512:
-  metadata.gz: 5a74c38f536f5b93ef8c78296cfb034c13c347ceed6db3870de289ad6f78bdf2254acb35d83a6a202f7a72011d8bedba07f4307b5d8914fcdf4c148fb55ac3ba
-  data.tar.gz: 692dd195bd990bbb94c32003a34469d22167d6c972a1918dc83f211fcca7f6347cfc2024cd0ec36d371fc3529f232537bccfcc8ffc189e931971c4208eed730b
+  metadata.gz: 4ed5a7e4a662c16aaf897d94dbddf23b72acd231ae6a7cd124bc91d31c7baca2dfbc8d599f17de5d315360d9faed99307f73caae545a8942f57b95e0ca2470ca
+  data.tar.gz: 5941c7d5c486b2cdc482065223ebb03b7c269af9b86448358045c1e3520e1aa40efcc8b0cf7635e3bc6e99e0a495930f33120c65d829eba562cecf4475d1fbe0

data/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>conjur-asset-dsl2</name>
+	<name>conjur-asset-policy</name>
 	<comment></comment>
 	<projects>
 	</projects>

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.8.1
+
+* Report an error if the same kind of record with the same id is declared more than once.
+* Report an error if a cycle is detected in the record/ownership dependency graph.
+
 # 0.8.0
 
 * **Breaking change** Removed `--syntax` flag from `policy load`. Only YML is supported going forwards.

data/conjur-asset-policy.gemspec

@@ -30,5 +30,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "ci_reporter_rspec"
   spec.add_development_dependency "aruba"
   spec.add_development_dependency 'io-grab'
-  spec.add_development_dependency 'simplecov'
 end

data/lib/conjur-asset-policy-version.rb

@@ -1,7 +1,7 @@
 module Conjur
   module Asset
     module Policy
-      VERSION = "0.8.0"
+      VERSION = "0.8.1"
     end
   end
 end

data/lib/conjur/policy/resolver.rb

@@ -6,7 +6,7 @@ module Conjur
       class << self
         # Resolve records to the specified owner id and namespace.
         def resolve records, account, ownerid, namespace = nil
-          resolver_classes = [ AccountResolver, IdResolver, OwnerResolver, FlattenResolver ]
+          resolver_classes = [ AccountResolver, IdResolver, OwnerResolver, FlattenResolver, DuplicateResolver ]
           resolver_classes.each do |cls|
             resolver = cls.new account, ownerid, namespace
             records = resolver.resolve records
@@ -79,7 +79,7 @@ module Conjur
         if record.respond_to?(:id) && record.respond_to?(:id=)
           id = record.id
           if id.blank?
-            raise "#{record.to_s} has no id, and no namespace is available to populate it" unless namespace
+            raise "#{record.class.simple_name} has no id" unless namespace
             id = namespace
           elsif id[0] == '/'
             id = id[1..-1]
@@ -157,7 +157,10 @@ module Conjur
         @result.flatten.sort do |a,b|
           score = sort_score(a) - sort_score(b)
           if score == 0
-            if a.respond_to?(:roleid) && @referenced_record_index[b].member?(a.roleid)
+            if a.respond_to?(:roleid) && @referenced_record_index[b].member?(a.roleid) &&
+              b.respond_to?(:roleid) && @referenced_record_index[a].member?(b.roleid)
+              raise "Dependency cycle encountered between #{a} and #{b}"
+            elsif a.respond_to?(:roleid) && @referenced_record_index[b].member?(a.roleid)
               score = -1
             elsif b.respond_to?(:roleid) && @referenced_record_index[a].member?(b.roleid)
               score = 1
@@ -171,15 +174,6 @@ module Conjur
       
       protected
       
-      # Select things uniquely by class and id, in this resolver.
-      def id_of record
-        if record.respond_to?(:id)
-          [ record.id, record.class.name ].join("@")
-        else
-          super
-        end
-      end
-      
       # Sort "Create" and "Record" objects to the front.
       def sort_score record
         if record.is_a?(Types::Create) || record.is_a?(Types::Record)
@@ -202,6 +196,18 @@ module Conjur
       end
     end
     
+    # Raises an exception if the same record is declared more than once.
+    class DuplicateResolver < Resolver
+      def resolve records
+        seen = Set.new
+        Array(records).flatten.each do |record|
+          if record.respond_to?(:id) && !seen.add?([ record.class.short_name, record.id ])
+            raise "#{record} is declared more than once"
+          end
+        end
+      end
+    end
+    
     # Unsets attributes that make for more verbose YAML output. This class is used to 
     # compact YAML expectations in test cases. It expects pre-flattened input.
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-asset-policy
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -164,20 +164,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - kgilpin@conjur.net
@@ -195,7 +181,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- backup.tar
 - bin/console
 - bin/setup
 - ci/test.sh