mirroring bot - 2025/09/03

Author: updating-bot

svn_browser/src/jd/http/Browser.java

@@ -640,7 +640,7 @@ private static void waitForPageAccess(final Browser browser, final Request reque
     private String                              acceptLanguage        = "de, en-gb;q=0.9, en;q=0.8";
     /*
      * -1 means use default Timeouts
-     *
+     * 
      * 0 means infinite (DO NOT USE if not needed)
      */
     private int                                 connectTimeout        = -1;
@@ -964,10 +964,10 @@ public PostFormDataRequest createPostFormDataRequest(String url) throws IOExcept
     /**
      * Creates a new postrequest based an an requestVariable ArrayList
      *
-     * @deprecated use {@link #createPostRequest(String, UrlQuery, String)
+     * @deprecated use {@link #createPostRequest(String, UrlQuery, String)
+     *
      *
      *
-     * 
      */
     @Deprecated
     public PostRequest createPostRequest(String url, final List<KeyValueStringEntry> post, final String encoding) throws IOException {
@@ -1780,8 +1780,8 @@ protected void mergeHeaders(final Request request) {
     }
 
     /**
-     * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Sec-Fetch-Site </br>
-     * auto completes Sec-Fetch-Site, some websites(eg facebook) check it
+     * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Sec-Fetch-Site </br> auto completes Sec-Fetch-Site, some websites(eg
+     * facebook) check it
      */
     protected void autoCompleteHeaders(final Request request) {
         if (request != null) {
@@ -2439,8 +2439,7 @@ public void setKeepResponseContentBytes(final boolean keepResponseContentBytes)
     }
 
     /**
-     * Sets Browser upper page load limit Byte value. </br>
-     * Use Integer.MAX_VALUE for "unlimited" (do not use "-1"!).
+     * Sets Browser upper page load limit Byte value. </br> Use Integer.MAX_VALUE for "unlimited" (do not use "-1"!).
      *
      * @since JD2
      * @param i
@@ -2585,8 +2584,7 @@ protected void prepareBlockDetectionBeforeLoadConnection(final Request request)
     }
 
     /**
-     * Checks for block by firewalls and similar. </br>
-     * To be called after a sent request.
+     * Checks for block by firewalls and similar. </br> To be called after a sent request.
      */
     public void checkForBlockedByAfterLoadConnection(Request request) throws IOException {
         if (this.getThrowExceptionOnBlockedBy(request)) {
@@ -2615,11 +2613,9 @@ protected static CloudflareBlockedType getCloudflareBlock(Browser browser, Reque
         final boolean isCloudflareServer = StringUtils.containsIgnoreCase(request.getResponseHeader(HTTPConstants.HEADER_RESPONSE_SERVER), "cloudflare");
         final boolean isTypicalCloudflareResponseCode = con.getResponseCode() == 403 || con.getResponseCode() == 502 || con.getResponseCode() == 503 || con.getResponseCode() == 429 || con.getResponseCode() == 522 || con.getResponseCode() == 523 || con.getResponseCode() == 526;
         /* 526: Invalid SSL certificate */
-        
         /**
          * TODO: 2023-12-21: Maybe remove reliance on http status-code as it looks like literally any status code can be returned when a
-         * Cloudflare block happens. </br>
-         * I've just added code 502 to the list of "Cloudflare response-codes".
+         * Cloudflare block happens. </br> I've just added code 502 to the list of "Cloudflare response-codes".
          */
         /*
          * It is really important to also check for Cloudflare html else stuff will fail/break e.g. icerbox.com wrong login -> Cloudflare
@@ -2930,6 +2926,41 @@ public Boolean prepareBlockDetection(Browser browser, Request request) {
                 return null;
             }
         },
+        DNS_BLOCK_OPENDNS {
+            @Override
+            public String getLabel() {
+                return "DNS block by opendns.com";
+            }
+
+            @Override
+            public BlockedTypeInterface isBlocked(Browser browser, Request request) {
+                final HTTPConnection con;
+                if (request == null || !request.isLoaded() || (con = request.getHttpConnection()) == null) {
+                    return null;
+                } else if (con.getResponseCode() == 403) {
+                    // <html><head><script type="text/javascript">location.replace("https://block.opendns.com/?url=
+                    if (request.containsHTML("(?i)block\\.opendns\\.com/\\?url=")) {
+                        return this;
+                    }
+                }
+                return null;
+            }
+
+            @Override
+            public BlockLevelType getBlockLevelType() {
+                return BlockLevelType.DNS;
+            }
+
+            @Override
+            public BlockSourceType getBlockSourceType() {
+                return BlockSourceType.SERVICE;
+            }
+
+            @Override
+            public Boolean prepareBlockDetection(Browser browser, Request request) {
+                return null;
+            }
+        },
         SHIELD_SQUARE {
             @Override
             public String getLabel() {
@@ -3141,8 +3172,8 @@ public BlockedTypeInterface isBlocked(Browser browser, Request request) {
                     return null;
                 }
                 if (true) { /*
-                             * TODO: Add header based detection too -> At least check "server" header so we do not only rely on html code.
-                             */
+                 * TODO: Add header based detection too -> At least check "server" header so we do not only rely on html code.
+                 */
                     /* See new ESET NOD32 html code 2023: https://board.jdownloader.org/showthread.php?t=91433 */
                     return null;
                 } else if (request.containsHTML("<div class\\s*=\\s*\"prodhead\">\\s*<div class\\s*=\\s*\"logoimg\">\\s*<span class\\s*=\\s*\"logotxt\">\\s*ESET NOD32 Antivirus\\s*</span>\\s*</div>\\s*</div>") && request.containsHTML("- ESET NOD32 Antivirus\\s*</title>")) {
@@ -3325,8 +3356,8 @@ public BlockedTypeInterface getBlockedType(final Request request) {
     }
 
     /**
-     * Returns true if any antiddos provider/other sort of blocking is blocking at this moment. </br>
-     * See also: https://svn.jdownloader.org/issues/89834
+     * Returns true if any antiddos provider/other sort of blocking is blocking at this moment. </br> See also:
+     * https://svn.jdownloader.org/issues/89834
      */
     public boolean isBlocked() {
         final Request request = this.getRequest();

svn_browser/src/jd/http/Request.java

@@ -612,6 +612,9 @@ public String getHtmlCode() {
                     useCS = "UTF-8";
                 } else if (contentType.matches("(?i)application/javascript")) {
                     useCS = "UTF-8";
+                } else if (contentType.matches("(?i)application/(x-mpegURL|vnd\\.apple\\.mpegurl)")) {
+                    // https://datatracker.ietf.org/doc/html/rfc8216
+                    useCS = "UTF-8";
                 }
             }
             if (StringUtils.isEmpty(useCS)) {

svn_trunk/src/jd/gui/swing/jdgui/menu/actions/sendlogs/LogAction.java

@@ -19,8 +19,6 @@
 import java.io.IOException;
 import java.util.List;
 
-import jd.controlling.ClipboardMonitoring;
-
 import org.appwork.uio.UIOManager;
 import org.appwork.utils.logging2.LogSink.FLUSH;
 import org.appwork.utils.logging2.LogSourceProvider;
@@ -36,6 +34,8 @@
 import org.jdownloader.logging.LogController;
 import org.jdownloader.startup.commands.ThreadDump;
 
+import jd.controlling.ClipboardMonitoring;
+
 public class LogAction extends AbstractLogAction {
     /**
      *
@@ -62,12 +62,13 @@ protected void createPackage(List<LogFolder> selection) throws Exception {
         id = null;
         super.createPackage(selection);
         final String id = this.id;
-        if (id != null) {
-            final String name = format(selection.get(0).getCreated()) + " <--> " + format(selection.get(selection.size() - 1).getLastModified());
-            final String jdLog = "jdlog://" + id + "/";
-            ClipboardMonitoring.getINSTANCE().setCurrentContent(jdLog);
-            Dialog.getInstance().showInputDialog(UIOManager.BUTTONS_HIDE_CANCEL, _GUI.T.LogAction_actionPerformed_givelogid_(), name + " " + jdLog);
+        if (id == null) {
+            return;
         }
+        final String name = format(selection.get(0).getCreated()) + " <--> " + format(selection.get(selection.size() - 1).getLastModified());
+        final String jdLog = "jdlog://" + id + "/";
+        ClipboardMonitoring.getINSTANCE().setCurrentContent(jdLog);
+        Dialog.getInstance().showInputDialog(UIOManager.BUTTONS_HIDE_CANCEL, _GUI.T.LogAction_actionPerformed_givelogid_(), name + " " + jdLog);
     }
 
     @Override