Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ gem "omniauth-saml", "~> 2.2"
gem "omniauth-rails_csrf_protection", "~> 1.0"
gem 'repost'

gem "ldap_lookup" # will use for admin interface, add rovers
gem "ldap_lookup", "2.0.1"
gem "pundit"

# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ GEM
launchy (3.0.1)
addressable (~> 2.8)
childprocess (~> 5.0)
ldap_lookup (0.1.8)
ldap_lookup (2.0.1)
net-ldap (~> 0.18.0)
letter_opener (1.10.0)
launchy (>= 2.2, < 4)
Expand Down Expand Up @@ -394,7 +394,7 @@ DEPENDENCIES
jbuilder
jsbundling-rails
kaminari
ldap_lookup
ldap_lookup (= 2.0.1)
letter_opener_web
omniauth-rails_csrf_protection (~> 1.0)
omniauth-saml (~> 2.2)
Expand Down
19 changes: 14 additions & 5 deletions config/initializers/ldap_lookup.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
LdapLookup.configuration do |config|
config.host = "ldap.umich.edu"
config.port = "389"
config.base = "dc=umich,dc=edu"
config.dept_attribute = "umichPostalAddressData"
config.group_attribute = "umichGroupEmail"
config.host = ENV.fetch('LDAP_HOST', 'ldap.umich.edu')
config.port = ENV.fetch('LDAP_PORT', '389')
config.base = ENV.fetch('LDAP_BASE', 'dc=umich,dc=edu')

# Optional: set for authenticated binds
config.username = ENV['LDAP_USERNAME']
config.password = ENV['LDAP_PASSWORD']

# Encryption - REQUIRED
config.encryption = ENV.fetch('LDAP_ENCRYPTION', 'start_tls').to_sym

# Optional: attribute overrides
config.dept_attribute = ENV.fetch('LDAP_DEPT_ATTRIBUTE', 'umichPostalAddressData')
config.group_attribute = ENV.fetch('LDAP_GROUP_ATTRIBUTE', 'umichGroupEmail')
end
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@
"@rails/actioncable" "^7.0"

"@hotwired/turbo@^8.0.4":
version "8.0.4"
resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.4.tgz#5c5361c06a37cdf10dcba4223f1afd0ca1c75091"
integrity sha512-mlZEFUZrJnpfj+g/XeCWWuokvQyN68WvM78JM+0jfSFc98wegm259vCbC1zSllcspRwbgXK31ibehCy5PA78/Q==
version "8.0.21"
resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.21.tgz#a3e80c01d70048200f64bbe3582b84f9bfac034e"
integrity sha512-fJTv3JnzFHeDxBb23esZSOhT4r142xf5o3lKMFMvzPC6AllkqbBKk5Yb31UZhtIsKQCwmO/pUQrtTUlYl5CHAQ==

"@kurkle/color@^0.3.0":
version "0.3.2"
Expand Down
Loading