2 files changed, 79 insertions, 52 deletions

diff --git a/_test/tests/inc/common_ml.test.php b/_test/tests/inc/common_ml.test.php
index 6f3b71db4..415c0a88d 100644
--- a/_test/tests/inc/common_ml.test.php
+++ b/_test/tests/inc/common_ml.test.php
@@ -90,6 +90,25 @@ class common_ml_test extends DokuWikiTest {
         $this->assertEquals($expect, ml($id, $args));
     }
 
+    function test_ml_img_external() {
+        global $conf;
+        $conf['useslash']   = 0;
+        $conf['userewrite'] = 0;
+
+        $ids  = array(
+            'https://example.com/lib/tpl/dokuwiki/images/logo.png',
+            'http://example.com/lib/tpl/dokuwiki/images/logo.png',
+            'ftp://example.com/lib/tpl/dokuwiki/images/logo.png'
+        );
+
+        foreach($ids as $id) {
+            $tok = media_get_token($id, 0, 0);
+
+            $expect = DOKU_BASE.$this->script.'?tok='.$tok.'&media='.rawurlencode($id);
+            $this->assertEquals($expect, ml($id));
+        }
+    }
+
     function test_ml_imgresize_array_external() {
         global $conf;
         $conf['useslash']   = 0;
@@ -107,8 +126,24 @@ class common_ml_test extends DokuWikiTest {
             $tok = media_get_token($id, $w, 0);
             $hash = substr(PassHash::hmac('md5', $id, auth_cookiesalt()), 0, 6);
 
-            $expect = DOKU_BASE.$this->script.'?hash='.$hash.'&w='.$w.'&tok='.$tok.'&media='.rawurlencode($id);
+            $expect = DOKU_BASE.$this->script.'?w='.$w.'&tok='.$tok.'&media='.rawurlencode($id);
             $this->assertEquals($expect, ml($id, $args));
         }
+
+        $h    = 50;
+        $args = array('h' => $h);
+        $tok = media_get_token($id, $h, 0);
+
+        $expect = DOKU_BASE.$this->script.'?h='.$h.'&tok='.$tok.'&media='.rawurlencode($id);
+        $this->assertEquals($expect, ml($id, $args));
+
+        $w    = 80;
+        $h    = 50;
+        $args = array('w' => $w, 'h' => $h);
+        $tok = media_get_token($id, $w, $h);
+
+        $expect = DOKU_BASE.$this->script.'?w='.$w.'&h='.$h.'&tok='.$tok.'&media='.rawurlencode($id);
+        $this->assertEquals($expect, ml($id, $args));
+
     }
 }
diff --git a/_test/tests/lib/exe/fetch_statuscodes_external.test.php b/_test/tests/lib/exe/fetch_statuscodes_external.test.php
index bd7b2f93b..79a45ec93 100644
--- a/_test/tests/lib/exe/fetch_statuscodes_external.test.php
+++ b/_test/tests/lib/exe/fetch_statuscodes_external.test.php
@@ -13,7 +13,7 @@ class fetch_statuscodes_external_test extends DokuWikiTest {
 
         header('X-Test: check headers working');
         $header_check = function_exists('xdebug_get_headers') ? xdebug_get_headers() : headers_list();
-        if (empty($header_check)) {
+        if(empty($header_check)) {
             $this->markTestSkipped('headers not returned, perhaps your sapi does not return headers, try xdebug');
         } else {
             header_remove('X-Test');
@@ -22,50 +22,53 @@ class fetch_statuscodes_external_test extends DokuWikiTest {
         parent::setUp();
 
         global $conf;
-        $conf['fetchsize'] = 500*1024; //500kb
+        $conf['fetchsize'] = 500 * 1024; //500kb
         $conf['xsendfile'] = 0;
 
-        global $MIME, $EXT, $CACHE, $INPUT;    // variables fetch creates in global scope -- should this be in fetch?
+        global $MIME, $EXT, $CACHE, $INPUT; // variables fetch creates in global scope -- should this be in fetch?
     }
 
-    function getUri($hash=null) {
+    function getUri() {
         $w = $this->width ? 'w='.$this->width.'&' : '';
         $h = $this->height ? 'h='.$this->height.'&' : '';
-        if($hash === null) {
-            $hash = 'hash='.substr(PassHash::hmac('md5', $this->media, auth_cookiesalt()), 0, 6).'&';
-        }
-        return '/lib/exe/fetch.php?'.$hash.$w.$h.'{%token%}media='.rawurlencode($this->media);
+        return '/lib/exe/fetch.php?'.$w.$h.'{%token%}media='.rawurlencode($this->media);
     }
 
-    function fetchResponse($token, $hash=null){
+    function fetchResponse($token) {
         $request = new TestRequest();
-        return $request->get(array(),str_replace('{%token%}',$token,$this->getUri($hash)));
+        return $request->get(array(), str_replace('{%token%}', $token, $this->getUri()));
     }
 
     /**
-     * modified image request with invalid hash
-     * expect: 412 status code
+     *  modified image request with valid token
+     *  and not-modified image request with valid token
+     *
+     *  expect: header with mime-type
+     *  expect: content
+     *  expect: no error response
      */
-    function test_invalid_hash() {
-        $invalid_hash = 'hash='.substr(PassHash::hmac('md5', 'junk', auth_cookiesalt()), 0, 6).'&';
-        $token = 'tok='.media_get_token($this->media, $this->width, $this->height).'&';
+    function test_valid_token() {
+        $valid_token_resize = 'tok='.media_get_token($this->media, $this->width, $this->height).'&';
 
-        $this->assertEquals(412,$this->fetchResponse($token, $invalid_hash)->getStatusCode());
+        $this->handlevalidresponse($valid_token_resize);
+
+        //original size
+        $this->width          = $this->height = 0;
+        $valid_token_original = 'tok='.media_get_token($this->media, $this->width, $this->height).'&';
+
+        $this->handlevalidresponse($valid_token_original);
 
     }
 
     /**
-     *  modified image request with valid token
-     *  expect: header with mime-type
-     *  expect: content
-     *  expect: no error response
+     * Performs asserts for valid request
+     *
+     * @param $valid_token
      */
-    function test_valid_token(){
-        $valid_token = 'tok='.media_get_token($this->media, $this->width, $this->height).'&';
-
+    private function handlevalidresponse($valid_token){
         $response = $this->fetchResponse($valid_token);
-        $this->assertTrue((bool)$response->getHeader('Content-Type'));
-        $this->assertTrue((bool)($response->getContent()));
+        $this->assertTrue((bool) $response->getHeader('Content-Type'));
+        $this->assertTrue((bool) ($response->getContent()));
 
         $status_code = $response->getStatusCode();
         $this->assertTrue(is_null($status_code) || (200 == $status_code));
@@ -75,41 +78,30 @@ class fetch_statuscodes_external_test extends DokuWikiTest {
      *  modified image request with invalid token
      *  expect: 412 status code
      */
-    function test_invalid_token(){
-        $invalid_token = 'tok='.media_get_token('junk',200,100).'&';
-        $this->assertEquals(412,$this->fetchResponse($invalid_token)->getStatusCode());
+    function test_invalid_token() {
+        $invalid_tokens = array(
+            'invalid_token_wrongid' => media_get_token('junk', 200, 100),
+            'invalid_token_wrongh'  => media_get_token($this->media, 200, 10),
+            'invalid_token_wrongw'  => media_get_token($this->media, 20, 100),
+            'invalid_token_wrongwh' => media_get_token($this->media, 20, 10)
+        );
+        foreach($invalid_tokens as $invalid_token)
+            $this->assertEquals(412, $this->fetchResponse('tok='.$invalid_token.'&')->getStatusCode());
+
     }
 
     /**
      *  modified image request with no token
+     *  and not modified image with no token
      *  expect: 412 status code
      */
-    function test_missing_token(){
-        $no_token = '';
-        $this->assertEquals(412,$this->fetchResponse($no_token)->getStatusCode());
-    }
-
-    /**
-     *  native image request which doesn't require a token
-     *  try: with a token & without a token
-     *  expect: (for both) header with mime-type, content matching source image filesize & no error response
-     */
-    function test_no_token_required(){
-        $this->width = $this->height = 0;   // no width & height, means image request at native dimensions
-        $any_token = 'tok='.media_get_token('junk',200,100).'&';
+    function test_missing_token() {
         $no_token = '';
-        $file = media_get_from_URL($this->media,'png', -1);
-        $bytes = filesize($file);
 
-        foreach(array($any_token, $no_token) as $token) {
-            $response = $this->fetchResponse($token);
-            $this->assertTrue((bool)$response->getHeader('Content-Type'));
-            $this->assertEquals(strlen($response->getContent()), $bytes);
+        $this->assertEquals(412, $this->fetchResponse($no_token)->getStatusCode());
 
-            $status_code = $response->getStatusCode();
-            $this->assertTrue(is_null($status_code) || (200 == $status_code));
-        }
+        $this->width = $this->height = 0;
+        $this->assertEquals(412, $this->fetchResponse($no_token)->getStatusCode());
     }
-
 }
 //Setup VIM: ex: et ts=4 :