Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Jul 22, 2014 · d965c2b · d965c2b
2 parents fbda2ce + b2764c3
commit d965c2b
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 26 deletions.
diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java b/...main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
@@ -112,7 +112,7 @@ private SystemConfigurationDto loadSystemConfiguration() {
             PrismObject<SystemConfigurationType> systemConfig = getModelService().getObject(SystemConfigurationType.class,
                     SystemObjectsType.SYSTEM_CONFIGURATION.value(), options, task, result);
 
-            dto = new SystemConfigurationDto(systemConfig, getMidpointApplication().getProtector());
+            dto = new SystemConfigurationDto(systemConfig);
             result.recordSuccess();
         } catch(Exception ex){
             LoggingUtils.logException(LOGGER, "Couldn't load system configuration", ex);
@@ -399,9 +399,11 @@ private SystemConfigurationType saveNotificationConfiguration(SystemConfiguratio
             mailServerConfig.setUsername(dto.getUsername());
             mailServerConfig.setTransportSecurity(dto.getMailTransportSecurityType());
 
-            ProtectedStringType pass = new ProtectedStringType();
-            pass.setClearValue(dto.getPassword());
-            mailServerConfig.setPassword(pass);
+            if(dto.getPassword() != null && StringUtils.isNotEmpty(dto.getPassword())){
+                ProtectedStringType pass = new ProtectedStringType();
+                pass.setClearValue(dto.getPassword());
+                mailServerConfig.setPassword(pass);
+            }
 
             if(mailConfig.getServer().isEmpty()){
                 if(dto.isConfigured())

diff --git a/.../java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html b/.../java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
@@ -153,8 +153,7 @@ <h3>
                 </label>
 
                 <div class="col-lg-4">
-                    <input type="password" class="form-control input-sm" wicket:id="password" autocomplete="off"
-                           wicket:message="placeholder:SystemConfigPanel.mail.password">
+                    <input type="password" class="form-control input-sm" wicket:id="password" autocomplete="off">
                 </div>
             </div>
 

diff --git a/.../java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java b/.../java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
@@ -26,6 +26,7 @@
 import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.MailTransportSecurityType;
+import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.*;
@@ -101,7 +102,15 @@ protected void initLayout(){
         TextField<String> userNameField = new TextField<>(ID_USERNAME, new PropertyModel<String>(getModel(), "notificationConfig.username"));
         PasswordTextField passwordField = new PasswordTextField(ID_PASSWORD, new PropertyModel<String>(getModel(), "notificationConfig.password"));
         passwordField.setRequired(false);
-        passwordField.setResetPassword(false);
+
+        if(getModel().getObject() != null){
+            if(getModel().getObject().getNotificationConfig().getPassword() != null){
+                passwordField.add(new AttributeAppender("placeholder", createStringResource("SystemConfigPanel.mail.password.placeholder.set")));
+            } else {
+                passwordField.add(new AttributeAppender("placeholder", createStringResource("SystemConfigPanel.mail.password.placeholder.empty")));
+            }
+        }
+
         TextField<String> redirectToFileField = new TextField<>(ID_REDIRECT_TO_FILE, new PropertyModel<String>(getModel(), "notificationConfig.redirectToFile"));
 
         IModel choices = WebMiscUtil.createReadonlyModelFromEnum(MailTransportSecurityType.class);

diff --git a/...com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.properties b/...com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.properties
@@ -31,6 +31,8 @@ SystemConfigPanel.mail.host=Host
 SystemConfigPanel.mail.port=Port
 SystemConfigPanel.mail.username=Username
 SystemConfigPanel.mail.password=Password
+SystemConfigPanel.mail.password.placeholder.empty=Set password
+SystemConfigPanel.mail.password.placeholder.set=Password is set
 SystemConfigPanel.mail.transportSecurity=Transport security
 SystemConfigPanel.notification.redirectToFile=Redirect to file
 SystemConfigPanel.notification.redirectToFile.placeholder=Filename

diff --git a/.../com/evolveum/midpoint/web/page/admin/configuration/dto/NotificationConfigurationDto.java b/.../com/evolveum/midpoint/web/page/admin/configuration/dto/NotificationConfigurationDto.java
@@ -15,16 +15,13 @@
  */
 package com.evolveum.midpoint.web.page.admin.configuration.dto;
 
-import com.evolveum.midpoint.prism.crypto.Protector;
-import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.MailConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.MailServerConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.MailTransportSecurityType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.NotificationConfigurationType;
-import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
+
 
 import java.io.Serializable;
 
@@ -48,7 +45,7 @@ public class NotificationConfigurationDto implements Serializable{
 
     public NotificationConfigurationDto(){}
 
-    public NotificationConfigurationDto(NotificationConfigurationType config, Protector protector){
+    public NotificationConfigurationDto(NotificationConfigurationType config){
 
         if(config.getMail() != null){
             MailConfigurationType mailConfig = config.getMail();
@@ -71,11 +68,7 @@ public NotificationConfigurationDto(NotificationConfigurationType config, Protec
                 username = serverConfig.getUsername();
 
                 if(serverConfig.getPassword() != null){
-                    try {
-                        password = protector.decryptString(serverConfig.getPassword());
-                    } catch (Exception e){
-                        LoggingUtils.logException(LOGGER, "Unable to decrypt password in mail configuration.", e);
-                    }
+                    password = "Set";
                 } else {
                     password = null;
                 }

diff --git a/...n/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java b/...n/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
@@ -39,14 +39,14 @@ public class SystemConfigurationDto implements Serializable {
     private NotificationConfigurationDto notificationConfig;
 
     public SystemConfigurationDto(){
-        this(null, null);
+        this(null);
     }
 
-    public SystemConfigurationDto(PrismObject<SystemConfigurationType> config, Protector protector) {
-        init(config.asObjectable(), protector);
+    public SystemConfigurationDto(PrismObject<SystemConfigurationType> config) {
+        init(config.asObjectable());
     }
 
-    private void init(SystemConfigurationType config, Protector protector){
+    private void init(SystemConfigurationType config){
         if(config == null){
             return;
         }
@@ -66,7 +66,7 @@ private void init(SystemConfigurationType config, Protector protector){
         objectTemplateDto = loadObjectTemplate(config);
 
         if(config.getNotificationConfiguration() != null){
-            notificationConfig = new NotificationConfigurationDto(config.getNotificationConfiguration(), protector);
+            notificationConfig = new NotificationConfigurationDto(config.getNotificationConfiguration());
         } else {
             notificationConfig = new NotificationConfigurationDto();
         }
@@ -76,9 +76,9 @@ private ObjectViewDto<ValuePolicyType> loadPasswordPolicy(SystemConfigurationTyp
         ValuePolicyType passPolicy = config.getGlobalPasswordPolicy();
 
         if(passPolicy != null){
-            passPolicyDto = new ObjectViewDto<ValuePolicyType>(passPolicy.getOid(), passPolicy.getName().getOrig());
+            passPolicyDto = new ObjectViewDto<>(passPolicy.getOid(), passPolicy.getName().getOrig());
         }else {
-            passPolicyDto = new ObjectViewDto<ValuePolicyType>();
+            passPolicyDto = new ObjectViewDto<>();
         }
 
         passPolicyDto.setType(ValuePolicyType.class);
@@ -89,9 +89,9 @@ private ObjectViewDto<ObjectTemplateType> loadObjectTemplate(SystemConfiguration
         ObjectTemplateType objectTemplate = config.getDefaultUserTemplate();
 
         if(objectTemplate != null){
-            objectTemplateDto = new ObjectViewDto<ObjectTemplateType>(objectTemplate.getOid(), objectTemplate.getName().getOrig());
+            objectTemplateDto = new ObjectViewDto<>(objectTemplate.getOid(), objectTemplate.getName().getOrig());
         }else {
-            objectTemplateDto = new ObjectViewDto<ObjectTemplateType>();
+            objectTemplateDto = new ObjectViewDto<>();
         }
 
         objectTemplateDto.setType(ObjectTemplateType.class);