From 5b3f8b279725c337de6988e703cca418b3e53826 Mon Sep 17 00:00:00 2001 From: Shiwei Tian Date: Tue, 6 Mar 2018 10:01:38 +0800 Subject: [PATCH] Change HTTP Requests into HTTPS Ones Issue-ID: HOLMES-104 Change-Id: I535050f7dcacc2caa75d9a8941d93000fd91c361 Signed-off-by: Shiwei Tian --- engine-d-standalone/src/main/assembly/bin/run.sh | 7 +++++++ engine-d-standalone/src/main/assembly/conf/engine-d.yml | 6 +++++- .../src/main/assembly/conf/holmes.keystore | Bin 0 -> 1387 bytes .../java/org/onap/holmes/engine/EngineDActiveApp.java | 1 + .../onap/holmes/engine/request/CompileRuleRequest.java | 1 - .../onap/holmes/engine/request/DeployRuleRequest.java | 4 ---- .../engine/resources/DmaapConfigurationService.java | 8 ++++---- .../onap/holmes/engine/resources/EngineResources.java | 4 ++-- .../holmes/engine/response/CorrelationRuleResponse.java | 2 -- pom.xml | 2 +- 10 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 engine-d-standalone/src/main/assembly/conf/holmes.keystore diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh index dab4cbc..d3d5348 100644 --- a/engine-d-standalone/src/main/assembly/bin/run.sh +++ b/engine-d-standalone/src/main/assembly/bin/run.sh @@ -70,6 +70,13 @@ fi #ActiveMQ IP Configurations sed -i "s|brokerIp:.*|brokerIp: $SERVICE_IP|" "$main_path/conf/engine-d.yml" +KEY_PATH="$main_path/conf/holmes.keystore" +KEY_PASSWORD="holmes" + +#HTTPS Configurations +sed -i "s|keyStorePath:.*|keyStorePath: $KEY_PATH|" "$main_path/conf/engine-d.yml" +sed -i "s|keyStorePassword:.*|keyStorePassword: $KEY_PASSWORD|" "$main_path/conf/engine-d.yml" + cat "$main_path/conf/engine-d.yml" diff --git a/engine-d-standalone/src/main/assembly/conf/engine-d.yml b/engine-d-standalone/src/main/assembly/conf/engine-d.yml index ff3201b..c5a750a 100644 --- a/engine-d-standalone/src/main/assembly/conf/engine-d.yml +++ b/engine-d-standalone/src/main/assembly/conf/engine-d.yml @@ -19,8 +19,12 @@ server: applicationContextPath: / adminContextPath: /admin connector: - type: http + type: https port: 9102 + keyStorePath: /home/holmes/conf/holmes.keystore + keyStorePassword: holmes + validateCerts: false + validatePeers: false # Logging settings. diff --git a/engine-d-standalone/src/main/assembly/conf/holmes.keystore b/engine-d-standalone/src/main/assembly/conf/holmes.keystore new file mode 100644 index 0000000000000000000000000000000000000000..a6266bb7195bc1c1156bb66a23e6b6d203cc0a57 GIT binary patch literal 1387 zcmezO_TO6u1_mY|W&~rF{Jg{hASdx)RYVI=Vvj)+(+&eZHZE;8MixdbCP79Vzjl+e& z@9O&+7yi4^zA&cUOLBF}tJoOMGonK5kFSVMXDgzmdVl(ibART{owDah;DTdQ7p&b_SZ(X3_d@POpl@cwM8@xI zp&Ew%s=A@VU-!h^{_foAc+seib7!8Q?bSU({Pv!#x;B?ZYG%m(^1Nw1|MZWED^3Ni zeQ)#l%hCn9-)>y{B(tRV`}3C2+e-%yYv1ELG`s3F+n2Xz z7~&6mMHO3@=(A?~>|?u8=FSUs4_HO6I@Y2e^_ZR{t-<$4qdUK-Z zrjqq8nZzvBsiukA@?Td7JlwHZ)yip)$kG*)0_*b>#flp@v=~Z0-sdI5E>U#p+zUzN z4f8TjW@kzK?~rw!xXXv{-uCyuHI!M4A62j8Eqr%aEJ)BrEIne$EjGvdAJ!g7e(aO9 z{%kK(WFbpYL`dqd%mSH3n|1!j{jWX57}J}UvO{~usrJ{MD;YBO^RL-CPpn*S|3%kl zr$4weq$+K5J^FFE+J@65|0Cm77sr2HeAVK%=k})?UtNzroOGwHcfp#4^GY4>vn-r@ zCHkCa-xmX!tJ3C0s*SR1-q`QtP;cMNt^3}%@pPi}W&w-s6B5BGnl(bt)W8y$l(T?I zInAJn@%#d2CPpSEmb|qgy9{{QIJMe5+P?ELGIFyr7^E3;8*s8QhqAB#;ZG}=GUAp?^a)Ya&$&Q<*me4p=OJs zY&%E(j4hS;qsNG6S97&zn)CCAXdRXxGuhB}{@EI&W`JOrFA=BN~4A ziqv-2>RBhc9&S#LJihz4qxOkrTl2^lwG)b#%wEEh;4x8wZMX5QsgtxPb-ILvT)O=A ztYr7q+u@9s0Stoc?b#m;Vt0n7gh4V0G8t|wg3PC literal 0 HcmV?d00001 diff --git a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java index 4f5593c..0e7acac 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java @@ -62,6 +62,7 @@ public class EngineDActiveApp extends IOCApplication { msinfo.setUrl("/api/holmes-engine-mgmt/v1"); msinfo.setProtocol("REST"); msinfo.setVisualRange("0|1"); + msinfo.setEnable_ssl(true); Set nodes = new HashSet<>(); Node node = new Node(); node.setIp(serviceAddrInfo[0]); diff --git a/engine-d/src/main/java/org/onap/holmes/engine/request/CompileRuleRequest.java b/engine-d/src/main/java/org/onap/holmes/engine/request/CompileRuleRequest.java index 6e0da48..8af9778 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/request/CompileRuleRequest.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/request/CompileRuleRequest.java @@ -24,7 +24,6 @@ import lombok.Setter; @Setter public class CompileRuleRequest { - @JsonProperty(value = "content") @NotNull private String content; } \ No newline at end of file diff --git a/engine-d/src/main/java/org/onap/holmes/engine/request/DeployRuleRequest.java b/engine-d/src/main/java/org/onap/holmes/engine/request/DeployRuleRequest.java index 74ddf67..f2ef369 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/request/DeployRuleRequest.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/request/DeployRuleRequest.java @@ -15,7 +15,6 @@ */ package org.onap.holmes.engine.request; -import com.fasterxml.jackson.annotation.JsonProperty; import javax.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -24,14 +23,11 @@ import lombok.Setter; @Setter public class DeployRuleRequest { - @JsonProperty(value = "content") @NotNull private String content; - @JsonProperty(value = "engineid") private String engineId; - @JsonProperty(value = "loopcontrolname") @NotNull private String loopControlName; } diff --git a/engine-d/src/main/java/org/onap/holmes/engine/resources/DmaapConfigurationService.java b/engine-d/src/main/java/org/onap/holmes/engine/resources/DmaapConfigurationService.java index 99567b8..548b9b2 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/resources/DmaapConfigurationService.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/resources/DmaapConfigurationService.java @@ -50,7 +50,7 @@ public class DmaapConfigurationService { + " and url. Both fields are required.") DmaapConfigRequest config, @Context HttpServletRequest request){ String url = config.getUrl(); - if (url.startsWith("http://")) { + if (url.startsWith("http://") || url.startsWith("https://")) { Subscriber subscriber = new Subscriber(); subscriber.setTopic(config.getName()); subscriber.setUrl(url); @@ -64,7 +64,7 @@ public class DmaapConfigurationService { return "{\"message\": \"Succeeded!\", \"topic\": \"" + config.getName() + "\"}"; } - return "{\"message\": \"Only the HTTP protocol is supported!\"}"; + return "{\"message\": \"Only the HTTP or HTTPS protocol is supported!\"}"; } @DELETE @@ -92,7 +92,7 @@ public class DmaapConfigurationService { + " and url. Both fields are required.") DmaapConfigRequest config, @Context HttpServletRequest request){ String url = config.getUrl(); - if (url.startsWith("http://")) { + if (url.startsWith("http://") || url.startsWith("https://")) { SecurityInfo securityInfo = new SecurityInfo(); SecurityInfo.DmaapInfo dmaapInfo = new SecurityInfo().new DmaapInfo(); dmaapInfo.setTopicUrl(config.getUrl()); @@ -100,6 +100,6 @@ public class DmaapConfigurationService { DcaeConfigurationsCache.addPubSecInfo(config.getName(), securityInfo); return "{\"message\": \"Succeeded!\", \"topic\": \"" + config.getName() + "\"}"; } - return "{\"message\": \"Only the HTTP protocol is supported!\"}"; + return "{\"message\": \"Only the HTTP or HTTPS protocol is supported!\"}"; } } diff --git a/engine-d/src/main/java/org/onap/holmes/engine/resources/EngineResources.java b/engine-d/src/main/java/org/onap/holmes/engine/resources/EngineResources.java index b4cb0b1..b9875da 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/resources/EngineResources.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/resources/EngineResources.java @@ -61,8 +61,8 @@ public class EngineResources { @Timed public CorrelationRuleResponse deployRule( @ApiParam(value = "The request entity of the HTTP call, which comprises three " - + "fields: \"content\" , \"loopcontrolname\" and \"engineid\". " - + "The \"content\" should be a valid Drools rule string and the \"engineid\" " + + "fields: \"content\" , \"loopControlName\" and \"engineId\". " + + "The \"content\" should be a valid Drools rule string and the \"engineId\" " + "has to be \"engine-d\" in the Amsterdam release.", required = true) DeployRuleRequest deployRuleRequest, @Context HttpServletRequest httpRequest) { diff --git a/engine-d/src/main/java/org/onap/holmes/engine/response/CorrelationRuleResponse.java b/engine-d/src/main/java/org/onap/holmes/engine/response/CorrelationRuleResponse.java index b234f91..306bd7f 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/response/CorrelationRuleResponse.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/response/CorrelationRuleResponse.java @@ -15,7 +15,6 @@ */ package org.onap.holmes.engine.response; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; import lombok.Setter; @@ -23,6 +22,5 @@ import lombok.Setter; @Setter public class CorrelationRuleResponse { - @JsonProperty(value = "package") private String packageName; } diff --git a/pom.xml b/pom.xml index 0a0caa1..68f7a01 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ org.onap.msb.java-sdk msb-java-sdk - 1.0.0 + 1.1.0-SNAPSHOT org.reflections -- 2.16.6