Skip to content
Snippets Groups Projects
Commit 075983fd authored by Mike McKay's avatar Mike McKay
Browse files

Got Secure Channel AdminUI setting to take effect.

parent 2abc41b5
No related branches found
No related tags found
No related merge requests found
...@@ -97,6 +97,7 @@ public class SchedulerConfig implements SchedulingConfigurer { ...@@ -97,6 +97,7 @@ public class SchedulerConfig implements SchedulingConfigurer {
_eventService.triggerEvent(new PreferenceEvent("emailPrefix", String.valueOf(XDAT.getNotificationsPreferences().getEmailPrefix()))); _eventService.triggerEvent(new PreferenceEvent("emailPrefix", String.valueOf(XDAT.getNotificationsPreferences().getEmailPrefix())));
_eventService.triggerEvent(new PreferenceEvent("host", String.valueOf(XDAT.getNotificationsPreferences().getHostname()))); _eventService.triggerEvent(new PreferenceEvent("host", String.valueOf(XDAT.getNotificationsPreferences().getHostname())));
_eventService.triggerEvent(new PreferenceEvent("requireLogin", String.valueOf(XDAT.getSiteConfigPreferences().getRequireLogin()))); _eventService.triggerEvent(new PreferenceEvent("requireLogin", String.valueOf(XDAT.getSiteConfigPreferences().getRequireLogin())));
_eventService.triggerEvent(new PreferenceEvent("security.channel", String.valueOf(XDAT.getSiteConfigPreferences().getSecurityChannel())));
for (final TriggerTask triggerTask : _triggerTasks) { for (final TriggerTask triggerTask : _triggerTasks) {
taskRegistrar.addTriggerTask(triggerTask); taskRegistrar.addTriggerTask(triggerTask);
} }
......
package org.nrg.xnat.event.listeners.methods;
import com.google.common.collect.ImmutableList;
import org.nrg.xdat.XDAT;
import org.nrg.xnat.security.TranslatingChannelProcessingFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Lazy;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@Component
public class RequiredChannelHandlerMethod extends AbstractSiteConfigPreferenceHandlerMethod {
@Override
public List<String> getHandledPreferences() {
return PREFERENCES;
}
@Override
public void handlePreferences(final Map<String, String> values) {
if (!Collections.disjoint(PREFERENCES, values.keySet())) {
updateRequiredChannel();
}
}
@Override
public void handlePreference(final String preference, final String value) {
if(PREFERENCES.contains(preference)){
updateRequiredChannel();
}
}
private void updateRequiredChannel(){
_filter.setRequiredChannel(XDAT.getSiteConfigPreferences().getSecurityChannel());
}
private static final Logger _log = LoggerFactory.getLogger(RequiredChannelHandlerMethod.class);
private static final List<String> PREFERENCES = ImmutableList.copyOf(Arrays.asList("security.channel"));
@Autowired
@Lazy
private JdbcTemplate _template;
@Autowired
@Qualifier("channelProcessingFilter")
private TranslatingChannelProcessingFilter _filter;
}
...@@ -322,6 +322,7 @@ userLoginsSessionControls: ...@@ -322,6 +322,7 @@ userLoginsSessionControls:
name: UI.login_failure_message name: UI.login_failure_message
label: Login Failure Message label: Login Failure Message
description: Text to show when a user fails to login description: Text to show when a user fails to login
value: "?? XNAT:data:siteConfig:UI.login_failure_message"
maximumFailedLogins: maximumFailedLogins:
kind: panel.input.number kind: panel.input.number
id: maximumFailedLogins id: maximumFailedLogins
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment