Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
5055b065
Commit
5055b065
authored
May 18, 2016
by
Leigh B Stoller
Browse files
Fix bug that was preventing users from deleting datasets.
parent
3b8933b8
Changes
1
Hide whitespace changes
Inline
Side-by-side
protogeni/lib/GeniCMV2.pm.in
View file @
5055b065
...
...
@@ -4355,7 +4355,10 @@ sub DeleteDataset($)
#
Only
real
local
users
can
do
blockstores
,
or
the
credential
#
must
include
the
correct
priv
.
#
my
$
user
=
GeniUser
->
Lookup
($
credential
->
owner_cert
()->
urn
(),
1
);
my
$
user
=
GeniCM
::
CreateUserFromCertificate
($
credential
);
return
$
user
if
(
GeniResponse
::
IsResponse
($
user
));
return
GeniResponse
->
Create
(
GENIRESPONSE_FORBIDDEN
)
if
(
! ((defined($user) && $user->IsLocal()) ||
$
credential
->
HasActualPrivilege
(
"blockstores"
)));
...
...
@@ -4373,8 +4376,8 @@ sub DeleteDataset($)
my
$
lease_owner
=
$
lease
->
GetAttribute
(
"creator_urn"
);
return
GeniResponse
->
Create
(
GENIRESPONSE_FORBIDDEN
)
if
(
! (defined($lease_owner) &&
!
($lease_owner eq $user->urn() ||
$
lease_owner
eq
$
ENV
{
'REALGENIURN'
})));
($
lease_owner
eq
$
user
->
urn
()
||
$
lease_owner
eq
$
ENV
{
'REALGENIURN'
})));
$
cmd
=
"$DELETEDATASET -b -f "
.
$
group
->
pid
()
.
"/"
.
$
group
->
gid
()
.
"/"
.
$
dataset
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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