X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fconf%2FUiInitializer.java;h=0520f58b0a979319e85cfd96ebd866c09931b027;hb=c4f35d65a835e53a7847524eea61cb172a2433f5;hp=e93c25becae905bf274cec2eb7d3359f0e776d3e;hpb=bcfe962f40d0ed2697bc3c6bdc56c89f163bb812;p=validation.git

diff --git a/ui/src/main/java/org/akraino/validation/ui/conf/UiInitializer.java b/ui/src/main/java/org/akraino/validation/ui/conf/UiInitializer.java
index e93c25b..0520f58 100644
--- a/ui/src/main/java/org/akraino/validation/ui/conf/UiInitializer.java
+++ b/ui/src/main/java/org/akraino/validation/ui/conf/UiInitializer.java
@@ -74,19 +74,21 @@ public class UiInitializer {
 
     @EventListener(ContextRefreshedEvent.class)
     public void setHttpProperties() throws NoSuchAlgorithmException, KeyManagementException {
-        SSLContext sslContext = SSLContext.getInstance("SSL");
-        sslContext.init(null, this.trustAll, new java.security.SecureRandom());
-        HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
-        // Install the all-trusting host verifier
-        HttpsURLConnection.setDefaultHostnameVerifier(this.hostnameVerifier);
-        DefaultClientConfig config = new DefaultClientConfig();
-        Map<String, Object> properties = config.getProperties();
-        HTTPSProperties httpsProperties = new HTTPSProperties((str, sslSession) -> true, sslContext);
-        properties.put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, httpsProperties);
+        if (System.getenv("TRUST_ALL") != null && System.getenv("TRUST_ALL").equals("true")) {
+            SSLContext sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, this.trustAll, new java.security.SecureRandom());
+            HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
+            // Install the all-trusting host verifier
+            HttpsURLConnection.setDefaultHostnameVerifier(this.hostnameVerifier);
+            DefaultClientConfig config = new DefaultClientConfig();
+            Map<String, Object> properties = config.getProperties();
+            HTTPSProperties httpsProperties = new HTTPSProperties((str, sslSession) -> true, sslContext);
+            properties.put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, httpsProperties);
+        }
     }
 
     @EventListener(ContextRefreshedEvent.class)
-    public void updateUsers() throws RuntimeException, IOException, CipherUtilException {
+    public void updateAdminUser() throws RuntimeException, IOException, CipherUtilException {
         User admin = null;
         List<User> users = userService.findAllActive();
         for (User user : users) {
@@ -97,20 +99,11 @@ public class UiInitializer {
         if (admin == null) {
             throw new RuntimeException("Admin user does not exist");
         }
-        admin.setLoginPwd(CipherUtil.encryptPKC(System.getenv("UI_ADMIN_PASSWORD"), System.getenv("ENCRYPTION_KEY")));
-        userService.saveUser(admin);
-        User akraino = null;
-        for (User user : users) {
-            if (user.getLoginId().equals("akraino")) {
-                akraino = user;
-            }
-        }
-        if (akraino == null) {
-            throw new RuntimeException("Akraino user does not exist");
+        if (admin.getLoginPwd().equals("admin_password")) {
+            admin.setLoginPwd(
+                    CipherUtil.encryptPKC(System.getenv("UI_ADMIN_PASSWORD"), System.getenv("ENCRYPTION_KEY")));
+            userService.saveUser(admin);
         }
-        akraino.setLoginPwd(
-                CipherUtil.encryptPKC(System.getenv("UI_AKRAINO_PASSWORD"), System.getenv("ENCRYPTION_KEY")));
-        userService.saveUser(akraino);
     }
 
 }