htauth 1.2.0 → 2.0.0

data/lib/htauth/digest.rb

@@ -1,132 +0,0 @@
-require 'htauth/version'
-require 'htauth/errors'
-require 'htauth/digest_file'
-
-require 'ostruct'
-require 'optparse'
-
-require 'highline'
-
-module HTAuth
-  class Digest
-
-    MAX_PASSWD_LENGTH = 255
-
-    attr_accessor :digest_file
-
-    def initialize
-      @digest_file = nil
-      @option_parser = nil
-      @options = nil
-    end
-
-    def options
-      if @options.nil? then
-        @options                = ::OpenStruct.new
-        @options.show_version   = false
-        @options.show_help      = false
-        @options.file_mode      = DigestFile::ALTER
-        @options.passwdfile     = nil
-        @options.realm          = nil
-        @options.username       = nil
-        @options.delete_entry   = false
-      end
-      @options
-    end
-
-    def option_parser
-      if not @option_parser then
-        @option_parser = OptionParser.new do |op|
-          op.banner = "Usage: #{op.program_name} [options] passwordfile realm username"
-          op.on("-c", "--create", "Create a new digest password file; this overwrites an existing file.") do |c|
-            options.file_mode = DigestFile::CREATE
-          end
-
-          op.on("-D", "--delete", "Delete the specified user.") do |d|
-            options.delete_entry = d
-          end
-
-          op.on("-h", "--help", "Display this help.") do |h|
-            options.show_help = h
-          end
-
-          op.on("-v", "--version", "Show version info.") do |v|
-            options.show_version = v
-          end
-        end
-      end
-      @option_parser
-    end
-
-    def show_help
-      $stdout.puts option_parser
-      exit 1
-    end
-
-    def show_version
-      $stdout.puts "#{option_parser.program_name}: version #{HTAuth::VERSION}"
-      exit 1
-    end
-
-    def parse_options(argv)
-      begin
-        option_parser.parse!(argv)
-        show_version if options.show_version
-        show_help if options.show_help or argv.size < 3
-
-        options.passwdfile = argv.shift
-        options.realm      = argv.shift
-        options.username   = argv.shift
-      rescue ::OptionParser::ParseError => pe
-        $stderr.puts "ERROR: #{option_parser.program_name} - #{pe}"
-        $stderr.puts "Try `#{option_parser.program_name} --help` for more information"
-        exit 1
-      end
-    end
-
-    def run(argv, env = ENV)
-      begin
-        parse_options(argv)
-        digest_file = DigestFile.new(options.passwdfile, options.file_mode)
-
-        if options.delete_entry then
-          digest_file.delete(options.username, options.realm)
-        else
-          # initialize here so that if $stdin is overwritten it gets picked up
-          hl = ::HighLine.new
-
-          action = digest_file.has_entry?(options.username, options.realm) ? "Changing" : "Adding"
-
-          $stdout.puts "#{action} password for #{options.username} in realm #{options.realm}."
-
-          pw_in       = hl.ask("        New password: ") { |q| q.echo = '*' } 
-          raise PasswordError, "password '#{pw_in}' too long" if pw_in.length >= MAX_PASSWD_LENGTH
-
-          pw_validate = hl.ask("Re-type new password: ") { |q| q.echo = '*' }
-          raise PasswordError, "They don't match, sorry." unless pw_in == pw_validate
-
-          digest_file.add_or_update(options.username, options.realm, pw_in)
-        end
-
-        digest_file.save!
-
-      rescue HTAuth::FileAccessError => fae
-        msg = "Could not open password file #{options.passwdfile} "
-        $stderr.puts "#{msg}: #{fae.message}"
-        $stderr.puts fae.backtrace.join("\n")
-        exit 1
-      rescue HTAuth::PasswordError => pe
-        $stderr.puts "#{pe.message}"
-        exit 1
-      rescue HTAuth::DigestFileError => fe
-        $stderr.puts "#{fe.message}"
-        exit 1
-      rescue SignalException => se
-        $stderr.puts
-        $stderr.puts "Interrupted #{se}"
-        exit 1
-      end
-      exit 0
-    end
-  end
-end

data/lib/htauth/errors.rb

@@ -1,10 +0,0 @@
-#-- 
-# Copyrigth (c) 2008 Jeremy Hinegardner
-# All rights reserved.  See LICENSE and/or COPYING for details
-#++
-
-module HTAuth
-  class FileAccessError < StandardError ; end
-  class TempFileError < StandardError ; end
-  class PasswordError < StandardError ; end
-end

data/lib/htauth/passwd.rb

@@ -1,181 +0,0 @@
-require 'htauth/errors'
-require 'htauth/passwd_file'
-
-require 'ostruct'
-require 'optparse'
-
-require 'highline'
-
-module HTAuth
-  class Passwd
-
-    MAX_PASSWD_LENGTH = 255
-
-    attr_accessor :passwd_file
-
-    def initialize
-      @passwd_file = nil
-      @option_parser = nil
-      @options = nil
-    end
-
-    def options
-      if @options.nil? then
-        @options                = ::OpenStruct.new
-        @options.batch_mode     = false
-        @options.file_mode      = File::ALTER
-        @options.passwdfile     = nil
-        @options.algorithm      = Algorithm::EXISTING
-        @options.send_to_stdout = false
-        @options.show_version   = false
-        @options.show_help      = false
-        @options.username       = nil
-        @options.delete_entry   = false
-        @options.password       = ""
-      end
-      @options
-    end
-
-    def option_parser
-      if not @option_parser then
-        @option_parser = OptionParser.new do |op|
-          op.banner = <<EOB
-Usage: 
-          #{op.program_name} [-cmdpsD] passwordfile username
-          #{op.program_name} -b[cmdpsD] passwordfile username password
-
-          #{op.program_name} -n[mdps] username
-          #{op.program_name} -nb[mdps] username password
-EOB
-
-          op.separator ""
-
-          op.on("-b", "--batch", "Batch mode, get the password from the command line, rather than prompt") do |b|
-            options.batch_mode = b
-          end
-
-          op.on("-c", "--create", "Create a new file; this overwrites an existing file.") do |c|
-            options.file_mode = HTAuth::File::CREATE
-          end
-
-          op.on("-d", "--crypt", "Force CRYPT encryption of the password.") do |c|
-            options.algorithm = "crypt"
-          end
-
-          op.on("-D", "--delete", "Delete the specified user.") do |d|
-            options.delete_entry = d
-          end
-
-          op.on("-h", "--help", "Display this help.") do |h|
-            options.show_help = h
-          end
-
-          op.on("-m", "--md5", "Force MD5 encryption of the password (default).") do |m|
-            options.algorithm = "md5"
-          end
-
-          op.on("-n", "--stdout", "Do not update the file; Display the results on stdout instead.") do |n|
-            options.send_to_stdout = true
-            options.passwdfile     = HTAuth::File::STDOUT_FLAG
-          end
-
-          op.on("-p", "--plaintext", "Do not encrypt the password (plaintext).") do |p|
-            options.algorithm = "plaintext"
-          end
-
-          op.on("-s", "--sha1", "Force SHA encryption of the password.") do |s|
-            options.algorithm = "sha1"
-          end
-
-          op.on("-v", "--version", "Show version info.") do |v|
-            options.show_version = v
-          end
-
-          op.separator ""
-
-          op.separator "The SHA algorihtm does not use a salt and is less secure than the MD5 algorithm"
-        end
-      end
-      @option_parser
-    end
-
-    def show_help
-      $stdout.puts option_parser
-      exit 1
-    end
-
-    def show_version
-      $stdout.puts "#{option_parser.program_name}: version #{HTAuth::VERSION}"
-      exit 1
-    end
-
-    def parse_options(argv)
-      begin
-        option_parser.parse!(argv)
-        show_version if options.show_version
-        show_help if options.show_help 
-
-        raise ::OptionParser::ParseError, "Unable to send to stdout AND create a new file" if options.send_to_stdout and (options.file_mode == File::CREATE)
-        raise ::OptionParser::ParseError, "a username is needed" if options.send_to_stdout and argv.size < 1
-        raise ::OptionParser::ParseError, "a username and password are needed" if options.send_to_stdout and options.batch_mode  and ( argv.size < 2 ) 
-        raise ::OptionParser::ParseError, "a passwordfile, username and password are needed " if not options.send_to_stdout and options.batch_mode and ( argv.size < 3 )
-        raise ::OptionParser::ParseError, "a passwordfile and username are needed" if argv.size < 2
-
-        options.passwdfile = argv.shift unless options.send_to_stdout
-        options.username   = argv.shift
-        options.password   = argv.shift if options.batch_mode
-
-      rescue ::OptionParser::ParseError => pe
-        $stderr.puts "ERROR: #{option_parser.program_name} - #{pe}"
-        show_help
-        exit 1
-      end
-    end
-
-    def run(argv, env = ENV)
-      begin
-        parse_options(argv)
-        passwd_file = PasswdFile.new(options.passwdfile, options.file_mode)
-
-        if options.delete_entry then
-          passwd_file.delete(options.username)
-        else
-          unless options.batch_mode 
-            # initialize here so that if $stdin is overwritten it gets picked up
-            hl = ::HighLine.new
-
-            action = passwd_file.has_entry?(options.username) ? "Changing" : "Adding"
-
-            $stdout.puts "#{action} password for #{options.username}."
-
-            pw_in       = hl.ask("        New password: ") { |q| q.echo = '*' } 
-            raise PasswordError, "password '#{pw_in}' too long" if pw_in.length >= MAX_PASSWD_LENGTH
-
-            pw_validate = hl.ask("Re-type new password: ") { |q| q.echo = '*' }
-            raise PasswordError, "They don't match, sorry." unless pw_in == pw_validate
-            options.password = pw_in
-          end
-          passwd_file.add_or_update(options.username, options.password, options.algorithm)
-        end
-
-        passwd_file.save! 
-
-      rescue HTAuth::FileAccessError => fae
-        msg = "Password file failure (#{options.passwdfile}) "
-        $stderr.puts "#{msg}: #{fae.message}"
-        exit 1
-      rescue HTAuth::PasswordError => pe
-        $stderr.puts "#{pe.message}"
-        exit 1
-      rescue HTAuth::PasswdFileError => fe
-        $stderr.puts "#{fe.message}"
-        exit 1
-      rescue SignalException => se
-        $stderr.puts
-        $stderr.puts "Interrupted #{se}"
-        exit 1
-      end
-      exit 0
-    end
-  end
-end

data/spec/digest_spec.rb

@@ -1,150 +0,0 @@
-require 'spec_helper'
-require 'htauth/digest'
-require 'tempfile'
-
-describe HTAuth::Digest do
-
-    before(:each) do
-
-        # existing 
-        @tf = Tempfile.new("rpasswrd-digest-test")
-        @tf.write(IO.read(DIGEST_ORIGINAL_TEST_FILE))
-        @tf.close       
-        @rdigest = HTAuth::Digest.new
-       
-        # new file
-        @new_file = File.join(File.dirname(@tf.path), "new-testfile")
-
-        # rework stdout and stderr
-        @stdout = StringIO.new
-        @old_stdout = $stdout
-        $stdout = @stdout
-
-        @stderr = StringIO.new
-        @old_stderr = $stderr
-        $stderr = @stderr
-
-        @stdin = StringIO.new
-        @old_stdin = $stdin
-        $stdin = @stdin
-    end
-
-    after(:each) do
-        @tf.close(true)
-        $stderr = @old_stderr
-        $stdout = @old_stdout
-        $stdin = @old_stdin
-        File.unlink(@new_file) if File.exist?(@new_file)
-    end
-
-    it "displays help appropriately" do
-        begin
-            @rdigest.run([ "-h" ])
-        rescue SystemExit => se
-            se.status.must_equal 1
-            @stdout.string.must_match( /passwordfile realm username/m )
-        end
-    end
-
-    it "displays the version appropriately" do
-        begin
-            @rdigest.run([ "--version" ])
-        rescue SystemExit => se
-            se.status.must_equal 1
-            @stdout.string.must_match( /version #{HTAuth::VERSION}/ )
-        end
-    end
-    
-    it "creates a new file with one entries" do
-        begin
-            @stdin.puts "b secret"
-            @stdin.puts "b secret"
-            @stdin.rewind
-            @rdigest.run([ "-c", @new_file, "htauth", "bob" ])
-        rescue SystemExit => se
-            se.status.must_equal 0
-            IO.read(@new_file).must_equal IO.readlines(DIGEST_ORIGINAL_TEST_FILE).first
-        end
-    end
-
-    it "truncates an exiting file if told to create a new file" do
-        begin
-            @stdin.puts "b secret"
-            @stdin.puts "b secret"
-            @stdin.rewind
-            @rdigest.run([ "-c", @tf.path, "htauth", "bob"])
-        rescue SystemExit => se
-            se.status.must_equal 0
-            IO.read(@tf.path).must_equal IO.read(DIGEST_DELETE_TEST_FILE)
-        end
-    end
-
-    it "adds an entry to an existing file" do
-        begin
-            @stdin.puts "c secret"
-            @stdin.puts "c secret"
-            @stdin.rewind
-            @rdigest.run([ @tf.path, "htauth-new", "charlie" ])
-        rescue SystemExit => se
-            se.status.must_equal 0
-            IO.read(@tf.path).must_equal IO.read(DIGEST_ADD_TEST_FILE)
-        end
-    end
-
-    it "updates an entry in an existing file" do
-        begin
-            @stdin.puts "a new secret"
-            @stdin.puts "a new secret"
-            @stdin.rewind
-            @rdigest.run([ @tf.path, "htauth", "alice" ])
-        rescue SystemExit => se
-            @stderr.string.must_equal ""
-            se.status.must_equal 0
-            IO.read(@tf.path).must_equal IO.read(DIGEST_UPDATE_TEST_FILE)
-        end
-    end
-    
-    it "deletes an entry in an existing file" do
-        begin
-            @rdigest.run([ "-d", @tf.path, "htauth", "alice" ])
-        rescue SystemExit => se
-            @stderr.string.must_equal ""
-            se.status.must_equal 0
-            IO.read(@tf.path).must_equal IO.read(DIGEST_DELETE_TEST_FILE)
-        end
-    end
-
-    it "has an error if it does not have permissions on the file" do
-        begin
-            @stdin.puts "a secret"
-            @stdin.puts "a secret"
-            @stdin.rewind
-            @rdigest.run([ "-c", "/etc/you-cannot-create-me", "htauth", "alice"])
-        rescue SystemExit => se
-            @stderr.string.must_match( %r{Could not open password file /etc/you-cannot-create-me}m )
-            se.status.must_equal 1
-        end
-    end
-
-    it "has an error if the input passwords do not match" do
-        begin
-            @stdin.puts "a secret"
-            @stdin.puts "a bad secret"
-            @stdin.rewind
-            @rdigest.run([ @tf.path, "htauth", "alice"])
-        rescue SystemExit => se
-            @stderr.string.must_match( /They don't match, sorry./m )
-            se.status.must_equal 1
-        end
-    end
-
-    it "has an error if the options are incorrect" do
-        begin
-            @rdigest.run(["--blah"])
-        rescue SystemExit => se
-            @stderr.string.must_match( /ERROR:/m )
-            se.status.must_equal 1
-        end
-    end
-
-end