.checkstyle
.project
.settings
+.idea
</description>
<properties>
+ <artifact.version>2.0.4-SNAPSHOT</artifact.version>
<swagger.version>1.5.19</swagger.version>
<log4j.version>2.13.3</log4j.version>
<jackson.version>2.9.5</jackson.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jettyVersion>9.4.36.v20210114</jettyVersion>
<eelf.version>1.0.0</eelf.version>
- <artifact.version>2.0.3-SNAPSHOT</artifact.version>
<junit.version>4.12</junit.version>
<!-- SONAR -->
<sonar.language>java</sonar.language>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jettyVersion}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
package org.onap.dmaap.dbcapi.client;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.ProtocolException;
+import java.net.SocketException;
+import java.net.URL;
+import java.util.Arrays;
+import javax.net.ssl.HttpsURLConnection;
import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum;
import org.onap.dmaap.dbcapi.model.ApiError;
import org.onap.dmaap.dbcapi.service.DmaapService;
import org.onap.dmaap.dbcapi.util.DmaapConfig;
-import javax.net.ssl.HttpsURLConnection;
-import java.io.*;
-import java.net.ConnectException;
-import java.net.ProtocolException;
-import java.net.SocketException;
-import java.net.URL;
-import java.util.Arrays;
-
public class DrProvConnection extends BaseLoggingClass {
uc = (HttpsURLConnection) u.openConnection();
uc.setInstanceFollowRedirects(false);
logger.info( "successful connect to " + pURL );
+ uc.setSSLSocketFactory(DmaapConfig.getSSLSocketFactory());
return(true);
} catch (Exception e) {
errorLogger.error( DmaapbcLogMessageEnum.HTTP_CONNECTION_ERROR, pURL, e.getMessage() );
return(false);
}
-
}
public String bodyToString( InputStream is ) {
logger.info( "post fields=" + Arrays.toString(postData) );
String responsemessage = null;
String responseBody = null;
+ int rc = -1;
try {
logger.info( "uc=" + uc );
uc.setUseCaches(false);
uc.setDoOutput(true);
OutputStream os = null;
- int rc = -1;
-
+
try {
uc.connect();
os = uc.getOutputStream();
uc.setDoOutput(false);
} catch (Exception e) {
}
- }
+ } catch (Exception e) {
+ logger.info( "Exception: " + e.getMessage() );
+ e.printStackTrace();
+ }
rc = uc.getResponseCode();
logger.info( "http response code:" + rc );
- responsemessage = uc.getResponseMessage();
- logger.info( "responsemessage=" + responsemessage );
-
-
+ responsemessage = uc.getResponseMessage();
+ logger.info( "responsemessage=" + responsemessage );
if (responsemessage == null) {
// work around for glitch in Java 1.7.0.21 and likely others
// When Expect: 100 is set and a non-100 response is received, the response message is not set but the response code is
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
- }
+ } catch (Exception e) {
+ logger.info( "Exception: " + e.getMessage() );
+ e.printStackTrace();
+ }
rc = uc.getResponseCode();
logger.info( "http response code:" + rc );
responsemessage = uc.getResponseMessage();
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
- }
+ } catch (Exception e) {
+ logger.info( "Exception: " + e.getMessage() );
+ e.printStackTrace();
+ }
rc = uc.getResponseCode();
logger.info( "http response code:" + rc );
responsemessage = uc.getResponseMessage();
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
- }
+ } catch (Exception e) {
+ logger.info( "Exception: " + e.getMessage() );
+ e.printStackTrace();
+ }
rc = uc.getResponseCode();
logger.info( "http response code:" + rc );
responsemessage = uc.getResponseMessage();
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
- }
+ } catch (Exception e) {
+ logger.info( "Exception: " + e.getMessage() );
+ e.printStackTrace();
+ }
rc = uc.getResponseCode();
logger.info( "http response code:" + rc );
responsemessage = uc.getResponseMessage();
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
- }
+ } catch (Exception e) {
+ logger.info( "Exception: " + e.getMessage() );
+ e.printStackTrace();
+ }
rc = uc.getResponseCode();
logger.info( "http response code:" + rc );
responsemessage = uc.getResponseMessage();
logger.info( "responsemessage=" + responsemessage );
-
-
if (responsemessage == null) {
}
public String doPutNodes( ApiError err ) {
logger.info( "entry: doPutNodes() " );
- //byte[] postData = nodeList.getBytes();
- //logger.info( "get fields=" + postData );
String responsemessage = null;
String responseBody = null;
try {
-
uc.setRequestMethod("PUT");
-
- //uc.setRequestProperty("Content-Type", subContentType );
- //uc.setRequestProperty( "charset", "utf-8");
- //uc.setRequestProperty( behalfHeader, "DGL" );
- //uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
uc.setUseCaches(false);
- //uc.setDoOutput(true);
- OutputStream os = null;
int rc = -1;
try {
uc.connect();
- //os = uc.getOutputStream();
- //os.write( postData );
-
} catch (ProtocolException pe) {
// Rcvd error instead of 100-Continue
try {
uc.setDoOutput(false);
} catch (Exception e) {
}
- }
+ } catch (Exception e) {
+ logger.info( "Exception: " + e.getMessage() );
+ e.printStackTrace();
+ }
rc = uc.getResponseCode();
logger.info( "http response code:" + rc );
responsemessage = uc.getResponseMessage();
}
public String doDeleteFeed(Feed putFeed, ApiError err) {
- //byte[] postData = putFeed.getBytes();
- //logger.info( "post fields=" + postData.toString() );
String responsemessage = null;
String responseBody = null;
uc.setRequestProperty("Content-Type", feedContentType );
uc.setRequestProperty( "charset", "utf-8");
uc.setRequestProperty( behalfHeader, putFeed.getOwner() );
- //uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
uc.setUseCaches(false);
uc.setDoOutput(true);
OutputStream os = null;
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
- }
+ } catch (Exception e) {
+ logger.info( "Exception: " + e.getMessage() );
+ e.printStackTrace();
+ }
rc = uc.getResponseCode();
logger.info( "http response code:" + rc );
responsemessage = uc.getResponseMessage();
public String doDeleteDr_Sub(DR_Sub delSub, ApiError err) {
logger.info( "entry: doDeleteDr_Sub() " );
byte[] postData = delSub.getBytes(provApi);
- logger.info( "post fields=" + postData );
+ logger.info( "post fields=" + Arrays.toString(postData));
String responsemessage = null;
String responseBody = null;
uc.setRequestProperty("Content-Type", subContentType);
uc.setRequestProperty( "charset", "utf-8");
uc.setRequestProperty( behalfHeader, "DGL" );
- //uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
uc.setUseCaches(false);
uc.setDoOutput(true);
OutputStream os = null;
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
- }
+ } catch (Exception e) {
+ logger.info( "Exception: " + e.getMessage() );
+ e.printStackTrace();
+ }
rc = uc.getResponseCode();
logger.info( "http response code:" + rc );
responsemessage = uc.getResponseMessage();
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
- }
+ } catch (Exception e) {
+ logger.info( "Exception: " + e.getMessage() );
+ e.printStackTrace();
+ }
rc = uc.getResponseCode();
logger.info( "http response code:" + rc );
package org.onap.dmaap.dbcapi.server;
import com.google.common.collect.Sets;
+import java.util.Properties;
import javax.servlet.DispatcherType;
-
import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.server.*;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
-
-import java.util.Properties;
+import org.onap.dmaap.dbcapi.util.DmaapConfig;
/**
* A Jetty server which supports:
*/
public class JettyServer extends BaseLoggingClass {
- private Server server;
+ private static final CertificateManager certificateManager =
+ new CertficateManagerFactory(DmaapConfig.getConfig()).initCertificateManager();
+ private final Server server;
public Server getServer() {
return server;
}
- public JettyServer(Properties params) throws Exception {
+ public static CertificateManager getCertificateManager() {
+ return certificateManager;
+ }
+
+ public JettyServer(Properties params) {
server = new Server();
- int httpPort = Integer.valueOf(params.getProperty("IntHttpPort", "80"));
- int sslPort = Integer.valueOf(params.getProperty("IntHttpsPort", "443"));
- boolean allowHttp = Boolean.valueOf(params.getProperty("HttpAllowed", "false"));
+ int httpPort = Integer.parseInt(params.getProperty("IntHttpPort", "80"));
+ int sslPort = Integer.parseInt(params.getProperty("IntHttpsPort", "443"));
+ boolean allowHttp = Boolean.parseBoolean(params.getProperty("HttpAllowed", "false"));
serverLogger.info("port params: http=" + httpPort + " https=" + sslPort);
serverLogger.info("allowHttp=" + allowHttp);
// HTTP Server
- HttpConfiguration http_config = new HttpConfiguration();
- http_config.setSecureScheme("https");
- http_config.setSecurePort(sslPort);
- http_config.setOutputBufferSize(32768);
+ HttpConfiguration httpConfig = new HttpConfiguration();
+ httpConfig.setSecureScheme("https");
+ httpConfig.setSecurePort(sslPort);
+ httpConfig.setOutputBufferSize(32768);
- try (ServerConnector httpConnector = new ServerConnector(server, new HttpConnectionFactory(http_config))) {
+ try (ServerConnector httpConnector = new ServerConnector(server, new HttpConnectionFactory(httpConfig))) {
httpConnector.setPort(httpPort);
httpConnector.setIdleTimeout(30000);
// HTTPS Server
-
- HttpConfiguration https_config = new HttpConfiguration(http_config);
- https_config.addCustomizer(new SecureRequestCustomizer());
+ HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
+ httpsConfig.addCustomizer(new SecureRequestCustomizer());
SslContextFactory sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setWantClientAuth(true);
- CertificateManager certificateManager = new CertficateManagerFactory(params).initCertificateManager();
if ( ! certificateManager.isReady()) {
serverLogger.error("CertificateManager is not ready. NOT starting https!");
} else {
- setUpKeystore(certificateManager, sslContextFactory);
- setUpTrustStore(certificateManager, sslContextFactory);
+ setUpKeystore(sslContextFactory);
+ setUpTrustStore(sslContextFactory);
if (sslPort != 0) {
try (ServerConnector sslConnector = new ServerConnector(server,
new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()),
- new HttpConnectionFactory(https_config))) {
+ new HttpConnectionFactory(httpsConfig))) {
sslConnector.setPort(sslPort);
server.addConnector(sslConnector);
serverLogger.info("Starting sslConnector on port " + sslPort + " for https");
try {
serverLogger.info("Starting jetty server");
- String unit_test = params.getProperty("UnitTest", "No");
- serverLogger.info("UnitTest=" + unit_test);
- if (unit_test.equals("No")) {
+ String unitTest = params.getProperty("UnitTest", "No");
+ serverLogger.info("UnitTest=" + unitTest);
+ if (unitTest.equals("No")) {
server.start();
server.dumpStdErr();
server.join();
Sets.newEnumSet(Sets.newHashSet(DispatcherType.FORWARD, DispatcherType.REQUEST), DispatcherType.class));
}
- private void setUpKeystore(CertificateManager certificateManager, SslContextFactory sslContextFactory) {
- String keystore = certificateManager.getKeyStoreFile();
+ private void setUpKeystore(SslContextFactory sslContextFactory) {
+ String keystore = JettyServer.certificateManager.getKeyStoreFile();
logger.info("https Server using keystore at " + keystore);
sslContextFactory.setKeyStorePath(keystore);
- sslContextFactory.setKeyStoreType(certificateManager.getKeyStoreType());
- sslContextFactory.setKeyStorePassword(certificateManager.getKeyStorePassword());
- sslContextFactory.setKeyManagerPassword(certificateManager.getKeyStorePassword());
+ sslContextFactory.setKeyStoreType(JettyServer.certificateManager.getKeyStoreType());
+ sslContextFactory.setKeyStorePassword(JettyServer.certificateManager.getKeyStorePassword());
+ sslContextFactory.setKeyManagerPassword(JettyServer.certificateManager.getKeyStorePassword());
}
- private void setUpTrustStore(CertificateManager certificateManager, SslContextFactory sslContextFactory) {
- String truststore = certificateManager.getTrustStoreFile();
+ private void setUpTrustStore(SslContextFactory sslContextFactory) {
+ String truststore = JettyServer.certificateManager.getTrustStoreFile();
logger.info("https Server using truststore at " + truststore);
sslContextFactory.setTrustStorePath(truststore);
- sslContextFactory.setTrustStoreType(certificateManager.getTrustStoreType());
- sslContextFactory.setTrustStorePassword(certificateManager.getTrustStorePassword());
+ sslContextFactory.setTrustStoreType(JettyServer.certificateManager.getTrustStoreType());
+ sslContextFactory.setTrustStorePassword(JettyServer.certificateManager.getTrustStorePassword());
}
}
package org.onap.dmaap.dbcapi.util;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
import java.io.*;
+import java.security.KeyStore;
import java.util.*;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import org.onap.dmaap.dbcapi.server.CertificateManager;
+import org.onap.dmaap.dbcapi.server.JettyServer;
public class DmaapConfig extends Properties {
- /**
- *
- */
+
+ private static final EELFLogger logger = EELFManager.getInstance().getLogger(DmaapConfig.class);
private static final long serialVersionUID = 1L;
- private static String configfname = System.getProperty("ConfigFile", "etc/dmaapbc.properties");
- private static Properties config = new DmaapConfig();
+ private static final String CONFIG_FILE_NAME = System.getProperty("ConfigFile", "etc/dmaapbc.properties");
+ private static final Properties config = new DmaapConfig();
+
public static Properties getConfig() {
return(config);
}
public static String getConfigFileName() {
- return(configfname);
+ return(CONFIG_FILE_NAME);
}
private DmaapConfig() {
- try (InputStream is = new FileInputStream(configfname)){
+ try (InputStream is = new FileInputStream(CONFIG_FILE_NAME)){
load(is);
} catch (Exception e) {
- System.err.println("Unable to load configuration file " + configfname);
- org.apache.log4j.Logger.getLogger(getClass()).fatal("Unable to load configuration file " + configfname, e);
+ logger.error("Unable to load configuration file " + CONFIG_FILE_NAME);
System.exit(1);
}
}
+
+ public static SSLSocketFactory getSSLSocketFactory() {
+ SSLSocketFactory factory = null;
+ try {
+ CertificateManager cm = JettyServer.getCertificateManager();
+ String truststore = cm.getTrustStoreFile();
+ KeyStore ts = KeyStore.getInstance(cm.getTrustStoreType());
+ try (InputStream in = new FileInputStream(truststore)) {
+ ts.load(in, cm.getTrustStorePassword().toCharArray());
+ }
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+ tmf.init(ts);
+ TrustManager[] tm = tmf.getTrustManagers();
+ SSLContext sslContext = SSLContext.getInstance("TLS");
+ sslContext.init(null, tm, null);
+ factory = sslContext.getSocketFactory();
+ } catch (Exception e) {
+ logger.error("Exception thrown trying to get SSLSocketFactory: ", e);
+ }
+ return factory;
+ }
}
major=2
minor=0
-patch=3
+patch=4
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins
Code Review / dmaap / dbcapi.git / commitdiff