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
1=== modified file 'ubuntu_sso/keyring.py'
2--- ubuntu_sso/keyring.py 2010-09-21 17:16:09 +0000
3+++ ubuntu_sso/keyring.py 2010-09-21 19:08:45 +0000
4@@ -59,8 +59,6 @@
5 class Keyring(object):
6 """A Keyring for a given application name."""
7
8- KEYRING_NAME = "login"
9-
10 def __init__(self, app_name):
11 """Initialize this instance given the app_name."""
12 if not gnomekeyring.is_available():
13@@ -68,12 +66,6 @@
14 self.app_name = app_name
15 self.token_name = get_token_name(self.app_name)
16
17- def _create_keyring(self, name):
18- """Creates a keyring, or if it already exists, it does nothing."""
19- keyring_names = gnomekeyring.list_keyring_names_sync()
20- if not name in keyring_names:
21- gnomekeyring.create_sync(name, None)
22-
23 def _find_keyring_item(self, attr=None):
24 """Return the keyring item or None if not found."""
25 if attr is None:
26@@ -105,13 +97,9 @@
27 # Creates the secret from the credentials
28 secret = urllib.urlencode(cred)
29
30- # Create the keyring if it does not exists
31- self._create_keyring(self.KEYRING_NAME)
32-
33 # Add our SSO credentials to the keyring
34- gnomekeyring.item_create_sync(self.KEYRING_NAME,
35- gnomekeyring.ITEM_GENERIC_SECRET, self.app_name,
36- self._get_keyring_attr(), secret, True)
37+ gnomekeyring.item_create_sync(None, gnomekeyring.ITEM_GENERIC_SECRET,
38+ self.app_name, self._get_keyring_attr(), secret, True)
39
40 def _migrate_old_token_name(self):
41 """Migrate credentials with old name, store them with new name."""
42
43=== modified file 'ubuntu_sso/tests/test_keyring.py'
44--- ubuntu_sso/tests/test_keyring.py 2010-09-10 19:44:44 +0000
45+++ ubuntu_sso/tests/test_keyring.py 2010-09-21 19:08:45 +0000
46@@ -60,7 +60,6 @@
47
48 def __init__(self):
49 """Initialize this instance."""
50- self.keyrings = set()
51 self.id_counter = itertools.count()
52 self.store = {}
53 self.deleted = []
54@@ -89,14 +88,6 @@
55 raise gnomekeyring.NoMatchError()
56 return items
57
58- def list_keyring_names_sync(self):
59- """The keyring you are looking for may be here."""
60- return self.keyrings
61-
62- def create_sync(self, name, password):
63- """Thanks, I'll create that keyring for you."""
64- self.keyrings.add((name, password))
65-
66 def is_available(self):
67 """A very available keyring."""
68 return True
69@@ -146,9 +137,6 @@
70 self.mgk = MockGnomeKeyring()
71 self.patch(gnomekeyring, "item_create_sync", self.mgk.item_create_sync)
72 self.patch(gnomekeyring, "is_available", self.mgk.is_available)
73- self.patch(gnomekeyring, "create_sync", self.mgk.create_sync)
74- self.patch(gnomekeyring, "list_keyring_names_sync",
75- self.mgk.list_keyring_names_sync)
76 self.patch(gnomekeyring, "find_items_sync", self.mgk.find_items_sync)
77 self.patch(gnomekeyring, "item_delete_sync", self.mgk.item_delete_sync)
78 fake_gethostname = build_fake_gethostname("darkstar")
79@@ -163,8 +151,6 @@
80
81 self.assertEqual(len(self.mgk.store), 2)
82 self.assertEqual(len(self.mgk.deleted), 0)
83- self.assertEqual(self.mgk.keyrings,
84- set([(keyring.Keyring.KEYRING_NAME, None)]))
85
86 def test_delete_ubuntusso(self):
87 """Test that a given key is deleted."""
88@@ -202,8 +188,8 @@
89 "oauth_token_secret": sample_oauth_secret,
90 }
91 secret = urllib.urlencode(old_creds)
92- self.mgk.item_create_sync(keyring.U1_APP_NAME, None,
93- keyring.Keyring.KEYRING_NAME,
94+ self.mgk.item_create_sync(None, None,
95+ keyring.U1_APP_NAME,
96 keyring.U1_KEY_ATTR,
97 secret, True)
98
99@@ -223,8 +209,8 @@
100 "oauth_token_secret": sample_oauth_secret,
101 }
102 secret = urllib.urlencode(old_creds)
103- self.mgk.item_create_sync(keyring.U1_APP_NAME, None,
104- keyring.Keyring.KEYRING_NAME,
105+ self.mgk.item_create_sync(None, None,
106+ keyring.U1_APP_NAME,
107 keyring.U1_KEY_ATTR,
108 secret, True)
109

Subscribers

People subscribed via source and target branches