Allan Barcelos hai 4 meses
pai
achega
9c2a92eac5

+ 2 - 2
src/main/java/io/jenkins/plugins/MfaUserProperty.java

@@ -14,7 +14,7 @@ import java.util.logging.Logger;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class MfaUserProperty extends UserProperty {
     private static final Logger LOGGER = Logger.getLogger(MfaUserProperty.class.getName());
@@ -52,7 +52,7 @@ public class MfaUserProperty extends UserProperty {
 
         // Load backup codes from session if they were just generated
         if (mfaEnabled) {
-            StaplerRequest currentReq = Stapler.getCurrentRequest();
+            StaplerRequest2 currentReq = Stapler.getCurrentRequest2();
             if (currentReq != null) {
                 String pending = (String) currentReq.getSession()
                         .getAttribute(MfaConstants.MFA_PENDING_BACKUP_CODES_ATTR);

+ 3 - 3
src/main/java/io/jenkins/plugins/MfaVerifyAction.java

@@ -6,8 +6,8 @@ import hudson.model.User;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 @Extension
 public class MfaVerifyAction implements RootAction {
@@ -30,7 +30,7 @@ public class MfaVerifyAction implements RootAction {
         return "mfa-verify";
     }
 
-    public void doVerify(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doVerify(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         User u = User.current();
         if (u == null) {
             rsp.sendRedirect(req.getContextPath() + "/login");

+ 5 - 5
src/main/java/io/jenkins/plugins/QrCodeAction.java

@@ -14,8 +14,8 @@ import java.util.Arrays;
 import java.util.logging.Logger;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 @Extension
 public class QrCodeAction implements RootAction {
@@ -40,7 +40,7 @@ public class QrCodeAction implements RootAction {
         return "mfa-totp";
     }
 
-    public void doGenerateSecret(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doGenerateSecret(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         User currentUser = User.current();
         if (currentUser == null) {
             rsp.sendError(401, "Not authenticated");
@@ -73,7 +73,7 @@ public class QrCodeAction implements RootAction {
         }
     }
 
-    public void doQrcode(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doQrcode(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         String secret = req.getParameter("secret");
         if (secret == null || secret.isEmpty()) {
             rsp.sendError(400, "Missing secret parameter");
@@ -94,7 +94,7 @@ public class QrCodeAction implements RootAction {
         }
     }
 
-    private void generateQRCodeImage(StaplerResponse rsp, String otpAuth) throws IOException, WriterException {
+    private void generateQRCodeImage(StaplerResponse2 rsp, String otpAuth) throws IOException, WriterException {
         QRCodeWriter qrCodeWriter = new QRCodeWriter();
         BitMatrix bitMatrix = qrCodeWriter.encode(otpAuth, BarcodeFormat.QR_CODE, 200, 200);
         BufferedImage qrImage = MatrixToImageWriter.toBufferedImage(bitMatrix);