tfa 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebf6d9964833d410f0acdb43efb3c6023c856c81
-  data.tar.gz: d7a46b812f7d40e668b7adca69af525f489530ed
+  metadata.gz: 414adc245dc71f49bbb95a5458410235771fe475
+  data.tar.gz: 0e6000d5e9a261ab11281be9927e0038d6de2af2
 SHA512:
-  metadata.gz: 42a58b16b4b0675caa6ec321b7814279923f362265d21cb89b6e25bb43859b95527ae84be8b3898b5d849d365e01a31d911862fbfbf9c09d85051f7085a03162
-  data.tar.gz: 13718267072086181704e5cc9a1ea3694e7e8bc45dfaf27a8c1a70d5da558a98a8edc01438be4ec751b0e9e95fa510cc0a030a5ae6fa8742a3d8278a312b5933
+  metadata.gz: 5645d6a5f42cebf8923148d85fc5be2b20e7f26666cc3075972d8ff4ce93ec66ff647b5c6544fb7dd6ed5ce3410cf0bc5879b48f40b44ceb0976dd6d7019fff9
+  data.tar.gz: 111d469cf45c8a343fd451b3c890f1b14d2c79533ec5be96a93ee5a31ed042a5d54f07ec1446bc3e2304317def1a1c7ab649fa609aa3c26a4c6a7b374846bf38

data/lib/tfa/add_command.rb

@@ -6,10 +6,7 @@ module TFA
 
     def run(arguments)
       name = arguments.first
-      secret = arguments.last
-      @storage.transaction do
-        @storage[name] = secret
-      end
+      @storage.save(arguments.first, arguments.last)
       "Added #{name}"
     end
   end

data/lib/tfa/console.rb

@@ -1,7 +1,7 @@
 module TFA
   class Console
     def initialize(filename = "tfa")
-      @storage = PStore.new(File.join(Dir.home, ".#{filename}.pstore"))
+      @storage = Storage.new(filename)
     end
 
     def run(arguments)
@@ -12,15 +12,14 @@ module TFA
     private
 
     def command_for(command_name)
-      case command_name
-      when "add"
-        AddCommand.new(@storage)
-      when "show"
-        ShowCommand.new(@storage)
-      when "totp"
-        TotpCommand.new(@storage)
-      else
-        UsageCommand.new(@storage)
+      registry[command_name].call
+    end
+
+    def registry
+      Hash.new { |x, y| lambda { UsageCommand.new(@storage) } }.tap do |commands|
+        commands['add'] = lambda { AddCommand.new(@storage) }
+        commands['show'] = lambda { ShowCommand.new(@storage) }
+        commands['totp'] = lambda { TotpCommand.new(@storage) }
       end
     end
   end

data/lib/tfa/show_command.rb

@@ -5,10 +5,8 @@ module TFA
     end
 
     def run(arguments)
-      name = arguments.last
-      @storage.transaction(true) do
-        @storage[name]
-      end
+      return @storage.secret_for(arguments.last) if arguments.any?
+      @storage.all_secrets
     end
   end
 end

data/lib/tfa/storage.rb

@@ -0,0 +1,33 @@
+module TFA
+  class Storage
+    def initialize(filename)
+      @storage = PStore.new(File.join(Dir.home, ".#{filename}.pstore"))
+    end
+
+    def all_secrets
+      open_readonly do |storage|
+        storage.roots.map { |key| { key => storage[key] } }
+      end
+    end
+
+    def secret_for(key)
+      open_readonly do |storage|
+        storage[key]
+      end
+    end
+
+    def save(key, value)
+      @storage.transaction do
+        @storage[key] = value
+      end
+    end
+
+    private
+
+    def open_readonly
+      @storage.transaction(true) do
+        yield @storage
+      end
+    end
+  end
+end

data/lib/tfa/totp_command.rb

@@ -5,16 +5,26 @@ module TFA
     end
 
     def run(arguments)
-      name = arguments.first
-      ::ROTP::TOTP.new(secret_for(name)).now
+      return password_for(secret_for(arguments.first)) if arguments.any?
+      all_passwords
     end
 
     private
 
-    def secret_for(name)
-      @storage.transaction(true) do
-        @storage[name]
+    def password_for(secret)
+      ::ROTP::TOTP.new(secret).now
+    end
+
+    def all_passwords
+      secrets = @storage.all_secrets
+      secrets.each do |hash|
+        hash[hash.keys.first] = password_for(hash[hash.keys.first])
       end
+      secrets
+    end
+
+    def secret_for(key)
+      @storage.secret_for(key)     
     end
   end
 end

data/lib/tfa/usage_command.rb

@@ -1,6 +1,7 @@
 module TFA
   class UsageCommand
     def initialize(storage)
+      @storage = storage
     end
 
     def run(arguments)

data/lib/tfa/version.rb

@@ -1,3 +1,3 @@
 module TFA
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/tfa.rb

@@ -6,3 +6,4 @@ require "tfa/show_command"
 require "tfa/totp_command"
 require "tfa/usage_command"
 require "tfa/console"
+require "tfa/storage"

data/spec/lib/show_command_spec.rb

@@ -1,16 +1,26 @@
 module TFA
   describe ShowCommand do
     subject { ShowCommand.new(storage) }
-    let(:storage) { PStore.new(Tempfile.new('blah').path) }
+    let(:storage) { Storage.new(Tempfile.new('blah').path) }
 
-    it "retrieves the secret associated with the key given" do
-      secret = SecureRandom.uuid
-      storage.transaction do
-        storage['production'] = secret
+    describe "#run" do
+      context "when looking up the secret for a specific key" do
+        it "retrieves the secret associated with the key given" do
+          secret = SecureRandom.uuid
+          storage.save('production', secret)
+          result = subject.run(['production'])
+          expect(result).to eql(secret)
+        end
       end
 
-      result = subject.run(['production'])
-      expect(result).to eql(secret)
+      context "when a specific name is not given" do
+        it "returns all the secrets" do
+          storage.save('development', "1")
+          storage.save('staging', "2")
+          storage.save('production', "3")
+          expect(subject.run([])).to eql([{"development" => "1"}, { "staging" => "2" }, { "production" => "3" }])
+        end
+      end
     end
   end
 end

data/spec/lib/totp_command_spec.rb

@@ -2,18 +2,32 @@ module TFA
   describe TotpCommand do
     subject { TotpCommand.new(storage) }
     let(:secret) { ::ROTP::Base32.random_base32 }
-    let(:storage) { PStore.new(Tempfile.new('test').path) }
+    let(:storage) { Storage.new(Tempfile.new('test').path) }
 
-    before :each do
-      storage.transaction do
-        storage['development'] = secret
-      end
+    def code_for(secret)
+      ::ROTP::TOTP.new(secret).now
     end
 
     describe "#run" do
-      it "returns a time based one time password for the authentication secret given" do
-        correct_code = ::ROTP::TOTP.new(secret).now
-        expect(subject.run(["development"])).to eql(correct_code)
+      context "when a single key is given" do
+        it "returns a time based one time password for the authentication secret given" do
+          storage.save('development', secret)
+          expect(subject.run(["development"])).to eql(code_for(secret))
+        end
+      end
+
+      context "when no arguments are given" do
+        let(:development_secret) { ::ROTP::Base32.random_base32 }
+        let(:staging_secret) { ::ROTP::Base32.random_base32 }
+
+        it "returns the one time password for all keys" do
+          storage.save('development', development_secret)
+          storage.save('staging', staging_secret)
+          expect(subject.run([])).to eql([
+            { 'development' => code_for(development_secret) }, 
+            { 'staging' => code_for(staging_secret) }
+          ])
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tfa
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - mo khan
@@ -86,6 +86,7 @@ files:
 - lib/tfa/add_command.rb
 - lib/tfa/console.rb
 - lib/tfa/show_command.rb
+- lib/tfa/storage.rb
 - lib/tfa/totp_command.rb
 - lib/tfa/usage_command.rb
 - lib/tfa/version.rb