Ubuntu Single Sign On Client

Merge lp:~alecu/ubuntu-sso-client/use-default-keyring-stable into lp:ubuntu-sso-client/stable-1-0

  1. use-default-keyring-stable
  2. Merge into stable-1-0
Proposed by Alejandro J. Cura
Status: Merged
Approved by: Natalia Bidart
Approved revision: 626
Merged at revision: 627
Proposed branch: lp:~alecu/ubuntu-sso-client/use-default-keyring-stable
Merge into: lp:ubuntu-sso-client/stable-1-0
Diff against target: 108 lines (+6/-32)
2 files modified
ubuntu_sso/keyring.py (+2/-14)
ubuntu_sso/tests/test_keyring.py (+4/-18)
To merge this branch: bzr merge lp:~alecu/ubuntu-sso-client/use-default-keyring-stable
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
John Lenton (community) Approve
Review via email: mp+36196@code.launchpad.net

Commit message

Do not create the login keyring, use default instead. (LP: #639690)

Description of the change

Do not create the login keyring, use default instead. (LP: #639690)

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubuntu_sso/keyring.py'
--- ubuntu_sso/keyring.py 2010-09-21 17:16:09 +0000
+++ ubuntu_sso/keyring.py 2010-09-21 19:08:45 +0000
@@ -59,8 +59,6 @@
59class Keyring(object):59class Keyring(object):
60 """A Keyring for a given application name."""60 """A Keyring for a given application name."""
6161
62 KEYRING_NAME = "login"
63
64 def __init__(self, app_name):62 def __init__(self, app_name):
65 """Initialize this instance given the app_name."""63 """Initialize this instance given the app_name."""
66 if not gnomekeyring.is_available():64 if not gnomekeyring.is_available():
@@ -68,12 +66,6 @@
68 self.app_name = app_name66 self.app_name = app_name
69 self.token_name = get_token_name(self.app_name)67 self.token_name = get_token_name(self.app_name)
7068
71 def _create_keyring(self, name):
72 """Creates a keyring, or if it already exists, it does nothing."""
73 keyring_names = gnomekeyring.list_keyring_names_sync()
74 if not name in keyring_names:
75 gnomekeyring.create_sync(name, None)
76
77 def _find_keyring_item(self, attr=None):69 def _find_keyring_item(self, attr=None):
78 """Return the keyring item or None if not found."""70 """Return the keyring item or None if not found."""
79 if attr is None:71 if attr is None:
@@ -105,13 +97,9 @@
105 # Creates the secret from the credentials97 # Creates the secret from the credentials
106 secret = urllib.urlencode(cred)98 secret = urllib.urlencode(cred)
10799
108 # Create the keyring if it does not exists
109 self._create_keyring(self.KEYRING_NAME)
110
111 # Add our SSO credentials to the keyring100 # Add our SSO credentials to the keyring
112 gnomekeyring.item_create_sync(self.KEYRING_NAME,101 gnomekeyring.item_create_sync(None, gnomekeyring.ITEM_GENERIC_SECRET,
113 gnomekeyring.ITEM_GENERIC_SECRET, self.app_name,102 self.app_name, self._get_keyring_attr(), secret, True)
114 self._get_keyring_attr(), secret, True)
115103
116 def _migrate_old_token_name(self):104 def _migrate_old_token_name(self):
117 """Migrate credentials with old name, store them with new name."""105 """Migrate credentials with old name, store them with new name."""
118106
=== modified file 'ubuntu_sso/tests/test_keyring.py'
--- ubuntu_sso/tests/test_keyring.py 2010-09-10 19:44:44 +0000
+++ ubuntu_sso/tests/test_keyring.py 2010-09-21 19:08:45 +0000
@@ -60,7 +60,6 @@
6060
61 def __init__(self):61 def __init__(self):
62 """Initialize this instance."""62 """Initialize this instance."""
63 self.keyrings = set()
64 self.id_counter = itertools.count()63 self.id_counter = itertools.count()
65 self.store = {}64 self.store = {}
66 self.deleted = []65 self.deleted = []
@@ -89,14 +88,6 @@
89 raise gnomekeyring.NoMatchError()88 raise gnomekeyring.NoMatchError()
90 return items89 return items
9190
92 def list_keyring_names_sync(self):
93 """The keyring you are looking for may be here."""
94 return self.keyrings
95
96 def create_sync(self, name, password):
97 """Thanks, I'll create that keyring for you."""
98 self.keyrings.add((name, password))
99
100 def is_available(self):91 def is_available(self):
101 """A very available keyring."""92 """A very available keyring."""
102 return True93 return True
@@ -146,9 +137,6 @@
146 self.mgk = MockGnomeKeyring()137 self.mgk = MockGnomeKeyring()
147 self.patch(gnomekeyring, "item_create_sync", self.mgk.item_create_sync)138 self.patch(gnomekeyring, "item_create_sync", self.mgk.item_create_sync)
148 self.patch(gnomekeyring, "is_available", self.mgk.is_available)139 self.patch(gnomekeyring, "is_available", self.mgk.is_available)
149 self.patch(gnomekeyring, "create_sync", self.mgk.create_sync)
150 self.patch(gnomekeyring, "list_keyring_names_sync",
151 self.mgk.list_keyring_names_sync)
152 self.patch(gnomekeyring, "find_items_sync", self.mgk.find_items_sync)140 self.patch(gnomekeyring, "find_items_sync", self.mgk.find_items_sync)
153 self.patch(gnomekeyring, "item_delete_sync", self.mgk.item_delete_sync)141 self.patch(gnomekeyring, "item_delete_sync", self.mgk.item_delete_sync)
154 fake_gethostname = build_fake_gethostname("darkstar")142 fake_gethostname = build_fake_gethostname("darkstar")
@@ -163,8 +151,6 @@
163151
164 self.assertEqual(len(self.mgk.store), 2)152 self.assertEqual(len(self.mgk.store), 2)
165 self.assertEqual(len(self.mgk.deleted), 0)153 self.assertEqual(len(self.mgk.deleted), 0)
166 self.assertEqual(self.mgk.keyrings,
167 set([(keyring.Keyring.KEYRING_NAME, None)]))
168154
169 def test_delete_ubuntusso(self):155 def test_delete_ubuntusso(self):
170 """Test that a given key is deleted."""156 """Test that a given key is deleted."""
@@ -202,8 +188,8 @@
202 "oauth_token_secret": sample_oauth_secret,188 "oauth_token_secret": sample_oauth_secret,
203 }189 }
204 secret = urllib.urlencode(old_creds)190 secret = urllib.urlencode(old_creds)
205 self.mgk.item_create_sync(keyring.U1_APP_NAME, None,191 self.mgk.item_create_sync(None, None,
206 keyring.Keyring.KEYRING_NAME,192 keyring.U1_APP_NAME,
207 keyring.U1_KEY_ATTR,193 keyring.U1_KEY_ATTR,
208 secret, True)194 secret, True)
209195
@@ -223,8 +209,8 @@
223 "oauth_token_secret": sample_oauth_secret,209 "oauth_token_secret": sample_oauth_secret,
224 }210 }
225 secret = urllib.urlencode(old_creds)211 secret = urllib.urlencode(old_creds)
226 self.mgk.item_create_sync(keyring.U1_APP_NAME, None,212 self.mgk.item_create_sync(None, None,
227 keyring.Keyring.KEYRING_NAME,213 keyring.U1_APP_NAME,
228 keyring.U1_KEY_ATTR,214 keyring.U1_KEY_ATTR,
229 secret, True)215 secret, True)
230216

Subscribers

People subscribed via source and target branches