otp 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c73f2c47bcd8a1d4b36391d5b8ffd77fee13670
-  data.tar.gz: 29c50f0d362b6abd5d018c69301f919dfffc748c
+  metadata.gz: 032b0bd99d66d97d8281cd5006409b1f482c2314
+  data.tar.gz: ca0320a12fe5d73c907e8cd445dac6fd0219112f
 SHA512:
-  metadata.gz: 234d1455ead02f326578c8a2470586eb056c8c91ace926476ff384e53843ef1a58481d015e8dc05442b6830834703cb1b5205344cdca6e9aa7ad7e1df9204b0b
-  data.tar.gz: cd3df6b91c9fb94f138646913aa6a3efdaa8988e0c3a96fb3b0dd58a3a9d32065425c932226cafad893d22fec14565997b2b4a92f76a0d30995498a4597820e5
+  metadata.gz: f60da46723a92855571fcabbf0b8e0ad264093822516ebdd9d152181cb102280c92a3ce97a499b9bf661aac9adf6ff2694e2ae02294eb39d2e6d1be70d3eb8ed
+  data.tar.gz: 8d90aba69fd87db84b94a3b0a374f817a8566d970be4820e868f16a1098b81e8de188247bc9b29c4f811a0e4779bb1c8cc43907aef5fc1b4fd974a7fd68e28bb

data/.rubocop.yml

@@ -0,0 +1,49 @@
+AllCops:
+  Exclude: []
+  RunRailsCops: false
+  DisplayCopNames: true
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/TrailingComma:
+  Enabled: false
+
+Style/SpaceAroundEqualsInParameterDefault:
+  Enabled: false
+
+Style/SpaceAroundOperators:
+  Enabled: false
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+Style/SpaceInsideBlockBraces:
+  Enabled: false
+
+Style/RedundantReturn:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+Style/FormatString:
+  Enabled: false
+
+Style/EachWithObject:
+  Enabled: false
+
+Metrics/AbcSize:
+  Max: 20
+
+Metrics/MethodLength:
+  Max: 30
+
+Style/IfUnlessModifier:
+  Enabled: false

data/Gemfile

@@ -5,4 +5,7 @@ gemspec
 
 group :development, :test do
   gem "test-unit"
+  gem "simplecov"
+  gem "rubocop", require: false
 end
+

data/lib/otp/base.rb

@@ -42,8 +42,8 @@ module OTP
     end
 
     def verify(given_pw, last:0, post:0)
-      raise "last must be greater than or equal to 0" if last < 0
-      raise "post must be greater than or equal to 0" if post < 0
+      raise ArgumentError, "last must be greater than or equal to 0" if last < 0
+      raise ArgumentError, "post must be greater than or equal to 0" if post < 0
       return false if given_pw.nil? || given_pw.empty?
       return (-last..post).any?{|i| compare(password(i), given_pw) }
     end

data/lib/otp/base32.rb

@@ -6,11 +6,11 @@ module OTP
     )
 
     DECODE_MAP = {
-      ?A=>0,  ?B=>1,  ?C=>2,  ?D=>3,  ?E=>4,  ?F=>5,  ?G=>6,  ?H=>7, 
-      ?I=>8,  ?J=>9,  ?K=>10, ?L=>11, ?M=>12, ?N=>13, ?O=>14, ?P=>15,
-      ?Q=>16, ?R=>17, ?S=>18, ?T=>19, ?U=>20, ?V=>21, ?W=>22, ?X=>23, 
-      ?Y=>24, ?Z=>25, ?2=>26, ?3=>27, ?4=>28, ?5=>29, ?6=>30, ?7=>31, 
-      ?==>-1,
+      "A"=>0,  "B"=>1,  "C"=>2,  "D"=>3,  "E"=>4,  "F"=>5,  "G"=>6,  "H"=>7,
+      "I"=>8,  "J"=>9,  "K"=>10, "L"=>11, "M"=>12, "N"=>13, "O"=>14, "P"=>15,
+      "Q"=>16, "R"=>17, "S"=>18, "T"=>19, "U"=>20, "V"=>21, "W"=>22, "X"=>23,
+      "Y"=>24, "Z"=>25, "2"=>26, "3"=>27, "4"=>28, "5"=>29, "6"=>30, "7"=>31,
+      "="=>-1,
     }
 
     DECODE_LENGTH = {
@@ -28,7 +28,7 @@ module OTP
 
     def encode(bytes, padding: true)
       return nil unless bytes
-      pad = padding ? ?= : ""
+      pad = padding ? "=" : ""
       ret = ""
       bytes = bytes.dup.force_encoding("binary")
       off = 0
@@ -68,7 +68,6 @@ module OTP
           else
             n <<= 5
             n |= d
-            l = ((i+1) * 5.0 / 8.0).floor
             l = DECODE_LENGTH[i+1]
           end
         end

data/lib/otp/uri.rb

@@ -10,10 +10,9 @@ module OTP
       uri = ::URI.parse(uri_string)
       raise "URI scheme not match: #{uri.scheme}" unless uri.scheme != SCHEME
       otp = otp_class(uri).new
-      if %r{/(?:([^:]*): *)?(.+)} =~ uri.path
-        otp.issuer = $1
-        otp.accountname = $2
-      end
+      m = %r{/(?:([^:]*): *)?(.+)}.match(::URI.decode(uri.path))
+      otp.issuer = m[1] if m[1]
+      otp.accountname = m[2]
       query = Hash[::URI.decode_www_form(uri.query)]
       otp.secret = query["secret"]
       if value = query["algorithm"]

data/lib/otp/version.rb

@@ -1,4 +1,3 @@
 module OTP
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end
-

data/test/helper.rb

@@ -0,0 +1,8 @@
+require "simplecov"
+SimpleCov.start do
+  add_filter "/test/"
+end
+
+require "test/unit"
+require "otp"
+

data/test/test_base.rb

@@ -0,0 +1,25 @@
+require_relative "helper"
+
+class TestBase < Test::Unit::TestCase
+  def test_base
+    otp = OTP::Base.new
+    otp.new_secret(20)
+    assert_equal(32, otp.secret.length)
+    otp.new_secret(40)
+    assert_equal(64, otp.secret.length)
+  end
+
+  def test_methods_expected_to_be_override
+    base = OTP::Base.new
+    totp = OTP::TOTP.new
+
+    [
+      [:moving_factor, ],
+      [:type_specific_uri_params, ],
+      [:extract_type_specific_uri_params, {}],
+    ].each do |m, *args|
+      assert_raise(NotImplementedError){ base.send(m, *args) }
+      assert_nothing_raised{ totp.send(m, *args) }
+    end
+  end
+end

data/test/test_base32.rb

@@ -1,5 +1,4 @@
-require "test/unit"
-require "otp/base32"
+require_relative "helper"
 
 class TestBase32 < Test::Unit::TestCase
   def assert_encode(encoded, plain, padding: true)

data/test/test_hotp.rb

@@ -1,5 +1,4 @@
-require "test/unit"
-require "otp"
+require_relative "helper"
 
 class TestHTOP < Test::Unit::TestCase
   def assert_hotp(hotp, count, pass)

data/test/test_totp.rb

@@ -1,5 +1,4 @@
-require "test/unit"
-require "otp"
+require_relative "helper"
 
 class TestTOTP < Test::Unit::TestCase
   def assert_totp(totp, time, pass)
@@ -71,4 +70,11 @@ class TestTOTP < Test::Unit::TestCase
     assert(totp.verify("78660635", last:2, post:2))
     assert(!totp.verify("97845627", last:2, post:2))
   end
+
+  def test_error
+    seed = "12345678901234567890"
+    totp = OTP::TOTP.new(OTP::Base32.encode(seed), "SHA1", 8)
+    assert_raise(ArgumentError){ assert(totp.verify("50451956", last:-2)) }
+    assert_raise(ArgumentError){ assert(totp.verify("50451956", post:-2)) }
+  end
 end

data/test/test_uri.rb

@@ -1,7 +1,23 @@
-require "test/unit"
-require "otp"
+require_relative "helper"
 
 class TestURI < Test::Unit::TestCase
+  def test_parse
+    uri = "otpauth://totp/account@example.com?secret=GEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQ"
+    otp = OTP::URI.parse(uri)
+    assert_equal("account@example.com", otp.accountname)
+    assert_equal(nil, otp.issuer)
+
+    uri = "otpauth://totp/My%20Company:%20%20account@example.com?secret=GEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQ"
+    otp = OTP::URI.parse(uri)
+    assert_equal("account@example.com", otp.accountname)
+    assert_equal("My Company", otp.issuer)
+
+    uri = "otpauth://totp/My%20Company:%20%20account@example.com?secret=GEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQ"
+    otp = OTP::URI.parse(uri)
+    assert_equal("account@example.com", otp.accountname)
+    assert_equal("My Company", otp.issuer)
+  end
+
   def test_totp
     secret = OTP::Base32.encode("12345678901234567890")
     totp = OTP::TOTP.new
@@ -46,4 +62,9 @@ class TestURI < Test::Unit::TestCase
     assert_equal("My Company", otp.issuer)
     assert_equal(otp.password, hotp.password)
   end
+
+  def test_parse_invalid
+    assert_raise(RuntimeError){ OTP::URI.parse("http://www.netlab.jp") }
+    assert_raise(RuntimeError){ OTP::URI.parse("otpauth://foo") }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: otp
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Yuuzou Gotou
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -60,6 +61,8 @@ files:
 - lib/otp/utils.rb
 - lib/otp/version.rb
 - otp.gemspec
+- test/helper.rb
+- test/test_base.rb
 - test/test_base32.rb
 - test/test_hotp.rb
 - test/test_totp.rb
@@ -89,6 +92,8 @@ signing_key:
 specification_version: 4
 summary: One-Time Password Library
 test_files:
+- test/helper.rb
+- test/test_base.rb
 - test/test_base32.rb
 - test/test_hotp.rb
 - test/test_totp.rb