From 6718eb8bc04df52cd475c7659831d9f549b9cf2e Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 24 Mar 2011 10:57:08 -0400 Subject: sss_obfuscate: abort on ctrl+c There is a python bug (http://bugs.python.org/issue11236) where getpass.getpass() does not throw KeyboardInterrupt on ctrl+c. This workaround is the closest we can get: if we detect the control character in the string that we read, we'll cancel. --- src/tools/sss_obfuscate | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/tools/sss_obfuscate b/src/tools/sss_obfuscate index 5a5742b9c..fbea1213d 100644 --- a/src/tools/sss_obfuscate +++ b/src/tools/sss_obfuscate @@ -44,13 +44,25 @@ def main(): try: pprompt = lambda: (getpass.getpass("Enter password: "), getpass.getpass("Re-enter password: ")) p1, p2 = pprompt() + + #Work around bug in Python 2.6 + if '\x03' in p1 or '\x03' in p2: + raise KeyboardInterrupt + while p1 != p2: print('Passwords do not match. Try again') p1, p2 = pprompt() + + #Work around bug in Python 2.6 + if '\x03' in p1 or '\x03' in p2: + raise KeyboardInterrupt password = p1 + except EOFError: print >> sys.stderr, '\nUnexpected end-of-file. Password change aborted' return 1 + except KeyboardInterrupt: + return 1 else: try: -- cgit