Merge remote branch 'halostatue/ldap-psw-cleanup' into ldap-psw-cleanup
This commit is contained in:
Rory O'Connell
commit
cc55227083
|
|
@ -16,7 +16,7 @@ require 'net/ber'
|
||||||
require 'net/ldap/pdu'
|
require 'net/ldap/pdu'
|
||||||
require 'net/ldap/filter'
|
require 'net/ldap/filter'
|
||||||
require 'net/ldap/dataset'
|
require 'net/ldap/dataset'
|
||||||
require 'net/ldap/psw'
|
require 'net/ldap/password'
|
||||||
require 'net/ldap/entry'
|
require 'net/ldap/entry'
|
||||||
|
|
||||||
# == Net::LDAP
|
# == Net::LDAP
|
||||||
|
|
|
||||||
52
lib/net/ldap/password.rb
Normal file
52
lib/net/ldap/password.rb
Normal file
|
|
@ -0,0 +1,52 @@
|
||||||
|
#----------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Gmail: garbagecat10
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
#
|
||||||
|
#---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
require 'digest/sha1'
|
||||||
|
require 'digest/md5'
|
||||||
|
|
||||||
|
class Net::LDAP::Password
|
||||||
|
class << self
|
||||||
|
# Generate a password-hash suitable for inclusion in an LDAP attribute.
|
||||||
|
# Pass a hash type (currently supported: :md5 and :sha) and a plaintext
|
||||||
|
# password. This function will return a hashed representation.
|
||||||
|
#
|
||||||
|
#--
|
||||||
|
# STUB: This is here to fulfill the requirements of an RFC, which
|
||||||
|
# one?
|
||||||
|
#
|
||||||
|
# TODO, gotta do salted-sha and (maybe)salted-md5. Should we provide
|
||||||
|
# sha1 as a synonym for sha1? I vote no because then should you also
|
||||||
|
# provide ssha1 for symmetry?
|
||||||
|
def generate(type, str)
|
||||||
|
digest, digest_name = case type
|
||||||
|
when :md5
|
||||||
|
[Digest::MD5.new, 'MD5']
|
||||||
|
when :sha
|
||||||
|
[Digest::SHA1.new, 'SHA']
|
||||||
|
else
|
||||||
|
raise Net::LDAP::LdapError, "Unsupported password-hash type (#{type})"
|
||||||
|
end
|
||||||
|
digest << str.to_s
|
||||||
|
return "{#{digest_name}}#{[digest.digest].pack('m').chomp }"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
#----------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
# Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Gmail: garbagecat10
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
#
|
|
||||||
#---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
require 'digest/sha1'
|
|
||||||
require 'digest/md5'
|
|
||||||
|
|
||||||
module Net
|
|
||||||
class LDAP
|
|
||||||
class Password
|
|
||||||
class << self
|
|
||||||
# Generate a password-hash suitable for inclusion in an LDAP
|
|
||||||
# attribute. Pass a hash type (currently supported: :md5 and :sha)
|
|
||||||
# and a plaintext password. This function will return a hashed
|
|
||||||
# representation.
|
|
||||||
#
|
|
||||||
# STUB: This is here to fulfill the requirements of an RFC, which
|
|
||||||
# one?
|
|
||||||
#
|
|
||||||
# TODO, gotta do salted-sha and (maybe) salted-md5.
|
|
||||||
# Should we provide sha1 as a synonym for sha1? I vote no because
|
|
||||||
# then should you also provide ssha1 for symmetry?
|
|
||||||
def generate(type, str)
|
|
||||||
digest, digest_name = case type
|
|
||||||
when :md5
|
|
||||||
[Digest::MD5.new, 'MD5']
|
|
||||||
when :sha
|
|
||||||
[Digest::SHA1.new, 'SHA']
|
|
||||||
else
|
|
||||||
raise Net::LDAP::LdapError.new("unsupported password-hash type (#{type})")
|
|
||||||
end
|
|
||||||
|
|
||||||
digest << str.to_s
|
|
||||||
return "{#{digest_name}}#{[digest.digest].pack('m').chomp }"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
Loading…
Reference in a new issue