src/moin/1.9: MoinMoin/user.py annotate

annotate MoinMoin/user.py @ 5917:c99f570e274a

moin account resetpw: make password optional, to be able to set a invalid password this is needed for resetting a password (or many passwords) so that the user is not able to login, but just to recover using password recovery.

author	Thomas Waldmann <tw AT waldmann-edv DOT de>
date	Thu, 17 Jan 2013 22:39:00 +0100
parents	19e8a1c50bda
children	5126fadbf24f

rev	line source
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	1 # -- coding: iso-8859-1 --
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	2 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	3 MoinMoin - User Accounts
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	4
1909 be140a589f11 improved some module docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1868 diff changeset	5 This module contains functions to access user accounts (list all users, get
be140a589f11 improved some module docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1868 diff changeset	6 some specific user). User instances are used to access the user profile of
be140a589f11 improved some module docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1868 diff changeset	7 some specific user (name, password, email, bookmark, trail, settings, ...).
be140a589f11 improved some module docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1868 diff changeset	8
3333 928a45b60bb3 remove remaining mentions of "UserPreferences", add to CHANGES Johannes Berg <johannes AT sipsolutions DOT net> parents: 3175 diff changeset	9 Some related code is in the userform and userprefs modules.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	10
1963 de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	11 TODO:
de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	12 * code is a mixture of highlevel user stuff and lowlevel storage functions,
de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	13 this has to get separated into:
de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	14 * user object highlevel stuff
de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	15 * storage code
de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	16
1918 bb2e053067fb fixing copyright headers: remove umlauts (encoding troubles), make epydoc compatible, reformat Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1909 diff changeset	17 @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
5915 19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	18 2003-2013 MoinMoin:ThomasWaldmann,
5720 69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	19 2010 Michael Foetsch <foetsch@yahoo.com>
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	20 @license: GNU GPL, see COPYING for details.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	21 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	22
4363 817d99d715fe remove direct usage of deprecated sha module - use hashlib, if possible Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4107 diff changeset	23 import os, time, codecs, base64
5720 69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	24 import md5crypt
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	25
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	26 try:
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	27 import crypt
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	28 except ImportError:
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	29 crypt = None
4363 817d99d715fe remove direct usage of deprecated sha module - use hashlib, if possible Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4107 diff changeset	30
817d99d715fe remove direct usage of deprecated sha module - use hashlib, if possible Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4107 diff changeset	31 from MoinMoin.support.python_compatibility import hash_new, hmac_new
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	32
2493 f3e3ffa68a7f Send UserCreatedEvent from user.save(), not the newaccount action. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2429 diff changeset	33 from MoinMoin import config, caching, wikiutil, i18n, events
5904 3a1b92276377 reorder imports, so that MoinMoin.support is already in sys.path Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5902 diff changeset	34 from werkzeug.security import safe_str_cmp as safe_str_equal
5612 cc15366f7b74 remove all calls to filesys.dc* (dclistdir, dcdisable), remove unused imports Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5532 diff changeset	35 from MoinMoin.util import timefuncs, random_string
3564 474f6ad01900 recoverpass: email password reset token rather than sha1 Johannes Berg <johannes AT sipsolutions DOT net> parents: 3333 diff changeset	36 from MoinMoin.wikiutil import url_quote_plus
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	37
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	38
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	39 def getUserList(request):
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	40 """ Get a list of all (numerical) user IDs.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	41
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	42 @param request: current request
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	43 @rtype: list
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	44 @return: all user IDs
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	45 """
1801 3369445b4aa8 move the dircache stuff to MoinMoin.util.filesys and disable it on win32 Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1791 diff changeset	46 import re
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	47 user_re = re.compile(r'^\d+\.\d+(\.\d+)?$')
5612 cc15366f7b74 remove all calls to filesys.dc* (dclistdir, dcdisable), remove unused imports Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5532 diff changeset	48 files = os.listdir(request.cfg.user_dir)
232 31c1fbb101a3 remove string/Cookie import, rewrite filter/map Thomas Waldmann <tw@waldmann-edv.de> parents: 138 diff changeset	49 userlist = [f for f in files if user_re.match(f)]
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	50 return userlist
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	51
2092 937da10cb5b3 s/filter/filter_func/ to avoid conflict with builtin name Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2091 diff changeset	52 def get_by_filter(request, filter_func):
937da10cb5b3 s/filter/filter_func/ to avoid conflict with builtin name Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2091 diff changeset	53 """ Searches for an user with a given filter function """
2091 7af58454aafa Send an event when user changes her jabber id, force jid to be unique. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2090 diff changeset	54 for uid in getUserList(request):
2090 9fec7760489e Add a get_by_jabber_id function to search for users given their jabber id. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2065 diff changeset	55 theuser = User(request, uid)
2092 937da10cb5b3 s/filter/filter_func/ to avoid conflict with builtin name Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2091 diff changeset	56 if filter_func(theuser):
2090 9fec7760489e Add a get_by_jabber_id function to search for users given their jabber id. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2065 diff changeset	57 return theuser
9fec7760489e Add a get_by_jabber_id function to search for users given their jabber id. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2065 diff changeset	58
690 e8ccec07515b Refactored user search by mail address. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 626 diff changeset	59 def get_by_email_address(request, email_address):
2090 9fec7760489e Add a get_by_jabber_id function to search for users given their jabber id. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2065 diff changeset	60 """ Searches for an user with a particular e-mail address and returns it. """
2092 937da10cb5b3 s/filter/filter_func/ to avoid conflict with builtin name Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2091 diff changeset	61 filter_func = lambda user: user.valid and user.email.lower() == email_address.lower()
937da10cb5b3 s/filter/filter_func/ to avoid conflict with builtin name Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2091 diff changeset	62 return get_by_filter(request, filter_func)
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	63
2090 9fec7760489e Add a get_by_jabber_id function to search for users given their jabber id. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2065 diff changeset	64 def get_by_jabber_id(request, jabber_id):
9fec7760489e Add a get_by_jabber_id function to search for users given their jabber id. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2065 diff changeset	65 """ Searches for an user with a perticular jabber id and returns it. """
2092 937da10cb5b3 s/filter/filter_func/ to avoid conflict with builtin name Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2091 diff changeset	66 filter_func = lambda user: user.valid and user.jid.lower() == jabber_id.lower()
937da10cb5b3 s/filter/filter_func/ to avoid conflict with builtin name Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2091 diff changeset	67 return get_by_filter(request, filter_func)
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	68
2011 6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	69 def _getUserIdByKey(request, key, search):
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	70 """ Get the user ID for a specified key/value pair.
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	71
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	72 This method must only be called for keys that are
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	73 guaranteed to be unique.
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	74
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	75 @param key: the key to look in
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	76 @param search: the value to look for
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	77 @return the corresponding user ID or None
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	78 """
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	79 if not search or not key:
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	80 return None
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	81 cfg = request.cfg
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	82 cachekey = '%s2id' % key
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	83 try:
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	84 _key2id = getattr(cfg.cache, cachekey)
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	85 except AttributeError:
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	86 arena = 'user'
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	87 cache = caching.CacheEntry(request, arena, cachekey, scope='wiki', use_pickle=True)
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	88 try:
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	89 _key2id = cache.content()
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	90 except caching.CacheError:
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	91 _key2id = {}
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	92 setattr(cfg.cache, cachekey, _key2id)
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	93 uid = _key2id.get(search, None)
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	94 if uid is None:
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	95 for userid in getUserList(request):
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	96 u = User(request, id=userid)
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	97 if hasattr(u, key):
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	98 value = getattr(u, key)
2299 39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	99 if isinstance(value, list):
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	100 for val in value:
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	101 _key2id[val] = userid
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	102 else:
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	103 _key2id[value] = userid
2011 6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	104 arena = 'user'
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	105 cache = caching.CacheEntry(request, arena, cachekey, scope='wiki', use_pickle=True)
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	106 try:
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	107 cache.update(_key2id)
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	108 except caching.CacheError:
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	109 pass
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	110 uid = _key2id.get(search, None)
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	111 return uid
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	112
6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	113
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	114 def getUserId(request, searchName):
1963 de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	115 """ Get the user ID for a specific user NAME.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	116
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	117 @param searchName: the user name to look up
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	118 @rtype: string
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	119 @return: the corresponding user ID or None
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	120 """
2011 6cd0e4cc8e18 refactor user.getUserId Johannes Berg <johannes AT sipsolutions DOT net> parents: 2010 diff changeset	121 return _getUserIdByKey(request, 'name', searchName)
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	122
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	123
2299 39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	124 def getUserIdByOpenId(request, openid):
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	125 """ Get the user ID for a specific OpenID.
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	126
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	127 @param openid: the openid to look up
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	128 @rtype: string
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	129 @return: the corresponding user ID or None
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	130 """
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	131 return _getUserIdByKey(request, 'openids', openid)
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	132
39d11cf4af6c OpenID relying party (client) support Johannes Berg <johannes AT sipsolutions DOT net> parents: 2286 diff changeset	133
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	134 def getUserIdentification(request, username=None):
1963 de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	135 """ Return user name or IP or '<unknown>' indicator.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	136
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	137 @param request: the request object
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	138 @param username: (optional) user name
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	139 @rtype: string
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	140 @return: user name or IP or unknown indicator
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	141 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	142 _ = request.getText
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	143
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	144 if username is None:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	145 username = request.user.name
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	146
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	147 return username or (request.cfg.show_hosts and request.remote_addr) or _("<unknown>")
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	148
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	149
3818 fe9305d5c7cf user: adjust tests, add one for password upgrade and fix a bug found Johannes Berg <johannes AT sipsolutions DOT net> parents: 3810 diff changeset	150 def encodePassword(pwd, salt=None):
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	151 """ Encode a cleartext password
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	152
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	153 @param pwd: the cleartext password, (unicode)
3818 fe9305d5c7cf user: adjust tests, add one for password upgrade and fix a bug found Johannes Berg <johannes AT sipsolutions DOT net> parents: 3810 diff changeset	154 @param salt: the salt for the password (string)
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	155 @rtype: string
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	156 @return: the password in apache htpasswd compatible SHA-encoding,
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	157 or None
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	158 """
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	159 pwd = pwd.encode('utf-8')
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	160
3818 fe9305d5c7cf user: adjust tests, add one for password upgrade and fix a bug found Johannes Berg <johannes AT sipsolutions DOT net> parents: 3810 diff changeset	161 if salt is None:
fe9305d5c7cf user: adjust tests, add one for password upgrade and fix a bug found Johannes Berg <johannes AT sipsolutions DOT net> parents: 3810 diff changeset	162 salt = random_string(20)
fe9305d5c7cf user: adjust tests, add one for password upgrade and fix a bug found Johannes Berg <johannes AT sipsolutions DOT net> parents: 3810 diff changeset	163 assert isinstance(salt, str)
4363 817d99d715fe remove direct usage of deprecated sha module - use hashlib, if possible Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4107 diff changeset	164 hash = hash_new('sha1', pwd)
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	165 hash.update(salt)
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	166
3822 b209aea96826 use base64 legacy interface for python 2.3 Johannes Berg <johannes AT sipsolutions DOT net> parents: 3821 diff changeset	167 return '{SSHA}' + base64.encodestring(hash.digest() + salt).rstrip()
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	168
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	169
5915 19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	170 class Fault(Exception):
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	171 """something went wrong"""
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	172
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	173 class NoSuchUser(Fault):
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	174 """raised if no such user exists"""
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	175
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	176 class MailFailed(Fault):
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	177 """raised if e-mail sending failed"""
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	178
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	179
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	180 def set_password(request, newpass, u=None, uid=None, uname=None, notify=False):
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	181 if uid:
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	182 u = User(request, uid)
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	183 elif uname:
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	184 u = User(request, None, uname)
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	185 if u and u.exists():
5917 c99f570e274a moin account resetpw: make password optional, to be able to set a invalid password Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5915 diff changeset	186 if not newpass:
c99f570e274a moin account resetpw: make password optional, to be able to set a invalid password Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5915 diff changeset	187 # set a invalid password hash
c99f570e274a moin account resetpw: make password optional, to be able to set a invalid password Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5915 diff changeset	188 u.enc_password = ''
c99f570e274a moin account resetpw: make password optional, to be able to set a invalid password Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5915 diff changeset	189 else:
c99f570e274a moin account resetpw: make password optional, to be able to set a invalid password Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5915 diff changeset	190 u.enc_password = encodePassword(newpass)
5915 19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	191 u.save()
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	192 if notify and not u.disabled and u.email:
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	193 mailok, msg = u.mailAccountData()
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	194 if not mailok:
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	195 raise MailFailed(msg)
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	196 else:
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	197 raise NoSuchUser('User does not exist (name: %r id: %r)!' % (u.name, u.id))
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	198
19e8a1c50bda moin account resetpw - added options --all-users and --notify Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5904 diff changeset	199
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	200 def normalizeName(name):
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	201 """ Make normalized user name
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	202
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	203 Prevent impersonating another user with names containing leading,
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	204 trailing or multiple whitespace, or using invisible unicode
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	205 characters.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	206
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	207 Prevent creating user page as sub page, because '/' is not allowed
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	208 in user names.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	209
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	210 Prevent using ':' and ',' which are reserved by acl.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	211
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	212 @param name: user name, unicode
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	213 @rtype: unicode
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	214 @return: user name that can be used in acl lines
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	215 """
826 8e880418d736 remove all underscore <-> blank magic Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 750 diff changeset	216 username_allowedchars = "'@.-_" # ' for names like O'Brian or email addresses.
8e880418d736 remove all underscore <-> blank magic Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 750 diff changeset	217 # "," and ":" must not be allowed (ACL delimiters).
8e880418d736 remove all underscore <-> blank magic Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 750 diff changeset	218 # We also allow _ in usernames for nicer URLs.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	219 # Strip non alpha numeric characters (except username_allowedchars), keep white space
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	220 name = ''.join([c for c in name if c.isalnum() or c.isspace() or c in username_allowedchars])
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	221
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	222 # Normalize white space. Each name can contain multiple
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	223 # words separated with only one space.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	224 name = ' '.join(name.split())
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	225
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	226 return name
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	227
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	228
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	229 def isValidName(request, name):
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	230 """ Validate user name
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	231
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	232 @param name: user name, unicode
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	233 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	234 normalized = normalizeName(name)
4146 3b36f0cfc656 (Re)moved normalizePagename from Request into wikiutil library Florian Krupicka <florian.krupicka@googlemail.com> parents: 3631 diff changeset	235 return (name == normalized) and not wikiutil.isGroupPage(name, request.cfg)
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	236
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	237
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	238 def encodeList(items):
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	239 """ Encode list of items in user data file
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	240
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	241 Items are separated by '\t' characters.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	242
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	243 @param items: list unicode strings
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	244 @rtype: unicode
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	245 @return: list encoded as unicode
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	246 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	247 line = []
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	248 for item in items:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	249 item = item.strip()
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	250 if not item:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	251 continue
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	252 line.append(item)
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	253
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	254 line = '\t'.join(line)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	255 return line
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	256
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	257 def decodeList(line):
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	258 """ Decode list of items from user data file
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	259
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	260 @param line: line containing list of items, encoded with encodeList
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	261 @rtype: list of unicode strings
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	262 @return: list of items in encoded in line
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	263 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	264 items = []
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	265 for item in line.split('\t'):
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	266 item = item.strip()
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	267 if not item:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	268 continue
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	269 items.append(item)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	270 return items
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	271
1940 d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	272 def encodeDict(items):
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	273 """ Encode dict of items in user data file
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	274
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	275 Items are separated by '\t' characters.
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	276 Each item is key:value.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	277
1940 d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	278 @param items: dict of unicode:unicode
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	279 @rtype: unicode
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	280 @return: dict encoded as unicode
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	281 """
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	282 line = []
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	283 for key, value in items.items():
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	284 item = u'%s:%s' % (key, value)
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	285 line.append(item)
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	286 line = '\t'.join(line)
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	287 return line
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	288
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	289 def decodeDict(line):
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	290 """ Decode dict of key:value pairs from user data file
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	291
1940 d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	292 @param line: line containing a dict, encoded with encodeDict
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	293 @rtype: dict
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	294 @return: dict unicode:unicode items
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	295 """
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	296 items = {}
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	297 for item in line.split('\t'):
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	298 item = item.strip()
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	299 if not item:
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	300 continue
1940 d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	301 key, value = item.split(':', 1)
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	302 items[key] = value
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	303 return items
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	304
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	305
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	306 class User:
1963 de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	307 """ A MoinMoin User """
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	308
265 2cbc7dc436d7 auth changes: added u.auth_method, u.auth_attribs and some debug code. Support for switching off some form fields. Thomas Waldmann <tw@waldmann-edv.de> parents: 244 diff changeset	309 def __init__(self, request, id=None, name="", password=None, auth_username="", **kw):
244 42f749b0d8bb fix empty username when using auth_username for autocreation Thomas Waldmann <tw@waldmann-edv.de> parents: 238 diff changeset	310 """ Initialize User object
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	311
1986 3475126f78c6 fix some builtin names used as attribute names Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1963 diff changeset	312 TODO: when this gets refactored, use "uid" not builtin "id"
3475126f78c6 fix some builtin names used as attribute names Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1963 diff changeset	313
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	314 @param request: the request object
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	315 @param id: (optional) user ID
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	316 @param name: (optional) user name
1606 ae56d79ae076 http auth / ssl clientcert auth: correctly decode name/password/email to unicode (ported from 1.5) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1597 diff changeset	317 @param password: (optional) user password (unicode)
265 2cbc7dc436d7 auth changes: added u.auth_method, u.auth_attribs and some debug code. Support for switching off some form fields. Thomas Waldmann <tw@waldmann-edv.de> parents: 244 diff changeset	318 @param auth_username: (optional) already authenticated user name
1606 ae56d79ae076 http auth / ssl clientcert auth: correctly decode name/password/email to unicode (ported from 1.5) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1597 diff changeset	319 (e.g. when using http basic auth) (unicode)
265 2cbc7dc436d7 auth changes: added u.auth_method, u.auth_attribs and some debug code. Support for switching off some form fields. Thomas Waldmann <tw@waldmann-edv.de> parents: 244 diff changeset	320 @keyword auth_method: method that was used for authentication,
2cbc7dc436d7 auth changes: added u.auth_method, u.auth_attribs and some debug code. Support for switching off some form fields. Thomas Waldmann <tw@waldmann-edv.de> parents: 244 diff changeset	321 default: 'internal'
2cbc7dc436d7 auth changes: added u.auth_method, u.auth_attribs and some debug code. Support for switching off some form fields. Thomas Waldmann <tw@waldmann-edv.de> parents: 244 diff changeset	322 @keyword auth_attribs: tuple of user object attribute names that are
2cbc7dc436d7 auth changes: added u.auth_method, u.auth_attribs and some debug code. Support for switching off some form fields. Thomas Waldmann <tw@waldmann-edv.de> parents: 244 diff changeset	323 determined by auth method and should not be
3333 928a45b60bb3 remove remaining mentions of "UserPreferences", add to CHANGES Johannes Berg <johannes AT sipsolutions DOT net> parents: 3175 diff changeset	324 changeable by preferences, default: ().
265 2cbc7dc436d7 auth changes: added u.auth_method, u.auth_attribs and some debug code. Support for switching off some form fields. Thomas Waldmann <tw@waldmann-edv.de> parents: 244 diff changeset	325 First tuple element was used for authentication.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	326 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	327 self._cfg = request.cfg
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	328 self.valid = 0
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	329 self.id = id
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	330 self.auth_username = auth_username
265 2cbc7dc436d7 auth changes: added u.auth_method, u.auth_attribs and some debug code. Support for switching off some form fields. Thomas Waldmann <tw@waldmann-edv.de> parents: 244 diff changeset	331 self.auth_method = kw.get('auth_method', 'internal')
2cbc7dc436d7 auth changes: added u.auth_method, u.auth_attribs and some debug code. Support for switching off some form fields. Thomas Waldmann <tw@waldmann-edv.de> parents: 244 diff changeset	332 self.auth_attribs = kw.get('auth_attribs', ())
1940 d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	333 self.bookmarks = {} # interwikiname: bookmark
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	334
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	335 # create some vars automatically
737 87cf4c0aac44 hopefully fixes the css_url backtrace for new users when admin removed css_url form field Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 733 diff changeset	336 self.__dict__.update(self._cfg.user_form_defaults)
87cf4c0aac44 hopefully fixes the css_url backtrace for new users when admin removed css_url form field Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 733 diff changeset	337
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	338 if name:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	339 self.name = name
4041 4a994a297ba3 replace cfg.user_autocreate setting by autocreate=<boolean> parameter of auth objects Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3845 diff changeset	340 elif auth_username: # this is needed for user autocreate
244 42f749b0d8bb fix empty username when using auth_username for autocreation Thomas Waldmann <tw@waldmann-edv.de> parents: 238 diff changeset	341 self.name = auth_username
266 1fb19804a4b9 removed some debug code Thomas Waldmann <tw@waldmann-edv.de> parents: 265 diff changeset	342
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	343 # create checkbox fields (with default 0)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	344 for key, label in self._cfg.user_checkbox_fields:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	345 setattr(self, key, self._cfg.user_checkbox_defaults.get(key, 0))
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	346
3567 ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	347 self.recoverpass_key = ""
3564 474f6ad01900 recoverpass: email password reset token rather than sha1 Johannes Berg <johannes AT sipsolutions DOT net> parents: 3333 diff changeset	348
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	349 if password:
3821 3433428abe41 user: work around bad semantics in user class constructor Johannes Berg <johannes AT sipsolutions DOT net> parents: 3819 diff changeset	350 self.enc_password = encodePassword(password)
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	351
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	352 #self.edit_cols = 80
8 da9701a3facb more cleanup Thomas Waldmann <tw@waldmann-edv.de> parents: 0 diff changeset	353 self.tz_offset = int(float(self._cfg.tz_offset) * 3600)
da9701a3facb more cleanup Thomas Waldmann <tw@waldmann-edv.de> parents: 0 diff changeset	354 self.language = ""
3032 c242772754c5 stats macro which shows the preferred language distribution of the wiki users (Thanks to Nina Kuisma) (ported from 1.6) Reimar Bauer <rb.proj AT googlemail DOT com> parents: 2726 diff changeset	355 self.real_language = "" # In case user uses "Browser setting". For language-statistics
3842 f40bd4c68aa2 MoinMoin.user: fix MoinMoinBugs/DuplicateNewUserNotification Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	356 self._stored = False
8 da9701a3facb more cleanup Thomas Waldmann <tw@waldmann-edv.de> parents: 0 diff changeset	357 self.date_fmt = ""
da9701a3facb more cleanup Thomas Waldmann <tw@waldmann-edv.de> parents: 0 diff changeset	358 self.datetime_fmt = ""
1689 7b80735ede14 quicklinks_default and subscribed_pages_default to preload the lists in the user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1638 diff changeset	359 self.quicklinks = self._cfg.quicklinks_default
7b80735ede14 quicklinks_default and subscribed_pages_default to preload the lists in the user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1638 diff changeset	360 self.subscribed_pages = self._cfg.subscribed_pages_default
2429 0cd1152b8da5 default to email notification of all events to ease migration from old scheme Johannes Berg <johannes AT sipsolutions DOT net> parents: 2426 diff changeset	361 self.email_subscribed_events = self._cfg.email_subscribed_events_default
0cd1152b8da5 default to email notification of all events to ease migration from old scheme Johannes Berg <johannes AT sipsolutions DOT net> parents: 2426 diff changeset	362 self.jabber_subscribed_events = self._cfg.jabber_subscribed_events_default
8 da9701a3facb more cleanup Thomas Waldmann <tw@waldmann-edv.de> parents: 0 diff changeset	363 self.theme_name = self._cfg.theme_default
da9701a3facb more cleanup Thomas Waldmann <tw@waldmann-edv.de> parents: 0 diff changeset	364 self.editor_default = self._cfg.editor_default
da9701a3facb more cleanup Thomas Waldmann <tw@waldmann-edv.de> parents: 0 diff changeset	365 self.editor_ui = self._cfg.editor_ui
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	366 self.last_saved = str(time.time())
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	367
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	368 # attrs not saved to profile
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	369 self._request = request
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	370
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	371 # we got an already authenticated username:
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	372 check_password = None
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	373 if not self.id and self.auth_username:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	374 self.id = getUserId(request, self.auth_username)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	375 if not password is None:
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	376 check_password = password
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	377 if self.id:
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	378 self.load_from_id(check_password)
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	379 elif self.name:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	380 self.id = getUserId(self._request, self.name)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	381 if self.id:
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	382 # no password given should fail
8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	383 self.load_from_id(password or u'')
3819 b3b04ffbecd8 user: fix password validation Johannes Berg <johannes AT sipsolutions DOT net> parents: 3818 diff changeset	384 # Still no ID - make new user
b3b04ffbecd8 user: fix password validation Johannes Berg <johannes AT sipsolutions DOT net> parents: 3818 diff changeset	385 if not self.id:
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	386 self.id = self.make_id()
3819 b3b04ffbecd8 user: fix password validation Johannes Berg <johannes AT sipsolutions DOT net> parents: 3818 diff changeset	387 if password is not None:
b3b04ffbecd8 user: fix password validation Johannes Berg <johannes AT sipsolutions DOT net> parents: 3818 diff changeset	388 self.enc_password = encodePassword(password)
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	389
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	390 # "may" so we can say "if user.may.read(pagename):"
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	391 if self._cfg.SecurityPolicy:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	392 self.may = self._cfg.SecurityPolicy(self)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	393 else:
1535 6a7dd84b091f Fixed evil relative import. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 1430 diff changeset	394 from MoinMoin.security import Default
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	395 self.may = Default(self)
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	396
689 ff56d9861a71 yet another i18n fix Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 688 diff changeset	397 if self.language and not self.language in i18n.wikiLanguages():
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	398 self.language = 'en'
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	399
339 083c2d82a173 add User.__repr__ Thomas Waldmann <tw@waldmann-edv.de> parents: 266 diff changeset	400 def __repr__(self):
1075 2ecd1e6c084d Fixed security issues in MoinMoin.user (do not reveal the ID), added variable hiding to cgitb. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 1005 diff changeset	401 return "<%s.%s at 0x%x name:%r valid:%r>" % (
339 083c2d82a173 add User.__repr__ Thomas Waldmann <tw@waldmann-edv.de> parents: 266 diff changeset	402 self.__class__.__module__, self.__class__.__name__,
1075 2ecd1e6c084d Fixed security issues in MoinMoin.user (do not reveal the ID), added variable hiding to cgitb. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 1005 diff changeset	403 id(self), self.name, self.valid)
339 083c2d82a173 add User.__repr__ Thomas Waldmann <tw@waldmann-edv.de> parents: 266 diff changeset	404
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	405 def make_id(self):
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	406 """ make a new unique user id """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	407 #!!! this should probably be a hash of REMOTE_ADDR, HTTP_USER_AGENT
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	408 # and some other things identifying remote users, then we could also
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	409 # use it reliably in edit locking
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	410 from random import randint
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	411 return "%s.%d" % (str(time.time()), randint(0, 65535))
238 b80624429934 added cfg.user_autocreate, for now for auth.http and auth.ssl_clientcert Thomas Waldmann <tw@waldmann-edv.de> parents: 232 diff changeset	412
b80624429934 added cfg.user_autocreate, for now for auth.http and auth.ssl_clientcert Thomas Waldmann <tw@waldmann-edv.de> parents: 232 diff changeset	413 def create_or_update(self, changed=False):
b80624429934 added cfg.user_autocreate, for now for auth.http and auth.ssl_clientcert Thomas Waldmann <tw@waldmann-edv.de> parents: 232 diff changeset	414 """ Create or update a user profile
b80624429934 added cfg.user_autocreate, for now for auth.http and auth.ssl_clientcert Thomas Waldmann <tw@waldmann-edv.de> parents: 232 diff changeset	415
b80624429934 added cfg.user_autocreate, for now for auth.http and auth.ssl_clientcert Thomas Waldmann <tw@waldmann-edv.de> parents: 232 diff changeset	416 @param changed: bool, set this to True if you updated the user profile values
b80624429934 added cfg.user_autocreate, for now for auth.http and auth.ssl_clientcert Thomas Waldmann <tw@waldmann-edv.de> parents: 232 diff changeset	417 """
4041 4a994a297ba3 replace cfg.user_autocreate setting by autocreate=<boolean> parameter of auth objects Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3845 diff changeset	418 if not self.valid and not self.disabled or changed: # do we need to save/update?
4a994a297ba3 replace cfg.user_autocreate setting by autocreate=<boolean> parameter of auth objects Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3845 diff changeset	419 self.save() # yes, create/update user profile
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	420
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	421 def __filename(self):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	422 """ Get filename of the user's file on disk
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	423
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	424 @rtype: string
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	425 @return: full path and filename of user account file
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	426 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	427 return os.path.join(self._cfg.user_dir, self.id or "...NONE...")
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	428
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	429 def exists(self):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	430 """ Do we have a user account for this user?
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	431
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	432 @rtype: bool
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	433 @return: true, if we have a user account
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	434 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	435 return os.path.exists(self.__filename())
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	436
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	437 def load_from_id(self, password=None):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	438 """ Load user account data from disk.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	439
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	440 Can only load user data if the id number is already known.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	441
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	442 This loads all member variables, except "id" and "valid" and
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	443 those starting with an underscore.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	444
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	445 @param password: If not None, then the given password must match the
8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	446 password in the user account file.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	447 """
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	448 if not self.exists():
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	449 return
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	450
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	451 data = codecs.open(self.__filename(), "r", config.charset).readlines()
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	452 user_data = {'enc_password': ''}
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	453 for line in data:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	454 if line[0] == '#':
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	455 continue
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	456
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	457 try:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	458 key, val = line.strip().split('=', 1)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	459 if key not in self._cfg.user_transient_fields and key[0] != '_':
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	460 # Decode list values
1923 eefebea247a0 user profiles: store lists with key[]=val1\tval2... (thanks to Johannes Berg) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1920 diff changeset	461 if key.endswith('[]'):
eefebea247a0 user profiles: store lists with key[]=val1\tval2... (thanks to Johannes Berg) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1920 diff changeset	462 key = key[:-2]
eefebea247a0 user profiles: store lists with key[]=val1\tval2... (thanks to Johannes Berg) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1920 diff changeset	463 val = decodeList(val)
1940 d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	464 # Decode dict values
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	465 elif key.endswith('{}'):
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	466 key = key[:-2]
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	467 val = decodeDict(val)
1923 eefebea247a0 user profiles: store lists with key[]=val1\tval2... (thanks to Johannes Berg) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1920 diff changeset	468 # for compatibility reading old files, keep these explicit
eefebea247a0 user profiles: store lists with key[]=val1\tval2... (thanks to Johannes Berg) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1920 diff changeset	469 # we will store them with [] appended
2152 cf4c4a3d6085 Add a list of selectable events user wants to be notified about. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2092 diff changeset	470 elif key in ['quicklinks', 'subscribed_pages', 'subscribed_events']:
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	471 val = decodeList(val)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	472 user_data[key] = val
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	473 except ValueError:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	474 pass
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	475
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	476 # Validate data from user file. In case we need to change some
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	477 # values, we set 'changed' flag, and later save the user data.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	478 changed = 0
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	479
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	480 if password is not None:
8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	481 # Check for a valid password, possibly changing storage
3819 b3b04ffbecd8 user: fix password validation Johannes Berg <johannes AT sipsolutions DOT net> parents: 3818 diff changeset	482 valid, changed = self._validatePassword(user_data, password)
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	483 if not valid:
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	484 return
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	485
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	486 # Remove ignored checkbox values from user data
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	487 for key, label in self._cfg.user_checkbox_fields:
1868 64507f46beb2 reduce usage of has_key() Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1832 diff changeset	488 if key in user_data and key in self._cfg.user_checkbox_disable:
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	489 del user_data[key]
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	490
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	491 # Copy user data into user object
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	492 for key, val in user_data.items():
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	493 vars(self)[key] = val
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	494
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	495 self.tz_offset = int(self.tz_offset)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	496
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	497 # Remove old unsupported attributes from user data file.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	498 remove_attributes = ['passwd', 'show_emoticons']
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	499 for attr in remove_attributes:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	500 if hasattr(self, attr):
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	501 delattr(self, attr)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	502 changed = 1
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	503
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	504 # make sure checkboxes are boolean
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	505 for key, label in self._cfg.user_checkbox_fields:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	506 try:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	507 setattr(self, key, int(getattr(self, key)))
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	508 except ValueError:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	509 setattr(self, key, 0)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	510
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	511 # convert (old) hourly format to seconds
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	512 if -24 <= self.tz_offset and self.tz_offset <= 24:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	513 self.tz_offset = self.tz_offset * 3600
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	514
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	515 if not self.disabled:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	516 self.valid = 1
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	517
3842 f40bd4c68aa2 MoinMoin.user: fix MoinMoinBugs/DuplicateNewUserNotification Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	518 # Mark this user as stored so saves don't send
f40bd4c68aa2 MoinMoin.user: fix MoinMoinBugs/DuplicateNewUserNotification Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	519 # the "user created" event
f40bd4c68aa2 MoinMoin.user: fix MoinMoinBugs/DuplicateNewUserNotification Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	520 self._stored = True
2493 f3e3ffa68a7f Send UserCreatedEvent from user.save(), not the newaccount action. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2429 diff changeset	521
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	522 # If user data has been changed, save fixed user data.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	523 if changed:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	524 self.save()
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	525
3819 b3b04ffbecd8 user: fix password validation Johannes Berg <johannes AT sipsolutions DOT net> parents: 3818 diff changeset	526 def _validatePassword(self, data, password):
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	527 """
8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	528 Check user password.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	529
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	530 This is a private method and should not be used by clients.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	531
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	532 @param data: dict with user data (from storage)
5239 90fae67c4cda Fix SHA -> SSHA password hash upgrade for old user profiles (more details below). Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4491 diff changeset	533 @param password: password to verify [unicode]
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	534 @rtype: 2 tuple (bool, bool)
8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	535 @return: password is valid, enc_password changed
8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	536 """
8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	537 epwd = data['enc_password']
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	538
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	539 # If we have no password set, we don't accept login with username
8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	540 if not epwd:
8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	541 return False, False
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	542
3819 b3b04ffbecd8 user: fix password validation Johannes Berg <johannes AT sipsolutions DOT net> parents: 3818 diff changeset	543 # require non empty password
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	544 if not password:
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	545 return False, False
e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	546
5720 69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	547 # Check and upgrade passwords from earlier MoinMoin versions and
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	548 # passwords imported from other wiki systems.
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	549 for method in ['{SHA}', '{APR1}', '{MD5}', '{DES}']:
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	550 if epwd.startswith(method):
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	551 d = epwd[len(method):]
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	552 if method == '{SHA}':
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	553 enc = base64.encodestring(
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	554 hash_new('sha1', password.encode('utf-8')).digest()).rstrip()
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	555 elif method == '{APR1}':
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	556 # d is of the form "$apr1$<salt>$<hash>"
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	557 salt = d.split('$')[2]
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	558 enc = md5crypt.apache_md5_crypt(password.encode('utf-8'),
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	559 salt.encode('ascii'))
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	560 elif method == '{MD5}':
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	561 # d is of the form "$1$<salt>$<hash>"
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	562 salt = d.split('$')[2]
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	563 enc = md5crypt.unix_md5_crypt(password.encode('utf-8'),
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	564 salt.encode('ascii'))
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	565 elif method == '{DES}':
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	566 if crypt is None:
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	567 return False, False
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	568 # d is 2 characters salt + 11 characters hash
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	569 salt = d[:2]
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	570 enc = crypt.crypt(password.encode('utf-8'), salt.encode('ascii'))
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	571
5902 840ebd16ddd9 use a constant time str comparison function to prevent timing attacks Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5772 diff changeset	572 if safe_str_equal(epwd, method + enc):
5720 69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	573 data['enc_password'] = encodePassword(password) # upgrade to SSHA
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	574 return True, True
69668ad0cae7 add support for other password hashes (thanks to Michael Foetsch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5613 diff changeset	575 return False, False
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	576
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	577 if epwd[:6] == '{SSHA}':
4107 a1858613ea4f user.py: replaced base64.b64decode by a python2.3 compatible call Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4041 diff changeset	578 data = base64.decodestring(epwd[6:])
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	579 salt = data[20:]
5239 90fae67c4cda Fix SHA -> SSHA password hash upgrade for old user profiles (more details below). Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4491 diff changeset	580 hash = hash_new('sha1', password.encode('utf-8'))
3808 8c5fbc62dd1d user storage: hash stored passwords, upgrade on use, remove charset magic Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	581 hash.update(salt)
5902 840ebd16ddd9 use a constant time str comparison function to prevent timing attacks Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5772 diff changeset	582 return safe_str_equal(hash.digest(), data[:20]), False
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	583
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	584 # No encoded password match, this must be wrong password
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	585 return False, False
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	586
1951 a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	587 def persistent_items(self):
a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	588 """ items we want to store into the user profile """
a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	589 return [(key, value) for key, value in vars(self).items()
a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	590 if key not in self._cfg.user_transient_fields and key[0] != '_']
a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	591
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	592 def save(self):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	593 """ Save user account data to user account file on disk.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	594
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	595 This saves all member variables, except "id" and "valid" and
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	596 those starting with an underscore.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	597 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	598 if not self.id:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	599 return
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	600
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	601 user_dir = self._cfg.user_dir
1430 fd7166892bd3 check for non-existing dir before calling os.makedirs Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1428 diff changeset	602 if not os.path.exists(user_dir):
fd7166892bd3 check for non-existing dir before calling os.makedirs Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1428 diff changeset	603 os.makedirs(user_dir)
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	604
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	605 self.last_saved = str(time.time())
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	606
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	607 # !!! should write to a temp file here to avoid race conditions,
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	608 # or even better, use locking
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	609
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	610 data = codecs.open(self.__filename(), "w", config.charset)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	611 data.write("# Data saved '%s' for id '%s'\n" % (
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	612 time.strftime(self._cfg.datetime_fmt, time.localtime(time.time())),
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	613 self.id))
1951 a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	614 attrs = self.persistent_items()
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	615 attrs.sort()
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	616 for key, value in attrs:
1951 a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	617 # Encode list values
a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	618 if isinstance(value, list):
a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	619 key += '[]'
a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	620 value = encodeList(value)
a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	621 # Encode dict values
a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	622 elif isinstance(value, dict):
a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	623 key += '{}'
a05a3b447db5 interwiki auth fixed, added getUserData xmlrpc method Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1940 diff changeset	624 value = encodeDict(value)
5530 970d94ea19f2 user profile saving, eliminate lineseps in keys/values Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4480 diff changeset	625 line = u"%s=%s" % (key, unicode(value))
970d94ea19f2 user profile saving, eliminate lineseps in keys/values Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4480 diff changeset	626 line = line.replace('\n', ' ').replace('\r', ' ') # no lineseps
970d94ea19f2 user profile saving, eliminate lineseps in keys/values Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4480 diff changeset	627 data.write(line + '\n')
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	628 data.close()
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	629
3103 4ede355c6089 bugfix for renaming of users (/MoinMoinBugs/RenamingUserAllowsOldUsernameToLogin) (ported from 1.6) Reimar Bauer <rb.proj AT googlemail DOT com> parents: 3101 diff changeset	630 arena = 'user'
4ede355c6089 bugfix for renaming of users (/MoinMoinBugs/RenamingUserAllowsOldUsernameToLogin) (ported from 1.6) Reimar Bauer <rb.proj AT googlemail DOT com> parents: 3101 diff changeset	631 key = 'name2id'
3175 2a3a6cb34e45 pylint findings: fix some harmless stuff Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3172 diff changeset	632 caching.CacheEntry(self._request, arena, key, scope='wiki').remove()
3103 4ede355c6089 bugfix for renaming of users (/MoinMoinBugs/RenamingUserAllowsOldUsernameToLogin) (ported from 1.6) Reimar Bauer <rb.proj AT googlemail DOT com> parents: 3101 diff changeset	633 try:
4ede355c6089 bugfix for renaming of users (/MoinMoinBugs/RenamingUserAllowsOldUsernameToLogin) (ported from 1.6) Reimar Bauer <rb.proj AT googlemail DOT com> parents: 3101 diff changeset	634 del self._request.cfg.cache.name2id
4ede355c6089 bugfix for renaming of users (/MoinMoinBugs/RenamingUserAllowsOldUsernameToLogin) (ported from 1.6) Reimar Bauer <rb.proj AT googlemail DOT com> parents: 3101 diff changeset	635 except:
4ede355c6089 bugfix for renaming of users (/MoinMoinBugs/RenamingUserAllowsOldUsernameToLogin) (ported from 1.6) Reimar Bauer <rb.proj AT googlemail DOT com> parents: 3101 diff changeset	636 pass
3707 cfbb31fbd6b7 clear openid cache when saving a user... Johannes Berg <johannes AT sipsolutions DOT net> parents: 3673 diff changeset	637 key = 'openid2id'
cfbb31fbd6b7 clear openid cache when saving a user... Johannes Berg <johannes AT sipsolutions DOT net> parents: 3673 diff changeset	638 caching.CacheEntry(self._request, arena, key, scope='wiki').remove()
cfbb31fbd6b7 clear openid cache when saving a user... Johannes Berg <johannes AT sipsolutions DOT net> parents: 3673 diff changeset	639 try:
cfbb31fbd6b7 clear openid cache when saving a user... Johannes Berg <johannes AT sipsolutions DOT net> parents: 3673 diff changeset	640 del self._request.cfg.cache.openid2id
cfbb31fbd6b7 clear openid cache when saving a user... Johannes Berg <johannes AT sipsolutions DOT net> parents: 3673 diff changeset	641 except:
cfbb31fbd6b7 clear openid cache when saving a user... Johannes Berg <johannes AT sipsolutions DOT net> parents: 3673 diff changeset	642 pass
3120 a7c1680aeaa0 PEP8 fixes, mostly whitespace Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3103 diff changeset	643
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	644 if not self.disabled:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	645 self.valid = 1
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	646
3842 f40bd4c68aa2 MoinMoin.user: fix MoinMoinBugs/DuplicateNewUserNotification Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	647 if not self._stored:
f40bd4c68aa2 MoinMoin.user: fix MoinMoinBugs/DuplicateNewUserNotification Johannes Berg <johannes AT sipsolutions DOT net> parents: 3707 diff changeset	648 self._stored = True
2493 f3e3ffa68a7f Send UserCreatedEvent from user.save(), not the newaccount action. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2429 diff changeset	649 event = events.UserCreatedEvent(self._request, self)
f3e3ffa68a7f Send UserCreatedEvent from user.save(), not the newaccount action. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2429 diff changeset	650 events.send_event(event)
f3e3ffa68a7f Send UserCreatedEvent from user.save(), not the newaccount action. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2429 diff changeset	651
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	652 # -----------------------------------------------------------------
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	653 # Time and date formatting
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	654
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	655 def getTime(self, tm):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	656 """ Get time in user's timezone.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	657
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	658 @param tm: time (UTC UNIX timestamp)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	659 @rtype: int
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	660 @return: tm tuple adjusted for user's timezone
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	661 """
476 4be11eec9c4f MoinMoin.util.datetime -> timefuncs to avoid conflict/confusion with stdlib datetime, also moved util.W3CDate there Thomas Waldmann <tw@waldmann-edv.de> parents: 449 diff changeset	662 return timefuncs.tmtuple(tm + self.tz_offset)
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	663
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	664
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	665 def getFormattedDate(self, tm):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	666 """ Get formatted date adjusted for user's timezone.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	667
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	668 @param tm: time (UTC UNIX timestamp)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	669 @rtype: string
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	670 @return: formatted date, see cfg.date_fmt
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	671 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	672 date_fmt = self.date_fmt or self._cfg.date_fmt
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	673 return time.strftime(date_fmt, self.getTime(tm))
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	674
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	675
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	676 def getFormattedDateTime(self, tm):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	677 """ Get formatted date and time adjusted for user's timezone.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	678
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	679 @param tm: time (UTC UNIX timestamp)
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	680 @rtype: string
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	681 @return: formatted date and time, see cfg.datetime_fmt
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	682 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	683 datetime_fmt = self.datetime_fmt or self._cfg.datetime_fmt
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	684 return time.strftime(datetime_fmt, self.getTime(tm))
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	685
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	686 # -----------------------------------------------------------------
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	687 # Bookmark
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	688
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	689 def setBookmark(self, tm):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	690 """ Set bookmark timestamp.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	691
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	692 @param tm: timestamp
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	693 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	694 if self.valid:
4480 af8cea9bfcda made cfg.interwikiname a unicode object (str only worked for ascii) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3842 diff changeset	695 interwikiname = self._cfg.interwikiname or u''
1940 d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	696 bookmark = unicode(tm)
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	697 self.bookmarks[interwikiname] = bookmark
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	698 self.save()
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	699
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	700 def getBookmark(self):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	701 """ Get bookmark timestamp.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	702
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	703 @rtype: int
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	704 @return: bookmark timestamp or None
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	705 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	706 bm = None
4480 af8cea9bfcda made cfg.interwikiname a unicode object (str only worked for ascii) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3842 diff changeset	707 interwikiname = self._cfg.interwikiname or u''
1940 d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	708 if self.valid:
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	709 try:
1940 d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	710 bm = int(self.bookmarks[interwikiname])
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	711 except (ValueError, KeyError):
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	712 pass
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	713 return bm
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	714
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	715 def delBookmark(self):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	716 """ Removes bookmark timestamp.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	717
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	718 @rtype: int
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	719 @return: 0 on success, 1 on failure
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	720 """
4480 af8cea9bfcda made cfg.interwikiname a unicode object (str only worked for ascii) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3842 diff changeset	721 interwikiname = self._cfg.interwikiname or u''
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	722 if self.valid:
1940 d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	723 try:
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	724 del self.bookmarks[interwikiname]
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	725 except KeyError:
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	726 return 1
d7296d36e6f0 enable user storage code to save simple dicts to user profile, use that to save RC bookmarks into user profile Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1935 diff changeset	727 self.save()
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	728 return 0
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	729 return 1
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	730
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	731 # -----------------------------------------------------------------
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	732 # Subscribe
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	733
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	734 def getSubscriptionList(self):
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	735 """ Get list of pages this user has subscribed to
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	736
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	737 @rtype: list
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	738 @return: pages this user has subscribed to
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	739 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	740 return self.subscribed_pages
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	741
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	742 def isSubscribedTo(self, pagelist):
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	743 """ Check if user subscription matches any page in pagelist.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	744
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	745 The subscription list may contain page names or interwiki page
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	746 names. e.g 'Page Name' or 'WikiName:Page_Name'
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	747
2165 eed1c7da25eb test_user: fix wrong subscription tests and a few other problems Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2152 diff changeset	748 TODO: check if it's fast enough when getting called for many
eed1c7da25eb test_user: fix wrong subscription tests and a few other problems Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2152 diff changeset	749 users from page.getSubscribersList()
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	750
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	751 @param pagelist: list of pages to check for subscription
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	752 @rtype: bool
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	753 @return: if user is subscribed any page in pagelist
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	754 """
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	755 if not self.valid:
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	756 return False
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	757
e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	758 import re
94 7f531b511f2e fix isSubscribedTo when calling multiple times, for example from page.getSubscribersList() Nir Soffer <nirs@freeshell.org> parents: 90 diff changeset	759 # Create a new list with both names and interwiki names.
7f531b511f2e fix isSubscribedTo when calling multiple times, for example from page.getSubscribersList() Nir Soffer <nirs@freeshell.org> parents: 90 diff changeset	760 pages = pagelist[:]
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	761 if self._cfg.interwikiname:
94 7f531b511f2e fix isSubscribedTo when calling multiple times, for example from page.getSubscribersList() Nir Soffer <nirs@freeshell.org> parents: 90 diff changeset	762 pages += [self._interWikiName(pagename) for pagename in pagelist]
7f531b511f2e fix isSubscribedTo when calling multiple times, for example from page.getSubscribersList() Nir Soffer <nirs@freeshell.org> parents: 90 diff changeset	763 # Create text for regular expression search
7f531b511f2e fix isSubscribedTo when calling multiple times, for example from page.getSubscribersList() Nir Soffer <nirs@freeshell.org> parents: 90 diff changeset	764 text = '\n'.join(pages)
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	765
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	766 for pattern in self.getSubscriptionList():
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	767 # Try simple match first
94 7f531b511f2e fix isSubscribedTo when calling multiple times, for example from page.getSubscribersList() Nir Soffer <nirs@freeshell.org> parents: 90 diff changeset	768 if pattern in pages:
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	769 return True
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	770 # Try regular expression search, skipping bad patterns
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	771 try:
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	772 pattern = re.compile(r'^%s$' % pattern, re.M)
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	773 except re.error:
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	774 continue
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	775 if pattern.search(text):
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	776 return True
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	777
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	778 return False
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	779
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	780 def subscribe(self, pagename):
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	781 """ Subscribe to a wiki page.
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	782
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	783 To enable shared farm users, if the wiki has an interwiki name,
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	784 page names are saved as interwiki names.
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	785
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	786 @param pagename: name of the page to subscribe
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	787 @type pagename: unicode
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	788 @rtype: bool
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	789 @return: if page was subscribed
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	790 """
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	791 if self._cfg.interwikiname:
121 e61a09408702 fix name error in user.subscribe Nir Soffer <nirs@freeshell.org> parents: 94 diff changeset	792 pagename = self._interWikiName(pagename)
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	793
121 e61a09408702 fix name error in user.subscribe Nir Soffer <nirs@freeshell.org> parents: 94 diff changeset	794 if pagename not in self.subscribed_pages:
e61a09408702 fix name error in user.subscribe Nir Soffer <nirs@freeshell.org> parents: 94 diff changeset	795 self.subscribed_pages.append(pagename)
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	796 self.save()
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	797
2065 23d90aae61b5 Send events when an user subscribes to a page and when page gets reverted. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2035 diff changeset	798 # Send a notification
23d90aae61b5 Send events when an user subscribes to a page and when page gets reverted. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2035 diff changeset	799 from MoinMoin.events import SubscribedToPageEvent, send_event
23d90aae61b5 Send events when an user subscribes to a page and when page gets reverted. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2035 diff changeset	800 e = SubscribedToPageEvent(self._request, pagename, self.name)
23d90aae61b5 Send events when an user subscribes to a page and when page gets reverted. Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl> parents: 2035 diff changeset	801 send_event(e)
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	802 return True
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	803
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	804 return False
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	805
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	806 def unsubscribe(self, pagename):
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	807 """ Unsubscribe a wiki page.
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	808
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	809 Try to unsubscribe by removing non-interwiki name (leftover
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	810 from old use files) and interwiki name from the subscription
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	811 list.
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	812
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	813 Its possible that the user will be subscribed to a page by more
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	814 then one pattern. It can be both pagename and interwiki name,
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	815 or few patterns that all of them match the page. Therefore, we
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	816 must check if the user is still subscribed to the page after we
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	817 try to remove names from the list.
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	818
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	819 @param pagename: name of the page to subscribe
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	820 @type pagename: unicode
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	821 @rtype: bool
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	822 @return: if unsubscrieb was successful. If the user has a
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	823 regular expression that match, it will always fail.
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	824 """
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	825 changed = False
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	826 if pagename in self.subscribed_pages:
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	827 self.subscribed_pages.remove(pagename)
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	828 changed = True
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	829
e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	830 interWikiName = self._interWikiName(pagename)
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	831 if interWikiName and interWikiName in self.subscribed_pages:
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	832 self.subscribed_pages.remove(interWikiName)
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	833 changed = True
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	834
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	835 if changed:
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	836 self.save()
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	837 return not self.isSubscribedTo([pagename])
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	838
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	839 # -----------------------------------------------------------------
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	840 # Quicklinks
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	841
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	842 def getQuickLinks(self):
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	843 """ Get list of pages this user wants in the navibar
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	844
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	845 @rtype: list
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	846 @return: quicklinks from user account
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	847 """
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	848 return self.quicklinks
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	849
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	850 def isQuickLinkedTo(self, pagelist):
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	851 """ Check if user quicklink matches any page in pagelist.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	852
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	853 @param pagelist: list of pages to check for quicklinks
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	854 @rtype: bool
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	855 @return: if user has quicklinked any page in pagelist
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	856 """
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	857 if not self.valid:
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	858 return False
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	859
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	860 for pagename in pagelist:
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	861 if pagename in self.quicklinks:
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	862 return True
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	863 interWikiName = self._interWikiName(pagename)
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	864 if interWikiName and interWikiName in self.quicklinks:
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	865 return True
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	866
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	867 return False
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	868
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	869 def addQuicklink(self, pagename):
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	870 """ Adds a page to the user quicklinks
01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	871
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	872 If the wiki has an interwiki name, all links are saved as
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	873 interwiki names. If not, as simple page name.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	874
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	875 @param pagename: page name
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	876 @type pagename: unicode
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	877 @rtype: bool
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	878 @return: if pagename was added
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	879 """
22 a47550d21d2d quicklinks: avoid dupes, dont render as interwiki if wiki == self Thomas Waldmann <tw@waldmann-edv.de> parents: 8 diff changeset	880 changed = False
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	881 interWikiName = self._interWikiName(pagename)
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	882 if interWikiName:
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	883 if pagename in self.quicklinks:
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	884 self.quicklinks.remove(pagename)
22 a47550d21d2d quicklinks: avoid dupes, dont render as interwiki if wiki == self Thomas Waldmann <tw@waldmann-edv.de> parents: 8 diff changeset	885 changed = True
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	886 if interWikiName not in self.quicklinks:
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	887 self.quicklinks.append(interWikiName)
22 a47550d21d2d quicklinks: avoid dupes, dont render as interwiki if wiki == self Thomas Waldmann <tw@waldmann-edv.de> parents: 8 diff changeset	888 changed = True
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	889 else:
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	890 if pagename not in self.quicklinks:
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	891 self.quicklinks.append(pagename)
22 a47550d21d2d quicklinks: avoid dupes, dont render as interwiki if wiki == self Thomas Waldmann <tw@waldmann-edv.de> parents: 8 diff changeset	892 changed = True
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	893
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	894 if changed:
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	895 self.save()
22 a47550d21d2d quicklinks: avoid dupes, dont render as interwiki if wiki == self Thomas Waldmann <tw@waldmann-edv.de> parents: 8 diff changeset	896 return changed
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	897
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	898 def removeQuicklink(self, pagename):
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	899 """ Remove a page from user quicklinks
01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	900
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	901 Remove both interwiki and simple name from quicklinks.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	902
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	903 @param pagename: page name
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	904 @type pagename: unicode
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	905 @rtype: bool
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	906 @return: if pagename was removed
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	907 """
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	908 changed = False
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	909 interWikiName = self._interWikiName(pagename)
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	910 if interWikiName and interWikiName in self.quicklinks:
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	911 self.quicklinks.remove(interWikiName)
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	912 changed = True
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	913 if pagename in self.quicklinks:
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	914 self.quicklinks.remove(pagename)
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	915 changed = True
e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	916
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	917 if changed:
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	918 self.save()
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	919 return changed
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	920
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	921 def _interWikiName(self, pagename):
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	922 """ Return the inter wiki name of a page name
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	923
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	924 @param pagename: page name
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	925 @type pagename: unicode
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	926 """
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	927 if not self._cfg.interwikiname:
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	928 return None
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	929
88 9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	930 return "%s:%s" % (self._cfg.interwikiname, pagename)
9f037347955c fixed quicklink bug when interwiki is None, create simpler addQuicklink and removeQuicklink methods, simplify isQuicklinkedTo method Nir Soffer <nirs@freeshell.org> parents: 34 diff changeset	931
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	932 # -----------------------------------------------------------------
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	933 # Trail
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	934
3101 65322abb0a33 Fix trail for anon users without a session, do not show a single page. (ported from 1.6) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3069 diff changeset	935 def _wantTrail(self):
4629 554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	936 return (not self.valid and self._request.cfg.cookie_lifetime[0] # anon sessions enabled
3101 65322abb0a33 Fix trail for anon users without a session, do not show a single page. (ported from 1.6) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3069 diff changeset	937 or self.valid and (self.show_page_trail or self.remember_last_visit)) # logged-in session
65322abb0a33 Fix trail for anon users without a session, do not show a single page. (ported from 1.6) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3069 diff changeset	938
1956 477760dd8487 speedup addTrail by passing existing page object Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1951 diff changeset	939 def addTrail(self, page):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	940 """ Add page to trail.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	941
1956 477760dd8487 speedup addTrail by passing existing page object Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1951 diff changeset	942 @param page: the page (object) to add to the trail
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	943 """
3101 65322abb0a33 Fix trail for anon users without a session, do not show a single page. (ported from 1.6) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3069 diff changeset	944 if self._wantTrail():
1956 477760dd8487 speedup addTrail by passing existing page object Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1951 diff changeset	945 pagename = page.page_name
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	946 # Add only existing pages that the user may read
3101 65322abb0a33 Fix trail for anon users without a session, do not show a single page. (ported from 1.6) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3069 diff changeset	947 if not (page.exists() and self._request.user.may.read(pagename)):
65322abb0a33 Fix trail for anon users without a session, do not show a single page. (ported from 1.6) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 3069 diff changeset	948 return
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	949
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	950 # Save interwiki links internally
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	951 if self._cfg.interwikiname:
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	952 pagename = self._interWikiName(pagename)
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	953
4629 554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	954 trail = self._request.session.get('trail', [])
5576 6b94d284ad11 avoid writing key/value to session dict if value doesn't change Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5538 diff changeset	955 trail_current = trail[:]
4629 554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	956
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	957 # Don't append tail to trail ;)
4629 554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	958 if trail and trail[-1] == pagename:
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	959 return
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	960
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	961 # Append new page, limiting the length
4629 554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	962 trail = [p for p in trail if p != pagename]
554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	963 pagename_stripped = pagename.strip()
554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	964 if pagename_stripped:
554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	965 trail.append(pagename_stripped)
5576 6b94d284ad11 avoid writing key/value to session dict if value doesn't change Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5538 diff changeset	966 trail = trail[-self._cfg.trail_size:]
6b94d284ad11 avoid writing key/value to session dict if value doesn't change Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5538 diff changeset	967 if trail != trail_current:
6b94d284ad11 avoid writing key/value to session dict if value doesn't change Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5538 diff changeset	968 # we only modify the session if we have something different:
6b94d284ad11 avoid writing key/value to session dict if value doesn't change Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5538 diff changeset	969 self._request.session['trail'] = trail
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	970
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	971 def getTrail(self):
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	972 """ Return list of recently visited pages.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	973
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	974 @rtype: list
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	975 @return: pages in trail
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	976 """
4629 554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	977 if self._wantTrail():
1935 740d9939ffe9 use session object to store page trail (even for anon users, if anon sessions are enabled) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1923 diff changeset	978 trail = self._request.session.get('trail', [])
4629 554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	979 else:
554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	980 trail = []
554e1d780e3b fixed anon session detection, optimized trail code Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4604 diff changeset	981 return trail
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	982
89 4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	983 # -----------------------------------------------------------------
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	984 # Other
4e44f6dfdfc2 user: formatting, move related methods together Nir Soffer <nirs@freeshell.org> parents: 88 diff changeset	985
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	986 def isCurrentUser(self):
1963 de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	987 """ Check if this user object is the user doing the current request """
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	988 return self._request.user.name == self.name
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	989
448 45924beef130 user.isSuperUser() check, require cfg.superuser being a list or tuple Thomas Waldmann <tw@waldmann-edv.de> parents: 416 diff changeset	990 def isSuperUser(self):
1963 de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	991 """ Check if this user is superuser """
4761 83390406fc5c Fix isSuperUser(). See below for details. Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4629 diff changeset	992 if not self.valid:
83390406fc5c Fix isSuperUser(). See below for details. Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4629 diff changeset	993 return False
1597 bbe187af4fc0 integrated MMDE (build scripts need more work) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1550 diff changeset	994 request = self._request
4761 83390406fc5c Fix isSuperUser(). See below for details. Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4629 diff changeset	995 if request.cfg.DesktopEdition and request.remote_addr == '127.0.0.1':
1597 bbe187af4fc0 integrated MMDE (build scripts need more work) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1550 diff changeset	996 # the DesktopEdition gives any local user superuser powers
bbe187af4fc0 integrated MMDE (build scripts need more work) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1550 diff changeset	997 return True
bbe187af4fc0 integrated MMDE (build scripts need more work) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1550 diff changeset	998 superusers = request.cfg.superuser
449 8ec16f62e989 Moved type check of the superuser setting. Alexander Schremmer <alex@alexanderweb.de.tla> parents: 448 diff changeset	999 assert isinstance(superusers, (list, tuple))
4761 83390406fc5c Fix isSuperUser(). See below for details. Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4629 diff changeset	1000 return self.name and self.name in superusers
448 45924beef130 user.isSuperUser() check, require cfg.superuser being a list or tuple Thomas Waldmann <tw@waldmann-edv.de> parents: 416 diff changeset	1001
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	1002 def host(self):
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	1003 """ Return user host """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	1004 _ = self._request.getText
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	1005 host = self.isCurrentUser() and self._cfg.show_hosts and self._request.remote_addr
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	1006 return host or _("<unknown>")
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	1007
1154 44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1008 def wikiHomeLink(self):
1963 de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	1009 """ Return wiki markup usable as a link to the user homepage,
1154 44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1010 it doesn't matter whether it already exists or not.
44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1011 """
44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1012 wikiname, pagename = wikiutil.getInterwikiHomePage(self._request, self.name)
44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1013 if wikiname == 'Self':
44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1014 if wikiutil.isStrictWikiname(self.name):
44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1015 markup = pagename
44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1016 else:
2726 6cb75379c073 change ["free link"] to [[free link]] in all built-in markup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2493 diff changeset	1017 markup = '[[%s]]' % pagename
1154 44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1018 else:
2726 6cb75379c073 change ["free link"] to [[free link]] in all built-in markup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2493 diff changeset	1019 markup = '[[%s:%s]]' % (wikiname, pagename)
1154 44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1020 return markup
44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1021
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	1022 def signature(self):
1154 44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1023 """ Return user signature using wiki markup
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	1024
1154 44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1025 Users sign with a link to their homepage.
44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1026 Visitors return their host address.
2286 01f05e74aa9c Big PEP8 and whitespace cleanup Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 2165 diff changeset	1027
90 246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	1028 TODO: The signature use wiki format only, for example, it will
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	1029 not create a link when using rst format. It will also break if
246601c7b298 fix unsubscribe, use always valid interwiki links, more correct error messages, refactror subscribePage, isSubscribedTo Nir Soffer <nirs@freeshell.org> parents: 89 diff changeset	1030 we change wiki syntax.
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	1031 """
1154 44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1032 if self.name:
44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1033 return self.wikiHomeLink()
44632345fbfb mailimport: use link to homepage or realname in from/to column, user.wikiHomeLink() to generate markup for user's homepage link Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1075 diff changeset	1034 else:
0 77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0 Thomas Waldmann <tw-public@gmx.de> parents: diff changeset	1035 return self.host()
1005 e1e1885deec1 whitespace-only cleanup, fix regex by using raw string Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 826 diff changeset	1036
3567 ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1037 def generate_recovery_token(self):
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1038 key = random_string(64, "abcdefghijklmnopqrstuvwxyz0123456789")
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1039 msg = str(int(time.time()))
4363 817d99d715fe remove direct usage of deprecated sha module - use hashlib, if possible Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 4107 diff changeset	1040 h = hmac_new(key, msg).hexdigest()
3567 ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1041 self.recoverpass_key = key
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1042 self.save()
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1043 return msg + '-' + h
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1044
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1045 def apply_recovery_token(self, tok, newpass):
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1046 parts = tok.split('-')
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1047 if len(parts) != 2:
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1048 return False
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1049 try:
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1050 stamp = int(parts[0])
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1051 except ValueError:
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1052 return False
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1053 # only allow it to be valid for twelve hours
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1054 if stamp + 126060 < time.time():
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1055 return False
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1056 # check hmac
4491 eb377776ca34 user.apply_recovery_token: key must be of type string Reimar Bauer <rb.proj AT googlemail DOT com> parents: 4481 diff changeset	1057 # key must be of type string
eb377776ca34 user.apply_recovery_token: key must be of type string Reimar Bauer <rb.proj AT googlemail DOT com> parents: 4481 diff changeset	1058 h = hmac_new(str(self.recoverpass_key), str(stamp)).hexdigest()
5902 840ebd16ddd9 use a constant time str comparison function to prevent timing attacks Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5772 diff changeset	1059 if not safe_str_equal(h, parts[1]):
3567 ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1060 return False
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1061 self.recoverpass_key = ""
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1062 self.enc_password = encodePassword(newpass)
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1063 self.save()
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1064 return True
ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1065
138 81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1066 def mailAccountData(self, cleartext_passwd=None):
1963 de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	1067 """ Mail a user who forgot his password a message enabling
de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	1068 him to login again.
de42f84ddb3c user: add some docstrings Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1957 diff changeset	1069 """
750 f158c4e8fea2 moved mail related functions to MoinMoin.mail Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 737 diff changeset	1070 from MoinMoin.mail import sendmail
1784 2668d470091f wikiutil.getSysPage renamed to getLocalizedPage Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 1689 diff changeset	1071 from MoinMoin.wikiutil import getLocalizedPage
138 81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1072 _ = self._request.getText
81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1073
3567 ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1074 tok = self.generate_recovery_token()
416 fb5e1ecdbc33 generate rnd password when there is none yet Thomas Waldmann <tw@waldmann-edv.de> parents: 339 diff changeset	1075
138 81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1076 text = '\n' + _("""\
81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1077 Login Name: %s
81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1078
3564 474f6ad01900 recoverpass: email password reset token rather than sha1 Johannes Berg <johannes AT sipsolutions DOT net> parents: 3333 diff changeset	1079 Password recovery token: %s
138 81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1080
5372 4a406029ad23 fix password reset url (email content needs full URL) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5242 diff changeset	1081 Password reset URL: %s?action=recoverpass&name=%s&token=%s
3123 5cb80bd604b4 refactored _() getText calls to match new api Radomir Dopieralski <moindev@sheep.art.pl> parents: 3120 diff changeset	1082 """) % (
3564 474f6ad01900 recoverpass: email password reset token rather than sha1 Johannes Berg <johannes AT sipsolutions DOT net> parents: 3333 diff changeset	1083 self.name,
3567 ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1084 tok,
5772 f3262beca6b1 include page name in password reset URL (thanks to Marwan Gedeon for the patch) Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 5720 diff changeset	1085 self._request.url, # use full url, including current page
3564 474f6ad01900 recoverpass: email password reset token rather than sha1 Johannes Berg <johannes AT sipsolutions DOT net> parents: 3333 diff changeset	1086 url_quote_plus(self.name),
3567 ddf31f2ae8e3 use hmac and make recoverpass token only valid for 12 hours Johannes Berg <johannes AT sipsolutions DOT net> parents: 3564 diff changeset	1087 tok, )
138 81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1088
81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1089 text = _("""\
3564 474f6ad01900 recoverpass: email password reset token rather than sha1 Johannes Berg <johannes AT sipsolutions DOT net> parents: 3333 diff changeset	1090 Somebody has requested to email you a password recovery token.
138 81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1091
3564 474f6ad01900 recoverpass: email password reset token rather than sha1 Johannes Berg <johannes AT sipsolutions DOT net> parents: 3333 diff changeset	1092 If you lost your password, please go to the password reset URL below or
474f6ad01900 recoverpass: email password reset token rather than sha1 Johannes Berg <johannes AT sipsolutions DOT net> parents: 3333 diff changeset	1093 go to the password recovery page again and enter your username and the
474f6ad01900 recoverpass: email password reset token rather than sha1 Johannes Berg <johannes AT sipsolutions DOT net> parents: 3333 diff changeset	1094 recovery token.
3123 5cb80bd604b4 refactored _() getText calls to match new api Radomir Dopieralski <moindev@sheep.art.pl> parents: 3120 diff changeset	1095 """) + text
138 81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1096
81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1097
81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1098 subject = _('[%(sitename)s] Your wiki account data',
3123 5cb80bd604b4 refactored _() getText calls to match new api Radomir Dopieralski <moindev@sheep.art.pl> parents: 3120 diff changeset	1099 ) % {'sitename': self._cfg.sitename or "Wiki"}
750 f158c4e8fea2 moved mail related functions to MoinMoin.mail Thomas Waldmann <tw AT waldmann-edv DOT de> parents: 737 diff changeset	1100 mailok, msg = sendmail.sendmail(self._request, [self.email], subject,
138 81654a482b3a Added createonly parameter to UserPreferences macro and userform action; moved mailAccountData to the user object; extended SystemAdmin to offer 'send acount data' links; fixed minor quoting problem in Page.link_to() Florian Festi <Florian.Festi@trick.informatik.uni-stuttgart.de> parents: 121 diff changeset	1101 text, mail_from=self._cfg.mail_from)
3069 15d744f727c9 UserPreferences 'send account data' also accepts username now (not only email addr), thanks to Joel Nackman (ported from 1.6) Reimar Bauer <rb.proj AT googlemail DOT com> parents: 3032 diff changeset	1102 return mailok, msg
416 fb5e1ecdbc33 generate rnd password when there is none yet Thomas Waldmann <tw@waldmann-edv.de> parents: 339 diff changeset	1103

Mercurial > public > src > moin > 1.9

annotate MoinMoin/user.py @ 5917:c99f570e274a