Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-9785 Improved Login Credentials Writer File Handling 

Signed-off-by: Nathan Gough <thenatog@gmail.com>

This closes #5856.
This commit is contained in:
exceptionfactory 2022-03-10 09:27:36 -06:00 committed by Nathan Gough
parent 546f986603
commit 859d5fe8cf
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nifi-commons/nifi-single-user-utils/src/main/java/org/apache/nifi/authentication/single/user/writer/StandardLoginCredentialsWriter.java
View File

@ -29,26 +29,20 @@ import javax.xml.stream.events.Characters;
import javax.xml.stream.events.EndElement; import javax.xml.stream.events.EndElement;
import javax.xml.stream.events.StartElement; import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent; import javax.xml.stream.events.XMLEvent;
import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.UncheckedIOException; import java.io.UncheckedIOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.Iterator; import java.util.Iterator;
/** /**
* Standard Login Credentials Writer updates Login Identity Providers Single User definition with Login Credentials * Standard Login Credentials Writer updates Login Identity Providers Single User definition with Login Credentials
*/ */
public class StandardLoginCredentialsWriter implements LoginCredentialsWriter { public class StandardLoginCredentialsWriter implements LoginCredentialsWriter {
private static final String PROVIDERS_PREFIX = "login-identity-providers-";
private static final String PROVIDERS_SUFFIX = ".xml";
private static final String CLASS_TAG = "class"; private static final String CLASS_TAG = "class";
private static final String PROVIDER_TAG = "provider"; private static final String PROVIDER_TAG = "provider";
@ -71,10 +65,9 @@ public class StandardLoginCredentialsWriter implements LoginCredentialsWriter {
@Override @Override
public void writeLoginCredentials(final SingleUserCredentials singleUserCredentials) { public void writeLoginCredentials(final SingleUserCredentials singleUserCredentials) {
try { final byte[] providers = readProviders();
final File updatedProvidersFile = File.createTempFile(PROVIDERS_PREFIX, PROVIDERS_SUFFIX); try (final InputStream providersInputStream = new ByteArrayInputStream(providers)) {
writeLoginCredentials(singleUserCredentials, updatedProvidersFile); writeLoginCredentials(singleUserCredentials, providersInputStream);
Files.move(updatedProvidersFile.toPath(), providersFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch (final IOException e) { } catch (final IOException e) {
throw new UncheckedIOException("Writing Login Identity Providers Failed", e); throw new UncheckedIOException("Writing Login Identity Providers Failed", e);
} catch (final XMLStreamException e) { } catch (final XMLStreamException e) {
@ -82,14 +75,20 @@ public class StandardLoginCredentialsWriter implements LoginCredentialsWriter {
} }
} }
private void writeLoginCredentials(final SingleUserCredentials singleUserCredentials, final File updatedProvidersFile) throws IOException, XMLStreamException { private byte[] readProviders() {
try (final OutputStream outputStream = new FileOutputStream(updatedProvidersFile)) { try {
return Files.readAllBytes(providersFile.toPath());
} catch (final IOException e) {
throw new UncheckedIOException("Reading Login Identity Providers Failed", e);
}
}
private void writeLoginCredentials(final SingleUserCredentials singleUserCredentials, final InputStream inputStream) throws IOException, XMLStreamException {
try (final OutputStream outputStream = new FileOutputStream(providersFile)) {
final XMLEventWriter providersWriter = getProvidersWriter(outputStream); final XMLEventWriter providersWriter = getProvidersWriter(outputStream);
try (final InputStream inputStream = new FileInputStream(providersFile)) { final XMLEventReader providersReader = getProvidersReader(inputStream);
final XMLEventReader providersReader = getProvidersReader(inputStream); updateLoginIdentityProviders(singleUserCredentials, providersReader, providersWriter);
updateLoginIdentityProviders(singleUserCredentials, providersReader, providersWriter); providersReader.close();
providersReader.close();
}
providersWriter.close(); providersWriter.close();
} }
} }
@ -131,7 +130,7 @@ public class StandardLoginCredentialsWriter implements LoginCredentialsWriter {
* *
* @param providersReader Providers Reader * @param providersReader Providers Reader
* @param providersWriter Providers Writer * @param providersWriter Providers Writer
* @param propertyValue Property Value to be added * @param propertyValue Property Value to be added
* @throws XMLStreamException Thrown on XMLEventReader.nextEvent() * @throws XMLStreamException Thrown on XMLEventReader.nextEvent()
*/ */
private void processProperty(final XMLEventReader providersReader, final XMLEventWriter providersWriter, final String propertyValue) throws XMLStreamException { private void processProperty(final XMLEventReader providersReader, final XMLEventWriter providersWriter, final String propertyValue) throws XMLStreamException {

17
nifi-commons/nifi-single-user-utils/src/test/java/org/apache/nifi/authentication/single/user/writer/StandardLoginCredentialsWriterTest.java
View File

@ -19,7 +19,9 @@ package org.apache.nifi.authentication.single.user.writer;
import org.apache.nifi.authentication.single.user.SingleUserCredentials; import org.apache.nifi.authentication.single.user.SingleUserCredentials;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.UncheckedIOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -27,6 +29,8 @@ import java.nio.file.Paths;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import java.util.UUID; import java.util.UUID;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
public class StandardLoginCredentialsWriterTest { public class StandardLoginCredentialsWriterTest {
@ -38,6 +42,19 @@ public class StandardLoginCredentialsWriterTest {
private static final String PROVIDER_CLASS = SingleUserCredentials.class.getName(); private static final String PROVIDER_CLASS = SingleUserCredentials.class.getName();
@Test
public void testWriteLoginCredentialsProvidersNotFound() {
final File providersNotFound = new File(UUID.randomUUID().toString());
assertFalse(providersNotFound.exists());
final StandardLoginCredentialsWriter writer = new StandardLoginCredentialsWriter(providersNotFound);
final String username = UUID.randomUUID().toString();
final String password = UUID.randomUUID().toString();
final SingleUserCredentials credentials = new SingleUserCredentials(username, password, PROVIDER_CLASS);
assertThrows(UncheckedIOException.class, () -> writer.writeLoginCredentials(credentials));
}
@Test @Test
public void testWriteLoginCredentialsBlankProviders() throws IOException, URISyntaxException { public void testWriteLoginCredentialsBlankProviders() throws IOException, URISyntaxException {
final Path sourceProvidersPath = Paths.get(getClass().getResource(BLANK_PROVIDERS).toURI()); final Path sourceProvidersPath = Paths.get(getClass().getResource(BLANK_PROVIDERS).toURI());