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

NIFI-4608 Removed unnecessary NiFiProperties mocking given enhancements to StringEncryptor. 

Fixed checkstyle issues.
Fixed test failure in FingerprintFactoryTest.

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #2273.
This commit is contained in:
Andy LoPresto 2017-11-14 10:36:35 -08:00 committed by Pierre Villard
parent b9c53083c4
commit 7f8007f22a
3 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
View File

@ -17,7 +17,6 @@
package org.apache.nifi.web.api.dto; package org.apache.nifi.web.api.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
/** /**

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/encrypt/StringEncryptor.java
View File

@ -113,7 +113,7 @@ public class StringEncryptor {
* @param provider the JCA Security provider ({@link EncryptionMethod#provider}) * @param provider the JCA Security provider ({@link EncryptionMethod#provider})
* @param key the UTF-8 characters from nifi.properties -- nifi.sensitive.props.key * @param key the UTF-8 characters from nifi.properties -- nifi.sensitive.props.key
*/ */
protected StringEncryptor(final String algorithm, final String provider, final String key) { public StringEncryptor(final String algorithm, final String provider, final String key) {
this.algorithm = algorithm; this.algorithm = algorithm;
this.provider = provider; this.provider = provider;
this.key = null; this.key = null;

34
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
View File

@ -21,14 +21,17 @@ import static org.apache.nifi.fingerprint.FingerprintFactory.FLOW_CONFIG_XSD;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Collections; import java.util.Collections;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.connectable.Position; import org.apache.nifi.connectable.Position;
@ -40,34 +43,24 @@ import org.apache.nifi.encrypt.StringEncryptor;
import org.apache.nifi.groups.RemoteProcessGroup; import org.apache.nifi.groups.RemoteProcessGroup;
import org.apache.nifi.remote.RemoteGroupPort; import org.apache.nifi.remote.RemoteGroupPort;
import org.apache.nifi.remote.protocol.SiteToSiteTransportProtocol; import org.apache.nifi.remote.protocol.SiteToSiteTransportProtocol;
import org.apache.nifi.util.NiFiProperties;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.ErrorHandler; import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException; import org.xml.sax.SAXParseException;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
/** /**
*/ */
public class FingerprintFactoryTest { public class FingerprintFactoryTest {
private NiFiProperties nifiProperties;
private StringEncryptor encryptor; private StringEncryptor encryptor;
private FingerprintFactory fingerprinter; private FingerprintFactory fingerprinter;
@Before @Before
public void setup() { public void setup() {
nifiProperties = getNiFiProperties(); encryptor = new StringEncryptor("PBEWITHMD5AND256BITAES-CBC-OPENSSL", "BC", "nififtw!");
encryptor = StringEncryptor.createEncryptor(nifiProperties);
fingerprinter = new FingerprintFactory(encryptor); fingerprinter = new FingerprintFactory(encryptor);
} }
@ -186,14 +179,6 @@ public class FingerprintFactoryTest {
return rootElement; return rootElement;
} }
private NiFiProperties getNiFiProperties() {
final NiFiProperties nifiProperties = mock(NiFiProperties.class);
when(nifiProperties.getProperty(StringEncryptor.NF_SENSITIVE_PROPS_ALGORITHM)).thenReturn("PBEWITHMD5AND256BITAES-CBC-OPENSSL");
when(nifiProperties.getProperty(StringEncryptor.NF_SENSITIVE_PROPS_PROVIDER)).thenReturn("BC");
when(nifiProperties.getProperty(anyString(), anyString())).then(invocation -> invocation.getArgumentAt(1, String.class));
return nifiProperties;
}
private <T> String fingerprint(final String methodName, final Class<T> inputClass, final T input) throws Exception { private <T> String fingerprint(final String methodName, final Class<T> inputClass, final T input) throws Exception {
final Method fingerprintFromComponent = FingerprintFactory.class.getDeclaredMethod(methodName, final Method fingerprintFromComponent = FingerprintFactory.class.getDeclaredMethod(methodName,
StringBuilder.class, inputClass); StringBuilder.class, inputClass);
@ -306,6 +291,7 @@ public class FingerprintFactoryTest {
// Assert fingerprints with expected one. // Assert fingerprints with expected one.
final String expected = "portId" + final String expected = "portId" +
"NO_VALUE" +
"3" + "3" +
"true" + "true" +
"1234" + "1234" +
@ -314,6 +300,6 @@ public class FingerprintFactoryTest {
final Element rootElement = serializeElement(encryptor, RemoteProcessGroup.class, groupComponent, "addRemoteProcessGroup", IDENTITY_LOOKUP); final Element rootElement = serializeElement(encryptor, RemoteProcessGroup.class, groupComponent, "addRemoteProcessGroup", IDENTITY_LOOKUP);
final Element componentElement = (Element) rootElement.getElementsByTagName("inputPort").item(0); final Element componentElement = (Element) rootElement.getElementsByTagName("inputPort").item(0);
assertEquals(expected.toString(), fingerprint("addRemoteGroupPortFingerprint", Element.class, componentElement)); assertEquals(expected, fingerprint("addRemoteGroupPortFingerprint", Element.class, componentElement));
} }
} }