aboutsummaryrefslogtreecommitdiffstats
path: root/adapters/mso-openstack-adapters/src
diff options
context:
space:
mode:
authorSmokowski, Steve (ss835w) <ss835w@us.att.com>2018-12-05 08:30:51 -0500
committerSmokowski, Steve (ss835w) <ss835w@us.att.com>2018-12-05 08:30:51 -0500
commit2bb9251043b543bb5005b7cf9af6ac4f58a0f733 (patch)
tree1d2667f823e552fa81e6287febfad0ba5c17269a /adapters/mso-openstack-adapters/src
parent9a3841eadc588c3b3f50f2351b741edd139ca13c (diff)
Resolve Security Exploits
normalize all file paths before using them Change-Id: I67aaa00d7218b95dde96f3679efe92c3c0cd33f9 Issue-ID: SO-1275 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
Diffstat (limited to 'adapters/mso-openstack-adapters/src')
-rw-r--r--adapters/mso-openstack-adapters/src/main/java/db/migration/R__CloudConfigMigration.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/adapters/mso-openstack-adapters/src/main/java/db/migration/R__CloudConfigMigration.java b/adapters/mso-openstack-adapters/src/main/java/db/migration/R__CloudConfigMigration.java
index 10dbbf1396..6339616803 100644
--- a/adapters/mso-openstack-adapters/src/main/java/db/migration/R__CloudConfigMigration.java
+++ b/adapters/mso-openstack-adapters/src/main/java/db/migration/R__CloudConfigMigration.java
@@ -36,6 +36,7 @@ import org.onap.so.logger.MsoLogger;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Paths;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -68,9 +69,11 @@ public class R__CloudConfigMigration implements JdbcMigration , MigrationInfoPro
// Try the override file
String configLocation = System.getProperty("spring.config.location");
if (configLocation != null) {
- try (InputStream stream = new FileInputStream(configLocation)) {
+ try (InputStream stream = new FileInputStream(Paths.get(configLocation).normalize().toString())) {
cloudConfig = loadCloudConfig(stream);
- }
+ }catch(Exception e){
+ LOGGER.warnSimple("Error Loading override.yaml",e);
+ }
}
if (cloudConfig == null) {