soar_authentication_token 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87964e7ea8211a562a63c243129746ca015c41f0
-  data.tar.gz: 9391628582b905df4d720f559bf787cdc1a46eaa
+  metadata.gz: d64a56545b16db366bd879f1c809320b71376327
+  data.tar.gz: 735dc7c143e3a5f500e2a8e04fe37bd5822ad920
 SHA512:
-  metadata.gz: ac01a6c65000634dfa674bf4fdee98dd943739e2b12626de27ed57750f44b8daf94d87c828d13f6592bcf62991dc46d190502d5939b1079bd6e3a74a228807a2
-  data.tar.gz: 287ca8ee2cf219bea7a132a8c41e18d5c33427fa99a1c01df1a187ee2928c3e5d394e9247d34bb8daea36b1329852540c6af00bda25c3a2204e7de1e92ae3000
+  metadata.gz: df0acc8c762e6984ea5dc5014a01399af4f21f69bf6568d5c343445932cf82792b443effa92d595df0c28c0483621ffabdecce9527210a2759ad71051119b94f
+  data.tar.gz: 94037e0ec776a1dea90b25aa9d8ccec2cc8f51ec44a856900d6b46266facf7c30b0039ac746abb0ac79f3ac6f27127a519276416c744980aa1a87b3879284ae6

data/.gitmodules

@@ -6,3 +6,7 @@
 	path = authentication-token-validator-service
 	url = git@gitlab.host-h.net:hetznerZA/authentication-token-validator-service.git
 	branch = master
+[submodule "authentication-token-store"]
+	path = authentication-token-store
+	url = git@gitlab.host-h.net:hetznerZA/authentication-token-store.git
+	branch = master

data/docker-compose-isolated.yml

@@ -0,0 +1,48 @@
+version: '2.0'
+services:
+  soar-authentication-token:
+    command: /bin/bash -c 'sleep 5; bundle exec rspec -cfd spec'
+    build: .
+    image: soar-authentication-token
+    volumes:
+      - .:/usr/local/src/
+    links:
+      - authentication-token-generator-service
+      - authentication-token-validator-service
+  authentication-token-generator-service:
+    build: authentication-token-generator-service
+    image: authentication-token-generator-service
+    expose:
+      - "9393"
+    volumes:
+      - ./authentication-token-generator-service:/usr/local/src/
+    environment:
+      - RACK_ENV=development
+      - ENVIRONMENT_FILE=environment_local_ecosystem.yml
+    links:
+      - authentication-token-store
+  authentication-token-validator-service:
+    build: authentication-token-validator-service
+    image: authentication-token-validator-service
+    expose:
+      - "9393"
+    volumes:
+      - ./authentication-token-validator-service:/usr/local/src/
+    environment:
+      - RACK_ENV=development
+      - ENVIRONMENT_FILE=environment_local_ecosystem.yml
+    links:
+      - authentication-token-store
+  authentication-token-store:
+    build: authentication-token-store
+    image: authentication-token-store
+    command: soaring start
+    expose:
+      - "9393"
+    environment:
+      - RACK_ENV=development
+      - ENVIRONMENT_FILE=environment_local_ecosystem.yml
+    links:
+      - authentication-token-redis-store
+  authentication-token-redis-store:
+    image: redis

data/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2.0'
 services:
   soar-authentication-token:
-    command: /bin/bash -c 'sleep 5; bundle update; bundle exec rspec -cfd spec'
+    command: /bin/bash -c 'sleep 5; bundle exec rspec -cfd spec'
     build: .
     image: soar-authentication-token
     volumes:
@@ -14,18 +14,39 @@ services:
     image: authentication-token-generator-service
     expose:
       - "9393"
+    ports:
+      - "7001:9393"
     volumes:
       - ./authentication-token-generator-service:/usr/local/src/
     environment:
       - RACK_ENV=development
       - ENVIRONMENT_FILE=environment_local_ecosystem.yml
+    links:
+      - authentication-token-store
   authentication-token-validator-service:
     build: authentication-token-validator-service
     image: authentication-token-validator-service
     expose:
       - "9393"
+    ports:
+      - "7002:9393"
     volumes:
       - ./authentication-token-validator-service:/usr/local/src/
     environment:
       - RACK_ENV=development
       - ENVIRONMENT_FILE=environment_local_ecosystem.yml
+    links:
+      - authentication-token-store
+  authentication-token-store:
+    build: authentication-token-store
+    image: authentication-token-store
+    command: soaring start
+    expose:
+      - "9393"
+    environment:
+      - RACK_ENV=development
+      - ENVIRONMENT_FILE=environment_local_ecosystem.yml
+    links:
+      - authentication-token-redis-store
+  authentication-token-redis-store:
+    image: redis

data/lib/soar_authentication_token/token_generator.rb

@@ -30,7 +30,9 @@ module SoarAuthenticationToken
     private
 
     def generate_locally(authenticated_identifier)
-      encode(meta(authenticated_identifier))
+      token_meta = meta(authenticated_identifier)
+      token = encode(token_meta)
+      [token, token_meta]
     end
 
     def generate_remotely(authenticated_identifier,flow_identifier)

data/lib/soar_authentication_token/token_validator.rb

@@ -71,7 +71,7 @@ module SoarAuthenticationToken
       body = JSON.parse(response.body)
       if 'success' == body['status']
         raise 'Token validation service did not provide authenticated_identifier' if body['data'].nil? or body['data']['authenticated_identifier'].nil?
-        return [true, body['data']['authenticated_identifier']]
+        return [true, body['data']]
       end
       if 'fail' == body['status']
         return [false, nil]

data/lib/soar_authentication_token/version.rb

@@ -1,3 +1,3 @@
 module SoarAuthenticationToken
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

data/spec/token_generator_spec.rb

@@ -42,11 +42,10 @@ describe SoarAuthenticationToken::TokenGenerator do
       @validator = SoarAuthenticationToken::TokenValidator.new(@validator_configuration_local)
       @validator.inject_store_provider(@test_store)
 
-      token = @iut.generate(authenticated_identifier: @test_authenticated_identifier, flow_identifier: 'test-flow-id')
-      token_validity, token_meta = @validator.validate(authentication_token: token, flow_identifier: 'test-flow-id')
-
+      token, token_generator_meta = @iut.generate(authenticated_identifier: @test_authenticated_identifier, flow_identifier: 'test-flow-id')
+      token_validity, token_validator_meta = @validator.validate(authentication_token: token, flow_identifier: 'test-flow-id')
       expect(token_validity).to eq(true)
-      expect(token_meta['authenticated_identifier']).to eq(@test_authenticated_identifier)
+      expect(token_validator_meta['authenticated_identifier']).to eq(@test_authenticated_identifier)
     end
   end
 
@@ -55,14 +54,14 @@ describe SoarAuthenticationToken::TokenGenerator do
       @iut = SoarAuthenticationToken::TokenGenerator.new(@configuration_remote)
       @iut.inject_store_provider(@test_store)
 
-      token = @iut.generate(authenticated_identifier: @test_authenticated_identifier, flow_identifier: 'test-flow-id')
+      token, token_generator_meta = @iut.generate(authenticated_identifier: @test_authenticated_identifier, flow_identifier: 'test-flow-id')
 
       @validator = SoarAuthenticationToken::TokenValidator.new(@configuration_remote)
       @iut.inject_store_provider(@test_store)
-      token_validity, token_meta = @validator.validate(authentication_token: token, flow_identifier: 'test-flow-id')
+      token_validity, token_validator_meta = @validator.validate(authentication_token: token, flow_identifier: 'test-flow-id')
 
       expect(token_validity).to eq(true)
-      expect(token_meta['authenticated_identifier']).to eq(@test_authenticated_identifier)
+      expect(token_validator_meta['authenticated_identifier']).to eq(@test_authenticated_identifier)
     end
   end
 end

data/spec/token_validator_spec.rb

@@ -50,25 +50,25 @@ describe SoarAuthenticationToken::TokenValidator do
 
   context "when validating a token locally using the configured public key" do
     it 'should indicate valid if the token is valid' do
-      token = @local_valid_generator.generate(authenticated_identifier: @test_identifier)
+      token, token_generator_meta = @local_valid_generator.generate(authenticated_identifier: @test_identifier)
       token_validity, token_meta = @iut_local.validate(authentication_token: token)
       expect(token_validity).to eq true
     end
 
     it 'should indicate invalid if the token is invalid' do
-      token = @local_invalid_generator.generate(authenticated_identifier: @test_identifier)
+      token, token_generator_meta = @local_invalid_generator.generate(authenticated_identifier: @test_identifier)
       token_validity, token_meta = @iut_local.validate(authentication_token: token)
       expect(token_validity).to eq false
     end
 
     it 'should provide the authenticated_identifier if the token is valid' do
-      token = @local_valid_generator.generate(authenticated_identifier: @test_identifier)
+      token, token_generator_meta = @local_valid_generator.generate(authenticated_identifier: @test_identifier)
       token_validity, token_meta = @iut_local.validate(authentication_token: token)
       expect(token_meta['authenticated_identifier']).to eq @test_identifier
     end
 
     it 'should not provide the authenticated_identifier if the token is invalid' do
-      token = @local_invalid_generator.generate(authenticated_identifier: @test_identifier)
+      token, token_generator_meta = @local_invalid_generator.generate(authenticated_identifier: @test_identifier)
       token_validity, token_meta = @iut_local.validate(authentication_token: token)
       expect(token_meta).to eq nil
     end
@@ -86,25 +86,25 @@ describe SoarAuthenticationToken::TokenValidator do
 
   context "when validating a token remotely using the configured url" do
     it 'should indicate valid if the token is valid' do
-      token = @remote_generator.generate(authenticated_identifier: @test_identifier)
+      token, token_generator_meta = @remote_generator.generate(authenticated_identifier: @test_identifier)
       token_validity, token_meta = @iut_remote.validate(authentication_token: token)
       expect(token_validity).to eq true
     end
 
     it 'should indicate invalid if the token is invalid' do
-      token = @local_invalid_generator.generate(authenticated_identifier: @test_identifier)
+      token, token_generator_meta = @local_invalid_generator.generate(authenticated_identifier: @test_identifier)
       token_validity, token_meta = @iut_remote.validate(authentication_token: token)
       expect(token_validity).to eq false
     end
 
     it 'should provide the authenticated_identifier if the token is valid' do
-      token = @remote_generator.generate(authenticated_identifier: @test_identifier)
+      token, token_generator_meta = @remote_generator.generate(authenticated_identifier: @test_identifier)
       token_validity, token_meta = @iut_remote.validate(authentication_token: token)
       expect(token_meta['authenticated_identifier']).to eq @test_identifier
     end
 
     it 'should not provide the authenticated_identifier if the token is invalid' do
-      token = @local_invalid_generator.generate(authenticated_identifier: @test_identifier)
+      token, token_generator_meta = @local_invalid_generator.generate(authenticated_identifier: @test_identifier)
       token_validity, token_meta = @iut_remote.validate(authentication_token: token)
       expect(token_meta).to eq nil
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar_authentication_token
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Barney de Villiers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: soar_xt
@@ -177,6 +177,7 @@ files:
 - bin/console
 - bin/keypair-generator
 - bin/setup
+- docker-compose-isolated.yml
 - docker-compose.yml
 - lib/soar_authentication_token.rb
 - lib/soar_authentication_token/keypair_generator.rb