soar-authentication-identity_uuid_translator 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad31c2ba0758930b4216021ccf55279f0c276d38
-  data.tar.gz: 5e0cbcb60fa6e0d87b8cb7b919f443541be544ab
+  metadata.gz: 62918fb1409f0b7fd6a28ba4c0e5d7e06a84fd0f
+  data.tar.gz: 154f26e6dba8e4841badb6219348beee137747b3
 SHA512:
-  metadata.gz: ebe9e7fd20daea4f936af51e9499e9d053b304effba39f50944a943f5a646f3c14e0943adbe0e6b60c2f35c01c3a20a3f96f94ceaf20e07a781b08f02681068b
-  data.tar.gz: 6f0903ab2cd8fbd4cf863e8a2d640cd01f4bfd50dc241e14b6d1ae7286268c799f6080b3596ec26599d059588e7d4e602b04309792f2e7317501dede9b67f2e9
+  metadata.gz: 5fe73df28bd768f251b1ba099fc92e7030c78f2e5b56ea6cf98f0e102451381d429feae83bf0336d0200ae8cd19237a5934873c6adec989af4224c5f7db3dc3e
+  data.tar.gz: 8b06e5067c6d8026865fa03be6eaf3da9db932b07b08efb826a253638c3fc2aec4034607fada8f89e677c2c068007a07c0449a6a0550020b6f9851732402c0dc

data/.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "soar-authentication-identity_uuid_translator"
-  spec.version       = "1.0.3"
+  spec.version       = "1.0.4"
   spec.authors       = ["Charles Mulder"]
   spec.email         = ["charles.mulder@hetzner.co.za"]
 

data/Dockerfile.dynamo_db

@@ -2,4 +2,4 @@ FROM openjdk:7
 WORKDIR /opt/dynamodb_local
 RUN wget -q -O - http://dynamodb-local.s3-website-us-west-2.amazonaws.com/dynamodb_local_latest.tar.gz | tar -xzf - -C /opt/dynamodb_local
 EXPOSE 8000
-ENTRYPOINT ["/usr/bin/java", "-Djava.library.path=/opt/dynamodb_local/DynamoDBLocal_lib", "-jar", "DynamoDBLocal.jar", "-inMemory"]
+ENTRYPOINT ["/usr/bin/java", "-Djava.library.path=/opt/dynamodb_local/DynamoDBLocal_lib", "-jar", "DynamoDBLocal.jar"]

data/Dockerfile.features

@@ -4,4 +4,4 @@ WORKDIR /usr/local/src
 ADD Gemfile .gemspec /usr/local/src/
 RUN bundle install --without development --with test
 ADD . /usr/local/src/
-CMD sleep 10; bundle exec cucumber;
+CMD bundle exec cucumber;

data/config/config.ci.dynamo_db.yml

@@ -6,7 +6,7 @@ config:
       partition_key: 'identity_uuid'
       sort_key: 'identity_role'
   configuration: 
-    region: 'us-west-2'
+    region: 'eu-west-1'
     endpoint: 'http://dynamodb:8000'
     http_read_timeout: 1, 
     retry_limit: 0

data/lib/soar/authentication/identity_uuid_translator/provider/customer.rb

@@ -8,7 +8,7 @@ module Soar
         class Customer
 
           ROLE = "customer_profile_administrator"
-          PREFIX = "genie:client:id:"
+          PREFIX = "mysql:genie:client:id:"
 
           ##
           # @param [String] identifier
@@ -29,6 +29,7 @@ module Soar
             @uuid = @uuid_generator.nil? ? @identifiers[0] : @uuid_generator::generate("#{PREFIX}#{@identifiers[0]}")
             @role_generator.generate({
                 "identity_uuid" => uuid,
+                "identity_source" => "#{PREFIX}#{@identifiers[0]}",
                 "identity_role" => ROLE,
                 "identity_role_attributes" => {
                   "profiles" => [client_number].compact

data/lib/soar/authentication/identity_uuid_translator/provider/staff.rb

@@ -7,6 +7,7 @@ module Soar
         class Staff
 
           ROLE = "hetzner_staff_member"
+          PREFIX = "ldap:people:genieuser:entryuuid:"
 
           def initialize(identifier: , identity_registry: , role_generator: nil)
             @identifier = identifier
@@ -19,7 +20,8 @@ module Soar
             identifiers = @idr.get_identifiers(@identifier)
             @uuid = identifiers[0]
             @role_generator.generate({
-                "identity_uuid" => uuid,
+                "identity_uuid" => @uuid,
+                "identity_source" => "#{PREFIX}#{@uuid}",
                 "identity_role" => ROLE
             }) if not @role_generator.nil? 
             return @uuid

data/lib/soar/authentication/identity_uuid_translator/test/orchestration_provider/base.rb

@@ -13,8 +13,8 @@ module Soar
         module OrchestrationProvider
           class Base
 
-            SLEEP_SECONDS = 1
-            CONNECTION_RETRIES = 6
+            SLEEP_SECONDS = 5
+            CONNECTION_RETRIES = 10
 
 						def initialize
               @connection_retries = CONNECTION_RETRIES
@@ -22,14 +22,14 @@ module Soar
 
             def given_roles_directory
               begin
-              roles_directory_configuration = YAML.load_file("config/#{ENV['ROLES_DIRECTORY_CONFIG_FILE']}")
-              @roles_directory = Soar::Registry::Directory.new(
-                Soar::Registry::Directory::Provider::DynamoDb.new(Hashie.symbolize_keys(roles_directory_configuration['config']))
-              )
-              @roles_directory.provider.recreate_table({
-                name: roles_directory_configuration['config']['table'][:name],
-                structure: JSON.parse(File.read("lib/soar/authentication/identity_uuid_translator/test/fixtures/roles_table.json"))
-              })
+                roles_directory_configuration = YAML.load_file("config/#{ENV['ROLES_DIRECTORY_CONFIG_FILE']}")
+                @roles_directory = Soar::Registry::Directory.new(
+                  Soar::Registry::Directory::Provider::DynamoDb.new(Hashie.symbolize_keys(roles_directory_configuration['config']))
+                )
+                @roles_directory.provider.recreate_table({
+                  name: roles_directory_configuration['config']['table'][:name],
+                  structure: JSON.parse(File.read("lib/soar/authentication/identity_uuid_translator/test/fixtures/roles_table.json"))
+                })
               rescue Soar::Registry::Directory::Error::NetworkingError => e
                 raise if @connection_retries == 0
                 sleep(SLEEP_SECONDS)

data/lib/soar/authentication/identity_uuid_translator/test/orchestration_provider/customer.rb

@@ -10,11 +10,21 @@ module Soar
             def given_existing_role_and_attributes
               @roles_directory.put({
                 "identity_uuid" => Soar::Authentication::IdentityUuidTranslator::UuidGenerator.generate("#{Soar::Authentication::IdentityUuidTranslator::Provider::Customer::PREFIX}#{@identity[:ID]}"),
+                "identity_source" => "#{Soar::Authentication::IdentityUuidTranslator::Provider::Customer::PREFIX}#{@identity[:ID]}",
                 "identity_role" => Soar::Authentication::IdentityUuidTranslator::Provider::Customer::ROLE,
                 "identity_role_attributes" => [Faker::Number.unique.number(10)].compact
               })
             end
 
+            def source?
+              primary_key = {
+                "identity_uuid" => @uuid,
+                "identity_role" => Soar::Authentication::IdentityUuidTranslator::Provider::Customer::ROLE
+              }
+              identity = @roles_directory.fetch(primary_key)
+              return identity['identity_source'] == "#{Soar::Authentication::IdentityUuidTranslator::Provider::Customer::PREFIX}#{@identity[:ID]}"
+            end
+
             def role?
               begin
                 primary_key = {
@@ -23,7 +33,7 @@ module Soar
                 }
                 identity = @roles_directory.fetch(primary_key)
                 identity['identity_role'] == Soar::Authentication::IdentityUuidTranslator::Provider::Customer::ROLE
-                return identity['identity_role_attributes'].include?(@identity[:Client_Number])
+                return identity['identity_role_attributes']['profiles'].include?(@identity[:Client_Number])
               rescue Soar::Registry::Directory::Error::NoEntriesFoundError => e
                 return false
               end

data/lib/soar/authentication/identity_uuid_translator/test/orchestration_provider/customer_email.rb

@@ -28,7 +28,7 @@ module Soar
                 )
               rescue Soar::Registry::Directory::Error::NetworkingError => e
                 raise if @connection_retries == 0
-                sleep(self::SLEEP_SECONDS)
+                sleep(SLEEP_SECONDS)
                 @connection_retries -= 1
                 given_identity_registry
               end

data/lib/soar/authentication/identity_uuid_translator/test/orchestration_provider/staff.rb

@@ -16,51 +16,56 @@ module Soar
                 @identity = {
                   dn: "cn=John Smith,#{@identity_directory_configuration['config']['base']}",
                   attributes: {
-                    cn: "John Smith",
-                    mail: @identifier,
-                    objectclass: ["inetOrgPerson", "top"],
-                    sn: "Smith"
-                  }
+                  cn: "John Smith",
+                  mail: @identifier,
+                  objectclass: ["inetOrgPerson", "top"],
+                  sn: "Smith"
+                }
                 }
                 @identity_directory.provider.delete(@identity[:dn])
                 @identity_directory.put(@identity)
               rescue Soar::Registry::Directory::Error::DuplicateEntryError => e
                 true
+              rescue Soar::Registry::Directory::Error::NetworkingError => e
+                raise if @connection_retries == 0
+                sleep(SLEEP_SECONDS)
+                @connection_retries -= 1
+                given_existing_identity
               end
             end
 
 
             def given_existing_role_and_attributes
-              @roles_directory.put({
-                "identity_uuid" => @identity_registry.get_identifiers(@identifier)[0],
-                "identity_role" => Soar::Authentication::IdentityUuidTranslator::Provider::Staff::ROLE
-              })
-            end
-
-            def given_identity_registry
-
               begin
-                @identity_directory_configuration = YAML.load_file("config/#{ENV['IDENTITY_DIRECTORY_CONFIG_FILE']}")
-
-                @identity_directory = Soar::Registry::Directory.new(
-                  Soar::Registry::Directory::Provider::Ldap.new(Hashie.symbolize_keys(@identity_directory_configuration['config']))
-                )
-
-                @identity_registry = Soar::Registry::Identity.new(
-                  Soar::Registry::Identity::Provider::Staff::Email.new({
-                    directory: @identity_directory,
-                    fetch_index: 'entryuuid',
-                    search_index: 'mail'
-                  })
-                )
+                @roles_directory.put({
+                  "identity_uuid" => @identity_registry.get_identifiers(@identifier)[0],
+                  "identity_role" => Soar::Authentication::IdentityUuidTranslator::Provider::Staff::ROLE
+                })
               rescue Soar::Registry::Directory::Error::NetworkingError => e
                 raise if @connection_retries == 0
                 sleep(SLEEP_SECONDS)
                 @connection_retries -= 1
-                given_identity_registry
+                given_existing_role_and_attributes
               end
             end
 
+            def given_identity_registry
+
+              @identity_directory_configuration = YAML.load_file("config/#{ENV['IDENTITY_DIRECTORY_CONFIG_FILE']}")
+
+              @identity_directory = Soar::Registry::Directory.new(
+                Soar::Registry::Directory::Provider::Ldap.new(Hashie.symbolize_keys(@identity_directory_configuration['config']))
+              )
+
+              @identity_registry = Soar::Registry::Identity.new(
+                Soar::Registry::Identity::Provider::Staff::Email.new({
+                  directory: @identity_directory,
+                  fetch_index: 'entryuuid',
+                  search_index: 'mail'
+                })
+              )
+            end
+
             def role?
               begin
                 primary_key = {
@@ -78,6 +83,15 @@ module Soar
               @uuid == @identity_registry.get_identifiers(@identifier)[0]
             end
 
+            def source?
+              primary_key = {
+                "identity_uuid" => @uuid,
+                "identity_role" => Soar::Authentication::IdentityUuidTranslator::Provider::Staff::ROLE
+              }
+              identity = @roles_directory.fetch(primary_key)
+              identity['identity_source'] == "#{Soar::Authentication::IdentityUuidTranslator::Provider::Staff::PREFIX}#{@uuid}"
+            end
+
           end
         end
       end

data/lib/soar/authentication/identity_uuid_translator/test/orchestrator.rb

@@ -48,6 +48,10 @@ module Soar
               @provider.uuid?
             end
 
+            def source?
+              @provider.source?
+            end
+
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar-authentication-identity_uuid_translator
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Charles Mulder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: soar-registry-identity