rotp 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53b1578ba5f12cd83cf8e616619b34d9f0135677
-  data.tar.gz: 2102035657efa48f1b85c621db30d68563a77b87
+  metadata.gz: e9938a2125556d7dcd7b8eae64d58d28e90a6d0f
+  data.tar.gz: 053694aa169605804930a516e41294e3b78b0fe4
 SHA512:
-  metadata.gz: 05a24b43f5622b2464cc174ba23cea19efe112ad838a8c9c9bdd05d31c6ac3e8e235b6ef550e38dd239569a25622e278887617eb39ecb83ebaa803848cf41108
-  data.tar.gz: c26363a86a528d49d672aed06ebc9c8852eb27aa53d93c5c4dc50c75a5a8e823b93c373ddc34845972734a86a4bad594ef342da6b354f56cdd1cafa572dca48a
+  metadata.gz: 62890466fe02ab700ce21c7f882a6f25fddeb9e35b0bd51ef5bd9567ae4a1decea947dc729c74852d8e0f471474686ac4fdad08f6c51600e83b1abb8608f8464
+  data.tar.gz: fedda9e325a1e7513907ee8a1b2314a97b0fb55e1c6f848fc122f73031473dfad630220a943ba27af700f7eeb2418d0d0951d42f488cee2839ccebf8ab6fa609

data/lib/rotp.rb

@@ -1,8 +1,8 @@
+require 'rotp/base32'
 require 'rotp/otp'
 require 'rotp/hotp'
 require 'rotp/totp'
 require 'uri'
-require 'base32'
 require 'openssl'
 
 module ROTP

data/lib/rotp/base32.rb

@@ -0,0 +1,48 @@
+module ROTP
+  class Base32
+    CHARS = "abcdefghijklmnopqrstuvwxyz234567".each_char.to_a
+
+    class << self
+      def decode(str)
+        output = []
+        str.scan(/.{1,8}/).each do |block|
+          char_array = decode_block(block).map{|c| c.chr}
+          output << char_array
+        end
+        output.join
+      end
+
+      def random_base32(length=16)
+        b32 = ''
+        OpenSSL::Random.random_bytes(length).each_byte do |b|
+          b32 << CHARS[b % 32]
+        end
+        b32
+      end
+
+      private
+
+      def decode_block(block)
+        length = block.scan(/[^=]/).length
+        quints = block.each_char.map {|c| decode_quint(c)}
+        bytes = []
+        bytes[0] = (quints[0] << 3) + (quints[1] ? quints[1] >> 2 : 0)
+        return bytes if length < 3
+        bytes[1] = ((quints[1] & 3) << 6) + (quints[2] << 1) + (quints[3] ? quints[3] >> 4 : 0)
+        return bytes if length < 4
+        bytes[2] = ((quints[3] & 15) << 4) + (quints[4] ? quints[4] >> 1 : 0)
+        return bytes if length < 6
+        bytes[3] = ((quints[4] & 1) << 7) + (quints[5] << 2) + (quints[6] ? quints[6] >> 3 : 0)
+        return bytes if length < 7
+        bytes[4] = ((quints[6] & 7) << 5) + (quints[7] || 0)
+        bytes
+      end
+
+      def decode_quint(q)
+        CHARS.index(q.downcase)
+      end
+
+    end
+
+  end
+end

data/lib/rotp/otp.rb

@@ -46,7 +46,7 @@ module ROTP
     end
 
     def byte_secret
-      Base32.decode(@secret.upcase)
+      Base32.decode(@secret)
     end
 
     # Turns an integer to the OATH specified

data/lib/rotp/version.rb

@@ -1,3 +1,3 @@
 module ROTP
-  VERSION = "1.4.5"
+  VERSION = "1.4.6"
 end

data/rotp.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('base32', '~> 0.2.0')
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
   if RUBY_VERSION < "1.9"

data/spec/base_spec.rb

@@ -1,5 +1,26 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
+describe "the Base32 implementation" do
+  it "should be 16 characters by default" do
+    ROTP::Base32.random_base32.length.should == 16
+    ROTP::Base32.random_base32.should match /\A[a-z2-7]+\z/
+  end
+  it "should be allow a specific length" do
+    ROTP::Base32.random_base32(32).length.should == 32
+  end
+  it "should correctly decode a string" do
+    ROTP::Base32.decode("F").unpack('H*').first.should == "28"
+    ROTP::Base32.decode("23").unpack('H*').first.should == "d6"
+    ROTP::Base32.decode("234").unpack('H*').first.should == "d6f8"
+    ROTP::Base32.decode("234A").unpack('H*').first.should == "d6f800"
+    ROTP::Base32.decode("234B").unpack('H*').first.should == "d6f810"
+    ROTP::Base32.decode("234BCD").unpack('H*').first.should == "d6f8110c"
+    ROTP::Base32.decode("234BCDE").unpack('H*').first.should == "d6f8110c80"
+    ROTP::Base32.decode("234BCDEFG").unpack('H*').first.should == "d6f8110c8530"
+    ROTP::Base32.decode("234BCDEFG234BCDEFG").unpack('H*').first.should == "d6f8110c8536b7c0886429"
+  end
+end
+
 describe "HOTP example values from the rfc" do
   it "should match the RFC" do
     # 12345678901234567890 in Bas32
@@ -57,6 +78,7 @@ describe "TOTP example values from the rfc" do
     end
   end
 
+
   it "should output its provisioning URI" do
     totp = ROTP::TOTP.new("wrn3pqx5uqxqvnqr")
     totp.provisioning_uri('mark@percival').should == "otpauth://totp/mark@percival?secret=wrn3pqx5uqxqvnqr"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rotp
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Mark Percival
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: base32
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +85,7 @@ files:
 - doc/method_list.html
 - doc/top-level-namespace.html
 - lib/rotp.rb
+- lib/rotp/base32.rb
 - lib/rotp/hotp.rb
 - lib/rotp/otp.rb
 - lib/rotp/totp.rb