Merge branch 'leftypol-captcha' into leftypol-release-tmp

PietroCarrara · Jun 6, 2021 · 1ce0183 · 1ce0183
2 parents b3bd5d7 + 6027660
commit 1ce0183
Show file tree

Hide file tree

Showing 14 changed files with 370 additions and 15 deletions.
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/presenter/ReplyPresenter.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/presenter/ReplyPresenter.java
@@ -59,6 +59,8 @@
 import com.github.adamantcheese.chan.utils.StringUtils;
 
 import java.io.File;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -218,11 +220,41 @@ public void onSubmitClicked(boolean longClicked) {
             return;
         }
 
-        submitOrAuthenticate(authenticateOnly);
+        checkForAuth(authenticateOnly);
     }
 
-    private void submitOrAuthenticate(boolean authenticateOnly) {
-        if (loadable.site.actions().postRequiresAuthentication()) {
+    private void checkForAuth(boolean authenticateOnly) {
+        final Future<Boolean> res = loadable.site.actions().postRequiresAuthentication();
+        if (res.isDone()) {
+            try {
+                this.submitOrAuthenticate(authenticateOnly, res.get());
+            } catch (ExecutionException e) {
+                e.printStackTrace();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        } else {
+            switchPage(Page.LOADING);
+            BackgroundUtils.runOnBackgroundThread(() -> {
+                Logger.d(this, "Background!");
+                try {
+                    final boolean auth = res.get();
+                    Logger.d(this, "Background: " + auth);
+                    BackgroundUtils.runOnMainThread(() -> {
+                        Logger.d(this,  "Main: " + auth);
+                        this.submitOrAuthenticate(authenticateOnly, auth);
+                    });
+                } catch (ExecutionException e) {
+                    e.printStackTrace();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            });
+        }
+    }
+
+    private void submitOrAuthenticate(boolean authenticateOnly, boolean requiresAuthentication) {
+        if (requiresAuthentication) {
             switchPage(Page.AUTHENTICATION, true, !authenticateOnly);
         } else {
             makeSubmitCall();

diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/DummySite.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/DummySite.java
@@ -21,10 +21,12 @@
 import com.github.adamantcheese.chan.core.site.parser.ChanReaderProcessingQueue;
 import com.github.adamantcheese.chan.core.site.parser.CommentParser;
 import com.github.adamantcheese.chan.core.site.parser.PostParser;
+import com.github.adamantcheese.chan.utils.CompletableFuture;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Future;
 
 import okhttp3.HttpUrl;
 import okhttp3.Request;
@@ -224,8 +226,8 @@ public void pages(Board board, PagesListener pagesListener) {}
             public void post(Loadable loadableWithDraft, PostListener postListener) {}
 
             @Override
-            public boolean postRequiresAuthentication() {
-                return false;
+            public Future<Boolean> postRequiresAuthentication() {
+                return new CompletableFuture<>(false);
             }
 
             @Override

diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/SiteActions.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/SiteActions.java
@@ -27,6 +27,8 @@
 import com.github.adamantcheese.chan.core.site.http.LoginResponse;
 import com.github.adamantcheese.chan.core.site.http.ReplyResponse;
 
+import java.util.concurrent.Future;
+
 public interface SiteActions {
     void boards(BoardsListener boardsListener);
 
@@ -50,7 +52,7 @@ interface PostListener {
         void onPostError(Exception exception);
     }
 
-    boolean postRequiresAuthentication();
+    Future<Boolean> postRequiresAuthentication();
 
     /**
      * If {@link ReplyResponse#requireAuthentication} was {@code true}, or if

diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/SiteAuthentication.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/SiteAuthentication.java
@@ -19,6 +19,7 @@
 import static com.github.adamantcheese.chan.core.site.SiteAuthentication.Type.CAPTCHA1;
 import static com.github.adamantcheese.chan.core.site.SiteAuthentication.Type.CAPTCHA2;
 import static com.github.adamantcheese.chan.core.site.SiteAuthentication.Type.CAPTCHA2_NOJS;
+import static com.github.adamantcheese.chan.core.site.SiteAuthentication.Type.SECURIMAGE;
 import static com.github.adamantcheese.chan.core.site.SiteAuthentication.Type.GENERIC_WEBVIEW;
 import static com.github.adamantcheese.chan.core.site.SiteAuthentication.Type.NONE;
 
@@ -29,6 +30,7 @@ public enum Type {
         CAPTCHA1,
         CAPTCHA2,
         CAPTCHA2_NOJS,
+        SECURIMAGE, // Simple PHP captcha displaying a image to text challenge
         GENERIC_WEBVIEW
     }
 
@@ -57,6 +59,17 @@ public static SiteAuthentication fromCaptcha2nojs(String siteKey, String baseUrl
         return a;
     }
 
+    /**
+     * Create a new authentication using Securimage's captcha
+     * @param captchaUrl The path to the securimage script. Usually something like "https://website.com/captcha.php"
+     * @return New authentication using Securimage's captcha
+     */
+    public static SiteAuthentication fromSecurimage(String captchaUrl) {
+        SiteAuthentication a = new SiteAuthentication(SECURIMAGE);
+        a.baseUrl = captchaUrl;
+        return a;
+    }
+
     public static SiteAuthentication fromUrl(String url, String retryText, String successText) {
         SiteAuthentication a = new SiteAuthentication(GENERIC_WEBVIEW);
         a.url = url;

diff --git a/...p/src/main/java/com/github/adamantcheese/chan/core/site/archives/ExternalSiteArchive.java b/...p/src/main/java/com/github/adamantcheese/chan/core/site/archives/ExternalSiteArchive.java
@@ -23,11 +23,13 @@
 import com.github.adamantcheese.chan.core.site.parser.CommentParser.ResolveLink;
 import com.github.adamantcheese.chan.core.site.parser.CommentParser.ThreadLink;
 import com.github.adamantcheese.chan.core.site.parser.PostParser;
+import com.github.adamantcheese.chan.utils.CompletableFuture;
 import com.github.adamantcheese.chan.utils.JavaUtils.NoDeleteArrayList;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Future;
 
 import kotlin.random.Random;
 import okhttp3.HttpUrl;
@@ -47,7 +49,7 @@ public ExternalSiteArchive(
         this.name = name;
         this.boardCodes = new NoDeleteArrayList<>(boardCodes);
         this.searchEnabled = searchEnabled;
-        
+
         id = Random.Default.nextInt(Integer.MIN_VALUE / 2, -1);
     }
 
@@ -136,7 +138,7 @@ public void pages(Board board, PagesListener pagesListener) {}
             public void post(Loadable loadableWithDraft, PostListener postListener) {}
 
             @Override
-            public boolean postRequiresAuthentication() { return false; }
+            public Future<Boolean> postRequiresAuthentication() { return new CompletableFuture(false); }
 
             @Override
             public SiteAuthentication postAuthenticate() {

diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/common/CommonSite.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/common/CommonSite.java
@@ -45,9 +45,11 @@
 import com.github.adamantcheese.chan.core.site.parser.PostParser;
 import com.github.adamantcheese.chan.utils.BackgroundUtils;
 import com.github.adamantcheese.chan.core.net.NetUtils;
+import com.github.adamantcheese.chan.utils.CompletableFuture;
 
 import java.util.Arrays;
 import java.util.Map;
+import java.util.concurrent.Future;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -478,8 +480,8 @@ public void handlePost(ReplyResponse response, Response httpResponse, String res
         }
 
         @Override
-        public boolean postRequiresAuthentication() {
-            return false;
+        public Future<Boolean> postRequiresAuthentication() {
+            return new CompletableFuture(false);
         }
 
         @Override

diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/sites/chan4/Chan4.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/sites/chan4/Chan4.java
@@ -50,6 +50,7 @@
 import com.github.adamantcheese.chan.core.site.http.LoginResponse;
 import com.github.adamantcheese.chan.core.site.parser.ChanReader;
 import com.github.adamantcheese.chan.utils.BackgroundUtils;
+import com.github.adamantcheese.chan.utils.CompletableFuture;
 import com.github.adamantcheese.chan.utils.Logger;
 import com.github.adamantcheese.chan.core.net.NetUtils;
 import com.github.adamantcheese.chan.core.net.NetUtilsClasses.HTMLProcessor;
@@ -64,6 +65,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.Future;
 
 import kotlin.random.Random;
 import okhttp3.HttpUrl;
@@ -377,8 +379,8 @@ public void onHttpFail(CommonReplyHttpCall httpPost, Exception e) {
         }
 
         @Override
-        public boolean postRequiresAuthentication() {
-            return !isLoggedIn();
+        public Future<Boolean> postRequiresAuthentication() {
+            return new CompletableFuture<>(!isLoggedIn());
         }
 
         @Override

diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/sites/dvach/Dvach.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/core/site/sites/dvach/Dvach.java
@@ -17,6 +17,7 @@
 import com.github.adamantcheese.chan.core.site.http.DeleteRequest;
 import com.github.adamantcheese.chan.core.site.http.HttpCall.HttpCallback;
 import com.github.adamantcheese.chan.core.site.parser.CommentParser;
+import com.github.adamantcheese.chan.utils.CompletableFuture;
 import com.github.adamantcheese.chan.utils.Logger;
 import com.github.adamantcheese.chan.core.net.NetUtils;
 import com.github.adamantcheese.chan.core.net.NetUtilsClasses.ResponseResult;
@@ -26,6 +27,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Future;
 
 import okhttp3.HttpUrl;
 
@@ -170,8 +172,8 @@ public void onHttpFail(CommonReplyHttpCall httpPost, Exception e) {
             }
 
             @Override
-            public boolean postRequiresAuthentication() {
-                return !isLoggedIn();
+            public Future<Boolean> postRequiresAuthentication() {
+                return new CompletableFuture<>(!isLoggedIn());
             }
 
             @Override

diff --git a/...src/main/java/com/github/adamantcheese/chan/core/site/sites/leftypol/LeftypolActions.java b/...src/main/java/com/github/adamantcheese/chan/core/site/sites/leftypol/LeftypolActions.java
@@ -1,15 +1,27 @@
 package com.github.adamantcheese.chan.core.site.sites.leftypol;
 
+import com.github.adamantcheese.chan.Chan;
+import com.github.adamantcheese.chan.core.di.NetModule;
 import com.github.adamantcheese.chan.core.model.orm.Loadable;
 import com.github.adamantcheese.chan.core.net.NetUtils;
+import com.github.adamantcheese.chan.core.site.SiteAuthentication;
 import com.github.adamantcheese.chan.core.site.common.CommonSite;
 import com.github.adamantcheese.chan.core.site.common.MultipartHttpCall;
 import com.github.adamantcheese.chan.core.site.common.vichan.VichanActions;
 import com.github.adamantcheese.chan.core.site.http.HttpCall;
 import com.github.adamantcheese.chan.core.site.http.ReplyResponse;
 import com.github.adamantcheese.chan.utils.BackgroundUtils;
+import com.github.adamantcheese.chan.utils.Logger;
 
+import org.json.JSONObject;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+
+import okhttp3.Call;
 import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
 import okhttp3.Response;
 
 public class LeftypolActions extends VichanActions {
@@ -26,6 +38,9 @@ public void setupPost(Loadable loadable, MultipartHttpCall call) {
         super.setupPost(loadable, call);
 
         call.parameter("user_flag", loadable.draft.flag);
+        if (loadable.draft.captchaResponse != "" && loadable.draft.captchaResponse != null) {
+            call.parameter("captcha", loadable.draft.captchaResponse);
+        }
     }
 
     @Override
@@ -55,6 +70,36 @@ public void process(Response response, String result) {
         }
     }
 
+    @Override
+    public Future<Boolean> postRequiresAuthentication() {
+        FutureTask<Boolean> future = new FutureTask<Boolean>(() -> {
+            // Build a request to "/status.php"
+            OkHttpClient.Builder cb = Chan.instance(NetModule.OkHttpClientWithUtils.class).newBuilder();
+            Request.Builder rb = new Request.Builder().url(this.rootUrl + "status.php");
+            Call call = cb.build().newCall(rb.build());
+
+            // Send the request, check if the captcha is enabled
+            Response r = call.execute();
+            if (r.isSuccessful()) {
+                JSONObject json = new JSONObject(r.body().string());
+                r.body().close();
+
+                return json.getBoolean("captcha");
+            } else {
+                Logger.e(this, "request to /status.php not successful");
+                r.body().close();
+                return false;
+            }
+        });
+        BackgroundUtils.runOnBackgroundThread(() -> future.run());
+        return future;
+    }
+
+    @Override
+    public SiteAuthentication postAuthenticate() {
+        return SiteAuthentication.fromSecurimage(this.rootUrl + "captcha.php");
+    }
+
     private void makePostCall(HttpCall call, ReplyResponse replyResponse, PostListener postListener) {
         NetUtils.makeHttpCall(call, new HttpCall.HttpCallback<HttpCall>() {
             @Override