mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-21 15:55:40 +00:00
Merge branch 'security-master' into master
This commit is contained in:
commit
88736fbb20
4 files changed
+94
-9
No files matched your search
@@ -29,7 +29,6 @@ import hudson.Util;
|
||||
import hudson.security.ACL;
|
||||
import java.io.IOException;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import jenkins.model.Jenkins;
|
||||
import jenkins.security.ApiTokenProperty;
|
||||
import org.kohsuke.stapler.HttpResponses;
|
||||
import org.kohsuke.stapler.StaplerRequest;
|
||||
@@ -68,9 +67,6 @@ public final class BuildAuthorizationToken {
|
||||
}
|
||||
|
||||
public static void checkPermission(Job<?, ?> project, BuildAuthorizationToken token, StaplerRequest req, StaplerResponse rsp) throws IOException {
|
||||
if (!Jenkins.get().isUseSecurity())
|
||||
return; // everyone is authorized
|
||||
|
||||
if (token != null && token.token != null) {
|
||||
//check the provided token
|
||||
String providedToken = req.getParameter("token");
|
||||
|
||||
Reference in new issue
Block a user