1 files changed, 14 insertions, 2 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py
index 1e77657d..362da18e 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -393,14 +393,26 @@ class textui(backend.Backend):
             raw_input(self.encode(prompt))
         )
 
+    def read_password(self, label):
+        """
+        Read a password either by prompting the user or from stdin depending
+        on whether there is a tty.
+
+        This will let you do something like: echo -e "foo\nfoo\n" | ipa passwd
+        """
+        if sys.stdin.isatty():
+            return getpass.getpass(label)
+        else:
+            return sys.stdin.readline().strip()
+
     def prompt_password(self, label):
         """
         Prompt user for a password.
         """
         try:
             while True:
-                pw1 = getpass.getpass('%s: ' % label)
-                pw2 = getpass.getpass(
+                pw1 = self.read_password('%s: ' % label)
+                pw2 = self.read_password(
                     _('Enter %(label)s again to verify: ') % dict(label=label)
                 )
                 if pw1 == pw2: