Skip to content
This repository was archived by the owner on Jun 15, 2018. It is now read-only.
Open
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
11 changes: 7 additions & 4 deletions simplemediawiki.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,17 @@ def tester(self, api_url):
return self._api_url
return None

def login(self, user, passwd):
def login(self, user, passwd, domain=None):
"""
Logs into the wiki with username *user* and password *passwd*. Returns
``True`` on successful login.

:param user: username
:param passwd: password
:param domain: domain (optional)
:returns: ``True`` on successful login, otherwise ``False``
"""
def do_login(self, user, passwd, token=None):
def do_login(self, user, passwd, token=None, domain=None):
"""
Login function that handles CSRF protection (see `MediaWiki bug
23076`_). Returns ``True`` on successful login.
Expand All @@ -237,18 +238,20 @@ def do_login(self, user, passwd, token=None):
data = {'action': 'login',
'lgname': user,
'lgpassword': passwd}
if domain:
data['lgdomain'] = domain
if token:
data['lgtoken'] = token
result = self.call(data)
if result['login']['result'] == 'Success':
self._high_limits = None
return True
elif result['login']['result'] == 'NeedToken' and not token:
return do_login(self, user, passwd, result['login']['token'])
return do_login(self, user, passwd, result['login']['token'], domain)
else:
return False

return do_login(self, user, passwd)
return do_login(self, user, passwd, domain=domain)

def logout(self):
"""
Expand Down