# The path to the redirection data file
RedirectionFile = etc/redirections.dat
#
+# https security required for publish request
+TlsEnabled = false
+#
+# Enabled TLS protocols
+NodeHttpsProtocols = TLSv1.1|TLSv1.2
+#
# The type of keystore for https
KeyStoreType = PKCS12
#
+# The path to your KeyStoreFile
+KeyStorePath = /opt/app/datartr/certs/org.onap.dmaap-dr-node.p12
+#
+# The key store password
+KeyStorePass = changeit
+#
+# The key manager password
+KeyManagerPass = changeit
+#
# The type of truststore for https
TrustStoreType = jks
#
+# The path to your trust store
+TrustStorePath = /opt/app/datartr/certs/truststore.jks
+#
+# The trust store password
+TrustStorePass = changeit
+#
# The path to the file used to trigger an orderly shutdown
QuiesceFile = etc/SHUTDOWN
#
# The key used to generate passwords for node to node transfers
NodeAuthKey = Node123!
-#
-# DR_NODE DEFAULT ENABLED TLS PROTOCOLS
-NodeHttpsProtocols = TLSv1.1|TLSv1.2
-#
-# AAF type to generate permission string
-AAFType = org.onap.dmaap-dr.feed
-#
-# AAF default instance to generate permission string - default should be legacy
-AAFInstance = legacy
-#
-# AAF action to generate permission string - default should be publish
-AAFAction = publish
-#
-# AAF CADI enabled flag
-CadiEnabled = false
-#
-# AAF Props file path
-AAFPropsFilePath = /opt/app/osaaf/local/org.onap.dmaap-dr.props
-# https security required for publish request
-TlsEnabled = false
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
</dependency>
- <dependency>
- <groupId>org.onap.aaf.authz</groupId>
- <artifactId>aaf-cadi-core</artifactId>
- </dependency>
<dependency>
<groupId>com.intellij</groupId>
<artifactId>annotations</artifactId>
</resources>
</configuration>
</execution>
- <execution>
- <id>copy-resources-etc</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr/etc</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>misc/**</include>
- <include>**/**</include>
- </includes>
- <excludes>
- <exclude>aaf/**</exclude>
- <exclude>docker/**</exclude>
- </excludes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-aaf-props</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/app/osaaf/local</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources/aaf</directory>
- <includes>
- <include>**/**</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
package org.onap.dmaap.datarouter.node;
+import org.onap.dmaap.datarouter.node.config.NodeConfig;
+
/**
* Information for a delivery destination that doesn't change from message to message.
*/
return destInfoLogData;
}
- DestInfoBuilder setLogdata(String logdata) {
+ public DestInfoBuilder setLogdata(String logdata) {
this.destInfoLogData = logdata;
return this;
}
return destInfoAuthUser;
}
- DestInfoBuilder setAuthuser(String authuser) {
+ public DestInfoBuilder setAuthuser(String authuser) {
this.destInfoAuthUser = authuser;
return this;
}
return destInfoAuthentication;
}
- DestInfoBuilder setAuthentication(String authentication) {
+ public DestInfoBuilder setAuthentication(String authentication) {
this.destInfoAuthentication = authentication;
return this;
}
return destInfoMetaOnly;
}
- DestInfoBuilder setMetaonly(boolean metaonly) {
+ public DestInfoBuilder setMetaonly(boolean metaonly) {
this.destInfoMetaOnly = metaonly;
return this;
}
return destInfoUse100;
}
- DestInfoBuilder setUse100(boolean use100) {
+ public DestInfoBuilder setUse100(boolean use100) {
this.destInfoUse100 = use100;
return this;
}
return destInfoPrivilegedSubscriber;
}
- DestInfoBuilder setPrivilegedSubscriber(boolean privilegedSubscriber) {
+ public DestInfoBuilder setPrivilegedSubscriber(boolean privilegedSubscriber) {
this.destInfoPrivilegedSubscriber = privilegedSubscriber;
return this;
}
return destInfoFollowRedirects;
}
- DestInfoBuilder setFollowRedirects(boolean followRedirects) {
+ public DestInfoBuilder setFollowRedirects(boolean followRedirects) {
this.destInfoFollowRedirects = followRedirects;
return this;
}
return destInfoDecompress;
}
- DestInfoBuilder setDecompress(boolean decompress) {
+ public DestInfoBuilder setDecompress(boolean decompress) {
this.destInfoDecompress = decompress;
return this;
}
- DestInfo createDestInfo() {
+ public DestInfo createDestInfo() {
return new DestInfo(this);
}
}
\ No newline at end of file
+++ /dev/null
-/*
- * ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dmaap.datarouter.node;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import org.onap.aaf.cadi.PropAccess;
-
-class NodeAafPropsUtils {
-
- private static final EELFLogger eelfLogger = EELFManager.getInstance().getLogger(NodeAafPropsUtils.class);
- private final PropAccess propAccess;
-
- NodeAafPropsUtils(File propsFile) throws IOException {
- propAccess = new PropAccess();
- try {
- propAccess.load(new FileInputStream(propsFile.getPath()));
- } catch (IOException e) {
- eelfLogger.error("Failed to load props file: " + propsFile + "\n" + e.getMessage(), e);
- throw e;
- }
- }
-
- String getDecryptedPass(String password) {
- String decryptedPass = "";
- try {
- decryptedPass = propAccess.decrypt(propAccess.getProperty(password), false);
- } catch (IOException e) {
- eelfLogger.error("Failed to decrypt " + password + " : " + e.getMessage(), e);
- }
- return decryptedPass;
- }
-
- PropAccess getPropAccess() {
- return propAccess;
- }
-}
import java.io.Reader;
import java.net.URL;
import java.nio.file.Files;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.Objects;
import java.util.Properties;
import java.util.Timer;
+import org.onap.dmaap.datarouter.node.config.NodeConfig;
+import org.onap.dmaap.datarouter.node.config.ProvData;
+import org.onap.dmaap.datarouter.node.delivery.DeliveryQueueHelper;
import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
+import org.onap.dmaap.datarouter.node.utils.NodeTlsManager;
+import org.onap.dmaap.datarouter.node.utils.NodeUtils;
/**
private static final String NODE_CONFIG_MANAGER = "NodeConfigManager";
private static final EELFLogger eelfLogger = EELFManager.getInstance().getLogger(NodeConfigManager.class);
- private static NodeConfigManager base;
-
private long maxfailuretimer;
private long initfailuretimer;
private long waitForFileProcessFailureTimer;
private final int intHttpPort;
private final int intHttpsPort;
private final int extHttpsPort;
- private String[] enabledprotocols;
- private final boolean cadiEnabled;
- private String aafType;
- private String aafInstance;
- private String aafAction;
private final boolean tlsEnabled;
- private String kstype;
- private String ksfile;
- private String kspass;
- private String kpass;
- private String tstype;
- private String tsfile;
- private String tspass;
private String myname;
private final String nak;
private final File quiesce;
private final RedirManager rdmgr;
private final Timer timer = new Timer("Node Configuration Timer", true);
private final RateLimitedOperation pfetcher;
- private NodeConfig config;
- private NodeAafPropsUtils nodeAafPropsUtils;
+ private static NodeConfigManager base;
+ private static NodeTlsManager nodeTlsManager;
+ private NodeConfig nodeConfig;
private static Properties drNodeProperties;
public static Properties getDrNodeProperties() {
}
eelfLogger.debug("NODE0303 Provisioning server is at: " + provhost);
provcheck = new IsFrom(provhost);
-
- cadiEnabled = Boolean.parseBoolean(getDrNodeProperties().getProperty("CadiEnabled", "false"));
- if (cadiEnabled) {
- aafType = getDrNodeProperties().getProperty("AAFType", "org.onap.dmaap-dr.feed");
- aafInstance = getDrNodeProperties().getProperty("AAFInstance", "legacy");
- aafAction = getDrNodeProperties().getProperty("AAFAction", "publish");
- }
tlsEnabled = Boolean.parseBoolean(getDrNodeProperties().getProperty("TlsEnabled", "true"));
if (isTlsEnabled()) {
try {
- kstype = getDrNodeProperties().getProperty("KeyStoreType", "PKCS12");
- tstype = getDrNodeProperties().getProperty("TrustStoreType", "jks");
- enabledprotocols = ((getDrNodeProperties().getProperty("NodeHttpsProtocols")).trim()).split("\\|");
- nodeAafPropsUtils = new NodeAafPropsUtils(new File(getDrNodeProperties()
- .getProperty("AAFPropsFilePath", "/opt/app/osaaf/local/org.onap.dmaap-dr.props")));
- getSslContextData();
- if (tsfile != null && tsfile.length() > 0) {
- System.setProperty("javax.net.ssl.trustStoreType", tstype);
- System.setProperty("javax.net.ssl.trustStore", tsfile);
- System.setProperty("javax.net.ssl.trustStorePassword", tspass);
- }
- myname = NodeUtils.getCanonicalName(kstype, ksfile, kspass);
+ nodeTlsManager = new NodeTlsManager(getDrNodeProperties());
+ myname = nodeTlsManager.getMyNameFromCertificate();
if (myname == null) {
NodeUtils.setIpAndFqdnForEelf(NODE_CONFIG_MANAGER);
- eelfLogger.error(EelfMsgs.MESSAGE_KEYSTORE_FETCH_ERROR, ksfile);
- eelfLogger.error("NODE0309 Unable to fetch canonical name from keystore file " + ksfile);
+ eelfLogger.error(EelfMsgs.MESSAGE_KEYSTORE_FETCH_ERROR, nodeTlsManager.getKeyStorefile());
+ eelfLogger.error("NODE0309 Unable to fetch canonical name from keystore file {}", nodeTlsManager.getKeyStorefile());
exit(1);
}
- eelfLogger.debug("NODE0304 My certificate says my name is " + myname);
+ eelfLogger.debug("NODE0304 My certificate says my name is {}", myname);
} catch (Exception e) {
eelfLogger.error("NODE0314 Failed to load AAF props. Exiting", e);
exit(1);
}
}
myname = "dmaap-dr-node";
-
eventlogurl = getDrNodeProperties().getProperty("LogUploadURL", "https://feeds-drtr.web.att.com/internal/logs");
intHttpPort = Integer.parseInt(getDrNodeProperties().getProperty("IntHttpPort", "80"));
intHttpsPort = Integer.parseInt(getDrNodeProperties().getProperty("IntHttpsPort", "443"));
pfetcher = new RateLimitedOperation(
Long.parseLong(getDrNodeProperties().getProperty("MinProvFetchInterval", "10000")), timer) {
public void run() {
- fetchconfig();
+ fetchNodeConfigFromProv();
}
};
eelfLogger.debug("NODE0305 Attempting to fetch configuration at " + provurl);
pfetcher.request();
}
- private void getSslContextData() {
- ksfile = nodeAafPropsUtils.getPropAccess().getProperty("cadi_keystore");
- kspass = nodeAafPropsUtils.getDecryptedPass("cadi_keystore_password");
- kpass = nodeAafPropsUtils.getDecryptedPass("cadi_keystore_password");
- tsfile = nodeAafPropsUtils.getPropAccess().getProperty("cadi_truststore");
- tspass = nodeAafPropsUtils.getDecryptedPass("cadi_truststore_password");
- }
-
/**
* Get the default node configuration manager.
*/
}
}
- private void fetchconfig() {
+ private void fetchNodeConfigFromProv() {
try {
- eelfLogger.debug("NodeConfigMan.fetchConfig: provurl:: " + provurl);
+ eelfLogger.debug("NodeConfigMan.fetchNodeConfigFromProv: provurl:: {}", provurl);
URL url = new URL(provurl);
Reader reader = new InputStreamReader(url.openStream());
- config = new NodeConfig(new ProvData(reader), myname, spooldir, extHttpsPort, nak);
+ nodeConfig = new NodeConfig(new ProvData(reader), myname, spooldir, extHttpsPort, nak);
localconfig();
configtasks.startRun();
runTasks();
} catch (Exception e) {
- NodeUtils.setIpAndFqdnForEelf("fetchconfigs");
+ NodeUtils.setIpAndFqdnForEelf("fetchNodeConfigFromProv");
eelfLogger.error(EelfMsgs.MESSAGE_CONF_FAILED, e.toString());
- eelfLogger.error("NODE0306 Configuration failed " + e + " - try again later", e);
+ eelfLogger.error("NODE0306 Configuration failed {} - try again later", e);
pfetcher.request();
}
}
/**
* Am I configured.
*/
- boolean isConfigured() {
- return config != null;
+ public boolean isConfigured() {
+ return nodeConfig != null;
}
/**
* @return array of targets
*/
Target[] parseRouting(String routing) {
- return config.parseRouting(routing);
+ return nodeConfig.parseRouting(routing);
}
/**
* @return If the credentials and IP address are recognized, true, otherwise false.
*/
boolean isAnotherNode(String credentials, String ip) {
- return config.isAnotherNode(credentials, ip);
+ return nodeConfig.isAnotherNode(credentials, ip);
}
/**
* @return True if the IP and credentials are valid for the specified feed.
*/
String isPublishPermitted(String feedid, String credentials, String ip) {
- return config.isPublishPermitted(feedid, credentials, ip);
- }
-
- /**
- * Check whether publication is allowed for AAF Feed.
- *
- * @param feedid The ID of the feed being requested
- * @param ip The requesting IP address
- * @return True if the IP and credentials are valid for the specified feed.
- */
- String isPublishPermitted(String feedid, String ip) {
- return config.isPublishPermitted(feedid, ip);
+ return nodeConfig.isPublishPermitted(feedid, credentials, ip);
}
/**
* @return True if the delete file is permitted for the subscriber.
*/
boolean isDeletePermitted(String subId) {
- return config.isDeletePermitted(subId);
+ return nodeConfig.isDeletePermitted(subId);
}
/**
* @return Null if the credentials are invalid or the user if they are valid.
*/
String getAuthUser(String feedid, String credentials) {
- return config.getAuthUser(feedid, credentials);
- }
-
- /**
- * AAF changes: TDP EPIC US# 307413 Check AAF_instance for feed ID in NodeConfig.
- *
- * @param feedid The ID of the feed specified
- */
- String getAafInstance(String feedid) {
- return config.getAafInstance(feedid);
- }
-
- String getAafInstance() {
- return aafInstance;
+ return nodeConfig.getAuthUser(feedid, credentials);
}
/**
* @return Null if the request should be accepted or the correct hostname if it should be sent to another node.
*/
String getIngressNode(String feedid, String user, String ip) {
- return config.getIngressNode(feedid, user, ip);
+ return nodeConfig.getIngressNode(feedid, user, ip);
}
/**
* @return The value of the parameter or null if it is not defined.
*/
private String getProvParam(String name) {
- return config.getProvParam(name);
+ return nodeConfig.getProvParam(name);
}
/**
* @return The value of the parameter or deflt if it is not defined.
*/
private String getProvParam(String name, String defaultValue) {
- name = config.getProvParam(name);
+ name = nodeConfig.getProvParam(name);
if (name == null) {
name = defaultValue;
}
/**
* Get all the outbound spooling destinations. This will include both subscriptions and nodes.
*/
- DestInfo[] getAllDests() {
- return config.getAllDests();
+ public DestInfo[] getAllDests() {
+ return nodeConfig.getAllDests();
}
/**
* Register a task to run whenever the configuration changes.
*/
- void registerConfigTask(Runnable task) {
+ public void registerConfigTask(Runnable task) {
configtasks.addTask(task);
}
* @return The targets this feed should be delivered to
*/
Target[] getTargets(String feedid) {
- return config.getTargets(feedid);
+ return nodeConfig.getTargets(feedid);
}
/**
*/
String getSpoolDir(String subid, String remoteaddr) {
if (provcheck.isFrom(remoteaddr)) {
- String sdir = config.getSpoolDir(subid);
+ String sdir = nodeConfig.getSpoolDir(subid);
if (sdir != null) {
eelfLogger.debug("NODE0310 Received subscription reset request for subscription " + subid
+ " from provisioning server " + remoteaddr);
/**
* Get the base directory for spool directories.
*/
- String getSpoolBase() {
+ public String getSpoolBase() {
return spooldir;
}
- /**
- * Get the key store type.
- */
- String getKSType() {
- return kstype;
- }
-
- /**
- * Get the key store file.
- */
- String getKSFile() {
- return ksfile;
- }
-
- /**
- * Get the key store password.
- */
- String getKSPass() {
- return kspass;
- }
-
- /**
- * Get the key password.
- */
- String getKPass() {
- return kpass;
- }
-
-
- String getTstype() {
- return tstype;
- }
-
- String getTsfile() {
- return tsfile;
- }
-
- String getTspass() {
- return tspass;
- }
-
/**
* Get the http port.
*/
/**
* Get the external name of this machine.
*/
- String getMyName() {
+ public String getMyName() {
return myname;
}
/**
* Get the number of threads to use for delivery.
*/
- int getDeliveryThreads() {
+ public int getDeliveryThreads() {
return deliverythreads;
}
/**
* Get the URL for uploading the event log data.
*/
- String getEventLogUrl() {
+ public String getEventLogUrl() {
return eventlogurl;
}
/**
* Get the prefix for the names of event log files.
*/
- String getEventLogPrefix() {
+ public String getEventLogPrefix() {
return eventlogprefix;
}
/**
* Get the suffix for the names of the event log files.
*/
- String getEventLogSuffix() {
+ public String getEventLogSuffix() {
return eventlogsuffix;
}
/**
* Get the interval between event log file rollovers.
*/
- String getEventLogInterval() {
+ public String getEventLogInterval() {
return eventloginterval;
}
/**
* Get the directory where the event and node log files live.
*/
- String getLogDir() {
+ public String getLogDir() {
return logdir;
}
/**
* How long do I keep log files (in milliseconds).
*/
- long getLogRetention() {
+ public long getLogRetention() {
return logretention;
}
* @return The feed ID
*/
public String getFeedId(String subid) {
- return config.getFeedId(subid);
+ return nodeConfig.getFeedId(subid);
}
/**
*
* @return The Authorization string for this node
*/
- String getMyAuth() {
- return config.getMyAuth();
+ public String getMyAuth() {
+ return nodeConfig.getMyAuth();
}
/**
* Get the fraction of free spool disk space where we start throwing away undelivered files. This is
* FREE_DISK_RED_PERCENT / 100.0. Default is 0.05. Limited by 0.01 <= FreeDiskStart <= 0.5.
*/
- double getFreeDiskStart() {
+ public double getFreeDiskStart() {
return fdpstart;
}
* Get the fraction of free spool disk space where we stop throwing away undelivered files. This is
* FREE_DISK_YELLOW_PERCENT / 100.0. Default is 0.2. Limited by FreeDiskStart <= FreeDiskStop <= 0.5.
*/
- double getFreeDiskStop() {
+ public double getFreeDiskStop() {
return fdpstop;
}
- /**
- * Disable and enable protocols.
- */
- String[] getEnabledprotocols() {
- return enabledprotocols;
+ protected boolean isTlsEnabled() {
+ return tlsEnabled;
}
- String getAafType() {
- return aafType;
+ public static NodeTlsManager getNodeTlsManager() {
+ return nodeTlsManager;
}
- String getAafAction() {
- return aafAction;
- }
+ /**
+ * Generate publish IDs.
+ */
+ static class PublishId {
- protected boolean isTlsEnabled() {
- return tlsEnabled;
- }
+ private long nextuid;
+ private final String myname;
- boolean getCadiEnabled() {
- return cadiEnabled;
- }
+ /**
+ * Generate publish IDs for the specified name.
+ *
+ * @param myname Unique identifier for this publish ID generator (usually fqdn of server)
+ */
+ public PublishId(String myname) {
+ this.myname = myname;
+ }
- NodeAafPropsUtils getNodeAafPropsUtils() {
- return nodeAafPropsUtils;
+ /**
+ * Generate a Data Router Publish ID that uniquely identifies the particular invocation of the Publish API for log
+ * correlation purposes.
+ */
+ public synchronized String next() {
+ long now = System.currentTimeMillis();
+ if (now < nextuid) {
+ now = nextuid;
+ }
+ nextuid = now + 1;
+ return (now + "." + myname);
+ }
}
/**
- * Builds the permissions string to be verified.
- *
- * @param aafInstance The aaf instance
- * @return The permissions
- */
- String getPermission(String aafInstance) {
- try {
- String type = getAafType();
- String action = getAafAction();
- if ("".equals(aafInstance)) {
- aafInstance = getAafInstance();
+ * Manage a list of tasks to be executed when an event occurs. This makes the following guarantees:
+ * <ul>
+ * <li>Tasks can be safely added and removed in the middle of a run.</li>
+ * <li>No task will be returned more than once during a run.</li>
+ * <li>No task will be returned when it is not, at that moment, in the list of tasks.</li>
+ * <li>At the moment when next() returns null, all tasks on the list have been returned during the run.</li>
+ * <li>Initially and once next() returns null during a run, next() will continue to return null until startRun() is
+ * called.
+ * </ul>
+ */
+ static class TaskList {
+
+ private Iterator<Runnable> runlist;
+ private final HashSet<Runnable> tasks = new HashSet<>();
+ private HashSet<Runnable> togo;
+ private HashSet<Runnable> sofar;
+ private HashSet<Runnable> added;
+ private HashSet<Runnable> removed;
+
+ /**
+ * Start executing the sequence of tasks.
+ */
+ synchronized void startRun() {
+ sofar = new HashSet<>();
+ added = new HashSet<>();
+ removed = new HashSet<>();
+ togo = new HashSet<>(tasks);
+ runlist = togo.iterator();
+ }
+
+ /**
+ * Get the next task to execute.
+ */
+ synchronized Runnable next() {
+ while (runlist != null) {
+ if (runlist.hasNext()) {
+ Runnable task = runlist.next();
+ if (addTaskToSoFar(task)) {
+ return task;
+ }
+ }
+ if (!added.isEmpty()) {
+ togo = added;
+ added = new HashSet<>();
+ removed.clear();
+ runlist = togo.iterator();
+ continue;
+ }
+ togo = null;
+ added = null;
+ removed = null;
+ sofar = null;
+ runlist = null;
}
- return type + "|" + aafInstance + "|" + action;
- } catch (Exception e) {
- eelfLogger.error("NODE0543 NodeConfigManager.getPermission: ", e);
+ return (null);
+ }
+
+ /**
+ * Add a task to the list of tasks to run whenever the event occurs.
+ */
+ synchronized void addTask(Runnable task) {
+ if (runlist != null) {
+ added.add(task);
+ removed.remove(task);
+ }
+ tasks.add(task);
+ }
+
+ /**
+ * Remove a task from the list of tasks to run whenever the event occurs.
+ */
+ synchronized void removeTask(Runnable task) {
+ if (runlist != null) {
+ removed.add(task);
+ added.remove(task);
+ }
+ tasks.remove(task);
+ }
+
+ private boolean addTaskToSoFar(Runnable task) {
+ if (removed.contains(task)) {
+ return false;
+ }
+ if (sofar.contains(task)) {
+ return false;
+ }
+ sofar.add(task);
+ return true;
}
- return null;
}
}
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import org.eclipse.jetty.server.Server;
+import org.onap.dmaap.datarouter.node.log.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The main starting point for the Data Router node.
nodeMainLogger.debug("NODE0001 Data Router Node Starting");
IsFrom.setDNSCache();
NodeConfigManager nodeConfigManager = NodeConfigManager.getInstance();
- nodeMainLogger.debug("NODE0002 I am " + nodeConfigManager.getMyName());
+ nodeMainLogger.debug("NODE0002 I am {}", nodeConfigManager.getMyName());
(new WaitForConfig(nodeConfigManager)).waitForConfig();
new LogManager(nodeConfigManager);
try {
server.join();
nodeMainLogger.debug("NODE0006 Node Server started-" + server.getState());
} catch (Exception e) {
- nodeMainLogger.error("NODE0006 Jetty failed to start. Reporting will we be unavailable: "
- + e.getMessage(), e);
+ nodeMainLogger.error("NODE0006 Jetty failed to start. Reporting will we be unavailable: {}", e.getMessage());
exit(1);
}
nodeMainLogger.debug("NODE0007 Node Server joined");
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import java.util.EnumSet;
-import javax.servlet.DispatcherType;
-import javax.servlet.ServletException;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.jetbrains.annotations.NotNull;
+import org.onap.dmaap.datarouter.node.delivery.Delivery;
public class NodeServer {
private static Server server;
private static Delivery delivery;
- private NodeServer(){
- }
+ private NodeServer(){}
static Server getServerInstance(NodeConfigManager nodeConfigManager) {
if (server == null) {
servletContextHandler.addServlet(new ServletHolder(new NodeServlet(delivery, nodeConfigManager)), "/*");
if (nodeConfigManager.isTlsEnabled()) {
- initialiseHttpsConnector(nodeConfigManager, httpConfiguration, httpServerConnector, servletContextHandler);
+ initialiseHttpsConnector(nodeConfigManager, httpConfiguration, httpServerConnector);
} else {
eelfLogger.info("NODE0005 Adding HTTP Connector");
server.setConnectors(new Connector[]{httpServerConnector});
}
private static void initialiseHttpsConnector(NodeConfigManager nodeConfigManager, HttpConfiguration httpConfiguration,
- ServerConnector httpServerConnector, ServletContextHandler servletContextHandler) {
+ ServerConnector httpServerConnector) {
HttpConfiguration httpsConfiguration = new HttpConfiguration(httpConfiguration);
httpsConfiguration.setRequestHeaderSize(8192);
// HTTPS connector
try (ServerConnector httpsServerConnector = new ServerConnector(server,
- new SslConnectionFactory(getSslContextFactory(nodeConfigManager), HttpVersion.HTTP_1_1.asString()),
+ new SslConnectionFactory(getSslContextFactory(), HttpVersion.HTTP_1_1.asString()),
new HttpConnectionFactory(httpsConfiguration))) {
-
httpsServerConnector.setPort(nodeConfigManager.getHttpsPort());
httpsServerConnector.setIdleTimeout(3600000);
httpsServerConnector.setAcceptQueueSize(2);
@NotNull
- private static SslContextFactory.Server getSslContextFactory(NodeConfigManager nodeConfigManager) {
- SslContextFactory sslContextFactory = new SslContextFactory.Server();
- sslContextFactory.setKeyStoreType(nodeConfigManager.getKSType());
- sslContextFactory.setKeyStorePath(nodeConfigManager.getKSFile());
- sslContextFactory.setKeyStorePassword(nodeConfigManager.getKSPass());
- sslContextFactory.setKeyManagerPassword(nodeConfigManager.getKPass());
+ private static SslContextFactory.Server getSslContextFactory() {
+ SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
+ sslContextFactory.setKeyStoreType(NodeConfigManager.getNodeTlsManager().getKeyStoreType());
+ sslContextFactory.setKeyStorePath(NodeConfigManager.getNodeTlsManager().getKeyStorefile());
+ sslContextFactory.setKeyStorePassword(NodeConfigManager.getNodeTlsManager().getKeyStorePassword());
+ sslContextFactory.setKeyManagerPassword(NodeConfigManager.getNodeTlsManager().getKeyManagerPassword());
+
+// sslContextFactory.setTrustStoreType(NodeConfigManager.getNodeTlsManager().getTrustStoreType());
+// sslContextFactory.setTrustStorePath(ProvRunner.getAafPropsUtils().getTruststorePathProperty());
+// sslContextFactory.setTrustStorePassword(ProvRunner.getAafPropsUtils().getTruststorePassProperty());
sslContextFactory.setExcludeCipherSuites(
"SSL_RSA_WITH_DES_CBC_SHA",
"SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
"SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"
);
-
sslContextFactory.addExcludeProtocols("SSLv3");
+ sslContextFactory.setIncludeProtocols(NodeConfigManager.getNodeTlsManager().getEnabledProtocols());
eelfLogger.info("Unsupported protocols: " + String.join(",", sslContextFactory.getExcludeProtocols()));
eelfLogger.info("Supported protocols: " + String.join(",", sslContextFactory.getIncludeProtocols()));
eelfLogger.info("Unsupported ciphers: " + String.join(",", sslContextFactory.getExcludeCipherSuites()));
eelfLogger.info("Supported ciphers: " + String.join(",", sslContextFactory.getIncludeCipherSuites()));
- return (SslContextFactory.Server) sslContextFactory;
+ return sslContextFactory;
}
}
package org.onap.dmaap.datarouter.node;
-import static org.onap.dmaap.datarouter.node.NodeUtils.sendResponseError;
+import static org.onap.dmaap.datarouter.node.utils.NodeUtils.sendResponseError;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.jetbrains.annotations.Nullable;
+import org.onap.dmaap.datarouter.node.delivery.Delivery;
import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
+import org.onap.dmaap.datarouter.node.log.StatusLog;
+import org.onap.dmaap.datarouter.node.utils.NodeUtils;
import org.slf4j.MDC;
/**
String pubid = null;
String rcvd = NodeUtils.logts(System.currentTimeMillis()) + ";from=" + ip + ";by=" + lip;
Target[] targets;
- boolean isAAFFeed = false;
if (fileid.startsWith("/delete/")) {
deleteFile(req, resp, fileid, pubid);
return;
return;
}
feedid = fileid.substring(0, index);
-
- if (config.getCadiEnabled()) {
- String path = req.getPathInfo();
- if (!path.startsWith("/internal") && feedid != null) {
- String aafInstance = config.getAafInstance(feedid);
- if (!("legacy".equalsIgnoreCase(aafInstance))) {
- isAAFFeed = true;
- String permission = config.getPermission(aafInstance);
- eelfLogger.debug("NodeServlet.common() permission string - " + permission);
- //Check in CADI Framework API if user has AAF permission or not
- if (!req.isUserInRole(permission)) {
- String message = "AAF disallows access to permission string - " + permission;
- eelfLogger.error("NODE0307 Rejecting unauthenticated PUT or DELETE of " + req.getPathInfo()
- + FROM + req.getRemoteAddr());
- resp.sendError(HttpServletResponse.SC_FORBIDDEN, message);
- eelfLogger.info(EelfMsgs.EXIT);
- return;
- }
- }
- }
- }
-
fileid = fileid.substring(index + 1);
pubid = config.getPublishId();
targets = config.getTargets(feedid);
}
fileid = fileid.substring(18);
pubid = generateAndValidatePublishId(req);
-
- user = "datartr"; // SP6 : Added usr as datartr to avoid null entries for internal routing
targets = config.parseRouting(req.getHeader("X-DMAAP-DR-ROUTING"));
} else {
eelfLogger.error("NODE0204 Rejecting bad URI for PUT or DELETE of " + req.getPathInfo() + FROM + req
String logurl = HTTPS + hp + INTERNAL_PUBLISH + fileid;
if (feedid != null) {
logurl = HTTPS + hp + PUBLISH + feedid + "/" + fileid;
- //Cadi code starts
- if (!isAAFFeed) {
- String reason = config.isPublishPermitted(feedid, credentials, ip);
- if (reason != null) {
- eelfLogger.error("NODE0111 Rejecting unauthorized publish attempt to feed " + PathUtil
- .cleanString(feedid) + " fileid " + PathUtil.cleanString(fileid) + FROM + PathUtil
- .cleanString(ip) + " reason " + PathUtil.cleanString(reason));
- resp.sendError(HttpServletResponse.SC_FORBIDDEN, reason);
- eelfLogger.info(EelfMsgs.EXIT);
- return;
- }
- user = config.getAuthUser(feedid, credentials);
- } else {
- String reason = config.isPublishPermitted(feedid, ip);
- if (reason != null) {
- eelfLogger.error("NODE0111 Rejecting unauthorized publish attempt to feed " + PathUtil
- .cleanString(feedid) + " fileid " + PathUtil.cleanString(fileid) + FROM + PathUtil
- .cleanString(ip) + " reason Invalid AAF user- " + PathUtil.cleanString(reason));
- String message = "Invalid AAF user- " + PathUtil.cleanString(reason);
- eelfLogger.debug("NODE0308 Rejecting unauthenticated PUT or DELETE of " + PathUtil
- .cleanString(req.getPathInfo()) + FROM + PathUtil.cleanString(req.getRemoteAddr()));
- resp.sendError(HttpServletResponse.SC_FORBIDDEN, message);
- return;
- }
- if ((req.getUserPrincipal() != null) && (req.getUserPrincipal().getName() != null)) {
- String userName = req.getUserPrincipal().getName();
- String[] attid = userName.split("@");
- user = attid[0];
- } else {
- user = "AAFUser";
- }
+ String reason = config.isPublishPermitted(feedid, credentials, ip);
+ if (reason != null) {
+ eelfLogger.info("NODE0111 Rejecting unauthorized publish attempt to feed " + feedid + " fileid "
+ + fileid + " from " + ip + " reason " + reason);
+ resp.sendError(javax.servlet.http.HttpServletResponse.SC_FORBIDDEN, reason);
+ eelfLogger.info(EelfMsgs.EXIT);
+ return;
}
- //Cadi code Ends
+ user = config.getAuthUser(feedid, credentials);
String newnode = config.getIngressNode(feedid, user, ip);
if (newnode != null) {
String port = "";
return -1;
}
}
+
+ /**
+ * Utility class that validates the path url formed from
+ * the string passed in the request parameters.
+ */
+ static class PathUtil {
+
+ private PathUtil() {
+ throw new IllegalStateException("Utility Class");
+ }
+
+ /**
+ * This method takes String as the parameter and return the filtered path string.
+ *
+ * @param string String to clean
+ * @return A cleaned String
+ */
+ static String cleanString(String string) {
+ if (string == null) {
+ return null;
+ }
+ StringBuilder cleanString = new StringBuilder();
+ for (int i = 0; i < string.length(); ++i) {
+ cleanString.append(cleanChar(string.charAt(i)));
+ }
+ return cleanString.toString();
+ }
+
+ /**
+ * This method filters the valid special characters in path string.
+ *
+ * @param character The char to be cleaned
+ * @return The cleaned char
+ */
+ private static char cleanChar(char character) {
+ // 0 - 9
+ for (int i = 48; i < 58; ++i) {
+ if (character == i) {
+ return (char) i;
+ }
+ }
+ // 'A' - 'Z'
+ for (int i = 65; i < 91; ++i) {
+ if (character == i) {
+ return (char) i;
+ }
+ }
+ // 'a' - 'z'
+ for (int i = 97; i < 123; ++i) {
+ if (character == i) {
+ return (char) i;
+ }
+ }
+ return getValidCharacter(character);
+ }
+
+ private static char getValidCharacter(char character) {
+ // other valid characters
+ switch (character) {
+ case '/':
+ return '/';
+ case '.':
+ return '.';
+ case '-':
+ return '-';
+ case ':':
+ return ':';
+ case '?':
+ return '?';
+ case '&':
+ return '&';
+ case '=':
+ return '=';
+ case '#':
+ return '#';
+ case '_':
+ return '_';
+ case ' ':
+ return ' ';
+ default:
+ return '%';
+ }
+ }
+ }
}
+++ /dev/null
-/*-\r
- * ============LICENSE_START=======================================================\r
- * Copyright (C) 2019 Nordix Foundation.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- *\r
- * SPDX-License-Identifier: Apache-2.0\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.dmaap.datarouter.node;\r
-\r
-/**\r
- * FORTIFY SCAN FIXES.\r
- * <p>This Utility is used for Fortify fixes. It Validates the path url formed from\r
- * the string passed in the request parameters.</p>\r
- */\r
-class PathUtil {\r
-\r
- private PathUtil() {\r
- throw new IllegalStateException("Utility Class");\r
- }\r
-\r
- /**\r
- * This method takes String as the parameter and return the filtered path string.\r
- *\r
- * @param string String to clean\r
- * @return A cleaned String\r
- */\r
- static String cleanString(String string) {\r
- if (string == null) {\r
- return null;\r
- }\r
- StringBuilder cleanString = new StringBuilder();\r
- for (int i = 0; i < string.length(); ++i) {\r
- cleanString.append(cleanChar(string.charAt(i)));\r
- }\r
- return cleanString.toString();\r
- }\r
-\r
- /**\r
- * This method filters the valid special characters in path string.\r
- *\r
- * @param character The char to be cleaned\r
- * @return The cleaned char\r
- */\r
- private static char cleanChar(char character) {\r
- // 0 - 9\r
- for (int i = 48; i < 58; ++i) {\r
- if (character == i) {\r
- return (char) i;\r
- }\r
- }\r
- // 'A' - 'Z'\r
- for (int i = 65; i < 91; ++i) {\r
- if (character == i) {\r
- return (char) i;\r
- }\r
- }\r
- // 'a' - 'z'\r
- for (int i = 97; i < 123; ++i) {\r
- if (character == i) {\r
- return (char) i;\r
- }\r
- }\r
- return getValidCharacter(character);\r
- }\r
-\r
- private static char getValidCharacter(char character) {\r
- // other valid characters\r
- switch (character) {\r
- case '/':\r
- return '/';\r
- case '.':\r
- return '.';\r
- case '-':\r
- return '-';\r
- case ':':\r
- return ':';\r
- case '?':\r
- return '?';\r
- case '&':\r
- return '&';\r
- case '=':\r
- return '=';\r
- case '#':\r
- return '#';\r
- case '_':\r
- return '_';\r
- case ' ':\r
- return ' ';\r
- default:\r
- return '%';\r
- }\r
- }\r
-}\r
+++ /dev/null
-/*******************************************************************************
- * ============LICENSE_START==================================================
- * * org.onap.dmaap
- * * ===========================================================================
- * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * ===========================================================================
- * * Licensed under the Apache License, Version 2.0 (the "License");
- * * you may not use this file except in compliance with the License.
- * * You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing, software
- * * distributed under the License is distributed on an "AS IS" BASIS,
- * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * * See the License for the specific language governing permissions and
- * * limitations under the License.
- * * ============LICENSE_END====================================================
- * *
- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * *
- ******************************************************************************/
-
-
-package org.onap.dmaap.datarouter.node;
-
-/**
- * Generate publish IDs.
- */
-public class PublishId {
-
- private long nextuid;
- private final String myname;
-
- /**
- * Generate publish IDs for the specified name.
- *
- * @param myname Unique identifier for this publish ID generator (usually fqdn of server)
- */
- public PublishId(String myname) {
- this.myname = myname;
- }
-
- /**
- * Generate a Data Router Publish ID that uniquely identifies the particular invocation of the Publish API for log
- * correlation purposes.
- */
- public synchronized String next() {
- long now = System.currentTimeMillis();
- if (now < nextuid) {
- now = nextuid;
- }
- nextuid = now + 1;
- return (now + "." + myname);
- }
-}
class TaskList {
private Iterator<Runnable> runlist;
- private HashSet<Runnable> tasks = new HashSet<>();
+ private final HashSet<Runnable> tasks = new HashSet<>();
private HashSet<Runnable> togo;
private HashSet<Runnable> sofar;
private HashSet<Runnable> added;
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.config;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import java.util.HashMap;
import java.util.HashSet;
import org.jetbrains.annotations.NotNull;
+import org.onap.dmaap.datarouter.node.DestInfo;
+import org.onap.dmaap.datarouter.node.DestInfoBuilder;
+import org.onap.dmaap.datarouter.node.IsFrom;
+import org.onap.dmaap.datarouter.node.Target;
+import org.onap.dmaap.datarouter.node.utils.NodeUtils;
/**
* Processed configuration for this node.
public class NodeConfig {
private static final String PUBLISHER_NOT_PERMITTED = "Publisher not permitted for this feed";
- private static EELFLogger logger = EELFManager.getInstance().getLogger(NodeConfig.class);
- private HashMap<String, String> params = new HashMap<>();
- private HashMap<String, Feed> feeds = new HashMap<>();
- private HashMap<String, DestInfo> nodeinfo = new HashMap<>();
- private HashMap<String, DestInfo> subinfo = new HashMap<>();
- private HashMap<String, IsFrom> nodes = new HashMap<>();
- private HashMap<String, ProvSubscription> provSubscriptions = new HashMap<>();
- private String myname;
+ private static final EELFLogger logger = EELFManager.getInstance().getLogger(NodeConfig.class);
+ private final HashMap<String, String> params = new HashMap<>();
+ private final HashMap<String, Feed> feeds = new HashMap<>();
+ private final HashMap<String, DestInfo> nodeinfo = new HashMap<>();
+ private final HashMap<String, DestInfo> subinfo = new HashMap<>();
+ private final HashMap<String, IsFrom> nodes = new HashMap<>();
+ private final HashMap<String, ProvSubscription> provSubscriptions = new HashMap<>();
+ private final String myname;
private String myauth;
- private DestInfo[] alldests;
+ private final DestInfo[] alldests;
private int rrcntr;
/**
feed.createdDate = pfx.getCreatedDate();
feed.loginfo = pfx.getLogData();
feed.status = pfx.getStatus();
- /*
- * AAF changes: TDP EPIC US# 307413
- * Passing aafInstance from ProvFeed to identify legacy/AAF feeds
- */
- feed.aafInstance = pfx.getAafInstance();
ArrayList<SubnetMatcher> v1 = pfstab.get(fid);
if (v1 == null) {
feed.subnets = new SubnetMatcher[0];
return (PUBLISHER_NOT_PERMITTED);
}
- /**
- * Check whether publication is allowed for AAF Feed.
- *
- * @param feedid The ID of the feed being requested.
- * @param ip The requesting IP address
- */
- public String isPublishPermitted(String feedid, String ip) {
- Feed feed = feeds.get(feedid);
- String nf = "Feed does not exist";
- if (feed != null) {
- nf = feed.status;
- }
- if (nf != null) {
- return nf;
- }
- if (feed.subnets.length == 0) {
- return null;
- }
- byte[] addr = NodeUtils.getInetAddress(ip);
- for (SubnetMatcher snm : feed.subnets) {
- if (snm.matches(addr)) {
- return null;
- }
- }
- return PUBLISHER_NOT_PERMITTED;
- }
-
/**
* Check whether delete file is allowed.
*
return (feeds.get(feedid).authusers.get(credentials));
}
- /**
- * AAF changes: TDP EPIC US# 307413 Check AAF_instance for feed ID.
- *
- * @param feedid The ID of the feed specified
- */
- public String getAafInstance(String feedid) {
- Feed feed = feeds.get(feedid);
- return feed.aafInstance;
- }
-
/**
* Check if the request should be redirected to a different ingress node.
*/
*/
public static class ProvFeed {
- private String id;
- private String logdata;
- private String status;
- private String createdDate;
- /*
- * AAF changes: TDP EPIC US# 307413
- * Passing aafInstance from to identify legacy/AAF feeds
- */
- private String aafInstance;
+ private final String id;
+ private final String logdata;
+ private final String status;
+ private final String createdDate;
/**
* Construct a feed configuration entry.
* @param status The reason why this feed cannot be used (Feed has been deleted, Feed has been suspended) or
* null if it is valid.
*/
- public ProvFeed(String id, String logdata, String status, String createdDate, String aafInstance) {
+ public ProvFeed(String id, String logdata, String status, String createdDate) {
this.id = id;
this.logdata = logdata;
this.status = status;
this.createdDate = createdDate;
- this.aafInstance = aafInstance;
}
/**
return (createdDate);
}
- /**
- * Get the aafInstance of the data feed.
- */
- public String getAafInstance() {
- return aafInstance;
- }
-
/**
* Get the feed id of the data feed.
*/
*/
public static class ProvFeedUser {
- private String feedid;
- private String user;
- private String credentials;
+ private final String feedid;
+ private final String user;
+ private final String credentials;
/**
* Construct a feed user configuration entry.
*/
public static class ProvFeedSubnet {
- private String feedid;
- private String cidr;
+ private final String feedid;
+ private final String cidr;
/**
* Construct a feed subnet configuration entry.
*/
public static class ProvSubscription {
- private String subid;
- private String feedid;
- private String url;
- private String authuser;
- private String credentials;
- private boolean metaonly;
- private boolean use100;
- private boolean privilegedSubscriber;
- private boolean followRedirect;
- private boolean decompress;
+ private final String subid;
+ private final String feedid;
+ private final String url;
+ private final String authuser;
+ private final String credentials;
+ private final boolean metaonly;
+ private final boolean use100;
+ private final boolean privilegedSubscriber;
+ private final boolean followRedirect;
+ private final boolean decompress;
/**
* Construct a subscription configuration entry.
* New field is added - FOLLOW_REDIRECTS feature iTrack:DATARTR-17 - 1706 Get the followRedirect of this
* destination.
*/
- boolean getFollowRedirect() {
+ public boolean getFollowRedirect() {
return (followRedirect);
}
}
*/
public static class ProvForceIngress {
- private String feedid;
- private String subnet;
- private String user;
- private String[] nodes;
+ private final String feedid;
+ private final String subnet;
+ private final String user;
+ private final String[] nodes;
/**
* Construct a forced ingress configuration entry.
*/
public static class ProvForceEgress {
- private String subid;
- private String node;
+ private final String subid;
+ private final String node;
/**
* Construct a forced egress configuration entry.
*/
public static class ProvHop {
- private String from;
- private String to;
- private String via;
+ private final String from;
+ private final String to;
+ private final String via;
/**
* Construct a hop entry.
Redirection[] redirections;
Target[] targets;
String createdDate;
- String aafInstance;
}
}
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.config;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import org.jetbrains.annotations.Nullable;
-import org.onap.dmaap.datarouter.node.NodeConfig.ProvHop;
+import org.onap.dmaap.datarouter.node.config.NodeConfig;
+import org.onap.dmaap.datarouter.node.config.NodeConfig.ProvHop;
/**
* Given a set of node names and next hops, identify and ignore any cycles and figure out the sequence of next hops to
* get from this node to any other node.
*/
-class PathFinder {
+public class PathFinder {
- private ArrayList<String> errors = new ArrayList<>();
- private HashMap<String, String> routes = new HashMap<>();
+ private final ArrayList<String> errors = new ArrayList<>();
+ private final HashMap<String, String> routes = new HashMap<>();
/**
* Find routes from a specified origin to all of the nodes given a set of specified next hops.
* @param nodes where we can go
* @param hops detours along the way
*/
- PathFinder(String origin, String[] nodes, NodeConfig.ProvHop[] hops) {
+ public PathFinder(String origin, String[] nodes, NodeConfig.ProvHop[] hops) {
HashSet<String> known = new HashSet<>();
HashMap<String, HashMap<String, Hop>> ht = new HashMap<>();
for (String n : nodes) {
*
* @return array of error descriptions
*/
- String[] getErrors() {
+ public String[] getErrors() {
return (errors.toArray(new String[0]));
}
* @param destination node
* @return list of node names separated by and ending with "/"
*/
- String getPath(String destination) {
+ public String getPath(String destination) {
String ret = routes.get(destination);
if (ret == null) {
return ("");
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.config;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
-import org.onap.dmaap.datarouter.node.NodeConfig.ProvFeed;
-import org.onap.dmaap.datarouter.node.NodeConfig.ProvFeedSubnet;
-import org.onap.dmaap.datarouter.node.NodeConfig.ProvFeedUser;
-import org.onap.dmaap.datarouter.node.NodeConfig.ProvForceEgress;
-import org.onap.dmaap.datarouter.node.NodeConfig.ProvForceIngress;
-import org.onap.dmaap.datarouter.node.NodeConfig.ProvHop;
-import org.onap.dmaap.datarouter.node.NodeConfig.ProvNode;
-import org.onap.dmaap.datarouter.node.NodeConfig.ProvParam;
-import org.onap.dmaap.datarouter.node.NodeConfig.ProvSubscription;
+import org.onap.dmaap.datarouter.node.config.NodeConfig.ProvFeed;
+import org.onap.dmaap.datarouter.node.config.NodeConfig.ProvFeedSubnet;
+import org.onap.dmaap.datarouter.node.config.NodeConfig.ProvFeedUser;
+import org.onap.dmaap.datarouter.node.config.NodeConfig.ProvForceEgress;
+import org.onap.dmaap.datarouter.node.config.NodeConfig.ProvForceIngress;
+import org.onap.dmaap.datarouter.node.config.NodeConfig.ProvHop;
+import org.onap.dmaap.datarouter.node.config.NodeConfig.ProvNode;
+import org.onap.dmaap.datarouter.node.config.NodeConfig.ProvParam;
+import org.onap.dmaap.datarouter.node.config.NodeConfig.ProvSubscription;
import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
+import org.onap.dmaap.datarouter.node.utils.NodeUtils;
/**
* Parser for provisioning data from the provisioning server.
private static final String FEED_ID = "feedid";
- private static EELFLogger eelfLogger = EELFManager.getInstance().getLogger(ProvData.class);
- private NodeConfig.ProvNode[] pn;
- private NodeConfig.ProvParam[] pp;
- private NodeConfig.ProvFeed[] pf;
- private NodeConfig.ProvFeedUser[] pfu;
- private NodeConfig.ProvFeedSubnet[] pfsn;
- private NodeConfig.ProvSubscription[] ps;
- private NodeConfig.ProvForceIngress[] pfi;
- private NodeConfig.ProvForceEgress[] pfe;
- private NodeConfig.ProvHop[] ph;
+ private static final EELFLogger eelfLogger = EELFManager.getInstance().getLogger(ProvData.class);
+ private final NodeConfig.ProvNode[] provNodes;
+ private final NodeConfig.ProvParam[] provParams;
+ private final NodeConfig.ProvFeed[] provFeeds;
+ private final NodeConfig.ProvFeedUser[] provFeedUsers;
+ private final NodeConfig.ProvFeedSubnet[] provFeedSubnets;
+ private final NodeConfig.ProvSubscription[] provSubscriptions;
+ private final NodeConfig.ProvForceIngress[] provForceIngresses;
+ private final NodeConfig.ProvForceEgress[] provForceEgresses;
+ private final NodeConfig.ProvHop[] provHops;
/**
* Construct raw provisioing data entries from the text (JSON) provisioning document received from the provisioning
* @param reader The reader for the JSON text.
*/
public ProvData(Reader reader) throws IOException {
- ArrayList<ProvNode> pnv = new ArrayList<>();
- ArrayList<NodeConfig.ProvParam> ppv = new ArrayList<>();
- ArrayList<NodeConfig.ProvFeed> pfv = new ArrayList<>();
- ArrayList<NodeConfig.ProvFeedUser> pfuv = new ArrayList<>();
- ArrayList<NodeConfig.ProvFeedSubnet> pfsnv = new ArrayList<>();
- ArrayList<NodeConfig.ProvSubscription> psv = new ArrayList<>();
- ArrayList<NodeConfig.ProvForceIngress> pfiv = new ArrayList<>();
- ArrayList<NodeConfig.ProvForceEgress> pfev = new ArrayList<>();
- ArrayList<NodeConfig.ProvHop> phv = new ArrayList<>();
+ ArrayList<ProvNode> provNodeArrayList = new ArrayList<>();
+ ArrayList<NodeConfig.ProvParam> provParamArrayList = new ArrayList<>();
+ ArrayList<NodeConfig.ProvFeed> provFeedArrayList = new ArrayList<>();
+ ArrayList<NodeConfig.ProvFeedUser> provFeedUserArrayList = new ArrayList<>();
+ ArrayList<NodeConfig.ProvFeedSubnet> provFeedSubnetArrayList = new ArrayList<>();
+ ArrayList<NodeConfig.ProvSubscription> provSubscriptionArrayList = new ArrayList<>();
+ ArrayList<NodeConfig.ProvForceIngress> provForceIngressArrayList = new ArrayList<>();
+ ArrayList<NodeConfig.ProvForceEgress> provForceEgressArrayList = new ArrayList<>();
+ ArrayList<NodeConfig.ProvHop> provHopArrayList = new ArrayList<>();
try {
- JSONTokener jtx = new JSONTokener(reader);
- JSONObject jcfg = new JSONObject(jtx);
- char cch = jtx.nextClean();
- if (cch != '\0') {
+ JSONTokener jsonTokener = new JSONTokener(reader);
+ JSONObject jsonObject = new JSONObject(jsonTokener);
+ char nextCleanChar = jsonTokener.nextClean();
+ if (nextCleanChar != '\0') {
throw new JSONException("Spurious characters following configuration");
}
reader.close();
- addJSONFeeds(pfv, pfuv, pfsnv, jcfg);
- addJSONSubs(psv, jcfg);
- addJSONParams(pnv, ppv, jcfg);
- addJSONRoutingInformation(pfiv, pfev, phv, jcfg);
+ addJSONFeeds(provFeedArrayList, provFeedUserArrayList, provFeedSubnetArrayList, jsonObject);
+ addJSONSubs(provSubscriptionArrayList, jsonObject);
+ addJSONParams(provNodeArrayList, provParamArrayList, jsonObject);
+ addJSONRoutingInformation(provForceIngressArrayList, provForceEgressArrayList, provHopArrayList, jsonObject);
} catch (JSONException jse) {
NodeUtils.setIpAndFqdnForEelf("ProvData");
eelfLogger.error(EelfMsgs.MESSAGE_PARSING_ERROR, jse.toString());
.error("NODE0201 Error parsing configuration data from provisioning server " + jse.toString(), jse);
throw new IOException(jse.toString(), jse);
}
- pn = pnv.toArray(new NodeConfig.ProvNode[pnv.size()]);
- pp = ppv.toArray(new NodeConfig.ProvParam[ppv.size()]);
- pf = pfv.toArray(new NodeConfig.ProvFeed[pfv.size()]);
- pfu = pfuv.toArray(new NodeConfig.ProvFeedUser[pfuv.size()]);
- pfsn = pfsnv.toArray(new NodeConfig.ProvFeedSubnet[pfsnv.size()]);
- ps = psv.toArray(new NodeConfig.ProvSubscription[psv.size()]);
- pfi = pfiv.toArray(new NodeConfig.ProvForceIngress[pfiv.size()]);
- pfe = pfev.toArray(new NodeConfig.ProvForceEgress[pfev.size()]);
- ph = phv.toArray(new NodeConfig.ProvHop[phv.size()]);
+ provNodes = provNodeArrayList.toArray(new ProvNode[0]);
+ provParams = provParamArrayList.toArray(new ProvParam[0]);
+ provFeeds = provFeedArrayList.toArray(new ProvFeed[0]);
+ provFeedUsers = provFeedUserArrayList.toArray(new ProvFeedUser[0]);
+ provFeedSubnets = provFeedSubnetArrayList.toArray(new ProvFeedSubnet[0]);
+ provSubscriptions = provSubscriptionArrayList.toArray(new ProvSubscription[0]);
+ provForceIngresses = provForceIngressArrayList.toArray(new ProvForceIngress[0]);
+ provForceEgresses = provForceEgressArrayList.toArray(new ProvForceEgress[0]);
+ provHops = provHopArrayList.toArray(new ProvHop[0]);
}
private static String[] gvasa(JSONObject object, String key) {
* Get the raw node configuration entries.
*/
public NodeConfig.ProvNode[] getNodes() {
- return (pn);
+ return (provNodes);
}
/**
* Get the raw parameter configuration entries.
*/
public NodeConfig.ProvParam[] getParams() {
- return (pp);
+ return (provParams);
}
/**
* Ge the raw feed configuration entries.
*/
public NodeConfig.ProvFeed[] getFeeds() {
- return (pf);
+ return (provFeeds);
}
/**
* Get the raw feed user configuration entries.
*/
public NodeConfig.ProvFeedUser[] getFeedUsers() {
- return (pfu);
+ return (provFeedUsers);
}
/**
* Get the raw feed subnet configuration entries.
*/
public NodeConfig.ProvFeedSubnet[] getFeedSubnets() {
- return (pfsn);
+ return (provFeedSubnets);
}
/**
* Get the raw subscription entries.
*/
public NodeConfig.ProvSubscription[] getSubscriptions() {
- return (ps);
+ return (provSubscriptions);
}
/**
* Get the raw forced ingress entries.
*/
public NodeConfig.ProvForceIngress[] getForceIngress() {
- return (pfi);
+ return (provForceIngresses);
}
/**
* Get the raw forced egress entries.
*/
public NodeConfig.ProvForceEgress[] getForceEgress() {
- return (pfe);
+ return (provForceEgresses);
}
/**
* Get the raw next hop entries.
*/
public NodeConfig.ProvHop[] getHops() {
- return (ph);
+ return (provHops);
}
@Nullable
String fname = gvas(jfeed, "name");
String fver = gvas(jfeed, "version");
String createdDate = gvas(jfeed, "created_date");
- /*
- * START - AAF changes
- * TDP EPIC US# 307413
- * Passing aafInstance to ProvFeed from feeds json passed by prov to identify legacy/AAF feeds
- */
- String aafInstance = gvas(jfeed, "aaf_instance");
- pfv.add(new ProvFeed(fid, fname + "//" + fver, stat, createdDate, aafInstance));
- /*
- * END - AAF changes
- */
+ pfv.add(new ProvFeed(fid, fname + "//" + fver, stat, createdDate));
addJSONFeedAuthArrays(pfuv, pfsnv, jfeed, fid);
}
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.config;
+
+import org.onap.dmaap.datarouter.node.utils.NodeUtils;
/**
* Compare IP addresses as byte arrays to a subnet specified as a CIDR.
* *
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.delivery;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Objects;
+import org.onap.dmaap.datarouter.node.DestInfo;
+import org.onap.dmaap.datarouter.node.NodeConfigManager;
/**
* Main control point for delivering files to destinations.
return false;
}
- static class DelItem implements Comparable<DelItem> {
+ public static class DelItem implements Comparable<DelItem> {
private String pubid;
private String spool;
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.delivery;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import java.util.HashMap;
import java.util.List;
import org.jetbrains.annotations.Nullable;
+import org.onap.dmaap.datarouter.node.DestInfo;
+import org.onap.dmaap.datarouter.node.log.StatusLog;
/**
* Mechanism for monitoring and controlling delivery of files to a destination.
/**
* Create a delivery queue for a given destination info.
*/
- DeliveryQueue(DeliveryQueueHelper deliveryQueueHelper, DestInfo destinationInfo) {
+ public DeliveryQueue(DeliveryQueueHelper deliveryQueueHelper, DestInfo destinationInfo) {
this.deliveryQueueHelper = deliveryQueueHelper;
this.destinationInfo = destinationInfo;
dir = new File(destinationInfo.getSpool());
*
* @return The length of the task in bytes or 0 if the task cannot be cancelled.
*/
- synchronized long cancelTask(String pubid) {
+ public synchronized long cancelTask(String pubid) {
if (working.get(pubid) != null) {
return (0);
}
/**
* Get the next task.
*/
- synchronized DeliveryTask getNext() {
+ public synchronized DeliveryTask getNext() {
DeliveryTask ret = peekNext();
if (ret != null) {
todoindex++;
/**
* Peek at the next task.
*/
- synchronized DeliveryTask peekNext() {
+ public synchronized DeliveryTask peekNext() {
long now = System.currentTimeMillis();
long mindate = now - deliveryQueueHelper.getExpirationTimer();
if (failed) {
/**
* Reset the retry timer.
*/
- void resetQueue() {
+ public void resetQueue() {
resumetime = System.currentTimeMillis();
}
/**
* Get task if in queue and mark as success.
*/
- boolean markTaskSuccess(String pubId) {
+ public boolean markTaskSuccess(String pubId) {
DeliveryTask task = working.get(pubId);
if (task != null) {
markSuccess(task);
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.delivery;
+
+import org.onap.dmaap.datarouter.node.DestInfo;
/**
* Interface to allow independent testing of the DeliveryQueue code
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.delivery;
import static com.att.eelf.configuration.Configuration.MDC_KEY_REQUEST_ID;
-import static org.onap.dmaap.datarouter.node.NodeUtils.isFiletypeGzip;
+import static org.onap.dmaap.datarouter.node.utils.NodeUtils.isFiletypeGzip;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import java.util.UUID;
import java.util.zip.GZIPInputStream;
import org.jetbrains.annotations.Nullable;
+import org.onap.dmaap.datarouter.node.DestInfo;
+import org.onap.dmaap.datarouter.node.utils.NodeUtils;
import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
import org.slf4j.MDC;
* @param pubid The publish ID for this file. This is used as the base for the file name in the spool directory and
* is of the form (milliseconds since 1970).(fqdn of initial data router node)
*/
- DeliveryTask(DeliveryTaskHelper deliveryTaskHelper, String pubid) {
+ public DeliveryTask(DeliveryTaskHelper deliveryTaskHelper, String pubid) {
this.deliveryTaskHelper = deliveryTaskHelper;
this.pubid = pubid;
destInfo = deliveryTaskHelper.getDestinationInfo();
/**
* Get the publish ID.
*/
- String getPublishId() {
+ public String getPublishId() {
return (pubid);
}
/**
* Remove meta and data files.
*/
- void clean() {
+ public void clean() {
deleteWithRetry(datafile);
deleteWithRetry(metafile);
eelfLogger.info(EelfMsgs.INVOKE, newInvocationId);
/**
* Set the resume time for a delivery task.
*/
- void setResumeTime(long resumeTime) {
+ public void setResumeTime(long resumeTime) {
this.resumeTime = resumeTime;
}
/**
* Has this delivery task been cleaned.
*/
- boolean isCleaned() {
+ public boolean isCleaned() {
return (hdrs == null);
}
/**
* Get creation date as encoded in the publish ID.
*/
- long getDate() {
+ public long getDate() {
return (date);
}
/**
* Get the content type.
*/
- String getCType() {
+ public String getCType() {
return (ctype);
}
/**
* Get the method.
*/
- String getMethod() {
+ public String getMethod() {
return (method);
}
/**
* Get the file ID.
*/
- String getFileId() {
+ public String getFileId() {
return (fileid);
}
/**
* Get the number of delivery attempts.
*/
- int getAttempts() {
+ public int getAttempts() {
return (attempts);
}
/**
* Get the (space delimited list of) subscription ID for this delivery task.
*/
- String getSubId() {
+ public String getSubId() {
return (subid);
}
/**
* Get the feed ID for this delivery task.
*/
- String getFeedId() {
+ public String getFeedId() {
return (feedid);
}
/**
* Get the followRedirects for this delivery task.
*/
- boolean getFollowRedirects() {
+ public boolean getFollowRedirects() {
return (followRedirects);
}
}
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.delivery;
+
+import org.onap.dmaap.datarouter.node.DestInfo;
/**
* Interface to allow independent testing of the DeliveryTask code.
"PBF|") && !event.getMessage().contains("EXP|") && !event.getMessage().contains("DLX|")) {
return FilterReply.ACCEPT;
}
- } else {
- return FilterReply.DENY;
}
return FilterReply.DENY;
}
* *
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.log;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jetbrains.annotations.NotNull;
+import org.onap.dmaap.datarouter.node.DestInfo;
+import org.onap.dmaap.datarouter.node.DestInfoBuilder;
+import org.onap.dmaap.datarouter.node.NodeConfigManager;
+import org.onap.dmaap.datarouter.node.delivery.DeliveryQueue;
+import org.onap.dmaap.datarouter.node.delivery.DeliveryQueueHelper;
/**
* Cleanup of old log files.
return worker;
}
- class Uploader extends Thread implements DeliveryQueueHelper {
+ public class Uploader extends Thread implements DeliveryQueueHelper {
private static final String META = "/.meta";
private EELFLogger logger = EELFManager.getInstance().getLogger(Uploader.class);
* *
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.log;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.onap.dmaap.datarouter.node.NodeConfigManager;
+import org.onap.dmaap.datarouter.node.utils.NodeUtils;
/**
* Logging for data router delivery events (PUB/DEL/EXP).
--- /dev/null
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2022 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dmaap.datarouter.node.utils;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Enumeration;
+import java.util.Properties;
+import javax.naming.InvalidNameException;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
+import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
+
+public class NodeTlsManager {
+
+ private static final EELFLogger eelfLogger = EELFManager.getInstance().getLogger(NodeTlsManager.class);
+
+ private String keyStoreType;
+ private String keyStorefile;
+ private String keyStorePassword;
+ private String keyManagerPassword;
+ private final String[] enabledProtocols;
+
+ public NodeTlsManager(Properties properties) {
+ enabledProtocols = properties.getProperty("NodeHttpsProtocols",
+ "TLSv1.1|TLSv1.2").trim().split("\\|");
+ setUpKeyStore(properties);
+ setUpTrustStore(properties);
+ }
+
+ private void setUpKeyStore(Properties properties) {
+ keyStoreType = properties.getProperty("KeyStoreType", "PKCS12");
+ keyStorefile = properties.getProperty("KeyStorePath");
+ keyStorePassword = properties.getProperty("KeyStorePass");
+ keyManagerPassword = properties.getProperty("KeyManagerPass");
+ }
+
+ private void setUpTrustStore(Properties properties) {
+ String trustStoreType = properties.getProperty("TrustStoreType", "jks");
+ String trustStoreFile = properties.getProperty("TrustStorePath");
+ String trustStorePassword = properties.getProperty("TrustStorePass");
+ if (trustStoreFile != null && trustStoreFile.length() > 0) {
+ eelfLogger.info("TrustStore found. Loading {} file {} to System Properties.", trustStoreType, trustStoreFile);
+ System.setProperty("javax.net.ssl.trustStoreType", trustStoreType);
+ System.setProperty("javax.net.ssl.trustStore", trustStoreFile);
+ System.setProperty("javax.net.ssl.trustStorePassword", trustStorePassword);
+ return;
+ }
+ eelfLogger.error("TrustStore not found. Falling back to 1 way TLS");
+ }
+
+ public String getKeyStoreType() {
+ return keyStoreType;
+ }
+
+ public String getKeyStorefile() {
+ return keyStorefile;
+ }
+
+ public String getKeyStorePassword() {
+ return keyStorePassword;
+ }
+
+ public String getKeyManagerPassword() {
+ return keyManagerPassword;
+ }
+
+ public String[] getEnabledProtocols() {
+ return enabledProtocols;
+ }
+
+ /**
+ * Get the CN value of the first private key entry with a certificate.
+ *
+ * @return CN of the certificate subject or null
+ */
+ public String getMyNameFromCertificate() {
+ return getCanonicalName(this.keyStoreType, this.keyStorefile, this.keyStorePassword);
+ }
+
+ private String getCanonicalName(String kstype, String ksfile, String kspass) {
+ KeyStore ks;
+ try {
+ ks = KeyStore.getInstance(kstype);
+ if (loadKeyStore(ksfile, kspass, ks)) {
+ return (null);
+ }
+ } catch (Exception e) {
+ NodeUtils.setIpAndFqdnForEelf("getCanonicalName");
+ eelfLogger.error(EelfMsgs.MESSAGE_KEYSTORE_LOAD_ERROR, e, ksfile);
+ return (null);
+ }
+ return (getCanonicalName(ks));
+ }
+
+ private String getCanonicalName(KeyStore ks) {
+ try {
+ Enumeration<String> aliases = ks.aliases();
+ while (aliases.hasMoreElements()) {
+ String name = getNameFromSubject(ks, aliases);
+ if (name != null) {
+ return name;
+ }
+ }
+ } catch (Exception e) {
+ eelfLogger.error("NODE0402 Error extracting my name from my keystore file " + e);
+ }
+ return (null);
+ }
+
+ private boolean loadKeyStore(String ksfile, String kspass, KeyStore ks)
+ throws NoSuchAlgorithmException, CertificateException {
+ try (FileInputStream fileInputStream = new FileInputStream(ksfile)) {
+ ks.load(fileInputStream, kspass.toCharArray());
+ } catch (IOException ioException) {
+ eelfLogger.error("IOException occurred while opening FileInputStream: " + ioException.getMessage(),
+ ioException);
+ return true;
+ }
+ return false;
+ }
+
+ private String getNameFromSubject(KeyStore ks, Enumeration<String> aliases) throws KeyStoreException {
+ String alias = aliases.nextElement();
+ String nameFromSubject = null;
+ if (ks.entryInstanceOf(alias, KeyStore.PrivateKeyEntry.class)) {
+ X509Certificate cert = (X509Certificate) ks.getCertificate(alias);
+ if (cert != null) {
+ String subject = cert.getSubjectX500Principal().getName();
+ try {
+ LdapName ln = new LdapName(subject);
+ for (Rdn rdn : ln.getRdns()) {
+ if (rdn.getType().equalsIgnoreCase("CN")) {
+ nameFromSubject = rdn.getValue().toString();
+ }
+ }
+ } catch (InvalidNameException e) {
+ eelfLogger.error("No valid CN not found for dr-node cert", e);
+ }
+ }
+ }
+ return nameFromSubject;
+ }
+}
******************************************************************************/
-package org.onap.dmaap.datarouter.node;
+package org.onap.dmaap.datarouter.node.utils;
import static com.att.eelf.configuration.Configuration.MDC_KEY_REQUEST_ID;
import static com.att.eelf.configuration.Configuration.MDC_SERVER_FQDN;
}
}
- /**
- * Given a keystore file and its password, return the value of the CN of the first private key entry with a
- * certificate.
- *
- * @param kstype The type of keystore
- * @param ksfile The file name of the keystore
- * @param kspass The password of the keystore
- * @return CN of the certificate subject or null
- */
- public static String getCanonicalName(String kstype, String ksfile, String kspass) {
- KeyStore ks;
- try {
- ks = KeyStore.getInstance(kstype);
- if (loadKeyStore(ksfile, kspass, ks)) {
- return (null);
- }
- } catch (Exception e) {
- setIpAndFqdnForEelf("getCanonicalName");
- eelfLogger.error(EelfMsgs.MESSAGE_KEYSTORE_LOAD_ERROR, e, ksfile);
- return (null);
- }
- return (getCanonicalName(ks));
- }
-
- /**
- * Given a keystore, return the value of the CN of the first private key entry with a certificate.
- *
- * @param ks The KeyStore
- * @return CN of the certificate subject or null
- */
- public static String getCanonicalName(KeyStore ks) {
- try {
- Enumeration<String> aliases = ks.aliases();
- while (aliases.hasMoreElements()) {
- String name = getNameFromSubject(ks, aliases);
- if (name != null) {
- return name;
- }
- }
- } catch (Exception e) {
- eelfLogger.error("NODE0402 Error extracting my name from my keystore file " + e.toString(), e);
- }
- return (null);
- }
-
/**
* Given a string representation of an IP address, get the corresponding byte array.
*
}
/**
- * Method to check to see if file is of type gzip.
+ * If file is of type gzip.
*
* @param file The name of the file to be checked
* @return True if the file is of type gzip
*/
public static boolean isFiletypeGzip(File file) {
try (FileInputStream fileInputStream = new FileInputStream(file);
- GZIPInputStream gzip = new GZIPInputStream(fileInputStream)) {
-
+ GZIPInputStream ignored = new GZIPInputStream(fileInputStream)) {
return true;
} catch (IOException e) {
- eelfLogger.error("NODE0403 " + file.toString() + " Not in gzip(gz) format: " + e.toString() + e);
+ eelfLogger.error("NODE0403 " + file + " Not in gzip(gz) format: " + e + e);
return false;
}
}
-
-
- private static boolean loadKeyStore(String ksfile, String kspass, KeyStore ks)
- throws NoSuchAlgorithmException, CertificateException {
- try (FileInputStream fileInputStream = new FileInputStream(ksfile)) {
- ks.load(fileInputStream, kspass.toCharArray());
- } catch (IOException ioException) {
- eelfLogger.error("IOException occurred while opening FileInputStream: " + ioException.getMessage(),
- ioException);
- return true;
- }
- return false;
- }
-
-
- private static String getNameFromSubject(KeyStore ks, Enumeration<String> aliases) throws KeyStoreException {
- String alias = aliases.nextElement();
- if (ks.entryInstanceOf(alias, KeyStore.PrivateKeyEntry.class)) {
- X509Certificate cert = (X509Certificate) ks.getCertificate(alias);
- if (cert != null) {
- String subject = cert.getSubjectX500Principal().getName();
- try {
- LdapName ln = new LdapName(subject);
- for (Rdn rdn : ln.getRdns()) {
- if (rdn.getType().equalsIgnoreCase("CN")) {
- return rdn.getValue().toString();
- }
- }
- } catch (InvalidNameException e) {
- eelfLogger.error("No valid CN not found for dr-node cert", e);
- }
- }
- }
- return null;
- }
}
+++ /dev/null
-############################################################
-# Properties Generated by AT&T Certificate Manager
-# by root
-# on 2022-03-22T12:31:16.865+0000
-# @copyright 2019, AT&T
-############################################################
-Challenge=enc:2dZO7B2UVelU01IezilQ9hUYptjIvurC6JWO9vJHOiiqg9qUna3AdEMxzBpXcgIO
-cadi_alias=dmaap-dr-node@dmaap-dr.onap.org
-cadi_key_password=enc:ow380FBQU5xvQEDzTiXdfx-BD_0dEWbRCXjnUPxVFatk_7KaejgiLCVew6C6x8_9
-cadi_keyfile=/opt/app/osaaf/local/org.onap.dmaap-dr.keyfile
-cadi_keystore=/opt/app/osaaf/local/org.onap.dmaap-dr.p12
-cadi_keystore_password=enc:Urky1AuqpokGwoSl72ypmhVONokY0H1Gy28S9P8jfvK1-d7W8SODXf87K37EubDo
-cadi_keystore_password_jks=enc:lwXWmxaVAHy207uNeiHPYLho3qezj4xu7_iH4myTitXuj_bo9esv0e1L19HluXlM
-cadi_keystore_password_p12=enc:Urky1AuqpokGwoSl72ypmhVONokY0H1Gy28S9P8jfvK1-d7W8SODXf87K37EubDo
-cadi_truststore=/opt/app/osaaf/local/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=enc:stAsWWKk5FOcWxyWsNqyQlSdkwWSxcy3Jed6RW_r4jyZosqV8kmSCJLSHNLyWyTH
-cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
+++ /dev/null
-uXr3OodaCvEvTDHfkpgh-_5UdpEkBowSRpKF18WNxMG0A9Y9k2REr-d075mNHshr5gOUYAlykgaX
-ImvY-oFtG71N-Q0uqYnYuU7eX7zgcOOFNpeT4q2db3wkiScaZgdv2UnfDOVX2Aq53GzyYeKcGB1W
-u0jKX8ryHVC0uvj69y1boiJBxQY1HwAqsh9q39Ut1XxyB42D7xDM7sa9G1I6YosQlthXPMt7Q_i0
-0CUHrozT6Wtnxfb8-qR6rM5PNmAxp8r5Jb4cnSbxJGEWpx1DkZPPZNvLjE9bBfinVftzrpIlqHd3
-2CCp3k6xrqui2c_0HaNILtKHX5VVKttRf9zoADk_l5_MowEJgh1fgu8m0r-iEB6oH18AWZ_PCtSr
-A0cqEDGbP-h7e8w-Dwb0yS_oSfeDISarZ1Q46CQFcDz7f4bVB3AW67YGM4SQBaFGivWS_Lz_juOx
-fhyo55HW_wL_92xRvAyXD1Eg64Lw0Cx0f9rn4uM7NkKaSCP8MmIvs84egCvDzCiWkT6SGzUTeZ7M
-qI0ow2tJPFUuvhozcYxJW9sFzTqTFL7iLtrO5nHmo7YUVf2WU8ByGOfC-ylZPjw0fiKpe-7MXVSz
-MIOxl3pgWSYt6kImBtZCateif6TgF_A-91yAOoQLm72baJKhOo-F-aJ4k6ToT4bZ-9-Hjs5Wk9sO
-4thYzDcMaGrWsssnR9QMBjl9x3uw5bfOYGduyyRCWC_TYNorrW6Bvh7gFZAWk_f6cK-pPahRo_3O
-erNlUHx6xaektjqUsmp91LzjCEWbmt5nDGw16VUSPhrtkca2ReWDL0vTnpjvPuRI7mWHdfyoVYMw
-KUDkRgn61QvELC0Rl0C12polUEjqSxCRvGzL8QiOrU_Z1hXhVyp2gVIYvDKyuyguvJlniEBQ2qbM
-3Y5savSaANj-b2-_J0ofhvYFGz1k_bjcCE6Wx2RSWk1nSJFJ0gFjp1Ky2cyKhhVMXCiWcbbA3vC8
-E1cE9Ixn4z5WYyHOAFyzrsiiapdn5MhB_kI-ObR2HuRy_GRJHMVpxqX15Bv3OXxWy51bXeYeRfit
-SVCoyfXMXbx12eVG4tvf3WyYg9RqK_QN57VAmnffq09MAXuzFB1NuxSeJeBHGtBW6XIvb6E32K6I
-rL7vfxGHhD7ZHqQzzie5I42HufANtBb1KNKHikeeACxxlpjOIHjjEZ6yffhoyhNbSHx4TNs7UYOf
-FUKs0TCO9ffSJ8JT67X-baqlnSYFkdqR6QTGhltZq1ssPYq6Y6NGN1iEHJMfapev07AQgp6mBBxJ
-dEwDZMAwlmb1yVkU1gfzcrGdAUeAAuM6LowPHUKYLJJvvaFLQJKbwwLvjnm_Tf9UR5QJ8a3JKiLt
-F0Ykc1AeO-fyiNPUVRnkc3--Gs0bLUpLe0_medGOZ_LLk45GarEzBCGajgF_joz8fsndKtDrEnB0
-z-8iiQ4bTZb_ALjKnnhcdKjoJNhZ-e3AsmadYO7ve2K3ApwOelWWh24iZ-ZSUbnlw-OQMu4RvI9h
-9KOTbu4gWokep3O2uT8-cVN-ax1FYRpmexHgIxZy-tmYjDdJTJQv3dMp5UngUs6xmIy5nyIBr51B
-YORSQmXRvbdvYeY7jOEQUGfXfS2yYtzLfJ07f8ODQJ24APDKsVEGWVBcBMqp53o9W7cPJ-4vnMLU
-mVYCKqVrT2bThRWb38OtaaJuA4A8GboDDe5Q0IZao0v3gqwgfCzJIjQx97AEHzEbLzEBxio_z8a0
-AYLi-_f7kMtgrMsj61gcRVUan5NVqnL7oVwFn8FuqeTRzMMbgJHUHfFzrgLxpRwnscGRzygZf39Q
-JqqOLGriWe_IOhXQ7aIp3uyBF-brJnrXcQIp3PF0fbVTGK_VyKDB6J0BjJyjmyL0TA37hDr8usna
-TgMtjF1qq9kOrJr2582n8TW-ogpyqm1ft7R18VT9_1JjtnCcTCudW-oJX87jv3UTJdaEkBMhc1Pe
-euLti-qSG3Q5QeO5AxM8mP_9YbLHB9YQboRWnbfC9oIFRmVgGAcdbHNFn0hfILBOTIYStQL4
\ No newline at end of file
+++ /dev/null
-############################################################
-# Properties Generated by AT&T Certificate Manager
-# by root
-# on 2022-03-22T12:31:14.170+0000
-# @copyright 2019, AT&T
-############################################################
-cadi_latitude=0.0
-cadi_longitude=0.0
+++ /dev/null
-############################################################
-# Properties Generated by AT&T Certificate Manager
-# by root
-# on 2022-03-22T12:31:14.169+0000
-# @copyright 2019, AT&T
-############################################################
-aaf_env=DEV
-aaf_id=dmaap-dr-node@dmaap-dr.onap.org
-aaf_locate_url=https://aaf-locate.onap:8095
-aaf_locator_app_ns=org.osaaf.aaf
-aaf_locator_container=oom
-aaf_locator_container_ns=onap
-aaf_locator_fqdn=dmaap-dr-node
-aaf_locator_public_fqdn=dmaap-dr.onap.org
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.introspect:2.1/introspect
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.token:2.1/token
-aaf_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.service:2.1
-aaf_url_cm=https://AAF_LOCATE_URL/%CNS.%AAF_NS.cm:2.1
-aaf_url_fs=https://AAF_LOCATE_URL/%CNS.%AAF_NS.fs:2.1
-aaf_url_gui=https://AAF_LOCATE_URL/%CNS.%AAF_NS.gui:2.1
-aaf_url_hello=https://aaf-locate.onap:8095/locate/onap.org.osaaf.aaf.hello:2.1
-aaf_url_oauth=https://AAF_LOCATE_URL/%CNS.%AAF_NS.oauth:2.1
-cadi_prop_files=/opt/app/osaaf/local/org.onap.dmaap-dr.location.props:/opt/app/osaaf/local/org.onap.dmaap-dr.cred.props
-cadi_protocols=TLSv1.1,TLSv1.2
# The path to the redirection data file
RedirectionFile = etc/redirections.dat
#
+# https security required for publish request
+TlsEnabled = false
+#
+# Enabled TLS protocols
+NodeHttpsProtocols = TLSv1.1|TLSv1.2
+#
# The type of keystore for https
KeyStoreType = PKCS12
#
+# The path to your KeyStoreFile
+KeyStorePath = /opt/app/datartr/certs/org.onap.dmaap-dr-node.p12
+#
+# The key store password
+KeyStorePass = changeit
+#
+# The key manager password
+KeyManagerPass = changeit
+#
# The type of truststore for https
TrustStoreType = jks
#
+# The path to your trust store
+TrustStorePath = /opt/app/datartr/certs/truststore.jks
+#
+# The trust store password
+TrustStorePass = changeit
+#
# The path to the file used to trigger an orderly shutdown
QuiesceFile = etc/SHUTDOWN
#
# The key used to generate passwords for node to node transfers
NodeAuthKey = Node123!
-#
-# DR_NODE DEFAULT ENABLED TLS PROTOCOLS
-NodeHttpsProtocols = TLSv1.1|TLSv1.2
-#
-# AAF CADI enabled flag
-CadiEnabled = false
-#
-# AAF type to generate permission string
-AAFType = org.onap.dmaap-dr.feed
-#
-# AAF default instance to generate permission string - default should be legacy
-AAFInstance = legacy
-#
-# AAF action to generate permission string - default should be publish
-AAFAction = publish
-#
-# AAF Props file path
-AAFPropsFilePath = /opt/app/osaaf/local/org.onap.dmaap-dr.props
-
-# https security required for publish request
-TlsEnabled = false
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.onap.dmaap.datarouter.node.delivery.DeliveryQueue;
+import org.onap.dmaap.datarouter.node.delivery.DeliveryQueueHelper;
+import org.onap.dmaap.datarouter.node.delivery.DeliveryTask;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
+import org.onap.dmaap.datarouter.node.delivery.DeliveryQueue;
+import org.onap.dmaap.datarouter.node.delivery.DeliveryTask;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
-import java.util.Hashtable;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.onap.dmaap.datarouter.node.Delivery.DelItem;
+import org.onap.dmaap.datarouter.node.delivery.Delivery;
+import org.onap.dmaap.datarouter.node.delivery.Delivery.DelItem;
+import org.onap.dmaap.datarouter.node.delivery.DeliveryQueue;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
import java.util.Timer;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
-import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.onap.dmaap.datarouter.node.LogManager.Uploader;
+import org.onap.dmaap.datarouter.node.log.LogManager;
+import org.onap.dmaap.datarouter.node.log.LogManager.Uploader;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
+++ /dev/null
-/*
- * ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.dmaap.datarouter.node;
-
-import java.io.File;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class NodeAafPropsUtilsTest {
-
- private NodeAafPropsUtils nodeAafPropsUtils;
-
- @Before
- public void setUp() throws IOException {
- nodeAafPropsUtils = new NodeAafPropsUtils(new File("src/test/resources/aaf/org.onap.dmaap-dr.props"));
- }
-
- @Test
- public void Veirfy_Aaf_Pass_Decryp_Successful() {
- Assert.assertEquals("w7(O#.QV#kQ;L(8fsaoT7cY&", nodeAafPropsUtils.getDecryptedPass("cadi_keystore_password"));
- }
-}
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mock;
+import org.onap.dmaap.datarouter.node.config.NodeConfig;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
@Test
public void Verify_NodeConfigMan_Getters_Secure() {
NodeConfigManager nodeConfigManager = NodeConfigManager.getInstance();
- Assert.assertEquals("legacy", nodeConfigManager.getAafInstance());
Assert.assertEquals("src/test/resources/spool/f", nodeConfigManager.getSpoolDir());
Assert.assertEquals("src/test/resources/spool", nodeConfigManager.getSpoolBase());
- Assert.assertEquals("PKCS12", nodeConfigManager.getKSType());
Assert.assertEquals(8080, nodeConfigManager.getHttpPort());
Assert.assertEquals(8443, nodeConfigManager.getHttpsPort());
Assert.assertEquals(443, nodeConfigManager.getExtHttpsPort());
Assert.assertEquals(".log", nodeConfigManager.getEventLogSuffix());
Assert.assertEquals("src/test/resources/logs", nodeConfigManager.getLogDir());
Assert.assertEquals((86400000L * 30), nodeConfigManager.getLogRetention());
- Assert.assertEquals(new String[] {"TLSv1.1", "TLSv1.2"}, nodeConfigManager.getEnabledprotocols());
- Assert.assertEquals("org.onap.dmaap-dr.feed", nodeConfigManager.getAafType());
- Assert.assertEquals("publish", nodeConfigManager.getAafAction());
- Assert.assertTrue(nodeConfigManager.getCadiEnabled());
Assert.assertFalse(nodeConfigManager.isShutdown());
- Assert.assertTrue(nodeConfigManager.isTlsEnabled());
+ Assert.assertFalse(nodeConfigManager.isTlsEnabled());
Assert.assertTrue(nodeConfigManager.isConfigured());
Assert.assertNotNull(nodeConfigManager.getPublishId());
Assert.assertNotNull(nodeConfigManager.getAllDests());
Assert.assertEquals(60000, nodeConfigManager.getFairTimeLimit());
Assert.assertNotNull(nodeConfigManager.getTargets("1"));
Assert.assertEquals("src/test/resources/spool/f", nodeConfigManager.getSpoolDir());
- Assert.assertEquals("src/test/resources/aaf/org.onap.dmaap-dr.p12", nodeConfigManager.getKSFile());
- Assert.assertEquals("jks", nodeConfigManager.getTstype());
- Assert.assertEquals("src/test/resources/aaf/org.onap.dmaap-dr.trust.jks", nodeConfigManager.getTsfile());
Assert.assertEquals(40, nodeConfigManager.getDeliveryThreads());
Assert.assertEquals("30", nodeConfigManager.getEventLogInterval());
Assert.assertFalse(nodeConfigManager.isFollowRedirects());
Assert.assertEquals("Basic ZG1hYXAtZHItbm9kZTp2OStFanZpWVBXSURrazVxRlF5ZkoxSC9LdHBuYWo4K0NVTXlNL0lRRUp2UGdjOUxpU2s5ZnpKTjdFazl3SzZkaG11S1E4S3RtcC9kelpBU3BRUGZCdz09", nodeConfigManager.getMyAuth());
Assert.assertEquals(0.05, nodeConfigManager.getFreeDiskStart(), 0.0);
Assert.assertEquals(0.2, nodeConfigManager.getFreeDiskStop(), 0.0);
- Assert.assertEquals("org.onap.dmaap-dr.feed|legacy|publish", nodeConfigManager.getPermission("legacy"));
}
/**
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.onap.dmaap.datarouter.node.config.NodeConfig;
+import org.onap.dmaap.datarouter.node.config.ProvData;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
-@SuppressStaticInitializationFor({"org.onap.dmaap.datarouter.node.ProvData"})
+@SuppressStaticInitializationFor({"org.onap.dmaap.datarouter.node.config.ProvData"})
@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
public class NodeConfigTest {
endpointAddrs.put("172.0.0.1");
auth.put("endpoint_addrs", endpointAddrs);
feed.put("authorization", auth);
- feed.put("aaf_instance", "legacy");
feeds.put(feed);
provData.put("feeds", feeds);
}
import java.io.File;
import java.io.IOException;
+import java.util.Properties;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.onap.dmaap.datarouter.node.delivery.Delivery;
+import org.onap.dmaap.datarouter.node.utils.NodeTlsManager;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
public class NodeServerTest {
private final NodeConfigManager config = mock(NodeConfigManager.class);
+ private NodeTlsManager nodeTlsManager;
@Before
public void setUp() throws Exception {
setUpConfig();
+ setUpNodeTlsMan();
setUpNodeMainDelivery();
createFilesAndDirectories();
}
Assert.assertNotNull(NodeServer.getServerInstance(config));
}
- private void setUpConfig() throws IllegalAccessException {
+ private void setUpConfig() {
PowerMockito.mockStatic(NodeConfigManager.class);
when(config.isShutdown()).thenReturn(false);
when(config.isConfigured()).thenReturn(true);
when(config.isDeletePermitted("1")).thenReturn(true);
when(config.getAllDests()).thenReturn(new DestInfo[0]);
when(config.isTlsEnabled()).thenReturn(true);
- when(config.getKSType()).thenReturn("PKCS12");
- when(config.getKSFile()).thenReturn("src/test/resources/aaf/org.onap.dmaap-dr.p12");
- when(config.getKSPass()).thenReturn("tVac2#@Stx%tIOE^x[c&2fgZ");
- when(config.getTstype()).thenReturn("jks");
- when(config.getTsfile()).thenReturn("src/test/resources/aaf/org.onap.dmaap-dr.trust.jks");
- when(config.getTspass()).thenReturn("XHX$2Vl?Lk*2CB.i1+ZFAhZd");
PowerMockito.when(NodeConfigManager.getInstance()).thenReturn(config);
}
+ private void setUpNodeTlsMan() throws IOException {
+ Properties nodeProps = new Properties();
+ nodeProps.load(NodeTlsManagerTest.class.getClassLoader().getResourceAsStream("node_test.properties"));
+ nodeTlsManager = new NodeTlsManager(nodeProps);
+ PowerMockito.when(NodeConfigManager.getNodeTlsManager()).thenReturn(nodeTlsManager);
+ }
+
private void setUpNodeMainDelivery() throws IllegalAccessException{
Delivery delivery = mock(Delivery.class);
doNothing().when(delivery).resetQueue(anyObject());
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.anyString;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.BDDMockito;
import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.internal.matchers.Any;
+import org.onap.dmaap.datarouter.node.delivery.Delivery;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString());
}
- @Test
- public void Given_Request_Is_HTTP_PUT_On_Publish_On_AAF_Feed_And_Cadi_Enabled_And_No_Permissions_Then_Forbidden_Response_Is_Generated() throws Exception {
- when(config.getCadiEnabled()).thenReturn(true);
- when(config.getAafInstance("1")).thenReturn("*");
- when(request.getPathInfo()).thenReturn("/publish/1/fileName");
- setHeadersForValidRequest(true);
- nodeServlet.doPut(request, response);
- verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), anyString());
- verifyEnteringExitCalled(listAppender);
- }
@Test
public void Given_Request_Is_HTTP_DELETE_On_Publish_With_Meta_Data_Malformed_Then_Bad_Request_Response_Is_Generated() throws Exception {
--- /dev/null
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2019 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dmaap.datarouter.node;
+
+import java.io.IOException;
+import java.util.Properties;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.dmaap.datarouter.node.utils.NodeTlsManager;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"java.net.ssl", "javax.security.auth.x500.X500Principal", "com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
+public class NodeTlsManagerTest {
+
+ private static NodeTlsManager nodeTlsManager;
+
+ @BeforeClass
+ public static void setUpClass() throws IOException {
+ Properties nodeProps = new Properties();
+ nodeProps.load(NodeTlsManagerTest.class.getClassLoader().getResourceAsStream("node_test.properties"));
+ nodeTlsManager = new NodeTlsManager(nodeProps);
+ }
+
+ @Test
+ public void Given_Get_CanonicalName_Called_Valid_CN_Returned_From_JKS() {
+ String canonicalName = nodeTlsManager.getMyNameFromCertificate();
+ Assert.assertEquals("dmaap-dr-node", canonicalName);
+ }
+
+}
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.onap.dmaap.datarouter.node.utils.NodeUtils;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.modules.junit4.PowerMockRunner;
import org.slf4j.MDC;
@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"java.net.ssl", "javax.security.auth.x500.X500Principal", "com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
+@PowerMockIgnore({"java.net.ssl", "com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
public class NodeUtilsTest {
@Mock
Assert.assertEquals("123", MDC.get("RequestId"));
Assert.assertEquals("456", MDC.get("InvocationId"));
}
-
- @Test
- public void Given_Get_CanonicalName_Called_Valid_CN_Returned_From_JKS() {
- String canonicalName = NodeUtils.getCanonicalName("jks", "src/test/resources/org.onap.dmaap-dr-test-cert.jks", "WGxd2P6MDo*Bi4+UdzWs{?$8");
- Assert.assertEquals("dmaap-dr-node", canonicalName);
- }
-
- @Test
- public void Given_Get_CanonicalName_Called_Valid_CN_Returned_From_P12() {
- String canonicalName = NodeUtils.getCanonicalName("PKCS12", "src/test/resources/aaf/org.onap.dmaap-dr.p12", "w7(O#.QV#kQ;L(8fsaoT7cY&");
- Assert.assertEquals("dmaap-dr-node", canonicalName);
- }
}
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.onap.dmaap.datarouter.node.config.NodeConfig;
+import org.onap.dmaap.datarouter.node.config.PathFinder;
import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
import java.nio.charset.StandardCharsets;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.onap.dmaap.datarouter.node.config.ProvData;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.modules.junit4.PowerMockRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.onap.dmaap.datarouter.node.log.StatusLog;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
+++ /dev/null
-############################################################
-# Properties Generated by AT&T Certificate Manager
-# by root
-# on 2022-03-22T12:31:16.865+0000
-# @copyright 2019, AT&T
-############################################################
-Challenge=enc:2dZO7B2UVelU01IezilQ9hUYptjIvurC6JWO9vJHOiiqg9qUna3AdEMxzBpXcgIO
-cadi_alias=dmaap-dr-node@dmaap-dr.onap.org
-cadi_key_password=enc:ow380FBQU5xvQEDzTiXdfx-BD_0dEWbRCXjnUPxVFatk_7KaejgiLCVew6C6x8_9
-cadi_keyfile=src/test/resources/aaf/org.onap.dmaap-dr.keyfile
-cadi_keystore=src/test/resources/aaf/org.onap.dmaap-dr.p12
-cadi_keystore_password=enc:Urky1AuqpokGwoSl72ypmhVONokY0H1Gy28S9P8jfvK1-d7W8SODXf87K37EubDo
-cadi_keystore_password_jks=enc:lwXWmxaVAHy207uNeiHPYLho3qezj4xu7_iH4myTitXuj_bo9esv0e1L19HluXlM
-cadi_keystore_password_p12=enc:Urky1AuqpokGwoSl72ypmhVONokY0H1Gy28S9P8jfvK1-d7W8SODXf87K37EubDo
-cadi_truststore=src/test/resources/aaf/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=enc:stAsWWKk5FOcWxyWsNqyQlSdkwWSxcy3Jed6RW_r4jyZosqV8kmSCJLSHNLyWyTH
-cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
+++ /dev/null
-uXr3OodaCvEvTDHfkpgh-_5UdpEkBowSRpKF18WNxMG0A9Y9k2REr-d075mNHshr5gOUYAlykgaX
-ImvY-oFtG71N-Q0uqYnYuU7eX7zgcOOFNpeT4q2db3wkiScaZgdv2UnfDOVX2Aq53GzyYeKcGB1W
-u0jKX8ryHVC0uvj69y1boiJBxQY1HwAqsh9q39Ut1XxyB42D7xDM7sa9G1I6YosQlthXPMt7Q_i0
-0CUHrozT6Wtnxfb8-qR6rM5PNmAxp8r5Jb4cnSbxJGEWpx1DkZPPZNvLjE9bBfinVftzrpIlqHd3
-2CCp3k6xrqui2c_0HaNILtKHX5VVKttRf9zoADk_l5_MowEJgh1fgu8m0r-iEB6oH18AWZ_PCtSr
-A0cqEDGbP-h7e8w-Dwb0yS_oSfeDISarZ1Q46CQFcDz7f4bVB3AW67YGM4SQBaFGivWS_Lz_juOx
-fhyo55HW_wL_92xRvAyXD1Eg64Lw0Cx0f9rn4uM7NkKaSCP8MmIvs84egCvDzCiWkT6SGzUTeZ7M
-qI0ow2tJPFUuvhozcYxJW9sFzTqTFL7iLtrO5nHmo7YUVf2WU8ByGOfC-ylZPjw0fiKpe-7MXVSz
-MIOxl3pgWSYt6kImBtZCateif6TgF_A-91yAOoQLm72baJKhOo-F-aJ4k6ToT4bZ-9-Hjs5Wk9sO
-4thYzDcMaGrWsssnR9QMBjl9x3uw5bfOYGduyyRCWC_TYNorrW6Bvh7gFZAWk_f6cK-pPahRo_3O
-erNlUHx6xaektjqUsmp91LzjCEWbmt5nDGw16VUSPhrtkca2ReWDL0vTnpjvPuRI7mWHdfyoVYMw
-KUDkRgn61QvELC0Rl0C12polUEjqSxCRvGzL8QiOrU_Z1hXhVyp2gVIYvDKyuyguvJlniEBQ2qbM
-3Y5savSaANj-b2-_J0ofhvYFGz1k_bjcCE6Wx2RSWk1nSJFJ0gFjp1Ky2cyKhhVMXCiWcbbA3vC8
-E1cE9Ixn4z5WYyHOAFyzrsiiapdn5MhB_kI-ObR2HuRy_GRJHMVpxqX15Bv3OXxWy51bXeYeRfit
-SVCoyfXMXbx12eVG4tvf3WyYg9RqK_QN57VAmnffq09MAXuzFB1NuxSeJeBHGtBW6XIvb6E32K6I
-rL7vfxGHhD7ZHqQzzie5I42HufANtBb1KNKHikeeACxxlpjOIHjjEZ6yffhoyhNbSHx4TNs7UYOf
-FUKs0TCO9ffSJ8JT67X-baqlnSYFkdqR6QTGhltZq1ssPYq6Y6NGN1iEHJMfapev07AQgp6mBBxJ
-dEwDZMAwlmb1yVkU1gfzcrGdAUeAAuM6LowPHUKYLJJvvaFLQJKbwwLvjnm_Tf9UR5QJ8a3JKiLt
-F0Ykc1AeO-fyiNPUVRnkc3--Gs0bLUpLe0_medGOZ_LLk45GarEzBCGajgF_joz8fsndKtDrEnB0
-z-8iiQ4bTZb_ALjKnnhcdKjoJNhZ-e3AsmadYO7ve2K3ApwOelWWh24iZ-ZSUbnlw-OQMu4RvI9h
-9KOTbu4gWokep3O2uT8-cVN-ax1FYRpmexHgIxZy-tmYjDdJTJQv3dMp5UngUs6xmIy5nyIBr51B
-YORSQmXRvbdvYeY7jOEQUGfXfS2yYtzLfJ07f8ODQJ24APDKsVEGWVBcBMqp53o9W7cPJ-4vnMLU
-mVYCKqVrT2bThRWb38OtaaJuA4A8GboDDe5Q0IZao0v3gqwgfCzJIjQx97AEHzEbLzEBxio_z8a0
-AYLi-_f7kMtgrMsj61gcRVUan5NVqnL7oVwFn8FuqeTRzMMbgJHUHfFzrgLxpRwnscGRzygZf39Q
-JqqOLGriWe_IOhXQ7aIp3uyBF-brJnrXcQIp3PF0fbVTGK_VyKDB6J0BjJyjmyL0TA37hDr8usna
-TgMtjF1qq9kOrJr2582n8TW-ogpyqm1ft7R18VT9_1JjtnCcTCudW-oJX87jv3UTJdaEkBMhc1Pe
-euLti-qSG3Q5QeO5AxM8mP_9YbLHB9YQboRWnbfC9oIFRmVgGAcdbHNFn0hfILBOTIYStQL4
\ No newline at end of file
+++ /dev/null
-############################################################
-# Properties Generated by AT&T Certificate Manager
-# by root
-# on 2022-03-22T12:31:14.170+0000
-# @copyright 2019, AT&T
-############################################################
-cadi_latitude=0.0
-cadi_longitude=0.0
+++ /dev/null
-############################################################
-# Properties Generated by AT&T Certificate Manager
-# by root
-# on 2022-03-22T12:31:14.169+0000
-# @copyright 2019, AT&T
-############################################################
-aaf_env=DEV
-aaf_id=dmaap-dr-node@dmaap-dr.onap.org
-aaf_locate_url=https://aaf-locate.onap:8095
-aaf_locator_app_ns=org.osaaf.aaf
-aaf_locator_container=oom
-aaf_locator_container_ns=onap
-aaf_locator_fqdn=dmaap-dr-node
-aaf_locator_public_fqdn=dmaap-dr.onap.org
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.introspect:2.1/introspect
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.token:2.1/token
-aaf_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.service:2.1
-aaf_url_cm=https://AAF_LOCATE_URL/%CNS.%AAF_NS.cm:2.1
-aaf_url_fs=https://AAF_LOCATE_URL/%CNS.%AAF_NS.fs:2.1
-aaf_url_gui=https://AAF_LOCATE_URL/%CNS.%AAF_NS.gui:2.1
-aaf_url_hello=https://aaf-locate.onap:8095/locate/onap.org.osaaf.aaf.hello:2.1
-aaf_url_oauth=https://AAF_LOCATE_URL/%CNS.%AAF_NS.oauth:2.1
-cadi_prop_files=src/test/resources/aaf/org.onap.dmaap-dr.location.props:src/test/resources/aaf/org.onap.dmaap-dr.cred.props
-cadi_protocols=TLSv1.1,TLSv1.2
# The path to the redirection data file
RedirectionFile = src/test/redirections.dat
#
+# https security required for publish request
+TlsEnabled = false
+#
+# Enabled TLS protocols
+NodeHttpsProtocols = TLSv1.1|TLSv1.2
+#
# The type of keystore for https
KeyStoreType = PKCS12
#
+# The path to your KeyStoreFile
+KeyStorePath = src/test/resources/certs/org.onap.dmaap-dr-node.p12
+#
+# The key store password
+KeyStorePass = secret
+#
+# The key manager password
+KeyManagerPass = secret
+#
# The type of truststore for https
TrustStoreType = jks
#
+# The path to your trust store
+TrustStorePath = src/test/certs/truststore.jks
+#
+# The trust store password
+TrustStorePass = secret
+#
# The path to the file used to trigger an orderly shutdown
QuiesceFile = etc/SHUTDOWN
#
# The key used to generate passwords for node to node transfers
NodeAuthKey = Node123!
-#
-# DR_NODE DEFAULT ENABLED TLS PROTOCOLS
-NodeHttpsProtocols = TLSv1.1|TLSv1.2
-#
-# AAF CADI enabled flag
-CadiEnabled = true
-#
-# AAF type to generate permission string
-AAFType = org.onap.dmaap-dr.feed
-#
-# AAF default instance to generate permission string - default should be legacy
-AAFInstance = legacy
-#
-# AAF action to generate permission string - default should be publish
-AAFAction = publish
-#
-# AAF Props file path
-AAFPropsFilePath = src/test/resources/aaf/org.onap.dmaap-dr.props
-
-# https security required for publish request
-TlsEnabled = true
-
"feedid": 1,
"name": "Default PM Feed",
"business_description": "Default Feed",
- "aaf_instance": "legacy",
"publisher": "dradmin",
"links": {
"subscribe": "https://dmaap-dr-prov/subscribe/1",
"feedid": 1,
"follow_redirect": false,
"decompress": true,
- "aaf_instance": "legacy",
"links": {
"feed": "https://dmaap-dr-prov/feed/1",
"log": "https://dmaap-dr-prov/sublog/1",
Code Review / dmaap / datarouter.git / commitdiff