|
@@ -1110,7 +1110,10 @@ public class HelpdeskServlet extends ControlledPwmServlet {
|
|
|
);
|
|
|
|
|
|
final UserIdentity userIdentity = UserIdentity.fromKey(jsonInput.getUsername(), pwmRequest.getPwmApplication());
|
|
|
- final HelpdeskProfile helpdeskProfile = pwmRequest.getPwmSession().getSessionManager().getHelpdeskProfile(pwmRequest.getPwmApplication());
|
|
|
+ final HelpdeskProfile helpdeskProfile = getHelpdeskProfile( pwmRequest );
|
|
|
+
|
|
|
+ HelpdeskServletUtil.checkIfUserIdentityViewable(pwmRequest, helpdeskProfile, userIdentity);
|
|
|
+
|
|
|
final ChaiUser chaiUser = getChaiUser(pwmRequest, getHelpdeskProfile(pwmRequest), userIdentity);
|
|
|
final UserInfo userInfo = UserInfoFactory.newUserInfo(
|
|
|
pwmRequest.getPwmApplication(),
|
|
@@ -1120,18 +1123,15 @@ public class HelpdeskServlet extends ControlledPwmServlet {
|
|
|
chaiUser.getChaiProvider()
|
|
|
);
|
|
|
|
|
|
- HelpdeskServletUtil.checkIfUserIdentityViewable(pwmRequest, helpdeskProfile, userIdentity);
|
|
|
-
|
|
|
{
|
|
|
- final HelpdeskUIMode mode = helpdeskProfile.readSettingAsEnum(PwmSetting.HELPDESK_CLEAR_RESPONSES, HelpdeskUIMode.class);
|
|
|
+ final HelpdeskUIMode mode = helpdeskProfile.readSettingAsEnum(PwmSetting.HELPDESK_SET_PASSWORD_MODE, HelpdeskUIMode.class);
|
|
|
if (mode == HelpdeskUIMode.none) {
|
|
|
throw new PwmUnrecoverableException(new ErrorInformation(PwmError.ERROR_SECURITY_VIOLATION,"setting "
|
|
|
- + PwmSetting.HELPDESK_CLEAR_RESPONSES.toMenuLocationDebug(helpdeskProfile.getIdentifier(), pwmRequest.getLocale())
|
|
|
+ + PwmSetting.HELPDESK_SET_PASSWORD_MODE.toMenuLocationDebug(helpdeskProfile.getIdentifier(), pwmRequest.getLocale())
|
|
|
+ " must not be set to none"));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
final PasswordUtility.PasswordCheckInfo passwordCheckInfo = PasswordUtility.checkEnteredPassword(
|
|
|
pwmRequest.getPwmApplication(),
|
|
|
pwmRequest.getLocale(),
|
|
@@ -1143,6 +1143,7 @@ public class HelpdeskServlet extends ControlledPwmServlet {
|
|
|
);
|
|
|
|
|
|
final RestCheckPasswordServer.JsonOutput jsonResponse = RestCheckPasswordServer.JsonOutput.fromPasswordCheckInfo(passwordCheckInfo);
|
|
|
+
|
|
|
final RestResultBean restResultBean = RestResultBean.withData(jsonResponse);
|
|
|
pwmRequest.outputJsonResult(restResultBean);
|
|
|
|