about summary refs log tree commit diff
path: root/app/models/bookmark.rb
diff options
context:
space:
mode:
authorntl-purism <57806346+ntl-purism@users.noreply.github.com>2019-11-30 12:44:59 -0600
committermultiple creatures <dev@multiple-creature.party>2019-12-31 02:41:24 -0600
commit244a90b45e926ebc37685ff5f79a011381b1eb97 (patch)
treeea9ec1906446da665320808e35840a0d4a8e052f /app/models/bookmark.rb
parentdecc593faaccb76281a1d76584800bf5a2260b88 (diff)
LDAP & PAM added to OAuth password grant strategy (#7999) (#12390)
When authenticating via OAuth, the resource owner password grant
strategy is allowed by Mastodon, but (without this PR), it does not
attempt to authenticate against LDAP or PAM. As a result, LDAP or PAM
authenticated users cannot sign in to Mastodon with their
email/password credentials via OAuth (for instance, for native/mobile
app users).

This PR fleshes out the authentication strategy supplied to doorkeeper
in its initializer by looking up the user with LDAP and/or PAM when
devise is configured to use LDAP/PAM backends. It attempts to follow the
same logic as the Auth::SessionsController for handling email/password
credentials.

Note #1: Since this pull request affects an initializer, it's unclear
how to add test automation.

Note #2: The PAM authentication path has not been manually tested. It
was added for completeness sake, and it is hoped that it can be manually
tested before merging.
Diffstat (limited to 'app/models/bookmark.rb')
0 files changed, 0 insertions, 0 deletions