提交 2a355129 编写于 作者: J Jesse Glick

matrix-auth 1.1

上级 1884ccfe
......@@ -24,14 +24,9 @@
package hudson.security;
import hudson.Extension;
import hudson.ExtensionPoint;
import hudson.model.User;
import java.util.logging.Level;
import java.util.logging.Logger;
import jenkins.model.Jenkins;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
/**
* Service which can add permissions for a given user to the configured authorization strategy.
......@@ -40,8 +35,6 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
*/
public abstract class PermissionAdder implements ExtensionPoint {
private static final Logger LOGGER = Logger.getLogger(PermissionAdder.class.getName());
/**
* Called to try to give a user global permission.
* @param strategy the configured authorization strategy
......@@ -51,22 +44,4 @@ public abstract class PermissionAdder implements ExtensionPoint {
*/
public abstract boolean add(AuthorizationStrategy strategy, User user, Permission perm);
// TODO delete when 1.535 released and matrix-auth can depend on it
@Restricted(NoExternalUse.class)
@Extension public static final class Legacy extends PermissionAdder {
@Override public boolean add(AuthorizationStrategy strategy, User user, Permission perm) {
try {
strategy.getClass().getMethod("add", Permission.class, String.class).invoke(strategy, Jenkins.ADMINISTER, user.getId());
return true;
} catch (NoSuchMethodException x) {
// fine, not GlobalMatrixAuthorizationStrategy or a subclass
} catch (Exception x) {
LOGGER.log(Level.WARNING, null, x);
}
return false;
}
}
}
......@@ -341,7 +341,7 @@ THE SOFTWARE.
<artifactItem>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-auth</artifactId>
<version>1.0.2</version>
<version>1.1</version>
<type>hpi</type>
</artifactItem>
</artifactItems>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册