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

Add error message if using password list in config #941

Merged
merged 6 commits into from
Dec 6, 2019
Merged

Add error message if using password list in config #941

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8e494c
Remove support for providing plaintext passwords in config/tessera CLI
chris-j-h Dec 5, 2019
958b5d6
Only validate key passwords once the rest of config has been validated
chris-j-h Dec 5, 2019
62e2fcd
Remove support for passwords field in config when running w/ keygen
chris-j-h Dec 5, 2019
67b2573
Account for keys configuration containing only the passwordFile field
chris-j-h Dec 5, 2019
4c6d426
Unit tests for deprecated passwords config field
chris-j-h Dec 6, 2019
2087cc0
Merge branch 'master' into add-error-message-if-using-pwd-list
namtruong Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 23 additions & 32 deletions cli/cli-api/src/main/java/com/quorum/tessera/cli/parsers/ConfigurationParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.quorum.tessera.cli.parsers;

import com.quorum.tessera.config.Config;
import com.quorum.tessera.config.ConfigException;
import com.quorum.tessera.config.KeyConfiguration;
import com.quorum.tessera.config.keypairs.ConfigKeyPair;
import com.quorum.tessera.config.util.ConfigFileStore;
Expand All @@ -13,25 +14,26 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import static java.nio.file.StandardOpenOption.APPEND;
import java.util.List;
import java.util.Objects;

import static java.nio.file.StandardOpenOption.CREATE_NEW;
import java.nio.file.attribute.PosixFilePermission;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static java.nio.file.StandardOpenOption.APPEND;
import static java.nio.file.StandardOpenOption.CREATE_NEW;

public class ConfigurationParser implements Parser<Config> {

protected static final Set<PosixFilePermission> NEW_PASSWORD_FILE_PERMS =
Stream.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE).collect(Collectors.toSet());

protected static final String passwordsMessage = "Configfile must contain \"passwordFile\" field. The \"passwords\" field is no longer supported.";

private final List<ConfigKeyPair> newlyGeneratedKeys;

private final FilesDelegate filesDelegate;
Expand All @@ -56,7 +58,7 @@ public Config parse(final CommandLine commandLine) throws IOException {
if (commandLine.hasOption("configfile") && !isGeneratingWithKeyVault) {
final Path path = Paths.get(commandLine.getOptionValue("configfile"));

if (!Files.exists(path)) {
if (!filesDelegate.exists(path)) {
throw new FileNotFoundException(String.format("%s not found.", path));
}

Expand All @@ -68,6 +70,9 @@ public Config parse(final CommandLine commandLine) throws IOException {
config.setKeys(new KeyConfiguration());
config.getKeys().setKeyData(new ArrayList<>());
}
if (config.getKeys().getKeyData() == null) {
config.getKeys().setKeyData(new ArrayList<>());
}
doPasswordStuff(config);
config.getKeys().getKeyData().addAll(newlyGeneratedKeys);
}
Expand All @@ -84,12 +89,12 @@ public Config parse(final CommandLine commandLine) throws IOException {
return config;
}

private static void output(CommandLine commandLine, Config config) throws IOException {
private void output(CommandLine commandLine, Config config) throws IOException {

if (commandLine.hasOption("output")) {
final Path outputConfigFile = Paths.get(commandLine.getOptionValue("output"));

try (OutputStream out = Files.newOutputStream(outputConfigFile, CREATE_NEW)) {
try (OutputStream out = filesDelegate.newOutputStream(outputConfigFile, CREATE_NEW)) {
JaxbUtil.marshal(config, out);
}
} else {
Expand All @@ -107,35 +112,21 @@ private void createFile(Path fileToMake) {
}
}

public Config doPasswordStuff(Config config) {

public Config doPasswordStuff(Config config) throws ConfigException {
final List<String> newPasswords =
newlyGeneratedKeys.stream().map(ConfigKeyPair::getPassword).collect(Collectors.toList());
newlyGeneratedKeys.stream().map(ConfigKeyPair::getPassword).collect(Collectors.toList());

if (config.getKeys().getPasswords() != null) {
config.getKeys().getPasswords().addAll(newPasswords);
return config;
}
boolean hasNewPasswords = newPasswords.stream().anyMatch(p -> Objects.nonNull(p) && !p.isEmpty());
boolean isUsingPasswordFile = Objects.nonNull(config.getKeys().getPasswordFile());

if (hasNewPasswords) {
if (!isUsingPasswordFile) {
throw new ConfigException(new RuntimeException(passwordsMessage));
}

if (config.getKeys().getPasswordFile() != null) {
Path passwordFile = config.getKeys().getPasswordFile();
createFile(passwordFile);
filesDelegate.write(passwordFile, newPasswords, APPEND);
return config;
}

/*
* Populate transient list of passwords that is consumed by KeyPasswordResolver
*/
if (newPasswords.stream().anyMatch(Objects::nonNull) && config.getKeys().getKeyData() != null) {

final List<String> existingPasswords =
config.getKeys().getKeyData().stream().map(k -> "").collect(Collectors.toList());

existingPasswords.addAll(newPasswords);
config.getKeys().setPasswords(existingPasswords);

return config;
}

return config;
Expand Down
Loading