openstack/keystone
Code Issues Proposed changes

Fixes duplicated DELETE queries on SQL backends

Browse Source 
The SQL deletion queries were sent twice a delete, for these entity types:
 - Region
 - Identity provider (federation extension)
 - Protocol (federation extension)
 - Consumer (oauth1 extension)
 - Access token (oauth1 extension)
 - request token (oauth1 extension)

Change-Id: Ibfaea87a24cac00f2a187eb5c8c8917b1f0a1929
Closes-Bug: 1324076
This commit is contained in:
Kévin Bernard-Allies 2014-05-28 16:06:50 +02:00
parent fa7812e3d4
commit 545ccf6d97
3 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
keystone/catalog/backends/sql.py
View File

@ -125,7 +125,6 @@ class Catalog(catalog.Driver):
with session.begin():
ref = self._get_region(session, region_id)
self._delete_child_regions(session, region_id)
session.query(Region).filter_by(id=region_id).delete()
session.delete(ref)
@sql.handle_conflicts(conflict_type='region')

6
keystone/contrib/federation/backends/sql.py
View File

@ -99,9 +99,6 @@ class Federation(core.Driver):
session = sql.get_session()
with session.begin():
idp_ref = self._get_idp(session, idp_id)
q = session.query(IdentityProviderModel)
q = q.filter_by(id=idp_id)
q.delete(synchronize_session=False)
session.delete(idp_ref)
def _get_idp(self, session, idp_id):
@ -182,9 +179,6 @@ class Federation(core.Driver):
session = sql.get_session()
with session.begin():
key_ref = self._get_protocol(session, idp_id, protocol_id)
q = session.query(FederationProtocolModel)
q = q.filter_by(id=protocol_id, idp_id=idp_id)
q.delete(synchronize_session=False)
session.delete(key_ref)
# Mapping CRUD

16
keystone/contrib/oauth1/backends/sql.py
View File

@ -109,9 +109,6 @@ class OAuth1(object):
def _delete_consumer(self, session, consumer_id):
consumer_ref = self._get_consumer(session, consumer_id)
q = session.query(Consumer)
q = q.filter_by(id=consumer_id)
q.delete(False)
session.delete(consumer_ref)
def _delete_request_tokens(self, session, consumer_id):
@ -120,9 +117,6 @@ class OAuth1(object):
req_tokens_list = set([x.id for x in req_tokens])
for token_id in req_tokens_list:
token_ref = self._get_request_token(session, token_id)
q = session.query(RequestToken)
q = q.filter_by(id=token_id)
q.delete(False)
session.delete(token_ref)
def _delete_access_tokens(self, session, consumer_id):
@ -131,9 +125,6 @@ class OAuth1(object):
acc_tokens_list = set([x.id for x in acc_tokens])
for token_id in acc_tokens_list:
token_ref = self._get_access_token(session, token_id)
q = session.query(AccessToken)
q = q.filter_by(id=token_id)
q.delete(False)
session.delete(token_ref)
def delete_consumer(self, consumer_id):
@ -246,9 +237,6 @@ class OAuth1(object):
session.add(token_ref)
# remove request token, it's been used
q = session.query(RequestToken)
q = q.filter_by(id=request_token_id)
q.delete(False)
session.delete(req_token_ref)
return token_ref.to_dict()
@ -278,8 +266,4 @@ class OAuth1(object):
if token_dict['authorizing_user_id'] != user_id:
raise exception.Unauthorized(_('User IDs do not match'))
q = session.query(AccessToken)
q = q.filter_by(id=access_token_id)
q.delete(False)
session.delete(token_ref)