Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #9556 - Better prompt for input on Password #9557

Merged
merged 7 commits into from
Apr 5, 2023
Merged

Fixes #9556 - Better prompt for input on Password #9557

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6f58b5
Fixes #9556 - Better prompt for input on Password
joakime Mar 31, 2023
2d71152
Allow blank username (results in no CRYPT output)
joakime Mar 31, 2023
95bd40c
Error on blank password during input
joakime Mar 31, 2023
7366465
Fixing PasswordTest.testCommandLineUsage
joakime Mar 31, 2023
411de6a
Merge remote-tracking branch 'origin/jetty-10.0.x' into fix/10.0.x/pa…
joakime Apr 3, 2023
7a861ae
Changes from review
joakime Apr 5, 2023
c1ec980
Changes from review
joakime Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
79 changes: 69 additions & 10 deletions jetty-util/src/main/java/org/eclipse/jetty/util/security/Password.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@

package org.eclipse.jetty.util.security;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Locale;

import org.eclipse.jetty.util.StringUtil;

/**
* Password utility class.
*
Expand Down Expand Up @@ -230,21 +234,76 @@ public static Password getPassword(String realm, String dft, String promptDft)
return new Password(passwd);
}

public static void main(String[] arg)
public static void main(String[] args) throws IOException
{
if (arg.length != 1 && arg.length != 2)
boolean promptUser = false;
String argUser = null;
String argPassword = null;

for (String arg: args)
{
if (arg.equals("--prompt"))
{
promptUser = true;
// ignore any other args
break;
}

if (argUser == null)
{
argUser = arg;
promptUser = true;
}
else
{
if (!arg.equals("?"))
promptUser = false;
argPassword = arg;
}
}

if (promptUser)
{
System.out.print("Username");
if (StringUtil.isNotBlank(argUser))
System.out.printf("[%s]", argUser);
System.out.print(": ");

BufferedReader input = new BufferedReader(new InputStreamReader(System.in));
String inputUser = input.readLine();
if (StringUtil.isNotBlank(inputUser))
argUser = inputUser;

System.out.print("Password: ");
argPassword = input.readLine();
if (StringUtil.isBlank(argPassword))
{
System.err.println("ERROR: blank passwords not supported");
System.exit(1);
}
}
else if (StringUtil.isBlank(argUser))
{
System.err.println("Usage - java " + Password.class.getName() + " [<user>] <password>");
System.err.println("If the password is ?, the user will be prompted for the password");
System.err.printf("Usage - java %s [<user>] <password> --prompt%n", Password.class.getName());
System.err.printf("Argument options:%n");
System.err.printf(" %s%n", Password.class.getName());
System.err.printf(" No arguments, will show this help%n");
System.err.printf(" %s myusername%n", Password.class.getName());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
System.err.printf(" %s myusername%n", Password.class.getName());
System.err.printf(" %s user%n", Password.class.getName());

System.err.printf(" username only, will prompt for entries%n");
System.err.printf(" %s myusername ?%n", Password.class.getName());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
System.err.printf(" %s myusername ?%n", Password.class.getName());
System.err.printf(" %s user ?%n", Password.class.getName());

System.err.printf(" username with question mark password, will prompt for entries%n");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
System.err.printf(" username with question mark password, will prompt for entries%n");
System.err.printf(" username with question mark password, will prompt for arguments%n");

System.err.printf(" %s myusername secretpassword%n", Password.class.getName());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
System.err.printf(" %s myusername secretpassword%n", Password.class.getName());
System.err.printf(" %s user password%n", Password.class.getName());

System.err.printf(" username with password, will produce obfuscation results%n");
System.err.printf(" %s --prompt%n", Password.class.getName());
System.err.printf(" will prompt for entries%n");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
System.err.printf(" will prompt for entries%n");
System.err.printf(" will prompt for arguments%n");

System.exit(1);
}
String p = arg[arg.length == 1 ? 0 : 1];
Password pw = new Password(p);
System.err.println(pw.toString());

Password pw = new Password(argPassword);
System.err.println(obfuscate(pw.toString()));
System.err.println(Credential.MD5.digest(p));
if (arg.length == 2)
System.err.println(Credential.Crypt.crypt(arg[0], pw.toString()));
System.err.println(Credential.MD5.digest(argPassword));
if (StringUtil.isNotBlank(argUser))
System.err.println(Credential.Crypt.crypt(argUser, pw.toString()));
System.exit(0);
}
}
4 changes: 2 additions & 2 deletions jetty-util/src/test/java/org/eclipse/jetty/util/security/PasswordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import org.eclipse.jetty.toolchain.test.MavenPaths;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -62,7 +63,7 @@ public void testObfuscateUnicode()
public void testCommandLineUsage() throws IOException, InterruptedException
{
ProcessBuilder passwordBuilder = new ProcessBuilder()
.directory(MavenTestingUtils.getTargetDir())
.directory(MavenPaths.targetDir().toFile())
.command("java",
"-cp", MavenTestingUtils.getTargetPath("classes").toString(),
Password.class.getName(),
Expand All @@ -79,7 +80,6 @@ public void testCommandLineUsage() throws IOException, InterruptedException
assertThat("Non-error exit code: " + output, exitCode, is(0));
assertThat("Output", output, not(containsString("Exception")));
assertThat("Output", output, allOf(
containsString("password"),
containsString("OBF:"),
containsString("MD5:"),
containsString("CRYPT:")
Expand Down