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

keyserver: insert rotation policy into metadata

Browse source
This commit is contained in:
Jimmy Zelinskie 2016-04-05 11:58:34 -04:00 • committed by Jimmy Zelinskie
parent 885a41e6f5
commit e456228434
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
endpoints/key_server.py
View file

@ -97,13 +97,19 @@ def get_service_key(service, kid):
@key_server.route('/services/<service>/keys/<kid>', methods=['PUT']) @key_server.route('/services/<service>/keys/<kid>', methods=['PUT'])
def put_service_keys(service, kid): def put_service_keys(service, kid):
metadata = {'ip': request.remote_addr}
expiration_date = request.args.get('expiration', None) expiration_date = request.args.get('expiration', None)
if expiration_date: if expiration_date is not None:
try: try:
expiration_date = datetime.utcfromtimestamp(float(expiration_date)) expiration_date = datetime.utcfromtimestamp(float(expiration_date))
except ValueError: except ValueError:
abort(400) abort(400)
rotation_ttl = request.args.get('rotation', None)
if rotation_ttl is not None:
metadata['rotation_ttl'] = rotation_ttl
try: try:
jwk = request.get_json() jwk = request.get_json()
except ValueError: except ValueError:
@ -119,7 +125,6 @@ def put_service_keys(service, kid):
_validate_jwk(jwk, kid) _validate_jwk(jwk, kid)
metadata = {'ip': request.remote_addr}
signer_kid = _signer_kid(encoded_jwt) signer_kid = _signer_kid(encoded_jwt)
if kid == signer_kid or signer_kid is None: if kid == signer_kid or signer_kid is None: