factor 0.1.07 → 0.1.09

data/lib/cli/credential_task.rb

@@ -4,24 +4,27 @@ require 'cli/command'
 module Factor
   module CLI
     class CredentialTask < Command
+
     
-      desc "list [KEY]", "list all the credentials"
-      #method_option :key, :alias=>"-k", :type=>:string, :desc=>"key reference"
-      def list(key="")
-        puts @client.get_credential(key)["value"]
+      desc "set SERVICE NAME VALUE", "add a key and value for the credential"
+      method_option :key, :type=>:string, :desc=>"File reference containing the symmetric key for encryption"
+      def set(service,name,value)
+        securet=nil
+        if options[:key]
+          secret=File.read(options[:key])
+        end
+        puts @client.set_credential(service,name,value,secret)
       end
-    
-      desc "set KEY VALUE", "add a key and value for the credential"
-      #method_option :key, :alias=>"-k", :type=>:string, :desc=>"key reference"
-      #method_option :value, :alias=>"-v", :type=>:string, :desc=>"values"
-      def set(key,value)
-        puts @client.set_credential(key,value)
+
+      desc "list", "get all of the credential"
+      def list()
+        puts @client.get_credentials()
       end
     
-      # desc "remove KEY", "remove a value from the credentials bag"
-      # def remove(key)
-      #   puts @client.remove_credential(key)
-      # end
+      desc "remove SERVICE NAME", "remove a value from the credentials bag"
+      def remove(service,name)
+        puts @client.remove_credential(service,name)
+      end
     
     end
   end

data/lib/cli/server_task.rb

@@ -8,6 +8,7 @@ module Factor
       method_option :tags, :alias=>"-t", :type=>:hash, :desc=>"Optional tags to identify from workflow"
       method_option :channels, :type=>:array, :desc=>"Optional channel ruby file list for development"
       method_option :verbose, :type=>:boolean, :desc=>"Display everything"
+      method_option :key, :type=>:string, :desc=>"File reference containing the symmetric key for encryption"
       def start
         engine = Factor::Runtime::Engine.new(get_config[:email],get_config[:token])
         
@@ -40,7 +41,11 @@ module Factor
         say "loading workflows complete" if options.verbose?
     
         say "loading credentials from server" if options.verbose?
-        engine = @client.load_credentials(engine) do |message|
+        securet=nil
+        if options[:key]
+          secret=File.read(options[:key])
+        end
+        engine = @client.load_credentials(engine,secret) do |message|
           say "  #{message}" if options.verbose?
         end
         say "loading credentials complete" if options.verbose?

data/lib/client/client.rb

@@ -4,6 +4,10 @@ require 'zip'
 require 'zip/zipfilesystem'
 require 'zip/zip'
 require 'open-uri'
+require 'digest/sha2'
+require 'openssl'
+require 'base64'
+
 
 module Factor
   module Client
@@ -40,11 +44,30 @@ module Factor
         engine
       end
     
-      def load_credentials(engine,&code)
+      def load_credentials(engine,secret=nil,&code)
         code.call("downloading credential list")
-        credentials = rest_get("credentials")
+        credentials = rest_get("credentials")["value"]
         code.call("loading credentials")
-        engine.load_credentials(credentials["value"])
+
+        if secret
+          code.call("decrypting credentials")
+          decrypter = OpenSSL::Cipher.new("AES-256-CFB")
+          sha256= Digest::SHA2.new(256)
+          decrypter.key=Base64.encode64(sha256.digest(secret))
+          decrypter.decrypt
+          credentials.each do |service,creds|
+            creds.each do |credential,value|
+              if value["encrypted"]
+                decrypted = decrypter.update(Base64.decode64(value["value"])) + decrypter.final
+                credentials[service][credential]["value"]=decrypted
+                credentials[service][credential]["encrypted"]=false
+              end
+            end
+          end  
+          code.call("decrypting credentials complete")
+        end
+
+        engine.load_credentials(credentials)
       
         engine
       end
@@ -91,17 +114,31 @@ module Factor
       end
     
     
-      def set_credential(key,value)
+      def set_credential(service,name,value,secret=nil)
         # this is a PUT not POST because it is technically editing, not creating a new one
-        rest_put("credentials",{:key=>key,:value=>value})
+        credential = {:service=>service,:name=>name,:value=>value}
+
+        if secret
+          payload=value
+          sha256= Digest::SHA2.new(256)
+          encrypter = OpenSSL::Cipher.new("AES-256-CFB")
+          encrypter.encrypt
+          encrypter.key=Base64.encode64(sha256.digest(secret))
+
+          encrypted = Base64.encode64(encrypter.update(value) + encrypter.final)
+          credential[:value]=encrypted
+          credential[:encrypted]=true
+        end
+
+        rest_post("credentials",credential)
       end
       
-      def get_credential(key="")
-        rest_get("credentials",{:key=>key})
+      def get_credentials()
+        rest_get("credentials")
       end
       
-      def remove_credential(key="")
-        rest_delete("credentials",{:key=>key})
+      def remove_credential(service,name)
+        rest_delete("credentials",{:service=>service,:name=>name})
       end
     
     

data/lib/runtime/engine.rb

@@ -37,7 +37,7 @@ module Factor
         @channel_definitions << definition
       end
     
-      def load_credentials credentials
+      def load_credentials credentials,secret=nil
         @credentials["credentials"] = credentials
       end
     
@@ -109,7 +109,7 @@ module Factor
       def call_channel_method(channel_name,action_name,params)
         channel_module_name = get_channel_module(channel_name)
         channel_module = @channel_modules[channel_module_name]
-        action_class = get_action_class(action_name)
+        action_class = get_action_class(channel_name,action_name)
         command = channel_module.const_get(action_class)
         command.new.do_work(params)
       end
@@ -120,10 +120,12 @@ module Factor
         @channel_definitions.select { |channel_definition| channel_definition['name']==channel_name }.first['module_name']
       end
 
-      def get_action_class(action_name)
+      def get_action_class(channel_name,action_name)
         @channel_definitions.each do |channel_definition|
-          channel_definition['actions'].each do |action|
-            return action["class_name"] if action['name']==action_name
+          if channel_definition['name']==channel_name
+            channel_definition['actions'].each do |action|
+              return action["class_name"] if action['name']==action_name
+            end
           end
         end
       end

data/lib/runtime/message.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'json'
+require 'json/ext'
 
 module Factor
   module Runtime
@@ -44,7 +44,9 @@ module Factor
       end
     
       def payload
-        {"body"=>@body, "workflow_instance_id"=>@workflow_instance_id, "activity_instance_id"=>@activity_instance_id, "last_activity_instance_id"=>@last_activity_instance_id}.to_json
+        JSON.generator = JSON::Ext::Generator
+        obj = {"body"=>@body, "workflow_instance_id"=>@workflow_instance_id, "activity_instance_id"=>@activity_instance_id, "last_activity_instance_id"=>@last_activity_instance_id}
+        JSON.generate(obj)
       end
     
       def from_queue routing_key, payload

data/lib/runtime/message_bus.rb

@@ -38,11 +38,13 @@ module Factor
         @queue.subscribe do |headers,payload|
           message = Message.new
           message.from_queue headers.routing_key, payload
+          puts "[Received Message (#{message.route})] #{message.body.inspect}"
           code.call(message)
         end
       end
     
       def send(message,close=false)
+        puts "[Sending Message (#{message.route})] #{message.body.inspect}"
         @exchange.publish(message.payload,:routing_key => message.route)
         EM.add_timer(1, Proc.new { close}) if close
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.1.07
+  version: 0.1.09
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor