summaryrefslogtreecommitdiffstats
path: root/artifactbroker
diff options
context:
space:
mode:
authorRadoslaw Chmiel <r.chmiel@partner.samsung.com>2022-07-07 12:26:38 +0200
committerRadoslaw Chmiel <r.chmiel@partner.samsung.com>2022-07-07 12:26:38 +0200
commit2dd69c0d88813832699813f6f002f01d02566107 (patch)
treeba7ba16569d806e7f6b08701a43acae5e9489584 /artifactbroker
parent7325a6ec3f2011f09c5d071248a5c34c82a532ad (diff)
Sdc client upgrade1.8.0
Updated sdc-distribution-client to 1.4.5 that contain vuln fixes for SDC-3572 and ability to connect to SDC via http needed for Service Mesh implementation (default set to https as before) implemented http/https proxy handling Issue-ID: MULTICLOUD-1476 Signed-off-by: Radoslaw Chmiel <r.chmiel@partner.samsung.com> Change-Id: If6c096b20f8eaca1232651aabd30a3b230787bcc
Diffstat (limited to 'artifactbroker')
-rw-r--r--artifactbroker/forwarding/pom.xml2
-rw-r--r--artifactbroker/model/pom.xml2
-rw-r--r--artifactbroker/packages/src/main/resources/etc/defaultConfig.json7
-rw-r--r--artifactbroker/plugins/reception-plugins/pom.xml2
-rw-r--r--artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java20
-rw-r--r--artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java47
-rw-r--r--artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java30
7 files changed, 105 insertions, 5 deletions
diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml
index 71c77f0..2203703 100644
--- a/artifactbroker/forwarding/pom.xml
+++ b/artifactbroker/forwarding/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.onap.sdc.sdc-distribution-client</groupId>
<artifactId>sdc-distribution-client</artifactId>
- <version>1.3.0</version>
+ <version>1.4.5</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml
index d3b9f50..6425cce 100644
--- a/artifactbroker/model/pom.xml
+++ b/artifactbroker/model/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.onap.sdc.sdc-distribution-client</groupId>
<artifactId>sdc-distribution-client</artifactId>
- <version>1.3.0</version>
+ <version>1.4.5</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/artifactbroker/packages/src/main/resources/etc/defaultConfig.json b/artifactbroker/packages/src/main/resources/etc/defaultConfig.json
index 6f0ace4..3497a5f 100644
--- a/artifactbroker/packages/src/main/resources/etc/defaultConfig.json
+++ b/artifactbroker/packages/src/main/resources/etc/defaultConfig.json
@@ -49,7 +49,12 @@
"keystorePassword": "null",
"activeserverTlsAuth": false,
"isFilterinEmptyResources": true,
- "isUseHttpsWithDmaap": false
+ "isUseHttpsWithDmaap": false,
+ "isUseHttpsWithSDC": true,
+ "httpsproxyHost": "null",
+ "httpproxyHost": "null",
+ "httpsproxyPort": 8181,
+ "httpproxyPort": 8080
}
}
},
diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml
index a5be3f6..ad29cd0 100644
--- a/artifactbroker/plugins/reception-plugins/pom.xml
+++ b/artifactbroker/plugins/reception-plugins/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.onap.sdc.sdc-distribution-client</groupId>
<artifactId>sdc-distribution-client</artifactId>
- <version>1.3.0</version>
+ <version>1.4.5</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java
index 04c978b..d2ff9ff 100644
--- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java
+++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java
@@ -114,4 +114,24 @@ public class SdcConfiguration implements IConfiguration {
public Boolean isUseHttpsWithDmaap() {
return configParameters.isUseHttpsWithDmaap();
}
+
+ @Override
+ public int getHttpsProxyPort() {
+ return configParameters.getHttpsProxyPort();
+ }
+
+ @Override
+ public String getHttpsProxyHost() {
+ return configParameters.getHttpsProxyHost();
+ }
+
+ @Override
+ public String getHttpProxyHost() {
+ return configParameters.getHttpProxyHost();
+ }
+
+ @Override
+ public int getHttpProxyPort() {
+ return configParameters.getHttpProxyPort();
+ }
}
diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java
index 65305c1..2476b07 100644
--- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java
+++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java
@@ -32,6 +32,7 @@ public class SdcReceptionHandlerConfigurationParameterBuilder {
private boolean activeserverTlsAuth;
private boolean filterinEmptyResources;
private boolean useHttpsWithDmaap;
+ private boolean useHttpsWithSDC;
private int pollingTimeout;
private int pollingInterval;
private String user;
@@ -42,6 +43,10 @@ public class SdcReceptionHandlerConfigurationParameterBuilder {
private String environmentName;
private String keystorePath;
private String keystorePassword;
+ private int httpsproxyPort;
+ private int httpproxyPort;
+ private String httpsproxyHost;
+ private String httpproxyHost;
private List<String> messageBusAddress;
private List<String> artifactTypes;
private int retryDelay;
@@ -236,6 +241,15 @@ public class SdcReceptionHandlerConfigurationParameterBuilder {
}
/**
+ * Returns the isUseHttpsWithSDC flag of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance.
+ *
+ * @return the isUseHttpsWithSDC
+ */
+ public Boolean getIsUseHttpsWithSDC() {
+ return useHttpsWithSDC;
+ }
+
+ /**
* Returns the polling interval of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance.
*
* @return the pollingInterval
@@ -351,7 +365,38 @@ public class SdcReceptionHandlerConfigurationParameterBuilder {
public int getRetryDelay() {
return retryDelay;
}
-
+ /**
+ * Returns the https proxy port of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance.
+ *
+ * @return the httpsproxyPort
+ */
+ public int getHttpsProxyPort() {
+ return httpsproxyPort;
+ }
+ /**
+ * Returns the https proxy host of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance.
+ *
+ * @return the httpsproxyHost
+ */
+ public String getHttpsProxyHost() {
+ return httpsproxyHost;
+ }
+ /**
+ * Returns the http proxy port of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance.
+ *
+ * @return the httpproxyPort
+ */
+ public int getHttpProxyPort() {
+ return httpproxyPort;
+ }
+ /**
+ * Returns the http proxy host of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance.
+ *
+ * @return the httpsproxyHost
+ */
+ public String getHttpProxyHost() {
+ return httpproxyHost;
+ }
}
diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java
index 6746dc3..c204d75 100644
--- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java
+++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java
@@ -40,6 +40,10 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan
private int pollingInterval;
private int pollingTimeout;
private int retryDelay;
+ private int httpsProxyPort;
+ private int httpProxyPort;
+ private String httpsProxyHost;
+ private String httpProxyHost;
private String consumerId;
private List<String> artifactTypes;
private String consumerGroup;
@@ -49,6 +53,7 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan
private boolean activeServerTlsAuth;
private boolean isFilterInEmptyResources;
private boolean isUseHttpsWithDmaap;
+ private boolean isUseHttpsWithSDC;
/**
* The constructor for instantiating {@link SdcReceptionHandlerConfigurationParameterGroup} class.
@@ -64,6 +69,10 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan
pollingInterval = builder.getPollingInterval();
pollingTimeout = builder.getPollingTimeout();
retryDelay = builder.getRetryDelay();
+ httpsProxyPort = builder.getHttpsProxyPort();
+ httpsProxyHost = builder.getHttpsProxyHost();
+ httpProxyPort = builder.getHttpProxyPort();
+ httpProxyHost = builder.getHttpProxyHost();
consumerId = builder.getConsumerId();
artifactTypes = builder.getArtifactTypes();
consumerGroup = builder.getConsumerGroup();
@@ -73,6 +82,7 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan
activeServerTlsAuth = builder.isActiveserverTlsAuth();
isFilterInEmptyResources = builder.isFilterinEmptyResources();
isUseHttpsWithDmaap = builder.getIsUseHttpsWithDmaap();
+ isUseHttpsWithSDC = builder.getIsUseHttpsWithSDC();
}
@@ -140,6 +150,26 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan
return isUseHttpsWithDmaap;
}
+ public boolean isUseHttpsWithSDC() {
+ return isUseHttpsWithSDC;
+ }
+
+ public int getHttpsProxyPort() {
+ return httpsProxyPort;
+ }
+
+ public String getHttpsProxyHost() {
+ return httpsProxyHost;
+ }
+
+ public int getHttpProxyPort() {
+ return httpProxyPort;
+ }
+
+ public String getHttpProxyHost() {
+ return httpProxyHost;
+ }
+
/**
* {@inheritDoc}.
*/