Make https enforcing more fine grained

Author: rubengees

library/src/main/java/me/proxer/library/api/HttpsEnforcingInterceptor.java

@@ -16,7 +16,7 @@ class HttpsEnforcingInterceptor implements Interceptor {
     public Response intercept(final Chain chain) throws IOException {
         final Request request = chain.request();
 
-        final boolean appliesToUrl = ProxerUrls.hasProxerWebOrCdnHost(request.url())
+        final boolean appliesToUrl = ProxerUrls.hasProxerWebOrCdnOrStreamHost(request.url())
                 || ProxerUrls.hasProxerMangaHost(request.url());
 
         if (appliesToUrl && !request.isHttps()) {

library/src/main/java/me/proxer/library/util/ProxerUrls.java

@@ -19,7 +19,7 @@
 @Accessors(fluent = true)
 public final class ProxerUrls {
 
-    private static final Pattern PROXER_STREAM_HOST_PATTERN = Pattern.compile("(s[0-9]+\\.)?stream\\.proxer\\.me");
+    private static final Pattern PROXER_STREAM_FILE_HOST_PATTERN = Pattern.compile("s[0-9]+\\.stream\\.proxer\\.me");
     private static final Pattern PROXER_MANGA_HOST_PATTERN = Pattern.compile("manga[0-9]+\\.proxer\\.me");
 
     /**
@@ -52,6 +52,16 @@ public final class ProxerUrls {
             .addPathSegment("")
             .build();
 
+    /**
+     * Returns the base url for all image links.
+     */
+    @Getter
+    private final HttpUrl streamBase = new HttpUrl.Builder()
+            .scheme("https")
+            .host("stream.proxer.me")
+            .addPathSegment("")
+            .build();
+
     /**
      * Returns the image link of a {@link NewsArticle}, based on its
      * {@code id} and {@code image}.
@@ -240,21 +250,22 @@ public HttpUrl captchaWeb(final Device device) {
      * Returns if the passed url has a valid host of proxer.
      */
     public boolean hasProxerHost(final HttpUrl url) {
-        return hasProxerWebOrCdnHost(url) || hasProxerStreamHost(url) || hasProxerMangaHost(url);
+        return hasProxerWebOrCdnOrStreamHost(url) || hasProxerStreamFileHost(url) || hasProxerMangaHost(url);
     }
 
     /**
      * Returns if the passed url has a valid host of proxer or the proxer cdn..
      */
-    public boolean hasProxerWebOrCdnHost(final HttpUrl url) {
-        return url.host().equals(webBase.host()) || url.host().equals(cdnBase.host());
+    public boolean hasProxerWebOrCdnOrStreamHost(final HttpUrl url) {
+        return url.host().equals(webBase.host()) || url.host().equals(cdnBase.host())
+                || url.host().equals(streamBase.host());
     }
 
     /**
      * Returns if the passed url has a valid proxer stream host.
      */
-    public boolean hasProxerStreamHost(final HttpUrl url) {
-        return PROXER_STREAM_HOST_PATTERN.matcher(url.host()).matches();
+    public boolean hasProxerStreamFileHost(final HttpUrl url) {
+        return PROXER_STREAM_FILE_HOST_PATTERN.matcher(url.host()).matches();
     }
 
     /**

library/src/test/java/me/proxer/library/api/HttpsEnforcingInterceptorTest.java

@@ -39,12 +39,21 @@ public void testHttpsUpgradeManga() throws IOException, InterruptedException {
     }
 
     @Test
-    public void testHttpsStreamUntouched() throws IOException, InterruptedException {
+    public void testHttpsUpgradeStream() throws IOException, InterruptedException {
+        server.enqueue(new MockResponse());
+
+        client.newCall(new Request.Builder().url("http://stream.proxer.me").build()).execute();
+
+        assertThat(server.takeRequest().getRequestUrl().isHttps()).isEqualTo(true);
+    }
+
+    @Test
+    public void testHttpsFileStreamUntouched() throws IOException, InterruptedException {
         startHttpOnlyServer();
 
         server.enqueue(new MockResponse());
 
-        client.newCall(new Request.Builder().url("http://stream.proxer.me").build()).execute();
+        client.newCall(new Request.Builder().url("http://s1.stream.proxer.me").build()).execute();
 
         assertThat(server.takeRequest().getRequestUrl().isHttps()).isEqualTo(false);
     }

library/src/test/java/me/proxer/library/util/ProxerUrlsTest.java

@@ -155,11 +155,11 @@ public void testHasProxerHostManga() {
     @Test
     public void testHasProxerHostStream() {
         //noinspection ConstantConditions
-        assertThat(ProxerUrls.hasProxerHost(HttpUrl.parse("https://stream.proxer.me/files/test.mp4"))).isTrue();
+        assertThat(ProxerUrls.hasProxerHost(HttpUrl.parse("https://stream.proxer.me/files/embed-abc.html"))).isTrue();
     }
 
     @Test
-    public void testHasProxerHostStreamServer() {
+    public void testHasProxerHostFileStream() {
         //noinspection ConstantConditions
         assertThat(ProxerUrls.hasProxerHost(HttpUrl.parse("https://s39.stream.proxer.me/files/test.mp4"))).isTrue();
     }