Skip to content

Commit

Permalink
Merge branch 'wardi-2817-context-user-always-username'
Browse files Browse the repository at this point in the history
  • Loading branch information
@amercader
amercader committed Jan 20, 2016
2 parents c70637b + ed2a241 commit 1a7885e
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 84 deletions.
6 changes: 0 additions & 6 deletions ckan/authz.py
View file
Expand Up @@ -431,12 +431,6 @@ def auth_is_anon_user(context):
See ckan/lib/base.py:232 for pylons context object logic
'''
context_user = context.get('user')
# FIXME: our current pattern is to set context['user'] to
# the IP address in our controller code. Detect and
# ignore that case for now. Stop putting the IP address
# in context['user'] in a future ckan version.
if context_user and '.' in context_user:
context_user = None
is_anon_user = not bool(context_user)

return is_anon_user
12 changes: 6 additions & 6 deletions ckan/controllers/api.py
View file
Expand Up @@ -52,7 +52,7 @@ def __call__(self, environ, start_response):

self._identify_user()
try:
context = {'model': model, 'user': c.user or c.author,
context = {'model': model, 'user': c.user,
'auth_user_obj': c.userobj}
logic.check_access('site_read', context)
except NotAuthorized:
Expand Down Expand Up @@ -622,7 +622,7 @@ def tag_counts(self, ver=None):
c.q = request.params.get('q', '')

context = {'model': model, 'session': model.Session,
'user': c.user or c.author, 'auth_user_obj': c.userobj}
'user': c.user, 'auth_user_obj': c.userobj}

tag_names = get_action('tag_list')(context, {})
results = []
Expand Down Expand Up @@ -657,7 +657,7 @@ def user_autocomplete(self):
user_list = []
if q:
context = {'model': model, 'session': model.Session,
'user': c.user or c.author, 'auth_user_obj': c.userobj}
'user': c.user, 'auth_user_obj': c.userobj}

data_dict = {'q': q, 'limit': limit}

Expand Down Expand Up @@ -734,7 +734,7 @@ def dataset_autocomplete(self):
package_dicts = []
if q:
context = {'model': model, 'session': model.Session,
'user': c.user or c.author, 'auth_user_obj': c.userobj}
'user': c.user, 'auth_user_obj': c.userobj}

data_dict = {'q': q, 'limit': limit}

Expand All @@ -751,7 +751,7 @@ def tag_autocomplete(self):
tag_names = []
if q:
context = {'model': model, 'session': model.Session,
'user': c.user or c.author, 'auth_user_obj': c.userobj}
'user': c.user, 'auth_user_obj': c.userobj}

data_dict = {'q': q, 'limit': limit}

Expand All @@ -770,7 +770,7 @@ def format_autocomplete(self):
formats = []
if q:
context = {'model': model, 'session': model.Session,
'user': c.user or c.author, 'auth_user_obj': c.userobj}
'user': c.user, 'auth_user_obj': c.userobj}
data_dict = {'q': q, 'limit': limit}
formats = get_action('format_autocomplete')(context, data_dict)

Expand Down
6 changes: 3 additions & 3 deletions ckan/controllers/feed.py
View file
Expand Up @@ -46,7 +46,7 @@ def _package_search(data_dict):
* unless overridden, sets a default item limit
"""
context = {'model': model, 'session': model.Session,
'user': c.user or c.author, 'auth_user_obj': c.userobj}
'user': c.user, 'auth_user_obj': c.userobj}

if 'sort' not in data_dict or not data_dict['sort']:
data_dict['sort'] = 'metadata_modified desc'
Expand Down Expand Up @@ -217,7 +217,7 @@ def _group_or_organization(self, obj_dict, is_org):
def group(self, id):
try:
context = {'model': model, 'session': model.Session,
'user': c.user or c.author, 'auth_user_obj': c.userobj}
'user': c.user, 'auth_user_obj': c.userobj}
group_dict = logic.get_action('group_show')(context, {'id': id})
except logic.NotFound:
base.abort(404, _('Group not found'))
Expand All @@ -227,7 +227,7 @@ def group(self, id):
def organization(self, id):
try:
context = {'model': model, 'session': model.Session,
'user': c.user or c.author, 'auth_user_obj': c.userobj}
'user': c.user, 'auth_user_obj': c.userobj}
group_dict = logic.get_action('organization_show')(context,
{'id': id})
except logic.NotFound:
Expand Down
36 changes: 18 additions & 18 deletions ckan/controllers/group.py
View file
Expand Up @@ -152,7 +152,7 @@ def index(self):
items_per_page = 21

context = {'model': model, 'session': model.Session,
'user': c.user or c.author, 'for_view': True,
'user': c.user, 'for_view': True,
'with_private': False}

q = c.q = request.params.get('q', '')
Expand Down Expand Up @@ -204,7 +204,7 @@ def read(self, id, limit=20):
id.split('@')[0])

context = {'model': model, 'session': model.Session,
'user': c.user or c.author,
'user': c.user,
'schema': self._db_to_form_schema(group_type=group_type),
'for_view': True}
data_dict = {'id': id}
Expand All @@ -230,7 +230,7 @@ def read(self, id, limit=20):
def _read(self, id, limit, group_type):
''' This is common code used by both read and bulk_process'''
context = {'model': model, 'session': model.Session,
'user': c.user or c.author,
'user': c.user,
'schema': self._db_to_form_schema(group_type=group_type),
'for_view': True, 'extras_as_string': True}

Expand Down Expand Up @@ -389,7 +389,7 @@ def bulk_process(self, id):
# check we are org admin

context = {'model': model, 'session': model.Session,
'user': c.user or c.author,
'user': c.user,
'schema': self._db_to_form_schema(group_type=group_type),
'for_view': True, 'extras_as_string': True}
data_dict = {'id': id}
Expand Down Expand Up @@ -460,7 +460,7 @@ def new(self, data=None, errors=None, error_summary=None):
data['type'] = group_type

context = {'model': model, 'session': model.Session,
'user': c.user or c.author,
'user': c.user,
'save': 'save' in request.params,
'parent': request.params.get('parent', None)}
try:
Expand Down Expand Up @@ -492,7 +492,7 @@ def edit(self, id, data=None, errors=None, error_summary=None):
id.split('@')[0])

context = {'model': model, 'session': model.Session,
'user': c.user or c.author,
'user': c.user,
'save': 'save' in request.params,
'for_edit': True,
'parent': request.params.get('parent', None)
Expand Down Expand Up @@ -608,7 +608,7 @@ def authz(self, id):

try:
context = \
{'model': model, 'user': c.user or c.author, 'group': group}
{'model': model, 'user': c.user, 'group': group}
self._check_access('group_edit_permissions', context)
c.authz_editable = True
c.group = context['group']
Expand All @@ -631,7 +631,7 @@ def delete(self, id):
self._redirect_to_this_controller(action='edit', id=id)

context = {'model': model, 'session': model.Session,
'user': c.user or c.author}
'user': c.user}

try:
self._check_access('group_delete', context, {'id': id})
Expand Down Expand Up @@ -660,7 +660,7 @@ def members(self, id):
group_type = self._ensure_controller_matches_group_type(id)

context = {'model': model, 'session': model.Session,
'user': c.user or c.author}
'user': c.user}

try:
c.members = self._action('member_list')(
Expand All @@ -679,7 +679,7 @@ def member_new(self, id):
group_type = self._ensure_controller_matches_group_type(id)

context = {'model': model, 'session': model.Session,
'user': c.user or c.author}
'user': c.user}

#self._check_access('group_delete', context, {'id': id})
try:
Expand Down Expand Up @@ -736,7 +736,7 @@ def member_delete(self, id):
self._redirect_to_this_controller(action='members', id=id)

context = {'model': model, 'session': model.Session,
'user': c.user or c.author}
'user': c.user}

try:
self._check_access('group_member_delete', context, {'id': id})
Expand Down Expand Up @@ -778,7 +778,7 @@ def history(self, id):
h.redirect_to(controller='revision', action='diff', **params)

context = {'model': model, 'session': model.Session,
'user': c.user or c.author,
'user': c.user,
'schema': self._db_to_form_schema()}
data_dict = {'id': id}
try:
Expand Down Expand Up @@ -844,7 +844,7 @@ def activity(self, id, offset=0):

group_type = self._ensure_controller_matches_group_type(id)
context = {'model': model, 'session': model.Session,
'user': c.user or c.author, 'for_view': True}
'user': c.user, 'for_view': True}
try:
c.group_dict = self._get_group_dict(id)
except NotFound:
Expand All @@ -867,7 +867,7 @@ def follow(self, id):
self._ensure_controller_matches_group_type(id)
context = {'model': model,
'session': model.Session,
'user': c.user or c.author}
'user': c.user}
data_dict = {'id': id}
try:
get_action('follow_group')(context, data_dict)
Expand All @@ -887,7 +887,7 @@ def unfollow(self, id):
self._ensure_controller_matches_group_type(id)
context = {'model': model,
'session': model.Session,
'user': c.user or c.author}
'user': c.user}
data_dict = {'id': id}
try:
get_action('unfollow_group')(context, data_dict)
Expand All @@ -906,7 +906,7 @@ def unfollow(self, id):
def followers(self, id):
group_type = self._ensure_controller_matches_group_type(id)
context = {'model': model, 'session': model.Session,
'user': c.user or c.author}
'user': c.user}
c.group_dict = self._get_group_dict(id)
try:
c.followers = \
Expand All @@ -926,7 +926,7 @@ def admins(self, id):
def about(self, id):
group_type = self._ensure_controller_matches_group_type(id)
context = {'model': model, 'session': model.Session,
'user': c.user or c.author}
'user': c.user}
c.group_dict = self._get_group_dict(id)
group_type = c.group_dict['type']
self._setup_template_variables(context, {'id': id},
Expand All @@ -938,7 +938,7 @@ def _get_group_dict(self, id):
''' returns the result of group_show action or aborts if there is a
problem '''
context = {'model': model, 'session': model.Session,
'user': c.user or c.author,
'user': c.user,
'for_view': True}
try:
return self._action('group_show')(
Expand Down
4 changes: 2 additions & 2 deletions ckan/controllers/home.py
View file
Expand Up @@ -19,7 +19,7 @@ class HomeController(base.BaseController):
def __before__(self, action, **env):
try:
base.BaseController.__before__(self, action, **env)
context = {'model': model, 'user': c.user or c.author,
context = {'model': model, 'user': c.user,
'auth_user_obj': c.userobj}
logic.check_access('site_read', context)
except logic.NotAuthorized:
Expand All @@ -41,7 +41,7 @@ def index(self):
try:
# package search
context = {'model': model, 'session': model.Session,
'user': c.user or c.author, 'auth_user_obj': c.userobj}
'user': c.user, 'auth_user_obj': c.userobj}
data_dict = {
'q': '*:*',
'facet.field': g.facets,
Expand Down

0 comments on commit 1a7885e

Please sign in to comment.