vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add 'Automatic' ServiceKeyApprovalType

Browse source
This commit is contained in:
Evan Cordell 2016-04-29 09:14:50 -05:00 • committed by Jimmy Zelinskie
parent c766727d1d
commit 2242c6773d
5 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/database.py
View file

@ -878,6 +878,7 @@ class TorrentInfo(BaseModel):
class ServiceKeyApprovalType(Enum): class ServiceKeyApprovalType(Enum):
SUPERUSER = 'Super User API' SUPERUSER = 'Super User API'
KEY_ROTATION = 'Key Rotation' KEY_ROTATION = 'Key Rotation'
AUTOMATIC = 'Automatic'
_ServiceKeyApproverProxy = Proxy() _ServiceKeyApproverProxy = Proxy()

4
endpoints/api/superuser.py
View file

@ -142,8 +142,6 @@ def org_view(org):
} }
def user_view(user, password=None): def user_view(user, password=None):
if user is None:
return None
user_data = { user_data = {
'kind': 'user', 'kind': 'user',
'name': user.username, 'name': user.username,
@ -493,7 +491,7 @@ def key_view(key):
def approval_view(approval): def approval_view(approval):
return { return {
'approver': user_view(approval.approver), 'approver': user_view(approval.approver) if approval.approver else None,
'approval_type': approval.approval_type, 'approval_type': approval.approval_type,
'approved_date': approval.approved_date, 'approved_date': approval.approved_date,
'notes': approval.notes, 'notes': approval.notes,

5
static/css/directives/ui/service-keys-manager.css
View file

@ -44,6 +44,11 @@
color: #128E72; color: #128E72;
} }
.service-keys-manager-element .approval-automatic {
font-size: 12px;
color: #777;
}
.service-keys-manager-element i.fa { .service-keys-manager-element i.fa {
margin-right: 4px; margin-right: 4px;
} }

8
static/directives/service-keys-manager.html
View file

@ -130,10 +130,10 @@
</span> </span>
</td> </td>
<td> <td>
<span class="approval-user" bo-if="key.approval && key.approval.approval_type == 'ServiceKeyApprovalType.SUPERUSER' && !key.approval.approver"> <span class="approval-automatic" bo-if="key.approval && key.approval.approval_type == 'ServiceKeyApprovalType.AUTOMATIC'">
Generated on Boot Generated Automatically
</span> </span>
<span class="approval-user" bo-if="key.approval && key.approval.approval_type == 'ServiceKeyApprovalType.SUPERUSER'&& key.approval.approver"> <span class="approval-user" bo-if="key.approval && key.approval.approval_type == 'ServiceKeyApprovalType.SUPERUSER'">
<span class="pretext">Approved by</span><span class="entity-reference" entity="key.approval.approver"></span> <span class="pretext">Approved by</span><span class="entity-reference" entity="key.approval.approver"></span>
</span> </span>
<span class="approval-rotation" bo-if="key.approval && key.approval.approval_type == 'ServiceKeyApprovalType.KEY_ROTATION'"> <span class="approval-rotation" bo-if="key.approval && key.approval.approval_type == 'ServiceKeyApprovalType.KEY_ROTATION'">
@ -362,4 +362,4 @@
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
</div><!-- /.modal-dialog --> </div><!-- /.modal-dialog -->
</div><!-- /.modal --> </div><!-- /.modal -->
</div> </div>

5
util/generatepresharedkey.py
View file

@ -6,7 +6,7 @@ from timeparse import ParseDatetime
import argparse import argparse
def generate_key(service, name, approver=None, expiration_date=None, notes=None): def generate_key(service, name, expiration_date=None, notes=None):
metadata = { metadata = {
'created_by': 'CLI tool', 'created_by': 'CLI tool',
} }
@ -16,7 +16,7 @@ def generate_key(service, name, approver=None, expiration_date=None, notes=None)
metadata=metadata, metadata=metadata,
name=name) name=name)
# Auto-approve the service key. # Auto-approve the service key.
model.service_keys.approve_service_key(key.kid, approver, ServiceKeyApprovalType.SUPERUSER, model.service_keys.approve_service_key(key.kid, None, ServiceKeyApprovalType.AUTOMATIC,
notes=notes or '') notes=notes or '')
# Log the creation and auto-approval of the service key. # Log the creation and auto-approval of the service key.
@ -36,7 +36,6 @@ def generate_key(service, name, approver=None, expiration_date=None, notes=None)
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Generates a preshared key') parser = argparse.ArgumentParser(description='Generates a preshared key')
parser.add_argument('approver', help='Quay username of the user approving this key')
parser.add_argument('service', help='The service name for which the key is being generated') parser.add_argument('service', help='The service name for which the key is being generated')
parser.add_argument('name', help='The friendly name for the key') parser.add_argument('name', help='The friendly name for the key')
parser.add_argument('--expiration', help='The optional expiration date/time for the key', parser.add_argument('--expiration', help='The optional expiration date/time for the key',