Commit b6939548 authored by Robert Ricci's avatar Robert Ricci

Rename 'capability' to 'privilege' to be consistent with the latest

SFA doc.
parent 075f0379
......@@ -4,9 +4,9 @@
# All rights reserved.
#
# ProtoGENI credential and capability specification. The key points:
# ProtoGENI credential and privilege specification. The key points:
#
# * A credential is a set of capabilities or a Ticket, each with a flag
# * A credential is a set of privileges or a Ticket, each with a flag
# to indicate delegation is permitted.
# * A credential is signed and the signature included in the body of the
# document.
......@@ -23,17 +23,17 @@ anyelementbody = (attribute * {text} | text | element * {anyelementbody} )*
# This is where we get the definition of RSpec from
include "../rspec/protogeni-rspec-common.rnc"
## Representation of a single capability.
CapabilitySpec = element capability {
# Name of the capability.
## Representation of a single privileges.
PrivilegeSpec = element privilege {
# Name of the privilege.
element name { xsd:string { minLength = "1" }},
# Flag indicating this capability can be delegated
# Flag indicating this privilege can be delegated
element can_delegate { xsd:boolean }
}
## A set of capabilities.
CapabilitiesSpec = element capabilities {
CapabilitySpec*
## A set of privileges.
PrivilegesSpec = element privileges {
PrivilegeSpec*
}
## Define a stub for future ticket.
......@@ -54,20 +54,20 @@ signatures = element signatures {
element sig:Signature { anyelementbody }+
}
## A credential granting capabilities or a ticket.
## A credential granting privileges or a ticket.
credentials = element credential {
## The ID for signature referencing.
attribute xml:id {xs:ID},
## The type of this credential. Currently a Capability set or a Ticket.
element type { "capability" | "ticket" },
## The type of this credential. Currently a Privilege set or a Ticket.
element type { "privilege" | "ticket" },
## A serial number.
element serial { xsd:string },
## UUID of the owner of this credential.
element owner_uuid { xsd:string },
## UUID of this credential
element this_uuid { xsd:string },
## Capabilities or a ticket
(CapabilitiesSpec | TicketSpec),
## Privileges or a ticket
(PrivilegesSpec | TicketSpec),
## Parent that delegated to us
element parent { credentials }?
}
......
......@@ -7,9 +7,9 @@
-->
<!--
ProtoGENI credential and capability specification. The key points:
ProtoGENI credential and privilege specification. The key points:
* A credential is a set of capabilities or a Ticket, each with a flag
* A credential is a set of privileges or a Ticket, each with a flag
to indicate delegation is permitted.
* A credential is signed and the signature included in the body of the
document.
......@@ -29,7 +29,7 @@
<xs:anyAttribute processContents="skip"/>
</xs:complexType>
<!-- This is where we get the definition of RSpec from -->
<xs:element name="capability">
<xs:element name="privilege">
<xs:complexType>
<xs:sequence>
<xs:element ref="credential:name"/>
......@@ -44,10 +44,10 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="capabilities">
<xs:element name="privileges">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="credential:capability"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="credential:privilege"/>
</xs:sequence>
</xs:complexType>
</xs:element>
......@@ -82,7 +82,7 @@
</xs:element>
<xs:complexType name="credentials">
<xs:annotation>
<xs:documentation>A credential granting capabilities or a ticket.</xs:documentation>
<xs:documentation>A credential granting privileges or a ticket.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element ref="credential:credential"/>
......@@ -97,9 +97,9 @@
<xs:element ref="credential:this_uuid"/>
<xs:choice>
<xs:annotation>
<xs:documentation>Capabilities or a ticket</xs:documentation>
<xs:documentation>Privileges or a ticket</xs:documentation>
</xs:annotation>
<xs:element ref="credential:capabilities"/>
<xs:element ref="credential:privileges"/>
<xs:element ref="credential:ticket"/>
</xs:choice>
<xs:element minOccurs="0" ref="credential:parent"/>
......@@ -109,11 +109,11 @@
</xs:element>
<xs:element name="type">
<xs:annotation>
<xs:documentation>The type of this credential. Currently a Capability set or a Ticket.</xs:documentation>
<xs:documentation>The type of this credential. Currently a Privilege set or a Ticket.</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="capability"/>
<xs:enumeration value="privilege"/>
<xs:enumeration value="ticket"/>
</xs:restriction>
</xs:simpleType>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<signed-credential xmlns="http://www.protogeni.net/resources/credential/0.1" xmlns:sig="http://www.w3.org/2000/09/xmldsig#">
<credential xml:id="Ref1">
<type>capability</type>
<type>privilege</type>
<serial>0</serial>
<owner_uuid>foo bar</owner_uuid>
<this_uuid>foo bar</this_uuid>
<capabilities>
<capability>
<privileges>
<privilege>
<name>frazzle</name>
<can_delegate>1</can_delegate>
</capability>
</capabilities>
</privilege>
</privileges>
</credential>
</signed-credential>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<signed-credential xmlns="http://www.protogeni.net/resources/credential/0.1" xmlns:sig="http://www.w3.org/2000/09/xmldsig#">
<credential xml:id="Ref2">
<type>capability</type>
<type>privilege</type>
<serial>2</serial>
<owner_uuid>foo bar</owner_uuid>
<this_uuid>foo bar</this_uuid>
<capabilities>
<capability>
<privileges>
<privilege>
<name>frazzle</name>
<can_delegate>1</can_delegate>
</capability>
<capability>
</privilege>
<privilege>
<name>drazzle</name>
<can_delegate>1</can_delegate>
</capability>
</capabilities>
</privilege>
</privileges>
<parent>
<credential xml:id="Ref1">
<type>capability</type>
<type>privilege</type>
<serial>3</serial>
<owner_uuid>foo bar</owner_uuid>
<this_uuid>foo bar</this_uuid>
<capabilities>
<capability>
<privileges>
<privilege>
<name>frazzle</name>
<can_delegate>1</can_delegate>
</capability>
</capabilities>
</privilege>
</privileges>
</credential>
</parent>
</credential>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<signed-credential xmlns="http://www.protogeni.net/resources/credential/0.1" xmlns:sig="http://www.w3.org/2000/09/xmldsig#">
<credential xml:id="ref1">
<type>capability</type>
<type>ticket</type>
<serial>3</serial>
<owner_uuid>0b2eb97e-ed30-11db-96cb-001143e453fe</owner_uuid>
<this_uuid>3e1948fe-ed30-11db-96cb-001143e453fe</this_uuid>
......
......@@ -5,7 +5,7 @@
<!--
EMULAB-COPYRIGHT
Copyright (c) 2005-2007 University of Utah and the Flux Group.
Copyright (c) 2005-2008 University of Utah and the Flux Group.
All rights reserved.
-->
......
......@@ -11,7 +11,7 @@ use XML::LibXML;
use Data::Dumper;
#
# Verify a GENI capability.
# Verify a GENI credential.
#
sub usage()
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment