asd

Author: xiaojieonly

app/src/main/AndroidManifest.xml

@@ -159,11 +159,11 @@
             android:configChanges="screenSize|uiMode"
             android:theme="@style/AppTheme.Toolbar"
             android:label="@string/filter"/>
-        <activity
-            android:name="com.hippo.ehviewer.ui.BlackListActivity"
-            android:configChanges="screenSize|uiMode"
-            android:theme="@style/AppTheme.Toolbar"
-            android:label="@string/blacklist"/>
+<!--        <activity-->
+<!--            android:name="com.hippo.ehviewer.ui.BlackListActivity"-->
+<!--            android:configChanges="screenSize|uiMode"-->
+<!--            android:theme="@style/AppTheme.Toolbar"-->
+<!--            android:label="@string/blacklist"/>-->
         <activity
             android:name="com.hippo.ehviewer.ui.SetSecurityActivity"
             android:configChanges="screenSize|uiMode"

app/src/main/java/com/hippo/ehviewer/EhApplication.java

@@ -68,7 +68,9 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
 
 import okhttp3.Cache;
 import okhttp3.ConnectionSpec;
@@ -319,6 +321,13 @@ public static OkHttpClient getOkHttpClient(@NonNull Context context) {
                     .writeTimeout(10, TimeUnit.SECONDS)
                     .cookieJar(getEhCookieStore(application))
                     .dns(new EhDns(application))
+                    .hostnameVerifier(new HostnameVerifier() {
+                        @Override
+                        public boolean verify(String hostname, SSLSession session) {
+                            //强行返回true 即验证成功
+                            return true;
+                        }
+                    })
                     .proxySelector(getEhProxySelector(application))
                     ).build();
         }
@@ -508,3 +517,4 @@ public static OkHttpClient.Builder enableTls120nPreLollipop(OkHttpClient.Builder
         return client;
     }
 }
+

app/src/main/java/com/hippo/ehviewer/client/EhDns.java

@@ -21,51 +21,42 @@
  */
 
 import android.content.Context;
+
+import androidx.annotation.NonNull;
+
 import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.Hosts;
 import com.hippo.ehviewer.Settings;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import okhttp3.Dns;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.dnsoverhttps.DnsOverHttps;
 
 public class EhDns implements Dns {
 
-  private static final Map<String, InetAddress> builtInHosts;
+  private static final Map<String, List<InetAddress>> builtInHosts;
 
   static {
-    Map<String, InetAddress> map = new HashMap<>();
-    put(map, "e-hentai.org", "104.20.26.25");
-    put(map, "exhentai.org", "178.175.132.20");
-    put(map, "repo.e-hentai.org", "94.100.29.73");
+    Map<String, List<InetAddress>> map = new HashMap<>();
+    put(map, "e-hentai.org", "104.20.26.25+104.20.27.25");
+    put(map, "repo.e-hentai.org", "94.100.28.57");
     put(map, "forums.e-hentai.org", "94.100.18.243");
-    put(map, "ehgt.org", "178.162.139.24");
-    put(map, "ul.ehgt.org", "94.100.24.82");
-    put(map, "github.com", "192.30.255.112");
-    put(map, "raw.githubusercontent.com", "151.101.0.133");
+    put(map, "ehgt.org", "37.48.89.44+178.162.139.24+178.162.140.212+81.171.10.48");
+    put(map, "ul.ehgt.org", "94.100.24.82+94.100.24.72");
     builtInHosts = map;
   }
 
-  private static void put(Map<String, InetAddress> map, String host, String ip) {
-    InetAddress address = Hosts.toInetAddress(host, ip);
-    if (address != null) {
-      map.put(host, address);
-    }
-  }
-
   private final Hosts hosts;
   private static DnsOverHttps dnsOverHttps;
 
-//  public EhDns(Context context) {
-//    hosts = EhApplication.getHosts(context);
-//  }
   public EhDns(Context context) {
     hosts = EhApplication.getHosts(context);
     DnsOverHttps.Builder builder = new DnsOverHttps.Builder()
@@ -87,24 +78,31 @@ public EhDns(Context context) {
     dnsOverHttps = builder.post(true).build();
   }
 
-  @Override
-  public List<InetAddress> lookup(String hostname) throws UnknownHostException {
-    if (hostname == null) throw new UnknownHostException("hostname == null");
-
-    InetAddress inetAddress = hosts.get(hostname);
-    if (inetAddress != null) {
-      return Collections.singletonList(inetAddress);
+  private static void put(Map<String, List<InetAddress>> map, String host, String ip_s) {
+    String[] ip_l = ip_s.split("\\+");
+    InetAddress[] addr_l = new InetAddress[ip_l.length];
+    for (int i = 0;i < ip_l.length;i++) {
+      addr_l[i] = Hosts.toInetAddress(host, ip_l[i]);
     }
+    map.put(host, Arrays.asList(addr_l));
+  }
 
+  @NonNull
+  @Override
+  public List<InetAddress> lookup(@NonNull String hostname) throws UnknownHostException {
+    hostname = hostname.replaceFirst("h.github.io", "hentai.org"); // domain fronting
+    List<InetAddress> inetAddresses = (List<InetAddress>) hosts.get(hostname);
+    if (inetAddresses != null) {
+      return inetAddresses;
+    }
     if (Settings.getBuiltInHosts()) {
-      inetAddress = builtInHosts.get(hostname);
-      if (inetAddress != null) {
-        return Collections.singletonList(inetAddress);
+      inetAddresses = builtInHosts.get(hostname);
+      if (inetAddresses != null) {
+        return inetAddresses;
       }
     }
-
     if (Settings.getDoH()) {
-      List<InetAddress> inetAddresses = dnsOverHttps.lookup(hostname);
+      inetAddresses = dnsOverHttps.lookup(hostname);
       if (inetAddresses != null && inetAddresses.size() > 0) {
         return inetAddresses;
       }
@@ -113,7 +111,7 @@ public List<InetAddress> lookup(String hostname) throws UnknownHostException {
       return Arrays.asList(InetAddress.getAllByName(hostname));
     } catch (NullPointerException e) {
       UnknownHostException unknownHostException =
-          new UnknownHostException("Broken system behaviour for dns lookup of " + hostname);
+              new UnknownHostException("Broken system behaviour for dns lookup of " + hostname);
       unknownHostException.initCause(e);
       throw unknownHostException;
     }