Move to new image proxy

Author: rubengees

library/src/main/kotlin/me/proxer/library/util/ProxerUrls.kt

@@ -58,9 +58,7 @@ object ProxerUrls {
      */
     val proxyBase: HttpUrl = HttpUrl.Builder()
         .scheme("https")
-        .host("prxr.me")
-        .addPathSegment("img")
-        .addPathSegment("")
+        .host("proxy.proxer.me")
         .build()
 
     /**
@@ -98,19 +96,18 @@ object ProxerUrls {
     /**
      * Returns the link to the image behind the proxy.
      */
-    fun proxyImage(url: HttpUrl): HttpUrl {
+    fun proxyImage(url: String): HttpUrl {
         return proxyBase.newBuilder()
-            .addQueryParameter("url", url.toString())
+            .addPathSegment("index.php")
+            .addQueryParameter("url", url)
             .build()
     }
 
     /**
      * Returns the link to the image behind the proxy.
      */
-    fun proxyImage(url: String): HttpUrl {
-        return proxyBase.newBuilder()
-            .addQueryParameter("url", url)
-            .build()
+    fun proxyImage(url: HttpUrl): HttpUrl {
+        return ProxerUrls.proxyImage(url.toString())
     }
 
     /**
@@ -304,7 +301,8 @@ object ProxerUrls {
      * Returns if the passed url has a valid host of proxer.
      */
     fun hasProxerHost(url: HttpUrl): Boolean {
-        return hasProxerWebOrCdnOrStreamHost(url) || hasProxerStreamFileHost(url) || hasProxerMangaHost(url)
+        return hasProxerWebOrCdnOrStreamHost(url) || hasProxerStreamFileHost(url) || hasProxerMangaHost(url) ||
+            hasProxerProxyHost(url)
     }
 
     /**
@@ -327,4 +325,11 @@ object ProxerUrls {
     fun hasProxerMangaHost(url: HttpUrl): Boolean {
         return PROXER_MANGA_HOST_PATTERN.matches(url.host())
     }
+
+    /**
+     * Returns if the passed url has a valid proxer image proxy host.
+     */
+    fun hasProxerProxyHost(url: HttpUrl): Boolean {
+        return url.host() == proxyBase.host()
+    }
 }

library/src/test/kotlin/me/proxer/library/internal/interceptor/HeaderInterceptorTest.kt

@@ -95,6 +95,19 @@ class HeaderInterceptorTest : ProxerTest() {
         assertThat(requestCaptor.value.header("User-Agent").toString()).isEqualTo("mock-user-agent")
     }
 
+    @Test
+    fun testCorrectHeadersForProxy() {
+        val requestCaptor = ArgumentCaptor.forClass(Request::class.java)
+
+        `when`(chain.request()).thenReturn(Request.Builder().url("https://proxy.proxer.me").build())
+        `when`(chain.proceed(notNull())).thenReturn(mock(Response::class.java))
+
+        interceptor.intercept(chain)
+
+        verify(chain).proceed(requestCaptor.capture())
+        assertThat(requestCaptor.value.header("User-Agent").toString()).isEqualTo("mock-user-agent")
+    }
+
     @Test
     fun testOtherHostThrows() {
         `when`(chain.request()).thenReturn(Request.Builder().url("https://example.com").build())

library/src/test/kotlin/me/proxer/library/internal/interceptor/HttpsEnforcingInterceptorTest.kt

@@ -82,6 +82,19 @@ class HttpsEnforcingInterceptorTest {
         assertThat(requestCaptor.value.url().toString()).isEqualTo("https://s1-ps.proxer.me/")
     }
 
+    @Test
+    fun testHttpsUpgradeProxy() {
+        val requestCaptor = ArgumentCaptor.forClass(Request::class.java)
+
+        `when`(chain.request()).thenReturn(Request.Builder().url("http://proxy.proxer.me").build())
+        `when`(chain.proceed(notNull())).thenReturn(mock(Response::class.java))
+
+        interceptor.intercept(chain)
+
+        verify(chain).proceed(requestCaptor.capture())
+        assertThat(requestCaptor.value.url().toString()).isEqualTo("https://proxy.proxer.me/")
+    }
+
     @Test
     fun testHttpsUntouched() {
         val requestCaptor = ArgumentCaptor.forClass(Request::class.java)

library/src/test/kotlin/me/proxer/library/util/ProxerUrlsTest.kt

@@ -48,13 +48,13 @@ class ProxerUrlsTest {
     @Test
     fun testProxyImage() {
         assertThat(ProxerUrls.proxyImage(HttpUrl.get("https://example.com/image.png")).toString())
-            .isEqualTo("https://prxr.me/img/?url=https%3A%2F%2Fexample.com%2Fimage.png")
+            .isEqualTo("https://proxy.proxer.me/index.php?url=https%3A%2F%2Fexample.com%2Fimage.png")
     }
 
     @Test
     fun testProxyImageString() {
         assertThat(ProxerUrls.proxyImage("https://example.com/image.png").toString())
-            .isEqualTo("https://prxr.me/img/?url=https%3A%2F%2Fexample.com%2Fimage.png")
+            .isEqualTo("https://proxy.proxer.me/index.php?url=https%3A%2F%2Fexample.com%2Fimage.png")
     }
 
     @Test
@@ -211,7 +211,7 @@ class ProxerUrlsTest {
 
     @Test
     fun testHasProxerHostProxy() {
-        assertThat(ProxerUrls.hasProxerHost(HttpUrl.get("https://prxr.me/test"))).isFalse()
+        assertThat(ProxerUrls.hasProxerHost(HttpUrl.get("https://proxy.proxer.me/index.php?url=test"))).isTrue()
     }
 
     @Test