heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Browse Source
This commit is contained in:
Christopher Allan Webber 2012-03-12 18:38:35 -05:00
commit 849cf91fc8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/tools/request.py
View File

@ -14,8 +14,12 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
from mediagoblin.db.util import ObjectId, InvalidId from mediagoblin.db.util import ObjectId, InvalidId
_log = logging.getLogger(__name__)
def setup_user_in_request(request): def setup_user_in_request(request):
""" """
Examine a request and tack on a request.user parameter if that's Examine a request and tack on a request.user parameter if that's
@ -30,12 +34,12 @@ def setup_user_in_request(request):
except InvalidId: except InvalidId:
user = None user = None
else: else:
user = request.db.User.one({'_id': oid}) user = request.db.User.find_one({'_id': oid})
if not user: if not user:
# Something's wrong... this user doesn't exist? Invalidate # Something's wrong... this user doesn't exist? Invalidate
# this session. # this session.
print "Killing session for %r" % request.session['user_id'] _log.warn("Killing session for user id %r", request.session['user_id'])
request.session.invalidate() request.session.invalidate()
request.user = user request.user = user