Rework CryptoUtils

CryptoUtils now takes the key from a file located in the resource not 
in spring file

Change-Id: I002978d292550e6173efb4324cbb977f35d7e753
Issue-ID: CLAMP-74
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

4 files changed, 10 insertions, 7 deletions

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8155cb2b2..321d88e17 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -96,7 +96,7 @@ kubernetes.namespace=com-att-ajsc
 spring.datasource.camunda.driverClassName=org.mariadb.jdbc.Driver

 spring.datasource.camunda.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/camundabpm?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647

 spring.datasource.camunda.username=camunda

-spring.datasource.camunda.password=D75B89195FD913848EA11416F755390E

+spring.datasource.camunda.password=e1bb2a8381d1aa6c09879bd627db3bb560ad29e8a3343fe6aa7e6a7ba622da4e

 spring.datasource.camunda.validationQuery=SELECT 1

 spring.datasource.camunda.validationQueryTimeout=20000

 spring.datasource.camunda.validationInterval=30000

@@ -117,7 +117,7 @@ camunda.bpm.database.schema-update=false
 spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver

 spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647

 spring.datasource.cldsdb.username=clds

-spring.datasource.cldsdb.password=035F8819FEBB754F3C99ECCCC1259850

+spring.datasource.cldsdb.password=4c90a0b48204383f4283448d23e0b885a47237b2a23588e7c4651604f51c1067

 spring.datasource.cldsdb.validationQuery=SELECT 1

 spring.datasource.cldsdb.validationQueryTimeout=20000

 spring.datasource.cldsdb.validationInterval=30000

@@ -144,7 +144,6 @@ org.onap.clamp.config.files.cldsReference=classpath:/clds/clds-reference.propert
 org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties

 org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json

 org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties

-org.onap.clamp.encryption.aes.key=aa3871669d893c7fb8abbcda31b88b4f

 

 #Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !

 CLDS_PERMISSION_TYPE_CL=permission-type-cl

diff --git a/src/main/resources/clds/clds-policy-config.properties b/src/main/resources/clds/clds-policy-config.properties
index b812ffa70..54b927727 100644
--- a/src/main/resources/clds/clds-policy-config.properties
+++ b/src/main/resources/clds/clds-policy-config.properties
@@ -20,6 +20,7 @@
 # ===================================================================
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ###
+
 # Configuration Settings for Policy Engine Components
 PDP_URL1=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
 PDP_URL2=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
@@ -28,7 +29,8 @@ NOTIFICATION_UEB_SERVERS=localhost
 NOTIFICATION_TOPIC=
 CLIENT_ID=myclientid
 # base64 encoding
-CLIENT_KEY=ChlakDuk
+#CLIENT_KEY=ChlakDuk
+CLIENT_KEY=5CE79532B3A2CB4D132FC0C04BF916A7
 #DEVL for development
 #TEST for Test environments
 #PROD for prod environments
diff --git a/src/main/resources/clds/clds-reference.properties b/src/main/resources/clds/clds-reference.properties
index 72308a94a..a8382cb0a 100644
--- a/src/main/resources/clds/clds-reference.properties
+++ b/src/main/resources/clds/clds-reference.properties
@@ -81,14 +81,14 @@ sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/
 sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8080
 sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/services
 sdc.serviceUsername=test

-sdc.servicePassword=A7CADD84A22398C980847A54D23E24E9

+sdc.servicePassword=aa2871669d793c7fb7abbcda31b88b4c29bf2982755b25f08f8d0130539c11b0

 sdc.artifactLabel=blueprintclampcockpit

 sdc.sdcX-InstanceID=CLAMP

 sdc.artifactType=DCAE_INVENTORY_BLUEPRINT

 sdc.locationArtifactLabel=locationclampcockpit

 sdc.locationArtifactType=DCAE_INVENTORY_JSON

 sdc.InstanceID=X-ECOMP-InstanceID

-#

+sdc.header.requestId = X-ECOMP-RequestID

 #

 #

 ui.location.default={"DC1":"Data Center 1","DC2":"Data Center 2","DC3":"Data Center 3"}

@@ -104,5 +104,6 @@ CLDS_SERVICE_CACHE_MAX_SECONDS=30
 DCAE_INVENTORY_URL = https://dcae.api.simpledemo.onap.org:8080
 

 #DCAE Dispatcher Url Properties

-DCAE_DISPATCHER_URL = https://dcae.api.simpledemo.onap.org:8443
+DCAE_DISPATCHER_URL = https://dcae.api.simpledemo.onap.org:8443

+dcae.header.requestId = "X-ECOMP-RequestID"
 

diff --git a/src/main/resources/clds/key.properties b/src/main/resources/clds/key.properties
new file mode 100644
index 000000000..dda811040
--- /dev/null
+++ b/src/main/resources/clds/key.properties
@@ -0,0 +1 @@
+org.onap.clamp.encryption.aes.key=aa3871669d893c7fb8abbcda31b88b4f
\ No newline at end of file