You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2016/07/18 10:53:25 UTC
svn commit: r1753205 - in
/commons/proper/net/trunk/src/main/java/examples/mail: IMAPUtils.java
Utils.java
Author: sebb
Date: Mon Jul 18 10:53:24 2016
New Revision: 1753205
URL: http://svn.apache.org/viewvc?rev=1753205&view=rev
Log:
Move password prompting into Utilities class
Added:
commons/proper/net/trunk/src/main/java/examples/mail/Utils.java (with props)
Modified:
commons/proper/net/trunk/src/main/java/examples/mail/IMAPUtils.java
Modified: commons/proper/net/trunk/src/main/java/examples/mail/IMAPUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/mail/IMAPUtils.java?rev=1753205&r1=1753204&r2=1753205&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/examples/mail/IMAPUtils.java (original)
+++ commons/proper/net/trunk/src/main/java/examples/mail/IMAPUtils.java Mon Jul 18 10:53:24 2016
@@ -17,12 +17,8 @@
package examples.mail;
-import java.io.BufferedReader;
-import java.io.Console;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.URI;
-import java.util.Locale;
import org.apache.commons.net.ProtocolCommandListener;
import org.apache.commons.net.imap.IMAPClient;
@@ -57,37 +53,8 @@ class IMAPUtils {
String username = userpass[0];
String password = userpass[1];
- /*
- * If the initial password is:
- * '*' - replace it with a line read from the system console
- * '-' - replace it with next line from STDIN
- * 'ABCD' - if the input is all upper case, use the field as an environment variable name
- *
- * Note: there are no guarantees that the password cannot be snooped.
- *
- * Even using the console may be subject to memory snooping,
- * however it should be safer than the other methods.
- *
- * STDIN may require creating a temporary file which could be read by others
- * Environment variables may be visible by using PS
- */
- if ("-".equals(password)) { // stdin
- BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
- password = in.readLine();
- } else if ("*".equals(password)) { // console
- Console con = System.console(); // Java 1.6
- if (con != null) {
- char[] pwd = con.readPassword("Password for " + username + ": ");
- password = new String(pwd);
- } else {
- throw new IOException("Cannot access Console");
- }
- } else if (password.equals(password.toUpperCase(Locale.ROOT))) { // environment variable name
- final String tmp = System.getenv(password);
- if (tmp != null) { // don't overwrite if variable does not exist (just in case password is all uppers)
- password=tmp;
- }
- }
+ // prompt for the password if necessary
+ password = Utils.getPassword(username, password);
final IMAPClient imap;
Added: commons/proper/net/trunk/src/main/java/examples/mail/Utils.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/mail/Utils.java?rev=1753205&view=auto
==============================================================================
--- commons/proper/net/trunk/src/main/java/examples/mail/Utils.java (added)
+++ commons/proper/net/trunk/src/main/java/examples/mail/Utils.java Mon Jul 18 10:53:24 2016
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package examples.mail;
+
+import java.io.BufferedReader;
+import java.io.Console;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Locale;
+
+/**
+ * Utilities for mail examples
+ */
+class Utils {
+
+ private Utils() {
+ // not instantiable
+ }
+
+ /**
+ * If the initial password is:
+ * '*' - replace it with a line read from the system console
+ * '-' - replace it with next line from STDIN
+ * 'ABCD' - if the input is all upper case, use the field as an environment variable name
+ *
+ * Note: there are no guarantees that the password cannot be snooped.
+ *
+ * Even using the console may be subject to memory snooping,
+ * however it should be safer than the other methods.
+ *
+ * STDIN may require creating a temporary file which could be read by others
+ * Environment variables may be visible by using PS
+ */
+ static String getPassword(String username, String password) throws IOException {
+ if ("-".equals(password)) { // stdin
+ BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+ password = in.readLine();
+ } else if ("*".equals(password)) { // console
+ Console con = System.console(); // Java 1.6
+ if (con != null) {
+ char[] pwd = con.readPassword("Password for " + username + ": ");
+ password = new String(pwd);
+ } else {
+ throw new IOException("Cannot access Console");
+ }
+ } else if (password.equals(password.toUpperCase(Locale.ROOT))) { // environment variable name
+ final String tmp = System.getenv(password);
+ if (tmp != null) { // don't overwrite if variable does not exist (just in case password is all uppers)
+ password=tmp;
+ }
+ }
+ return password;
+ }
+
+}
Propchange: commons/proper/net/trunk/src/main/java/examples/mail/Utils.java
------------------------------------------------------------------------------
svn:eol-style = native