From f634662c07a8ae7a56b90e5e8b6a43bb55c7f30d Mon Sep 17 00:00:00 2001 From: nicobo Date: Thu, 17 Sep 2015 00:04:54 +0200 Subject: [PATCH] # reversed changes from pom.xml as indicated by imod # default strategy is now 'none' --- pom.xml | 15 +++++---------- .../script_realm/ScriptSecurityRealm.java | 18 +++++++++--------- .../plugins/script_realm/Messages.properties | 8 ++++---- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 74cb9aa..26f4549 100644 --- a/pom.xml +++ b/pom.xml @@ -7,11 +7,11 @@ script-realm - 1.6-emailfullnameresolvers-SNAPSHOT + 1.6-SNAPSHOT hpi Security Realm by custom script Supports authentication by custom script, groups resolving for a user, and triggers e-mail and full name resolvers. - https://github.com/nicolabs/script-realm-plugin + https://wiki.jenkins-ci.org/display/JENKINS/Script+Security+Realm UTF-8 @@ -47,16 +47,11 @@ Dominik Bartholdi - - - nicobo - Nicolas BONARDELLE - http://nicolabs.net/contact - - scm:git:git://github.com/nicolabs/script-realm-plugin.git - scm:git:ssh://git@github.com/nicolabs/script-realm-plugin.git - https://github.com/nicolabs/script-realm-plugin + scm:git:git://github.com/jenkins/script-realm-plugin.git + scm:git:ssh://git@github.com/jenkinsci/script-realm-plugin.git + http://github.com/jenkins/script-realm-plugin diff --git a/src/main/java/hudson/plugins/script_realm/ScriptSecurityRealm.java b/src/main/java/hudson/plugins/script_realm/ScriptSecurityRealm.java index 9a70544..304f35e 100644 --- a/src/main/java/hudson/plugins/script_realm/ScriptSecurityRealm.java +++ b/src/main/java/hudson/plugins/script_realm/ScriptSecurityRealm.java @@ -72,7 +72,7 @@ public class ScriptSecurityRealm extends AbstractPasswordBasedSecurityRealm { private static final Logger LOGGER = Logger.getLogger(ScriptSecurityRealm.class.getName()); /** Strategy : call the global resolve method (let Jenkins choose) */ - private static final String OPTION_RESOLVER_DEFAULTSTRATEGY = "*"; + private static final String OPTION_RESOLVER_ANYSTRATEGY = "*"; /** Strategy : don't resolve */ private static final String OPTION_RESOLVER_NONESTRATEGY = ""; @@ -150,19 +150,19 @@ public class ScriptSecurityRealm extends AbstractPasswordBasedSecurityRealm { } public String getDefaultEmailResolver() { - return OPTION_RESOLVER_DEFAULTSTRATEGY; + return OPTION_RESOLVER_NONESTRATEGY; } public String getDefaultNameResolver() { - return OPTION_RESOLVER_DEFAULTSTRATEGY; + return OPTION_RESOLVER_NONESTRATEGY; } public ListBoxModel doFillEmailResolverItems() { ListBoxModel items = new ListBoxModel(); ExtensionList mars = MailAddressResolver.all(); - items.add(new Option(Messages.ScriptSecurityRealm_EmailResolver_defaultstrategy_label(),OPTION_RESOLVER_DEFAULTSTRATEGY)); // This entry will use Jenkins's default behavior (calling all found resolvers) + items.add(new Option(Messages.ScriptSecurityRealm_EmailResolver_nonestrategy_label(),OPTION_RESOLVER_NONESTRATEGY)); // This entry will disable resolving if selected if ( ! mars.isEmpty() ) { - items.add(new Option(Messages.ScriptSecurityRealm_EmailResolver_nonestrategy_label(),OPTION_RESOLVER_NONESTRATEGY)); // This entry will disable resolving if selected + items.add(new Option(Messages.ScriptSecurityRealm_EmailResolver_anystrategy_label(),OPTION_RESOLVER_ANYSTRATEGY)); // This entry will use Jenkins's default behavior (calling all found resolvers) // Adds all found e-mail resolvers as options so the user can select one of them for (MailAddressResolver mar : mars) { // class name is used both as label and value @@ -175,9 +175,9 @@ public class ScriptSecurityRealm extends AbstractPasswordBasedSecurityRealm { public ListBoxModel doFillNameResolverItems() { ListBoxModel items = new ListBoxModel(); ExtensionList unrs = UserNameResolver.all(); - items.add(new Option(Messages.ScriptSecurityRealm_NameResolver_defaultstrategy_label(),OPTION_RESOLVER_DEFAULTSTRATEGY)); // This entry will use Jenkins's default behavior (calling all found resolvers) + items.add(new Option(Messages.ScriptSecurityRealm_NameResolver_nonestrategy_label(),OPTION_RESOLVER_NONESTRATEGY)); // This entry will disable resolving if selected if ( ! unrs.isEmpty() ) { - items.add(new Option(Messages.ScriptSecurityRealm_NameResolver_nonestrategy_label(),OPTION_RESOLVER_NONESTRATEGY)); // This entry will disable resolving if selected + items.add(new Option(Messages.ScriptSecurityRealm_NameResolver_anystrategy_label(),OPTION_RESOLVER_ANYSTRATEGY)); // This entry will use Jenkins's default behavior (calling all found resolvers) // Adds all found name resolvers as options so the user can select one of them for (UserNameResolver unr : unrs) { // class name is used both as label and value @@ -233,7 +233,7 @@ public class ScriptSecurityRealm extends AbstractPasswordBasedSecurityRealm { if ( !OPTION_RESOLVER_NONESTRATEGY.equals(nameResolver) ) { String fullname = null; - if ( OPTION_RESOLVER_DEFAULTSTRATEGY.equals(nameResolver) ) { + if ( OPTION_RESOLVER_ANYSTRATEGY.equals(nameResolver) ) { LOGGER.log(Level.FINE,"Calling any registered UserNameResolver for {0}",new Object[]{user}); fullname = UserNameResolver.resolve(user); } else { @@ -260,7 +260,7 @@ public class ScriptSecurityRealm extends AbstractPasswordBasedSecurityRealm { Mailer.UserProperty existing = user.getProperty(Mailer.UserProperty.class); if (existing==null || !existing.hasExplicitlyConfiguredAddress()) { String email = null; - if ( OPTION_RESOLVER_DEFAULTSTRATEGY.equals(emailResolver) ) { + if ( OPTION_RESOLVER_ANYSTRATEGY.equals(emailResolver) ) { LOGGER.log(Level.FINE,"Calling any registered MailAddressResolver for {0}",new Object[]{user}); email = MailAddressResolver.resolve(user); } else { diff --git a/src/main/resources/hudson/plugins/script_realm/Messages.properties b/src/main/resources/hudson/plugins/script_realm/Messages.properties index ab26f0c..fbb40dd 100644 --- a/src/main/resources/hudson/plugins/script_realm/Messages.properties +++ b/src/main/resources/hudson/plugins/script_realm/Messages.properties @@ -1,5 +1,5 @@ # Labels for the strategies in the drop-down list -ScriptSecurityRealm.EmailResolver.defaultstrategy.label=Default (try all existing resolvers) -ScriptSecurityRealm.EmailResolver.nonestrategy.label=None (do not resolve) -ScriptSecurityRealm.NameResolver.defaultstrategy.label=Default (try all existing resolvers) -ScriptSecurityRealm.NameResolver.nonestrategy.label=None (do not resolve) \ No newline at end of file +ScriptSecurityRealm.EmailResolver.nonestrategy.label=Default (do not resolve) +ScriptSecurityRealm.EmailResolver.anystrategy.label=Any (try all existing resolvers) +ScriptSecurityRealm.NameResolver.nonestrategy.label=Default (do not resolve) +ScriptSecurityRealm.NameResolver.anystrategy.label=Any (try all existing resolvers) \ No newline at end of file