ひとまず設定項目を追加
LDAP接続については未調整
trunk/hiki/auth/ldap.rb (diff) trunk/misc/plugin/auth_ldap.rb (diff) trunk/misc/plugin/ja/auth_ldap.rb (diff)| @@ -5,25 +5,25 @@ | ||
| 5 | 5 | # |
| 6 | 6 | |
| 7 | 7 | require 'ldap' |
| 8 | -require 'uri' | |
| 9 | -require 'cgi' | |
| 8 | +require 'plugin' | |
| 9 | +#require 'uri' | |
| 10 | +#require 'cgi' | |
| 10 | 11 | |
| 12 | +class LdapLogin | |
| 11 | 13 | |
| 12 | -class Ldap | |
| 13 | - | |
| 14 | 14 | #This class handle LDAP logins. |
| 15 | - def initialize(host,basedn,userattr) | |
| 16 | - @host = host | |
| 17 | - @basedn = basedn | |
| 18 | - @userattr = userattr | |
| 15 | + def initialize() | |
| 16 | + @host = @conf['ldap.host'] | |
| 17 | + @basedn = @conf['ldap.basedn'] | |
| 18 | + @userattr = @conf['ldap.userattr'] | |
| 19 | 19 | end |
| 20 | 20 | |
| 21 | - def ldap_connect(uid, pass) | |
| 21 | + def ldap_login(name,password) | |
| 22 | 22 | conn = LDAP::Conn.new(@host, LDAP::LDAP_PORT) |
| 23 | 23 | conn.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION,3) |
| 24 | - dn="@basedn=#{uid},ou=People,dc=hoge,dc=fuga,dc=honya" | |
| 24 | + dn="@basedn=@userattr=#{name},ou=People,dc=hoge,dc=fuga,dc=honya" | |
| 25 | 25 | begin |
| 26 | - conn.simple_bind(dn, pass) | |
| 26 | + connect.simple_bind(dn, password) | |
| 27 | 27 | true |
| 28 | 28 | rescue LDAP::ResultError |
| 29 | 29 | false |
| @@ -3,30 +3,76 @@ | ||
| 3 | 3 | |
| 4 | 4 | require 'hiki/auth/ldap' |
| 5 | 5 | require 'hiki/session' |
| 6 | +require 'logger' | |
| 7 | +$logger = Logger.new('hiki.log') | |
| 6 | 8 | |
| 7 | 9 | @conf['ldap.host'] ||= '' |
| 8 | 10 | @conf['ldap.basedn'] ||= '' |
| 9 | 11 | @conf['ldap.userattr'] ||= '' |
| 12 | +@conf['ldap.binddn'] ||= '' | |
| 13 | +@conf['ldap.bindpass'] ||= '' | |
| 10 | 14 | |
| 11 | 15 | def saveconf_auth_ldap |
| 16 | +$logger.debug 'do saveconv_auth_ldap' | |
| 12 | 17 | if @mode == 'saveconf' then |
| 13 | 18 | @conf['ldap.host'] = @cgi.params['ldap.host'][0] |
| 14 | 19 | @conf['ldap.basedn'] = @cgi.params['ldap.basedn'][0] |
| 15 | 20 | @conf['ldap.userattr'] = @cgi.params['ldap.userattr'][0] |
| 21 | + @conf['ldap.binddn'] = @cgi.params['ldap.binddn'][0] | |
| 22 | + @conf['ldap.bindpass'] = @cgi.params['ldap.bindpass'][0] | |
| 16 | 23 | end |
| 17 | 24 | end |
| 18 | 25 | |
| 26 | +def login(name,pass) | |
| 27 | +hostname = @conf['ldap.host'] | |
| 28 | +basedn = @conf['ldap.basedn'] | |
| 29 | +userattr = @conf['ldap.userattr'] | |
| 30 | +binddn = @conf['ldap.binddn'] | |
| 31 | +bindpass = @conf['ldap.bindpass'] | |
| 32 | + | |
| 33 | +str = 'load auth_ldap login ' + hostname + "is hostname" | |
| 34 | +$logger.debug str | |
| 35 | +conn = LDAP::Conn.new(hostname, LDAP::LDAP_PORT) | |
| 36 | +conn.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION,3) | |
| 37 | +begin | |
| 38 | + conn.simple_bind(dn, pass) | |
| 39 | + true | |
| 40 | + rescue LDAP::ResultError | |
| 41 | + false | |
| 42 | + end | |
| 43 | + | |
| 44 | +$logger.debug 'end auth_ldap login ' | |
| 45 | +end | |
| 46 | + | |
| 47 | +def auth_ldap | |
| 48 | +$logger.debug 'load auth_ldap' | |
| 49 | + con=Ldap.new | |
| 50 | +end | |
| 51 | + | |
| 19 | 52 | add_conf_proc('auth_ldap', label_auth_ldap_config) do |
| 20 | 53 | saveconf_auth_ldap |
| 54 | +$logger.debug 'add_cof_procのsaveconv_auth_ldap clear' | |
| 55 | + | |
| 21 | 56 | <<-HTML |
| 22 | 57 | <h3 class="subtitle">#{label_auth_ldap_host}</h3> |
| 23 | 58 | <p>#{label_auth_ldap_host_msg}</p> |
| 24 | 59 | <p><input name="ldap.host" size="40" value="#{CGI::escapeHTML(@conf['ldap.host']||"")}"></p> |
| 60 | + | |
| 25 | 61 | <h3 class="subtitle">#{label_auth_ldap_basedn}</h3> |
| 26 | 62 | <p>#{label_auth_ldap_basedn_msg}</p> |
| 27 | 63 | <p><input name="ldap.basedn" size="40" value="#{CGI::escapeHTML(@conf['ldap.basedn']||"")}"></p> |
| 64 | + | |
| 28 | 65 | <h3 class="subtitle">#{label_auth_ldap_userattr}</h3> |
| 29 | 66 | <p>#{label_auth_ldap_userattr_msg}</p> |
| 30 | 67 | <p><input name="ldap.userattr" size="40" value="#{CGI::escapeHTML(@conf['ldap.userattr'])||""}"></p> |
| 68 | + | |
| 69 | + <h3 class="subtitle">#{label_auth_ldap_binddn}</h3> | |
| 70 | + <p>#{label_auth_ldap_binddn_msg}</p> | |
| 71 | + <p><input name="ldap.binddn" size="40" value="#{CGI::escapeHTML(@conf['ldap.binddn'])||""}"></p> | |
| 72 | + | |
| 73 | + <h3 class="subtitle">#{label_auth_ldap_bindpass}</h3> | |
| 74 | + <p>#{label_auth_ldap_bindpass_msg}</p> | |
| 75 | + <p><input name="ldap.bindpass" size="40" value="#{CGI::escapeHTML(@conf['ldap.bindpass'])||""}"></p> | |
| 76 | + | |
| 31 | 77 | HTML |
| 32 | 78 | end |
| \ No newline at end of file |
| @@ -30,13 +30,29 @@ | ||
| 30 | 30 | end |
| 31 | 31 | |
| 32 | 32 | def label_auth_ldap_basedn_msg |
| 33 | - 'BaseDNを指定します。 ' | |
| 33 | + 'BaseDNを指定します' | |
| 34 | 34 | end |
| 35 | 35 | |
| 36 | +def label_auth_ldap_binddn | |
| 37 | + 'BINDDN' | |
| 38 | +end | |
| 39 | + | |
| 40 | +def label_auth_ldap_binddn_msg | |
| 41 | + '検索の際に利用するBINDDNを指定します。' | |
| 42 | +end | |
| 43 | + | |
| 44 | +def label_auth_ldap_bindpass | |
| 45 | + 'BINDDN Password' | |
| 46 | +end | |
| 47 | + | |
| 48 | +def label_auth_ldap_bindpass_msg | |
| 49 | + '検索の際に利用するBINDDNのパスワードを指定します。' | |
| 50 | +end | |
| 51 | + | |
| 36 | 52 | def label_auth_ldap_userattr |
| 37 | 53 | 'ユーザ' |
| 38 | 54 | end |
| 39 | - | |
| 55 | + | |
| 40 | 56 | def label_auth_ldap_userattr_msg |
| 41 | 57 | 'ユーザの属性を指定します。 ' |
| 42 | 58 | end |