Don't enforce https for streams

These don't support https.

Author: rubengees

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

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

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

@@ -19,8 +19,8 @@
 @Accessors(fluent = true)
 public final class ProxerUrls {
 
-    private static final Pattern PROXER_SUB_HOST_PATTERN = Pattern
-            .compile("(manga[0-9]+|(s[0-9]+\\.)?stream)\\.proxer\\.me");
+    private static final Pattern PROXER_STREAM_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");
 
     /**
      * Returns the base url for all web pages.
@@ -240,7 +240,27 @@ public HttpUrl captchaWeb(final Device device) {
      * Returns if the passed url has a valid host of proxer.
      */
     public boolean hasProxerHost(final HttpUrl url) {
-        return url.host().equals(webBase.host()) || url.host().equals(cdnBase.host())
-                || PROXER_SUB_HOST_PATTERN.matcher(url.host()).matches();
+        return hasProxerWebOrCdnHost(url) || hasProxerStreamHost(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());
+    }
+
+    /**
+     * 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();
+    }
+
+    /**
+     * Returns if the passed url has a valid proxer manga host.
+     */
+    public boolean hasProxerMangaHost(final HttpUrl url) {
+        return PROXER_MANGA_HOST_PATTERN.matcher(url.host()).matches();
     }
 }

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

@@ -30,14 +30,25 @@ public void testHttpsUpgradeCdn() throws IOException, InterruptedException {
     }
 
     @Test
-    public void testHttpsUpgradeSub() throws IOException, InterruptedException {
+    public void testHttpsUpgradeManga() throws IOException, InterruptedException {
         server.enqueue(new MockResponse());
 
         client.newCall(new Request.Builder().url("http://manga1.proxer.me").build()).execute();
 
         assertThat(server.takeRequest().getRequestUrl().isHttps()).isEqualTo(true);
     }
 
+    @Test
+    public void testHttpsStreamUntouched() throws IOException, InterruptedException {
+        startHttpOnlyServer();
+
+        server.enqueue(new MockResponse());
+
+        client.newCall(new Request.Builder().url("http://stream.proxer.me").build()).execute();
+
+        assertThat(server.takeRequest().getRequestUrl().isHttps()).isEqualTo(false);
+    }
+
     @Test
     public void testHttpsUntouched() throws IOException, InterruptedException {
         server.enqueue(new MockResponse());

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

@@ -159,12 +159,14 @@ public void testTokenNotSetForCdnHost() throws IOException, InterruptedException
     @Test
     public void testTokenNotSetForStreamHost() throws IOException, InterruptedException, ProxerException {
         server.enqueue(new MockResponse().setBody(fromResource("login.json")));
-        server.enqueue(new MockResponse());
 
         api.user().login("test", "secret").build().execute();
-        api.client().newCall(new Request.Builder().url("http://s3.stream.proxer.me").build()).execute();
 
-        server.takeRequest();
+        startHttpOnlyServer();
+
+        server.enqueue(new MockResponse());
+
+        api.client().newCall(new Request.Builder().url("http://s3.stream.proxer.me").build()).execute();
 
         assertThat(server.takeRequest().getHeaders().get("proxer-api-token")).isNull();
     }