soar-authentication-identity 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8552455d9ef80cea2f5b3d055a4aaf8053faa9a6
-  data.tar.gz: d2a1bbb6de58e7a269d5b3f6b43e1773f3a58674
+  metadata.gz: d0c10321d30cb51dff6520b6593a11f12a3aa6fa
+  data.tar.gz: a2e413006c1fbede1b6b91ca6a0b02f0ff348fbf
 SHA512:
-  metadata.gz: 1fb680c5866e405254781531d6f80ccff2347d1844f988da33b139c01d5ef4da33b6f1f2237c508f4d4c69a75c9c8a0836952b1e74d10c59a55cba706735076a
-  data.tar.gz: e081c971369a76e52e09157f4b4a9a0f1f87ebb72e195b0cb32b8d51c31c47fe3ee9c8901b7b3e53601595963ba095c6a23c7696a5fd00fd719d914a72459450
+  metadata.gz: a9cf1b43cdb354c07683908a1c84803875126f2c147e2debecb4c94ac547fa42fa0a13b091436bd1b16e5de18b74bd02a336a7c66cf8f1fcf6b9ea4eab74c01b
+  data.tar.gz: ddbde62e2d3cf33e17cd33586d8bf51d4b723ab755646249f9719c2797599e773ec12243800e807842cf6470bf66780d7eec4f0e0ecf4e005d88e894ad7d9361

data/.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "soar-authentication-identity"
-  spec.version       = "0.0.5"
+  spec.version       = "1.0.0"
   spec.authors       = ["Charles Mulder"]
   spec.email         = ["charles.mulder@hetzner.co.za"]
 
@@ -10,5 +10,5 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'soar-registry-identity', '~> 1.0.1'
+  spec.add_runtime_dependency 'soar-registry-identity', '~> 1.0.2'
 end

data/README.md

@@ -15,8 +15,8 @@ Example using the factory.
         "staff" => {
             "class" => 'Soar::Registry::Directory::Provider::Stub',
             "config" => {
-                "table" => "identity",
-                "index" => ["uuid", "email"]
+                table: "identity",
+                index: ["uuid", "email"]
             }
         },
         "customer" => {},
@@ -45,7 +45,8 @@ $ TEST_ORCHESTRATION_PROVIDER=Stub cucumber
 
 #### Staff identity provider
 ```bash
-$ TEST_ORCHESTRATION_PROVIDER=Staff cucumber
+$ docker-compose --file docker-compose.ldap.yml up --remove-orphans
+$ CONFIG_FILE=config.ldap.yml TEST_ORCHESTRATION_PROVIDER=Staff cucumber
 ```
 
 #### Customer identity provider
@@ -58,14 +59,14 @@ Not implemented
 
 #### Stub identity provider
 ```bash
-docker-compose --file docker-compose.stub.yml up --abort-on-container-exit --remove-orphans
+docker-compose --file docker-compose.ci.stub.yml up --abort-on-container-exit --remove-orphans
 EXIT_CODE=$(docker ps -a -f "name=soar-authentication-identity-provider-stub" -q | xargs docker inspect -f "{{ .State.ExitCode }}");
 exit $EXIT_CODE;
 ```
 
 #### Staff identity provider
 ```bash
-docker-compose --file docker-compose.staff.yml up --abort-on-container-exit --remove-orphans
+docker-compose --file docker-compose.ci.staff.yml up --abort-on-container-exit --remove-orphans
 EXIT_CODE=$(docker ps -a -f "name=soar-authentication-identity-provider-staff" -q | xargs docker inspect -f "{{ .State.ExitCode }}");
 exit $EXIT_CODE;
 ```

data/config/config.ci.ldap.yml

@@ -0,0 +1,17 @@
+class: 'Soar::Registry::Directory::Provider::Ldap'
+config:
+  base: 'dc=hetzner,dc=co,dc=za'
+  index:
+    - :entryuuid
+    - :mail
+  config:
+    host: 'ldap'
+    port: 389
+  attributes: 
+    - 'entryuuid'
+    - 'cn' 
+    - 'mail' 
+    - 'sn'
+  credentials: 
+    username: 'cn=admin,dc=hetzner,dc=co,dc=za'
+    password: 'secret'

data/config/config.ldap.yml

@@ -0,0 +1,17 @@
+class: 'Soar::Registry::Directory::Provider::Ldap'
+config:
+  base: 'dc=hetzner,dc=co,dc=za'
+  index:
+    - :entryuuid
+    - :mail
+  config:
+    host: 'localhost'
+    port: 389
+  attributes: 
+    - 'entryuuid'
+    - 'cn' 
+    - 'mail' 
+    - 'sn'
+  credentials: 
+    username: 'cn=admin,dc=hetzner,dc=co,dc=za'
+    password: 'secret'

data/docker-compose.ci.staff.yml

@@ -0,0 +1,26 @@
+version: "2"
+services:
+    ldap:
+        image: nickstenning/slapd
+        expose: 
+            - "389"
+        container_name: soar-authentication-identity-provider-staff-ldap
+        environment:
+            - LDAP_DOMAIN=hetzner.co.za
+            - LDAP_ORGANIZATION=Hetzner
+            - LDAP_ROOTPASS=secret
+
+    tests:
+        build: 
+            context: .
+        image: soar-authentication-identity-provider-staff
+        container_name: soar-authentication-identity-provider-staff
+        links: 
+            - ldap
+        environment:
+            - CONFIG_FILE=config.ci.ldap.yml
+            - TEST_ORCHESTRATION_PROVIDER=Staff
+
+
+
+

data/docker-compose.ldap.yml

@@ -0,0 +1,11 @@
+version: "2"
+services:
+  ldap:
+    image: nickstenning/slapd
+    ports: 
+      - "389:389"
+    environment:
+        - LDAP_DOMAIN=hetzner.co.za
+        - LDAP_ORGANIZATION=Hetzner
+        - LDAP_ROOTPASS=secret
+

data/lib/soar/authentication/identity/factory.rb

@@ -1,5 +1,6 @@
 require 'soar/authentication/identity'
 require 'soar/registry/directory'
+require 'hashie'
 
 module Soar
   module Authentication
@@ -12,9 +13,7 @@ module Soar
         # @return [Soar::Authentication::Identity]
         # @raise [ArgumentError]
         ##
-        def self.create(directory_configurations: nil, authenticated_identifier: nil)
-          raise ArgumentError, 'Missing required directory configuration' if directory_configurations.nil?
-          raise ArgumentError, 'Missing required authenticated identifier' if authenticated_identifier.nil?
+        def self.create(directory_configurations: , authenticated_identifier: )
           provider = get_provider(directory_configurations, authenticated_identifier)
           Soar::Authentication::Identity.new(provider)
         end
@@ -28,7 +27,7 @@ module Soar
         ##
         def self.get_directory(config)
           provider_class = Object.const_get(config.fetch('class'))
-          provider = provider_class.new(config.fetch('config').symbolize_keys)
+          provider = provider_class.new(Hashie.symbolize_keys(config.fetch('config')))
           Soar::Registry::Directory.new(provider)
         end
 
@@ -40,13 +39,14 @@ module Soar
         def self.get_provider(directory_configurations, authenticated_identifier)
           case authenticated_identifier
             when /@hetzner.co.za\z/
+            #when /^[^@-_a-zA-Z0-9]@hetzner.co.za\z/
               Soar::Authentication::Identity::Provider::Staff.new({
-                directory: get_directory(directory_configurations.fetch('staff')),
+                directory: get_directory(directory_configurations.fetch(:staff)),
                 authenticated_identifier: authenticated_identifier
               })
-            when /D\d*$/
+            when /D\d+$/
               raise NotImplementedError, 'Domain identities require an implementation'
-            when /^[CF]{0,1}\d*$/
+            when /^[CF]{0,1}\d+$/
               raise NotImplementedError, 'Customer identities require an implementation'
             else
               raise Soar::Authentication::Identity::Error::UnknownIdentityError, 'Unknown identity'

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

@@ -17,8 +17,7 @@ module Soar
 
           def uuid
             attributes = @identity_registry.get_attributes(@authenticated_identifier)
-            primary_key = @directory.index[0]
-            attributes[primary_key]
+            attributes[@directory.index[0]]
           end
 
           def role

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

@@ -9,30 +9,34 @@ module Soar
           class Staff
 
             def initialize
+              @directory_configurations = {
+                staff: YAML.load_file("config/#{ENV['CONFIG_FILE']}"),
+                customer: {},
+                domain: {}
+              }
+
               @entry = {
-                "uuid" => SecureRandom.uuid,
-                "email" => 'test@hetzner.co.za'
+                  dn: "cn=John Smith,#{@directory_configurations[:staff]["config"]["base"]}",
+                  attributes: {
+                    cn: "John Smith",
+                    mail: "test@hetzner.co.za",
+                    objectclass: ["inetOrgPerson", "top"],
+                    sn: "Smith" 
+                  }
               }
+
               @identity = Soar::Authentication::Identity::Factory.create({
-                authenticated_identifier: @entry["email"],
-                directory_configurations:  {
-                  "staff" => {
-                    "class" => 'Soar::Registry::Directory::Provider::Stub',
-                    "config" => {
-                      "table" => "identity",
-                      "index" => ["uuid", "email"]
-                    }
-                  },
-                  "customer" => {},
-                  "domain" => {}
-                }
+                authenticated_identifier: @entry[:attributes][:mail],
+                directory_configurations: @directory_configurations
               })
+
             end
 
             ##
             # @return [Nil]
             ##
             def given_existing_identity
+              @identity.directory.provider.delete(@entry[:dn])
               @identity.directory.put(@entry)
             end
 
@@ -40,7 +44,7 @@ module Soar
             # @return [Nil]
             ##
             def given_authenticated_identifier
-              @entry["email"]
+              @entry[:attributes][:mail]
             end
 
             ##
@@ -54,7 +58,8 @@ module Soar
             # @return [Boolean]
             ##
             def uuid?
-              @entry["uuid"] == @identity.uuid
+              entry = @identity.directory.search("mail", @entry[:attributes][:mail])
+              entry[0][@identity.directory.index[0]] == @identity.uuid
             end
 
             ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar-authentication-identity
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Charles Mulder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: soar-registry-identity
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 description: 
 email:
 - charles.mulder@hetzner.co.za
@@ -40,8 +40,11 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- docker-compose.staff.yml
-- docker-compose.stub.yml
+- config/config.ci.ldap.yml
+- config/config.ldap.yml
+- docker-compose.ci.staff.yml
+- docker-compose.ci.stub.yml
+- docker-compose.ldap.yml
 - lib/soar/authentication/identity.rb
 - lib/soar/authentication/identity/error.rb
 - lib/soar/authentication/identity/factory.rb

data/docker-compose.staff.yml

@@ -1,13 +0,0 @@
-version: "2"
-services:
-    tests:
-        build: 
-            context: .
-        image: soar-authentication-identity-provider-staff
-        container_name: soar-authentication-identity-provider-staff
-        environment:
-            - TEST_ORCHESTRATION_PROVIDER=Staff
-
-
-
-