|
a/Allura/allura/lib/plugin.py |
|
b/Allura/allura/lib/plugin.py |
|
... |
|
... |
| 313 |
username, errmsg)
|
313 |
username, errmsg)
|
| 314 |
assert False, errmsg
|
314 |
assert False, errmsg
|
| 315 |
|
315 |
|
| 316 |
def by_username(self, username):
|
316 |
def by_username(self, username):
|
| 317 |
from allura import model as M
|
317 |
from allura import model as M
|
| 318 |
return M.User.query.get(username=username)
|
318 |
return M.User.query.get(username=username, disabled=False)
|
| 319 |
|
319 |
|
| 320 |
def set_password(self, user, old_password, new_password):
|
320 |
def set_password(self, user, old_password, new_password):
|
| 321 |
try:
|
321 |
try:
|
| 322 |
dn = 'uid=%s,%s' % (user.username, config['auth.ldap.suffix'])
|
322 |
dn = 'uid=%s,%s' % (user.username, config['auth.ldap.suffix'])
|
| 323 |
con = ldap.initialize(config['auth.ldap.server'])
|
323 |
con = ldap.initialize(config['auth.ldap.server'])
|
|
... |
|
... |
| 327 |
except ldap.INVALID_CREDENTIALS:
|
327 |
except ldap.INVALID_CREDENTIALS:
|
| 328 |
raise exc.HTTPUnauthorized()
|
328 |
raise exc.HTTPUnauthorized()
|
| 329 |
|
329 |
|
| 330 |
def _login(self):
|
330 |
def _login(self):
|
| 331 |
from allura import model as M
|
331 |
from allura import model as M
|
| 332 |
user = M.User.query.get(username=self.request.params['username'])
|
332 |
user = M.User.query.get(username=self.request.params['username'], disabled=False)
|
| 333 |
if user is None: raise exc.HTTPUnauthorized()
|
333 |
if user is None: raise exc.HTTPUnauthorized()
|
| 334 |
try:
|
334 |
try:
|
| 335 |
dn = 'uid=%s,%s' % (user.username, config['auth.ldap.suffix'])
|
335 |
dn = 'uid=%s,%s' % (user.username, config['auth.ldap.suffix'])
|
| 336 |
con = ldap.initialize(config['auth.ldap.server'])
|
336 |
con = ldap.initialize(config['auth.ldap.server'])
|
| 337 |
con.bind_s(dn, self.request.params['password'])
|
337 |
con.bind_s(dn, self.request.params['password'])
|