nicolabs/script-realm-plugin
1
0
Fork 0
mirror of https://github.com/nicolabs/script-realm-plugin.git synced 2025-09-05 02:46:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

# reversed changes from pom.xml as indicated by imod

Browse source 
# default strategy is now 'none'
This commit is contained in:
nicobo 2015-09-17 00:04:54 +02:00
parent 8dc3e29579
commit f634662c07
3 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pom.xml
View file

@ -7,11 +7,11 @@
</parent>
<artifactId>script-realm</artifactId>
<version>1.6-emailfullnameresolvers-SNAPSHOT</version>
<version>1.6-SNAPSHOT</version>
<packaging>hpi</packaging>
<name>Security Realm by custom script</name>
<description>Supports authentication by custom script, groups resolving for a user, and triggers e-mail and full name resolvers.</description>
<url>https://github.com/nicolabs/script-realm-plugin</url>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Script+Security+Realm</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@ -47,16 +47,11 @@
<name>Dominik Bartholdi</name>
<email>-</email>
</developer>
<developer>
<id>nicobo</id>
<name>Nicolas BONARDELLE</name>
<url>http://nicolabs.net/contact</url>
</developer>
</developers>
<scm>
<connection>scm:git:git://github.com/nicolabs/script-realm-plugin.git</connection>
<developerConnection>scm:git:ssh://git@github.com/nicolabs/script-realm-plugin.git</developerConnection>
<url>https://github.com/nicolabs/script-realm-plugin</url>
<connection>scm:git:git://github.com/jenkins/script-realm-plugin.git</connection>
<developerConnection>scm:git:ssh://git@github.com/jenkinsci/script-realm-plugin.git</developerConnection>
<url>http://github.com/jenkins/script-realm-plugin</url>
</scm>
<distributionManagement>
<repository>

18
src/main/java/hudson/plugins/script_realm/ScriptSecurityRealm.java
View file

@ -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<MailAddressResolver> 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<UserNameResolver> 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 {

8
src/main/resources/hudson/plugins/script_realm/Messages.properties
View file

@ -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)
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)