Skip to content

Support email attribut #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Support email attribut #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
08a9d42
ajout support email
salleman33 Apr 30, 2024
1004b84
test 1
salleman33 Apr 30, 2024
3e61337
test 2
salleman33 Apr 30, 2024
b24944e
surchage de l'email
salleman33 Apr 30, 2024
bfd09e4
modif version omniauth-ldap
salleman33 Apr 30, 2024
d8929f2
ajout title
Nov 29, 2024
2620677
modif title par ldap_title
Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
plugins:
ldap_title:
default: 'LDAP Authentication'
ldap_enabled:
default: true
ldap_user_create_mode:
Expand All @@ -15,6 +17,8 @@ plugins:
default: 'dc=example,dc=com'
ldap_uid:
default: 'sAMAccountName'
ldap_email:
default: 'email'
ldap_bind_dn:
default: ''
ldap_password:
Expand Down
6 changes: 5 additions & 1 deletion plugin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

gem 'pyu-ruby-sasl', '0.0.3.3', require: false
gem 'rubyntlm', '0.3.4', require: false
gem 'net-ldap', '0.17.1'
gem 'net-ldap', '0.19.0'
gem 'omniauth-ldap', '1.0.5'

require 'yaml'
Expand All @@ -23,6 +23,9 @@ def enabled?
end

def after_authenticate(auth_options)
if SiteSetting.ldap_email != 'email'
auth_options.info[:email] = auth_options.extra[:raw_info][SiteSetting.ldap_email].first()
end
return auth_result(auth_options.info)
end

Expand All @@ -31,6 +34,7 @@ def register_middleware(omniauth)
omniauth.provider :ldap,
setup: -> (env) {
env["omniauth.strategy"].options.merge!(
title: SiteSetting.ldap_title,
host: SiteSetting.ldap_hostname,
port: SiteSetting.ldap_port,
method: SiteSetting.ldap_method,
Expand Down