Merge branch 'master' of https://github.com/bhuvaneswaran/python-openstackclient

bhuvan · bhuvan · commit b8e44bf585bd · 2012-08-02T13:29:46.000-07:00
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
@@ -20,6 +20,7 @@
 """
 
 import getpass
+import keyring
 import logging
 import os
 import sys
@@ -33,6 +34,7 @@
 
 
 VERSION = '0.1'
+KEYRING_SERVICE = 'openstack'
 
 
 def env(*vars, **kwargs):
@@ -149,12 +151,14 @@ def authenticate_user(self):
                     "You must provide a username via"
                     " either --os-username or env[OS_USERNAME]")
 
+            self.get_password_from_keyring()
             if not self.options.os_password:
                 # No password, if we've got a tty, try prompting for it
                 if hasattr(sys.stdin, 'isatty') and sys.stdin.isatty():
                     # Check for Ctl-D
                     try:
                         self.options.os_password = getpass.getpass()
+                        self.set_password_in_keyring()
                     except EOFError:
                         pass
                 # No password because we did't have a tty or the
@@ -188,6 +192,24 @@ def authenticate_user(self):
             )
         return
 
+    def get_password_from_keyring(self):
+        """Get password from keyring, if it's set"""
+        service = KEYRING_SERVICE
+        if not self.options.os_password:
+            password = keyring.get_password(service, self.options.os_username)
+            os.options.os_password = password
+
+    def set_password_in_keyring(self):
+        """Set password in keyring for this user"""
+        service = KEYRING_SERVICE
+        if self.options.os_password:
+            password = keyring.get_password(service, self.options.os_username)
+            # either password is not set in keyring, or it is different
+            if password != self.options.os_password:
+                keyring.set_password(service,
+                                     self.options.os_username,
+                                     self.options.os_password)
+
     def initialize_app(self, argv):
         """Global app init bits:
 
diff --git a/tools/pip-requires b/tools/pip-requires
@@ -1,6 +1,7 @@
 cliff
 argparse
 httplib2
+keyring
 prettytable
 python-keystoneclient>=0.1,<0.2
 python-novaclient>=2,<3
