Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
G
gracedb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
99
Issues
99
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
1
Merge Requests
1
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lscsoft
gracedb
Commits
6b5240ba
Commit
6b5240ba
authored
May 29, 2019
by
Tanner Prestegard
Committed by
GraceDB
Jun 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup of Group usage
parent
c2b20c67
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
26 additions
and
31 deletions
+26
-31
gracedb/alerts/tests/test_views.py
gracedb/alerts/tests/test_views.py
+0
-1
gracedb/api/v1/events/views.py
gracedb/api/v1/events/views.py
+2
-2
gracedb/api/v1/superevents/serializers.py
gracedb/api/v1/superevents/serializers.py
+0
-1
gracedb/api/v1/superevents/views.py
gracedb/api/v1/superevents/views.py
+0
-1
gracedb/events/models.py
gracedb/events/models.py
+0
-2
gracedb/events/view_logic.py
gracedb/events/view_logic.py
+2
-2
gracedb/events/views.py
gracedb/events/views.py
+2
-2
gracedb/ligoauth/middleware.py
gracedb/ligoauth/middleware.py
+2
-1
gracedb/ligoauth/tests/test_backends.py
gracedb/ligoauth/tests/test_backends.py
+1
-1
gracedb/ligoauth/tests/test_middleware.py
gracedb/ligoauth/tests/test_middleware.py
+7
-7
gracedb/search/tests/test_access.py
gracedb/search/tests/test_access.py
+5
-5
gracedb/superevents/mixins.py
gracedb/superevents/mixins.py
+0
-1
gracedb/superevents/utils.py
gracedb/superevents/utils.py
+5
-5
No files found.
gracedb/alerts/tests/test_views.py
View file @
6b5240ba
...
...
@@ -2,7 +2,6 @@ import mock
import
pytest
from
django.conf
import
settings
from
django.contrib.auth.models
import
Group
as
AuthGroup
from
django.urls
import
reverse
from
core.tests.utils
import
GraceDbTestBase
...
...
gracedb/api/v1/events/views.py
View file @
6b5240ba
...
...
@@ -8,7 +8,7 @@ import StringIO
import
urllib
from
django.conf
import
settings
from
django.contrib.auth.models
import
User
,
Permission
,
Group
as
Auth
Group
from
django.contrib.auth.models
import
User
,
Permission
,
Group
as
Django
Group
from
django.contrib.contenttypes.models
import
ContentType
from
django.core.exceptions
import
ValidationError
from
django.db
import
IntegrityError
...
...
@@ -146,7 +146,7 @@ def group_required(view):
@
wraps
(
view
)
def
inner
(
self
,
request
,
event
,
group_name
,
*
args
,
**
kwargs
):
try
:
group
=
Auth
Group
.
objects
.
get
(
name
=
str
(
group_name
))
group
=
Django
Group
.
objects
.
get
(
name
=
str
(
group_name
))
except
:
return
Response
(
"Group does not exist."
,
status
=
status
.
HTTP_404_NOT_FOUND
)
...
...
gracedb/api/v1/superevents/serializers.py
View file @
6b5240ba
...
...
@@ -5,7 +5,6 @@ import os
from
django.conf
import
settings
from
django.contrib.auth
import
get_user_model
from
django.contrib.auth.models
import
Group
as
AuthGroup
from
django.db
import
models
from
django.utils.translation
import
ugettext_lazy
as
_
...
...
gracedb/api/v1/superevents/views.py
View file @
6b5240ba
...
...
@@ -5,7 +5,6 @@ import os
from
django.http
import
HttpResponse
from
django.shortcuts
import
get_object_or_404
from
django.contrib.auth.models
import
Group
as
AuthGroup
from
guardian.shortcuts
import
get_objects_for_user
from
rest_framework
import
mixins
,
parsers
,
permissions
,
serializers
,
status
,
\
...
...
gracedb/events/models.py
View file @
6b5240ba
...
...
@@ -8,8 +8,6 @@ from django.utils.translation import ugettext_lazy as _
from
model_utils.managers
import
InheritanceManager
#from django.contrib.auth.models import User as DjangoUser
#from django.contrib.auth.models import Group
from
django.contrib.auth
import
get_user_model
from
django.contrib.contenttypes.models
import
ContentType
...
...
gracedb/events/view_logic.py
View file @
6b5240ba
...
...
@@ -22,7 +22,7 @@ from core.vfile import VersionedFile
from
django.contrib.contenttypes.models
import
ContentType
from
django.contrib.auth.models
import
Permission
from
django.contrib.auth.models
import
Group
as
Auth
Group
from
django.contrib.auth.models
import
Group
as
Django
Group
from
django.conf
import
settings
from
guardian.models
import
GroupObjectPermission
...
...
@@ -356,7 +356,7 @@ def get_lvem_perm_status(request, event):
# Get the group
# Returns a tuple: (can_expose, can_protect)
try
:
lv_em_group
=
Auth
Group
.
objects
.
get
(
name
=
settings
.
LVEM_OBSERVERS_GROUP
)
lv_em_group
=
Django
Group
.
objects
.
get
(
name
=
settings
.
LVEM_OBSERVERS_GROUP
)
except
:
# Something is really wrong.
return
(
None
,
None
)
...
...
gracedb/events/views.py
View file @
6b5240ba
...
...
@@ -20,7 +20,7 @@ from .forms import CreateEventForm, SignoffForm
from
django.contrib.auth.decorators
import
permission_required
from
django.contrib.auth.models
import
User
,
Permission
from
django.contrib.auth.models
import
Group
as
Auth
Group
from
django.contrib.auth.models
import
Group
as
Django
Group
from
django.contrib.contenttypes.models
import
ContentType
from
.permission_utils
import
filter_events_for_user
,
user_has_perm
from
.permission_utils
import
is_external
,
check_external_file_access
...
...
@@ -710,7 +710,7 @@ def modify_permissions(request, event):
# Get the group
try
:
g
=
Auth
Group
.
objects
.
get
(
name
=
group_name
)
g
=
Django
Group
.
objects
.
get
(
name
=
group_name
)
except
Group
.
DoesNotExist
:
return
HttpResponseNotFound
(
'Group not found'
)
...
...
gracedb/ligoauth/middleware.py
View file @
6b5240ba
...
...
@@ -3,6 +3,7 @@ import re
from
django.conf
import
settings
from
django.contrib
import
auth
from
django.contrib.auth.models
import
Group
as
DjangoGroup
from
django.contrib.auth.middleware
import
PersistentRemoteUserMiddleware
from
django.contrib.auth.models
import
Group
from
django.core.exceptions
import
ImproperlyConfigured
...
...
@@ -126,7 +127,7 @@ class ControlRoomMiddleware(object):
# Add user to control room group(s)
for
ifo
,
ip
in
settings
.
CONTROL_ROOM_IPS
.
iteritems
():
if
(
ip
==
user_ip
):
control_room_group
=
Group
.
objects
.
get
(
name
=
control_room_group
=
Django
Group
.
objects
.
get
(
name
=
(
ifo
.
lower
()
+
self
.
control_room_group_suffix
))
request
.
user
.
groups
.
through
.
objects
.
get_or_create
(
user
=
request
.
user
,
group
=
control_room_group
)
...
...
gracedb/ligoauth/tests/test_backends.py
View file @
6b5240ba
from
django.conf
import
settings
from
django.contrib.auth.models
import
Group
as
AuthGroup
,
User
,
AnonymousUser
from
django.contrib.auth.models
import
User
,
AnonymousUser
from
django.contrib.auth.middleware
import
AuthenticationMiddleware
from
django.core.exceptions
import
ImproperlyConfigured
from
django.test
import
RequestFactory
,
TestCase
...
...
gracedb/ligoauth/tests/test_middleware.py
View file @
6b5240ba
from
django.conf
import
settings
from
django.contrib.auth.models
import
Group
as
Auth
Group
,
User
,
AnonymousUser
from
django.contrib.auth.models
import
Group
as
Django
Group
,
User
,
AnonymousUser
from
django.contrib.auth.middleware
import
AuthenticationMiddleware
from
django.core.exceptions
import
ImproperlyConfigured
from
django.test
import
RequestFactory
...
...
@@ -44,7 +44,7 @@ class TestControlRoomMiddlewareHomeView(GraceDbTestBase):
super
(
TestControlRoomMiddlewareHomeView
,
cls
).
setUpTestData
()
# Create control room group
cls
.
control_room_group
,
_
=
Auth
Group
.
objects
.
get_or_create
(
cls
.
control_room_group
,
_
=
Django
Group
.
objects
.
get_or_create
(
name
=
cls
.
ifo
.
lower
()
+
'_control_room'
)
def
test_internal_user_in_control_room
(
self
):
...
...
@@ -145,7 +145,7 @@ class TestControlRoomMiddleware(GraceDbTestBase):
super
(
TestControlRoomMiddleware
,
cls
).
setUpTestData
()
# Create control room group
cls
.
control_room_group
,
_
=
Auth
Group
.
objects
.
get_or_create
(
cls
.
control_room_group
,
_
=
Django
Group
.
objects
.
get_or_create
(
name
=
cls
.
ifo
.
lower
()
+
'_control_room'
)
def
test_internal_user_in_control_room
(
self
):
...
...
@@ -391,7 +391,7 @@ class TestShibbolethWebAuthMiddleware(GraceDbTestBase):
def
test_group_addition
(
self
):
"""Add a group for a user based on shib group header content"""
# Create new group for testing
new_group
=
Auth
Group
.
objects
.
create
(
name
=
'new_group'
)
new_group
=
Django
Group
.
objects
.
create
(
name
=
'new_group'
)
# Compile group header
delim
=
ShibbolethWebAuthMiddleware
.
group_delimiter
groups_str
=
delim
.
join
([
self
.
internal_group
.
name
,
new_group
.
name
])
...
...
@@ -426,7 +426,7 @@ class TestShibbolethWebAuthMiddleware(GraceDbTestBase):
def
test_group_removal
(
self
):
"""Remove a group for a user based on shib group header content"""
# Create new group, add to user
new_group
=
Auth
Group
.
objects
.
create
(
name
=
'new_group'
)
new_group
=
Django
Group
.
objects
.
create
(
name
=
'new_group'
)
self
.
internal_user
.
groups
.
add
(
new_group
)
# Set up request
...
...
@@ -467,7 +467,7 @@ class TestShibbolethWebAuthMiddleware(GraceDbTestBase):
r_user
.
groups
.
add
(
self
.
internal_group
)
# Create new group for testing
new_group
=
Auth
Group
.
objects
.
create
(
name
=
'new_group'
)
new_group
=
Django
Group
.
objects
.
create
(
name
=
'new_group'
)
# Compile group header
delim
=
ShibbolethWebAuthMiddleware
.
group_delimiter
groups_str
=
delim
.
join
([
self
.
internal_group
.
name
,
new_group
.
name
])
...
...
@@ -507,7 +507,7 @@ class TestShibbolethWebAuthMiddleware(GraceDbTestBase):
r_user
=
RobotUser
.
objects
.
create
(
username
=
'robot.user'
)
r_user
.
groups
.
add
(
self
.
internal_group
)
# Create new group and add robotusre
new_group
=
Auth
Group
.
objects
.
create
(
name
=
'new_group'
)
new_group
=
Django
Group
.
objects
.
create
(
name
=
'new_group'
)
r_user
.
groups
.
add
(
new_group
)
# Set up request
...
...
gracedb/search/tests/test_access.py
View file @
6b5240ba
import
urllib
from
django.conf
import
settings
from
django.contrib.auth.models
import
Group
as
Auth
Group
,
Permission
from
django.contrib.auth.models
import
Group
as
Django
Group
,
Permission
from
django.contrib.contenttypes.models
import
ContentType
from
django.test
import
TestCase
from
django.urls
import
reverse
...
...
@@ -52,12 +52,12 @@ class TestEventSearch(EventCreateMixin, GraceDbTestBase, SearchTestingBase):
# Assign default permissions for internal group (also have to create
# executives group because this perm assign code is TERRIBLE)
execs
,
_
=
Auth
Group
.
objects
.
get_or_create
(
name
=
'executives'
)
execs
,
_
=
Django
Group
.
objects
.
get_or_create
(
name
=
'executives'
)
assign_default_event_perms
(
cls
.
internal_event
)
assign_default_event_perms
(
cls
.
lvem_event
)
# Expose events
lvem_group
=
Auth
Group
.
objects
.
get
(
name
=
settings
.
LVEM_OBSERVERS_GROUP
)
lvem_group
=
Django
Group
.
objects
.
get
(
name
=
settings
.
LVEM_OBSERVERS_GROUP
)
update_event_perms_for_group
(
cls
.
lvem_event
,
lvem_group
,
'expose'
)
def
test_internal_user_search
(
self
):
...
...
@@ -168,12 +168,12 @@ class TestEventLatest(EventCreateMixin, GraceDbTestBase):
# Assign default permissions for internal group (also have to create
# executives group because this perm assign code is TERRIBLE)
execs
,
_
=
Auth
Group
.
objects
.
get_or_create
(
name
=
'executives'
)
execs
,
_
=
Django
Group
.
objects
.
get_or_create
(
name
=
'executives'
)
assign_default_event_perms
(
cls
.
internal_event
)
assign_default_event_perms
(
cls
.
lvem_event
)
# Expose an event to LV-EM
lvem_group
=
Auth
Group
.
objects
.
get
(
name
=
settings
.
LVEM_OBSERVERS_GROUP
)
lvem_group
=
Django
Group
.
objects
.
get
(
name
=
settings
.
LVEM_OBSERVERS_GROUP
)
update_event_perms_for_group
(
cls
.
lvem_event
,
lvem_group
,
'expose'
)
def
test_internal_user_latest
(
self
):
...
...
gracedb/superevents/mixins.py
View file @
6b5240ba
...
...
@@ -3,7 +3,6 @@ import pytz
from
django
import
forms
from
django.conf
import
settings
from
django.contrib.auth.models
import
Group
as
AuthGroup
from
django.contrib.auth.models
import
Permission
from
django.contrib.contenttypes.models
import
ContentType
from
django.views.generic.base
import
ContextMixin
...
...
gracedb/superevents/utils.py
View file @
6b5240ba
...
...
@@ -4,7 +4,7 @@ import os
from
django.conf
import
settings
from
django.http
import
Http404
from
django.shortcuts
import
get_object_or_404
from
django.contrib.auth.models
import
Group
as
Auth
Group
from
django.contrib.auth.models
import
Group
as
Django
Group
from
.buildVOEvent
import
construct_voevent_file
from
.models
import
Superevent
,
Log
,
Labelling
,
EMObservation
,
EMFootprint
,
\
...
...
@@ -831,8 +831,8 @@ def expose_superevent(superevent, user, add_log_message=True,
issue_alert
=
True
):
# Get groups
lvem_group
=
Auth
Group
.
objects
.
get
(
name
=
settings
.
LVEM_OBSERVERS_GROUP
)
public_group
=
Auth
Group
.
objects
.
get
(
name
=
settings
.
PUBLIC_GROUP
)
lvem_group
=
Django
Group
.
objects
.
get
(
name
=
settings
.
LVEM_OBSERVERS_GROUP
)
public_group
=
Django
Group
.
objects
.
get
(
name
=
settings
.
PUBLIC_GROUP
)
# Assign permissions which will expose the superevent to LV-EM and the
# public
...
...
@@ -860,8 +860,8 @@ def hide_superevent(superevent, user, add_log_message=True,
issue_alert
=
True
):
# Get groups
lvem_group
=
Auth
Group
.
objects
.
get
(
name
=
settings
.
LVEM_OBSERVERS_GROUP
)
public_group
=
Auth
Group
.
objects
.
get
(
name
=
settings
.
PUBLIC_GROUP
)
lvem_group
=
Django
Group
.
objects
.
get
(
name
=
settings
.
LVEM_OBSERVERS_GROUP
)
public_group
=
Django
Group
.
objects
.
get
(
name
=
settings
.
PUBLIC_GROUP
)
# Assign permissions which will expose the superevent to LV-EM and the
# public
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment