From d85198fb3eef460e2d4c8fea5eea2d1e78fa06b6 Mon Sep 17 00:00:00 2001
From: rsandell <rsandell@cloudbees.com>
Date: Fri, 15 Oct 2021 15:52:37 +0200
Subject: [PATCH 1/3] Adapt callables to SECURITY-2456

---
 src/main/java/hudson/plugins/s3/callable/S3Callable.java       | 3 ++-
 .../hudson/plugins/s3/callable/S3CleanupUploadCallable.java    | 3 ++-
 .../java/hudson/plugins/s3/callable/S3WaitUploadCallable.java  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/hudson/plugins/s3/callable/S3Callable.java b/src/main/java/hudson/plugins/s3/callable/S3Callable.java
index 5dfa6ab8..e5facdef 100644
--- a/src/main/java/hudson/plugins/s3/callable/S3Callable.java
+++ b/src/main/java/hudson/plugins/s3/callable/S3Callable.java
@@ -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;
 
@@ -46,7 +47,7 @@ protected synchronized TransferManager getTransferManager() {
 
     @Override
     public void checkRoles(RoleChecker roleChecker) throws SecurityException {
-
+        roleChecker.check(this, Roles.SLAVE);
     }
 
     private String getUniqueKey() {
diff --git a/src/main/java/hudson/plugins/s3/callable/S3CleanupUploadCallable.java b/src/main/java/hudson/plugins/s3/callable/S3CleanupUploadCallable.java
index 88cad3a9..0ee89d4d 100644
--- a/src/main/java/hudson/plugins/s3/callable/S3CleanupUploadCallable.java
+++ b/src/main/java/hudson/plugins/s3/callable/S3CleanupUploadCallable.java
@@ -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;
@@ -22,6 +23,6 @@ public Void invoke(FilePath file) {
 
     @Override
     public void checkRoles(RoleChecker checker) throws SecurityException {
-
+        checker.check(this, Roles.SLAVE);
     }
 }
diff --git a/src/main/java/hudson/plugins/s3/callable/S3WaitUploadCallable.java b/src/main/java/hudson/plugins/s3/callable/S3WaitUploadCallable.java
index e96d79cd..27cc79b1 100644
--- a/src/main/java/hudson/plugins/s3/callable/S3WaitUploadCallable.java
+++ b/src/main/java/hudson/plugins/s3/callable/S3WaitUploadCallable.java
@@ -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;
@@ -22,6 +23,6 @@ public Void invoke(FilePath file) throws InterruptedException {
 
     @Override
     public void checkRoles(RoleChecker checker) throws SecurityException {
-
+        checker.check(this, Roles.SLAVE);
     }
 }

From aac6b27447f77421efcbe7053c4ea0976d04e626 Mon Sep 17 00:00:00 2001
From: rsandell <rsandell@cloudbees.com>
Date: Tue, 19 Oct 2021 16:21:43 +0200
Subject: [PATCH 2/3] [maven-release-plugin] prepare release s3-0.12.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 26eb210c..af879d10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
     <artifactId>s3</artifactId>
     <packaging>hpi</packaging>
-    <version>0.12.1-SNAPSHOT</version>
+    <version>0.12.1</version>
     <name>Jenkins S3 publisher plugin</name>
     <url>https://github.com/jenkinsci/s3-plugin</url>
 
@@ -52,7 +52,7 @@
         <connection>scm:git:git://github.com/jenkinsci/s3-plugin.git</connection>
         <developerConnection>scm:git:git@github.com:jenkinsci/s3-plugin.git</developerConnection>
         <url>https://github.com/jenkinsci/s3-plugin</url>
-        <tag>HEAD</tag>
+        <tag>s3-0.12.1</tag>
     </scm>
 
     <dependencies>

From d28464dab30e080e976b382d22346172df141a14 Mon Sep 17 00:00:00 2001
From: rsandell <rsandell@cloudbees.com>
Date: Tue, 19 Oct 2021 16:21:43 +0200
Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index af879d10..d53b94b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
     <artifactId>s3</artifactId>
     <packaging>hpi</packaging>
-    <version>0.12.1</version>
+    <version>0.12.2-SNAPSHOT</version>
     <name>Jenkins S3 publisher plugin</name>
     <url>https://github.com/jenkinsci/s3-plugin</url>
 
@@ -52,7 +52,7 @@
         <connection>scm:git:git://github.com/jenkinsci/s3-plugin.git</connection>
         <developerConnection>scm:git:git@github.com:jenkinsci/s3-plugin.git</developerConnection>
         <url>https://github.com/jenkinsci/s3-plugin</url>
-        <tag>s3-0.12.1</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencies>