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

canonicalize json

Browse source
This commit is contained in:
Jimmy Zelinskie 2016-03-29 14:49:07 -04:00 • committed by Jimmy Zelinskie
parent f406942984
commit 97ae800e6c
3 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
endpoints/key_server.py
View file

@ -1,5 +1,3 @@
import json
from datetime import datetime
import jwt
@ -68,7 +66,14 @@ def get_service_keys(service):
@key_server.route('/services/<service>/keys/<kid>', methods=['GET'])
def get_service_key(kid):
key = data.model.service_keys.get_service_key(kid)
try:
key = data.model.service_keys.get_service_key(kid)
except data.model.ServiceKeyDoesNotExist:
abort(404)
if key.approval is None:
abort(404)
return jsonify(key.jwk)
@ -92,26 +97,30 @@ def put_service_keys(service, kid):
_validate_jwk(jwk, kid)
metadata = {'ip': request.remote_addr}
signer_kid = _signer_kid(encoded_jwt)
signer_key = _signer_key(signer_kid)
if kid == signer_kid:
# The key is self-signed. Create a new instance and await approval.
_validate_jwt(encoded_jwt, jwk, service)
data.model.service_keys.create_service_key('', kid, service, jwk, metadata, expiration_date)
return make_response('', 202)
metadata.update({'created_by': 'Key Rotation'})
signer_key = _signer_key(signer_kid)
signer_jwk = signer_key.jwk
if signer_key.service != service:
abort(403)
_validate_jwt(encoded_jwt, signer_key.jwk, service)
metadata = {
'ip': request.remote_addr,
'created_by': 'Key Rotation',
'rotated_by': json.dumps(signer_key),
}
_validate_jwt(encoded_jwt, signer_jwk, service)
try:
data.model.service_keys.replace_service_key(kid, jwk, metadata, expiration_date)
except data.model.ServiceKeyDoesNotExist:
abort(404)
return make_response('', 200)
@key_server.route('/services/<service>/keys/<kid>', methods=['DELETE'])
def delete_service_key(service, kid):