htauth 1.2.0 → 2.0.0

data/spec/passwd_entry_spec.rb

@@ -2,137 +2,137 @@ require 'spec_helper'
 require 'htauth/passwd_entry'
 
 describe HTAuth::PasswdEntry do
-    before(:each) do
-        @alice = HTAuth::PasswdEntry.new("alice", "a secret", "crypt", { :salt => "mD" })
-        @bob   = HTAuth::PasswdEntry.new("bob", "b secret", "crypt", { :salt => "b8"})
-        @salt  = "lo1tk/.."
-    end
-
-    it "initializes with a user and realm" do
-        @alice.user.must_equal "alice"
-    end
-
-    it "has the correct crypt password" do
-        @alice.password = "a secret"
-        @alice.digest.must_equal "mDwdZuXalQ5zk"
-    end
-
-    it "encrypts correctly for md5" do
-        bob = HTAuth::PasswdEntry.new("bob", "b secret", "md5", { :salt => @salt })
-        bob.digest.must_equal "$apr1$lo1tk/..$CarApvZPee0F6Wj1U0GxZ1"
-    end
-    
-    it "encrypts correctly for sha1" do
-        bob = HTAuth::PasswdEntry.new("bob", "b secret", "sha1", { :salt => @salt })
-        bob.digest.must_equal "{SHA}b/tjGXbX80MEKVnF200S43ca4hY="
-    end
-    
-    it "encrypts correctly for plaintext" do
-        bob = HTAuth::PasswdEntry.new("bob", "b secret", "plaintext", { :salt => @salt })
-        bob.digest.must_equal "b secret"
-    end
-
-    it "encrypts with crypt as a default, when parsed from crypt()'d line" do
-        bob2 = HTAuth::PasswdEntry.from_line(@bob.to_s)
-        bob2.algorithm.must_be_instance_of( Array )
-        bob2.algorithm.size.must_equal 2
-        bob2.password = "another secret"
-        bob2.algorithm.must_be_instance_of(HTAuth::Crypt)
-    end
-
-    it "encrypts with crypt as a default, when parsed from plaintext line" do
-        p = HTAuth::PasswdEntry.new('paul', 'p secret', 'plaintext')
-        p2 = HTAuth::PasswdEntry.from_line(p.to_s)
-        p2.algorithm.must_be_instance_of(Array)
-        p2.algorithm.size.must_equal 2
-        p2.password = "another secret"
-        p2.algorithm.must_be_instance_of(HTAuth::Crypt)
-    end
-
-    it "encrypts with md5 as default, when parsed from an md5 line" do
-        m = HTAuth::PasswdEntry.new("mary", "m secret", "md5") 
-        m2 = HTAuth::PasswdEntry.from_line(m.to_s)
-        m2.algorithm.must_be_instance_of(HTAuth::Md5)
-    end
-    
-    it "encrypts with sha1 as default, when parsed from an sha1 line" do
-        s = HTAuth::PasswdEntry.new("steve", "s secret", "sha1") 
-        s2 = HTAuth::PasswdEntry.from_line(s.to_s)
-        s2.algorithm.must_be_instance_of(HTAuth::Sha1)
-    end
-
-    it "determins the algorithm to be crypt when checking a password" do
-        bob2 = HTAuth::PasswdEntry.from_line(@bob.to_s)
-        bob2.algorithm.must_be_instance_of(Array)
-        bob2.algorithm.size.must_equal 2
-        bob2.authenticated?("b secret").must_equal true
-        bob2.algorithm.must_be_instance_of(HTAuth::Crypt)
-    end
-    
-    it "determins the algorithm to be plain when checking a password" do
-        bob2 = HTAuth::PasswdEntry.from_line("bob:b secret")
-        bob2.algorithm.must_be_instance_of(Array)
-        bob2.algorithm.size.must_equal 2
-        bob2.authenticated?("b secret").must_equal true
-        bob2.algorithm.must_be_instance_of(HTAuth::Plaintext)
-    end
-
-    it "authenticates correctly against md5" do
-        m = HTAuth::PasswdEntry.new("mary", "m secret", "md5") 
-        m2 = HTAuth::PasswdEntry.from_line(m.to_s)
-        m2.authenticated?("m secret").must_equal true
-    end
-    
-    it "authenticates correctly against sha1" do
-        s = HTAuth::PasswdEntry.new("steve", "s secret", "sha1") 
-        s2 = HTAuth::PasswdEntry.from_line(s.to_s)
-        s2.authenticated?("s secret").must_equal true
-    end
-
-
-
-
-    it "returns username for a key" do
-        @alice.key.must_equal "alice"
-    end
-
-    it "checks the password correctly" do
-        @bob.authenticated?("b secret").must_equal true
-    end
-
-    it "formats correctly when put to a string" do
-        @bob.to_s.must_equal "bob:b8Ml4Jp9I0N8E"
-    end
-
-    it "parses an input line" do
-        @bob_new = HTAuth::PasswdEntry.from_line("bob:b8Ml4Jp9I0N8E")
-        @bob.user.must_equal @bob_new.user
-        @bob.digest.must_equal @bob_new.digest
-    end
-
-    it "knows if an input line is a possible entry and raises an exception" do
-        lambda { HTAuth::PasswdEntry.is_entry!("#stuff") }.must_raise(HTAuth::InvalidPasswdEntry)
-        lambda { HTAuth::PasswdEntry.is_entry!("this:that:other:stuff") }.must_raise(HTAuth::InvalidPasswdEntry)
-        lambda { HTAuth::PasswdEntry.is_entry!("this:that:other") }.must_raise(HTAuth::InvalidPasswdEntry)
-        lambda { HTAuth::PasswdEntry.is_entry!("this:that:0a90549e8ffb2dd62f98252a95d88xyz") }.must_raise(HTAuth::InvalidPasswdEntry)
-    end
-    
-    it "knows if an input line is a possible entry and returns false" do
-        HTAuth::PasswdEntry.is_entry?("#stuff").must_equal false
-        HTAuth::PasswdEntry.is_entry?("this:that:other:stuff").must_equal false 
-        HTAuth::PasswdEntry.is_entry?("this:that:other").must_equal false 
-        HTAuth::PasswdEntry.is_entry?("this:that:0a90549e8ffb2dd62f98252a95d88xyz").must_equal false
-    end
-    
-    it "knows if an input line is a possible entry and returns true" do
-        HTAuth::PasswdEntry.is_entry?("bob:irRm0g.SDfCyI").must_equal true
-        HTAuth::PasswdEntry.is_entry?("bob:b secreat").must_equal true
-        HTAuth::PasswdEntry.is_entry?("bob:{SHA}b/tjGXbX80MEKVnF200S43ca4hY=").must_equal true
-        HTAuth::PasswdEntry.is_entry?("bob:$apr1$lo1tk/..$CarApvZPee0F6Wj1U0GxZ1").must_equal true
-
-    end
-
-    it "duplicates itself" do
-        @alice.dup.to_s.must_equal @alice.to_s
-    end
+  before(:each) do
+    @alice = HTAuth::PasswdEntry.new("alice", "a secret", "crypt", { :salt => "mD" })
+    @bob   = HTAuth::PasswdEntry.new("bob", "b secret", "crypt", { :salt => "b8"})
+    @salt  = "lo1tk/.."
+  end
+
+  it "initializes with a user and realm" do
+    @alice.user.must_equal "alice"
+  end
+
+  it "has the correct crypt password" do
+    @alice.password = "a secret"
+    @alice.digest.must_equal "mDwdZuXalQ5zk"
+  end
+
+  it "encrypts correctly for md5" do
+    bob = HTAuth::PasswdEntry.new("bob", "b secret", "md5", { :salt => @salt })
+    bob.digest.must_equal "$apr1$lo1tk/..$CarApvZPee0F6Wj1U0GxZ1"
+  end
+
+  it "encrypts correctly for sha1" do
+    bob = HTAuth::PasswdEntry.new("bob", "b secret", "sha1", { :salt => @salt })
+    bob.digest.must_equal "{SHA}b/tjGXbX80MEKVnF200S43ca4hY="
+  end
+
+  it "encrypts correctly for plaintext" do
+    bob = HTAuth::PasswdEntry.new("bob", "b secret", "plaintext", { :salt => @salt })
+    bob.digest.must_equal "b secret"
+  end
+
+  it "encrypts with crypt as a default, when parsed from crypt()'d line" do
+    bob2 = HTAuth::PasswdEntry.from_line(@bob.to_s)
+    bob2.algorithm.must_be_instance_of( Array )
+    bob2.algorithm.size.must_equal 2
+    bob2.password = "another secret"
+    bob2.algorithm.must_be_instance_of(HTAuth::Crypt)
+  end
+
+  it "encrypts with crypt as a default, when parsed from plaintext line" do
+    p = HTAuth::PasswdEntry.new('paul', 'p secret', 'plaintext')
+    p2 = HTAuth::PasswdEntry.from_line(p.to_s)
+    p2.algorithm.must_be_instance_of(Array)
+    p2.algorithm.size.must_equal 2
+    p2.password = "another secret"
+    p2.algorithm.must_be_instance_of(HTAuth::Crypt)
+  end
+
+  it "encrypts with md5 as default, when parsed from an md5 line" do
+    m = HTAuth::PasswdEntry.new("mary", "m secret", "md5") 
+    m2 = HTAuth::PasswdEntry.from_line(m.to_s)
+    m2.algorithm.must_be_instance_of(HTAuth::Md5)
+  end
+
+  it "encrypts with sha1 as default, when parsed from an sha1 line" do
+    s = HTAuth::PasswdEntry.new("steve", "s secret", "sha1") 
+    s2 = HTAuth::PasswdEntry.from_line(s.to_s)
+    s2.algorithm.must_be_instance_of(HTAuth::Sha1)
+  end
+
+  it "determins the algorithm to be crypt when checking a password" do
+    bob2 = HTAuth::PasswdEntry.from_line(@bob.to_s)
+    bob2.algorithm.must_be_instance_of(Array)
+    bob2.algorithm.size.must_equal 2
+    bob2.authenticated?("b secret").must_equal true
+    bob2.algorithm.must_be_instance_of(HTAuth::Crypt)
+  end
+
+  it "determins the algorithm to be plain when checking a password" do
+    bob2 = HTAuth::PasswdEntry.from_line("bob:b secret")
+    bob2.algorithm.must_be_instance_of(Array)
+    bob2.algorithm.size.must_equal 2
+    bob2.authenticated?("b secret").must_equal true
+    bob2.algorithm.must_be_instance_of(HTAuth::Plaintext)
+  end
+
+  it "authenticates correctly against md5" do
+    m = HTAuth::PasswdEntry.new("mary", "m secret", "md5") 
+    m2 = HTAuth::PasswdEntry.from_line(m.to_s)
+    m2.authenticated?("m secret").must_equal true
+  end
+
+  it "authenticates correctly against sha1" do
+    s = HTAuth::PasswdEntry.new("steve", "s secret", "sha1") 
+    s2 = HTAuth::PasswdEntry.from_line(s.to_s)
+    s2.authenticated?("s secret").must_equal true
+  end
+
+
+
+
+  it "returns username for a key" do
+    @alice.key.must_equal "alice"
+  end
+
+  it "checks the password correctly" do
+    @bob.authenticated?("b secret").must_equal true
+  end
+
+  it "formats correctly when put to a string" do
+    @bob.to_s.must_equal "bob:b8Ml4Jp9I0N8E"
+  end
+
+  it "parses an input line" do
+    @bob_new = HTAuth::PasswdEntry.from_line("bob:b8Ml4Jp9I0N8E")
+    @bob.user.must_equal @bob_new.user
+    @bob.digest.must_equal @bob_new.digest
+  end
+
+  it "knows if an input line is a possible entry and raises an exception" do
+    lambda { HTAuth::PasswdEntry.is_entry!("#stuff") }.must_raise(HTAuth::InvalidPasswdEntry)
+    lambda { HTAuth::PasswdEntry.is_entry!("this:that:other:stuff") }.must_raise(HTAuth::InvalidPasswdEntry)
+    lambda { HTAuth::PasswdEntry.is_entry!("this:that:other") }.must_raise(HTAuth::InvalidPasswdEntry)
+    lambda { HTAuth::PasswdEntry.is_entry!("this:that:0a90549e8ffb2dd62f98252a95d88xyz") }.must_raise(HTAuth::InvalidPasswdEntry)
+  end
+
+  it "knows if an input line is a possible entry and returns false" do
+    HTAuth::PasswdEntry.is_entry?("#stuff").must_equal false
+    HTAuth::PasswdEntry.is_entry?("this:that:other:stuff").must_equal false 
+    HTAuth::PasswdEntry.is_entry?("this:that:other").must_equal false 
+    HTAuth::PasswdEntry.is_entry?("this:that:0a90549e8ffb2dd62f98252a95d88xyz").must_equal false
+  end
+
+  it "knows if an input line is a possible entry and returns true" do
+    HTAuth::PasswdEntry.is_entry?("bob:irRm0g.SDfCyI").must_equal true
+    HTAuth::PasswdEntry.is_entry?("bob:b secreat").must_equal true
+    HTAuth::PasswdEntry.is_entry?("bob:{SHA}b/tjGXbX80MEKVnF200S43ca4hY=").must_equal true
+    HTAuth::PasswdEntry.is_entry?("bob:$apr1$lo1tk/..$CarApvZPee0F6Wj1U0GxZ1").must_equal true
+
+  end
+
+  it "duplicates itself" do
+    @alice.dup.to_s.must_equal @alice.to_s
+  end
 end

data/spec/passwd_file_spec.rb

@@ -4,63 +4,63 @@ require 'tempfile'
 
 describe HTAuth::PasswdFile do
 
-    before(:each) do
-        @tf             = Tempfile.new("rpasswrd-passwd")
-        @tf.write(IO.read(PASSWD_ORIGINAL_TEST_FILE))
-        @tf.close       
-        @passwd_file    = HTAuth::PasswdFile.new(@tf.path)
-        
-        @tf2                = Tempfile.new("rpasswrd-passwd-empty")
-        @tf2.close
-        @empty_passwd_file  = HTAuth::PasswdFile.new(@tf2.path)
-    end
+  before(:each) do
+    @tf             = Tempfile.new("rpasswrd-passwd")
+    @tf.write(IO.read(PASSWD_ORIGINAL_TEST_FILE))
+    @tf.close
+    @passwd_file    = HTAuth::PasswdFile.new(@tf.path)
 
-    after(:each) do
-        @tf2.close(true)
-        @tf.close(true)
-    end
+    @tf2                = Tempfile.new("rpasswrd-passwd-empty")
+    @tf2.close
+    @empty_passwd_file  = HTAuth::PasswdFile.new(@tf2.path)
+  end
 
-    it "can add a new entry to an already existing passwd file" do
-        @passwd_file.add_or_update("charlie", "c secret", "sha1")
-        @passwd_file.contents.must_equal IO.read(PASSWD_ADD_TEST_FILE)
-    end
+  after(:each) do
+    @tf2.close(true)
+    @tf.close(true)
+  end
 
-    it "can tell if an entry already exists in the passwd file" do
-        @passwd_file.has_entry?("alice").must_equal true
-        @passwd_file.has_entry?("david").must_equal false
-    end
-    
-    it "can update an entry in an already existing passwd file, algorithm can change" do
-        @passwd_file.add_or_update("alice", "a new secret", "sha1")
-        @passwd_file.contents.must_equal IO.read(PASSWD_UPDATE_TEST_FILE)
-    end
+  it "can add a new entry to an already existing passwd file" do
+    @passwd_file.add_or_update("charlie", "c secret", "sha1")
+    @passwd_file.contents.must_equal IO.read(PASSWD_ADD_TEST_FILE)
+  end
 
-    it "fetches a copy of an entry" do
-        @passwd_file.fetch("alice").to_s.must_equal "alice:$apr1$DghnA...$CsPcgerfsI/Ryy0AOAJtb0"
-    end
+  it "can tell if an entry already exists in the passwd file" do
+    @passwd_file.has_entry?("alice").must_equal true
+    @passwd_file.has_entry?("david").must_equal false
+  end
 
-    it "raises an error if an attempt is made to alter a non-existenet file" do
-        lambda { HTAuth::PasswdFile.new("some-file") }.must_raise(HTAuth::FileAccessError)
-    end
+  it "can update an entry in an already existing passwd file, algorithm can change" do
+    @passwd_file.add_or_update("alice", "a new secret", "sha1")
+    @passwd_file.contents.must_equal IO.read(PASSWD_UPDATE_TEST_FILE)
+  end
 
-    # this test will only work on systems that have /etc/ssh_host_rsa_key 
-    it "raises an error if an attempt is made to open a file where no permissions are granted" do
-        lambda { HTAuth::PasswdFile.new("/etc/ssh_host_rsa_key") }.must_raise(HTAuth::FileAccessError)
-    end
+  it "fetches a copy of an entry" do
+    @passwd_file.fetch("alice").to_s.must_equal "alice:$apr1$DghnA...$CsPcgerfsI/Ryy0AOAJtb0"
+  end
 
-    it "deletes an entry" do
-        @passwd_file.delete("bob")
-        @passwd_file.contents.must_equal IO.read(PASSWD_DELETE_TEST_FILE)
-    end
+  it "raises an error if an attempt is made to alter a non-existenet file" do
+    lambda { HTAuth::PasswdFile.new("some-file") }.must_raise(HTAuth::FileAccessError)
+  end
+
+  # this test will only work on systems that have /etc/ssh_host_rsa_key 
+  it "raises an error if an attempt is made to open a file where no permissions are granted" do
+    lambda { HTAuth::PasswdFile.new("/etc/ssh_host_rsa_key") }.must_raise(HTAuth::FileAccessError)
+  end
+
+  it "deletes an entry" do
+    @passwd_file.delete("bob")
+    @passwd_file.contents.must_equal IO.read(PASSWD_DELETE_TEST_FILE)
+  end
 
-    it "is usable in a ruby manner and yeilds itself when opened" do
-        HTAuth::PasswdFile.open(@tf.path) do |pf|
-            pf.add_or_update("alice", "a new secret", "md5")
-            pf.delete('bob')
-        end
-        lines = IO.readlines(@tf.path)
-        lines.size.must_equal 1
-        lines.first.split(':').first.must_equal "alice"
-        lines.first.split(':').last.must_match( /\$apr1\$/ )
+  it "is usable in a ruby manner and yeilds itself when opened" do
+    HTAuth::PasswdFile.open(@tf.path) do |pf|
+      pf.add_or_update("alice", "a new secret", "md5")
+      pf.delete('bob')
     end
+    lines = IO.readlines(@tf.path)
+    lines.size.must_equal 1
+    lines.first.split(':').first.must_equal "alice"
+    lines.first.split(':').last.must_match( /\$apr1\$/ )
+  end
 end

data/spec/plaintext_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 require 'htauth/plaintext'
 
 describe HTAuth::Plaintext do
-    it "has a prefix" do
-        HTAuth::Plaintext.new.prefix.must_equal ""
-    end
+  it "has a prefix" do
+    HTAuth::Plaintext.new.prefix.must_equal ""
+  end
 
-    it "encrypts the same way that apache does" do
-        apache_result = "a secret"
-        pt = HTAuth::Plaintext.new
-        pt.encode("a secret").must_equal apache_result
-    end
+  it "encrypts the same way that apache does" do
+    apache_result = "a secret"
+    pt = HTAuth::Plaintext.new
+    pt.encode("a secret").must_equal apache_result
+  end
 end
 

data/spec/sha1_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 require 'htauth/sha1'
 
 describe HTAuth::Sha1 do
-    it "has a prefix" do
-        HTAuth::Sha1.new.prefix.must_equal "{SHA}"
-    end
+  it "has a prefix" do
+    HTAuth::Sha1.new.prefix.must_equal "{SHA}"
+  end
 
-    it "encrypts the same way that apache does" do
-        apache_result = "{SHA}ZrnlrvmM7ZCOV3FAvM7la89NKbk="
-        sha1 = HTAuth::Sha1.new
-        sha1.encode("a secret").must_equal apache_result
-    end
+  it "encrypts the same way that apache does" do
+    apache_result = "{SHA}ZrnlrvmM7ZCOV3FAvM7la89NKbk="
+    sha1 = HTAuth::Sha1.new
+    sha1.encode("a secret").must_equal apache_result
+  end
 end
 

data/spec/spec_helper.rb

@@ -19,3 +19,10 @@ DIGEST_ADD_TEST_FILE       = File.join(File.dirname(__FILE__), "test.add.digest"
 DIGEST_UPDATE_TEST_FILE    = File.join(File.dirname(__FILE__), "test.update.digest")
 DIGEST_DELETE_TEST_FILE    = File.join(File.dirname(__FILE__), "test.delete.digest")
 DIGEST_COMMENTED_TEST_FILE = File.join(File.dirname(__FILE__), "test.comments.digest")
+
+require 'stringio'
+class ConsoleIO < StringIO
+  def noecho(&block)
+    yield self
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htauth
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 description: HTAuth is a pure ruby replacement for the Apache support programs htdigest
   and htpasswd.  Command line and API access are provided for access to htdigest and
   htpasswd files.
@@ -104,28 +90,30 @@ files:
 - bin/htpasswd-ruby
 - lib/htauth.rb
 - lib/htauth/algorithm.rb
+- lib/htauth/cli.rb
+- lib/htauth/cli/digest.rb
+- lib/htauth/cli/passwd.rb
+- lib/htauth/console.rb
 - lib/htauth/crypt.rb
-- lib/htauth/digest.rb
 - lib/htauth/digest_entry.rb
 - lib/htauth/digest_file.rb
 - lib/htauth/entry.rb
-- lib/htauth/errors.rb
+- lib/htauth/error.rb
 - lib/htauth/file.rb
 - lib/htauth/md5.rb
-- lib/htauth/passwd.rb
 - lib/htauth/passwd_entry.rb
 - lib/htauth/passwd_file.rb
 - lib/htauth/plaintext.rb
 - lib/htauth/sha1.rb
 - lib/htauth/version.rb
+- spec/cli/digest_spec.rb
+- spec/cli/passwd_spec.rb
 - spec/crypt_spec.rb
 - spec/digest_entry_spec.rb
 - spec/digest_file_spec.rb
-- spec/digest_spec.rb
 - spec/md5_spec.rb
 - spec/passwd_entry_spec.rb
 - spec/passwd_file_spec.rb
-- spec/passwd_spec.rb
 - spec/plaintext_spec.rb
 - spec/sha1_spec.rb
 - spec/spec_helper.rb
@@ -170,14 +158,14 @@ summary: HTAuth is a pure ruby replacement for the Apache support programs htdig
   and htpasswd.  Command line and API access are provided for access to htdigest and
   htpasswd files.
 test_files:
+- spec/cli/digest_spec.rb
+- spec/cli/passwd_spec.rb
 - spec/crypt_spec.rb
 - spec/digest_entry_spec.rb
 - spec/digest_file_spec.rb
-- spec/digest_spec.rb
 - spec/md5_spec.rb
 - spec/passwd_entry_spec.rb
 - spec/passwd_file_spec.rb
-- spec/passwd_spec.rb
 - spec/plaintext_spec.rb
 - spec/sha1_spec.rb
 - spec/spec_helper.rb