Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate SECURITY-2458 adaptation #154

Merged
merged 3 commits into from
Nov 8, 2021
Merged

Integrate SECURITY-2458 adaptation #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d85198f
Adapt callables to SECURITY-2456
rsandell Oct 15, 2021
aac6b27
[maven-release-plugin] prepare release s3-0.12.1
rsandell Oct 19, 2021
d28464d
[maven-release-plugin] prepare for next development iteration
rsandell Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<artifactId>s3</artifactId>
<packaging>hpi</packaging>
<version>0.12.1-SNAPSHOT</version>
<version>0.12.2-SNAPSHOT</version>
<name>Jenkins S3 publisher plugin</name>
<url>https://github.com/jenkinsci/s3-plugin</url>

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/hudson/plugins/s3/callable/S3Callable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import hudson.ProxyConfiguration;
import hudson.plugins.s3.ClientHelper;
import hudson.util.Secret;
import jenkins.security.Roles;
import org.apache.commons.lang.StringUtils;
import org.jenkinsci.remoting.RoleChecker;

Expand Down Expand Up @@ -46,7 +47,7 @@ protected synchronized TransferManager getTransferManager() {

@Override
public void checkRoles(RoleChecker roleChecker) throws SecurityException {

roleChecker.check(this, Roles.SLAVE);
}

private String getUniqueKey() {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/hudson/plugins/s3/callable/S3CleanupUploadCallable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import hudson.FilePath;
import hudson.plugins.s3.Uploads;
import hudson.remoting.VirtualChannel;
import jenkins.security.Roles;
import org.jenkinsci.remoting.RoleChecker;

import java.io.File;
Expand All @@ -22,6 +23,6 @@ public Void invoke(FilePath file) {

@Override
public void checkRoles(RoleChecker checker) throws SecurityException {

checker.check(this, Roles.SLAVE);
}
}
3 changes: 2 additions & 1 deletion src/main/java/hudson/plugins/s3/callable/S3WaitUploadCallable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import hudson.FilePath;
import hudson.plugins.s3.Uploads;
import hudson.remoting.VirtualChannel;
import jenkins.security.Roles;
import org.jenkinsci.remoting.RoleChecker;

import java.io.File;
Expand All @@ -22,6 +23,6 @@ public Void invoke(FilePath file) throws InterruptedException {

@Override
public void checkRoles(RoleChecker checker) throws SecurityException {

checker.check(this, Roles.SLAVE);
}
}