Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b29365a5
authored
May 31, 2018
by
Szabolcs Gelencser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement proper permission check for template details
parent
d3079ae0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
8 deletions
+15
-8
circle/dashboard/views/template.py
+15
-8
No files found.
circle/dashboard/views/template.py
View file @
b29365a5
...
@@ -20,6 +20,7 @@ from datetime import timedelta
...
@@ -20,6 +20,7 @@ from datetime import timedelta
import
json
import
json
import
logging
import
logging
import
openstack_api
from
braces.views._access
import
AccessMixin
from
braces.views._access
import
AccessMixin
from
django.contrib
import
messages
from
django.contrib
import
messages
from
django.contrib.auth.models
import
User
from
django.contrib.auth.models
import
User
...
@@ -219,7 +220,7 @@ class TemplateList(LoginRequiredMixin, FilterMixin, SingleTableView):
...
@@ -219,7 +220,7 @@ class TemplateList(LoginRequiredMixin, FilterMixin, SingleTableView):
context
[
'search_form'
]
=
self
.
search_form
context
[
'search_form'
]
=
self
.
search_form
#TODO: what is this?
#
TODO: what is this?
# tem0for t in InstanceTemplate.objects.all()
# tem0for t in InstanceTemplate.objects.all()
# # if t.instance_set.count() < 1]
# # if t.instance_set.count() < 1]
...
@@ -279,6 +280,7 @@ class TemplateList(LoginRequiredMixin, FilterMixin, SingleTableView):
...
@@ -279,6 +280,7 @@ class TemplateList(LoginRequiredMixin, FilterMixin, SingleTableView):
def
get_queryset
(
self
):
def
get_queryset
(
self
):
return
InstanceTemplate
.
objects
.
filter
(
owner_id
=
self
.
request
.
user
.
id
)
return
InstanceTemplate
.
objects
.
filter
(
owner_id
=
self
.
request
.
user
.
id
)
class
TemplateDelete
(
DeleteViewBase
):
class
TemplateDelete
(
DeleteViewBase
):
model
=
InstanceTemplate
model
=
InstanceTemplate
success_message
=
_
(
"Template successfully deleted."
)
success_message
=
_
(
"Template successfully deleted."
)
...
@@ -292,19 +294,23 @@ class TemplateDelete(DeleteViewBase):
...
@@ -292,19 +294,23 @@ class TemplateDelete(DeleteViewBase):
object
.
delete
()
object
.
delete
()
class
TemplateDetail
(
LoginRequiredMixin
,
GraphMixin
,
SuccessMessageMixin
,
UpdateView
):
class
TemplateDetail
(
LoginRequiredMixin
,
GraphMixin
,
SuccessMessageMixin
,
UpdateView
):
model
=
InstanceTemplate
model
=
InstanceTemplate
template_name
=
"dashboard/template-edit.html"
template_name
=
"dashboard/template-edit.html"
form_class
=
TemplateForm
form_class
=
TemplateForm
success_message
=
_
(
"Successfully modified template."
)
success_message
=
_
(
"Successfully modified template."
)
def
__get_snapshot_ids
(
self
,
request
):
images
=
openstack_api
.
glance
.
image_list_detailed
(
request
)[
0
]
# TODO: why nested lists?
return
[
i
.
id
for
i
in
images
if
hasattr
(
i
,
'image_location'
)
and
i
.
image_location
==
'snapshot'
]
def
get
(
self
,
request
,
*
args
,
**
kwargs
):
def
get
(
self
,
request
,
*
args
,
**
kwargs
):
template
=
self
.
get_object
()
template
=
self
.
get_object
()
#TODO: multiple users
snapshot_ids
=
self
.
__get_snapshot_ids
(
request
)
if
template
.
owner_id
!=
request
.
user
.
id
:
if
template
.
image_id
not
in
snapshot_ids
:
raise
PermissionDenied
()
raise
PermissionDenied
()
if
request
.
is_ajax
():
if
request
.
is_ajax
():
...
@@ -392,10 +398,10 @@ class TemplateDetail(LoginRequiredMixin, GraphMixin, SuccessMessageMixin, Update
...
@@ -392,10 +398,10 @@ class TemplateDetail(LoginRequiredMixin, GraphMixin, SuccessMessageMixin, Update
return
reverse_lazy
(
"dashboard.views.template-detail"
,
return
reverse_lazy
(
"dashboard.views.template-detail"
,
kwargs
=
self
.
kwargs
)
kwargs
=
self
.
kwargs
)
def
post
(
self
,
request
):
def
post
(
self
,
request
,
*
args
,
**
kwargs
):
template
=
self
.
get_object
()
template
=
self
.
get_object
()
# TODO: multiple users
snapshot_ids
=
self
.
__get_snapshot_ids
(
request
)
if
template
.
owner_id
!=
request
.
user
.
id
:
if
template
.
image_id
not
in
snapshot_ids
:
raise
PermissionDenied
()
raise
PermissionDenied
()
return
super
(
TemplateDetail
,
self
)
.
post
(
self
,
request
,
args
,
kwargs
)
return
super
(
TemplateDetail
,
self
)
.
post
(
self
,
request
,
args
,
kwargs
)
...
@@ -404,6 +410,7 @@ class TemplateDetail(LoginRequiredMixin, GraphMixin, SuccessMessageMixin, Update
...
@@ -404,6 +410,7 @@ class TemplateDetail(LoginRequiredMixin, GraphMixin, SuccessMessageMixin, Update
kwargs
[
'user'
]
=
self
.
request
.
user
kwargs
[
'user'
]
=
self
.
request
.
user
return
kwargs
return
kwargs
#
#
# class DiskRemoveView(DeleteViewBase):
# class DiskRemoveView(DeleteViewBase):
# model = Disk
# model = Disk
...
...
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