x/tatu
Code Issues Proposed changes

Make serial number the main identifier of UserCert

Browse Source
This commit is contained in:
Pino de Candia 2018-01-24 00:04:26 -06:00
parent 5153135019
commit 6ecf7ceec7
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tatu/api/app.py
View File

@ -23,7 +23,7 @@ def create_app(sa):
api.add_route('/authorities', models.Authorities()) api.add_route('/authorities', models.Authorities())
api.add_route('/authorities/{auth_id}', models.Authority()) api.add_route('/authorities/{auth_id}', models.Authority())
api.add_route('/usercerts', models.UserCerts()) api.add_route('/usercerts', models.UserCerts())
api.add_route('/usercerts/{user_id}/{fingerprint}', models.UserCert()) api.add_route('/usercerts/{serial}', models.UserCert())
api.add_route('/hostcerts', models.HostCerts()) api.add_route('/hostcerts', models.HostCerts())
api.add_route('/hostcerts/{host_id}/{fingerprint}', models.HostCert()) api.add_route('/hostcerts/{host_id}/{fingerprint}', models.HostCert())
api.add_route('/hosttokens', models.Tokens()) api.add_route('/hosttokens', models.Tokens())

5
tatu/api/models.py
View File

@ -164,8 +164,8 @@ class UserCerts(object):
class UserCert(object): class UserCert(object):
@falcon.before(validate) @falcon.before(validate)
def on_get(self, req, resp, user_id, fingerprint): def on_get(self, req, resp, serial):
user = db.getUserCert(self.session, user_id, fingerprint) user = db.getUserCertBySerial(self.session, serial)
if user is None: if user is None:
resp.status = falcon.HTTP_NOT_FOUND resp.status = falcon.HTTP_NOT_FOUND
return return
@ -316,3 +316,4 @@ class RevokedUserKeys(object):
cert=req.body.get('cert', None) cert=req.body.get('cert', None)
) )
resp.status = falcon.HTTP_OK resp.status = falcon.HTTP_OK
resp.body = json.dumps({})

5
tatu/db/models.py
View File

@ -78,7 +78,10 @@ sa.Index('idx_user_finger', UserCert.user_id, UserCert.fingerprint, unique=True)
def getUserCertBySerial(session, serial): def getUserCertBySerial(session, serial):
return session.query(UserCert).get(serial) try:
return session.query(UserCert).get(serial)
except Exception:
return None
def getUserCert(session, user_id, fingerprint): def getUserCert(session, user_id, fingerprint):