You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2018/04/11 07:39:17 UTC
ant git commit: remove obsolete reflection for Java6 code
Repository: ant
Updated Branches:
refs/heads/master cc335d3a4 -> 066c4ce61
remove obsolete reflection for Java6 code
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/066c4ce6
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/066c4ce6
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/066c4ce6
Branch: refs/heads/master
Commit: 066c4ce61e8a9da76ccbbc99972b5d20cdcc69b0
Parents: cc335d3
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Apr 11 09:36:58 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Apr 11 09:38:16 2018 +0200
----------------------------------------------------------------------
.../tools/ant/input/SecureInputHandler.java | 26 ++++++--------------
1 file changed, 8 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/066c4ce6/src/main/org/apache/tools/ant/input/SecureInputHandler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/input/SecureInputHandler.java b/src/main/org/apache/tools/ant/input/SecureInputHandler.java
index 039c6f8..390a3cc 100644
--- a/src/main/org/apache/tools/ant/input/SecureInputHandler.java
+++ b/src/main/org/apache/tools/ant/input/SecureInputHandler.java
@@ -17,13 +17,12 @@
*/
package org.apache.tools.ant.input;
+import java.util.Arrays;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.util.ReflectUtil;
/**
* Prompts and requests input. May loop until a valid input has
- * been entered. Doesn't echo input (requires Java6). If Java6 is not
- * available, falls back to the DefaultHandler (insecure).
+ * been entered. Doesn't echo input.
* @since Ant 1.7.1
*/
public class SecureInputHandler extends DefaultInputHandler {
@@ -41,19 +40,10 @@ public class SecureInputHandler extends DefaultInputHandler {
*/
public void handleInput(InputRequest request) throws BuildException {
String prompt = getPrompt(request);
- try {
- Object console = ReflectUtil.invokeStatic(System.class, "console");
- do {
- char[] input = ReflectUtil.invoke(
- console, "readPassword", String.class, prompt,
- Object[].class, null);
- request.setInput(new String(input));
- /* for security zero char array after retrieving value */
- java.util.Arrays.fill(input, ' ');
- } while (!request.isInputValid());
- } catch (Exception e) {
- /* Java6 not present use default handler */
- super.handleInput(request);
- }
+ do {
+ char[] input = System.console().readPassword();
+ request.setInput(new String(input));
+ Arrays.fill(input, ' ');
+ } while (!request.isInputValid());
}
-}
\ No newline at end of file
+}