Add revision display tests and fix issues

.travis.yml

@@ -1,13 +1,12 @@
 language: php
 php:
-  - "5.7"
+  - "nightly"
+  - "7.2"
+  - "7.1"
+  - "7.0"
   - "5.6"
-  - "5.5"
-  - "5.4"
-  - "5.3"
 env:
   - DOKUWIKI=master
-  - DOKUWIKI=stable
 before_install: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh
 install: sh travis.sh
 script: cd _test && phpunit --stderr --group plugin_publish

_test/publish.test.php

@@ -8,6 +8,7 @@
  * @group plugins
  * @group integrationtests
  * @author Michael Große <[email protected]>
+ * @author Phy25 <[email protected]>
  */
 class approvel_test extends DokuWikiTest {
 
@@ -34,8 +35,19 @@ public function setUp(){
         $conf['useacl']    = 1;
         $conf['superuser'] = '@admin';
         $AUTH_ACL = array(
-            '*                     @ALL        4',
-            '*                     @admin     16',);
+            '*                     @ALL        1',  // READ only
+            '*                     @author     4',  // EDIT
+            '*                     @admin     16',);// DELETE
+    }
+
+    private function logout(){
+        global $USERINFO;
+        $USERINFO = null;
+
+        global $default_server_vars;
+        $default_server_vars['REMOTE_USER'] = null; //Hack until Issue splitbrain/dokuwiki#1099 is fixed
+
+        $_SERVER['REMOTE_USER'] = null;
     }
 
     /**
@@ -81,6 +93,251 @@ public function test_no_aprroved_banner() {
             strpos($response->getContent(), '<div class="approval') === false,
             'The approved banner is still showing even so it is supposed not to show.'
         );
+    }
+
+    private function _prepare_pub_draft_revisions_and_test_common($test_namespace = false){
+        // init one approved and one draft
+        saveWikiText('foo', 'This should get APPROVED', 'approved');
+
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=foo&publish_approve');
+        $this->assertTrue(
+            strpos($response->getContent(), '<div class="approval approved_yes">') !== false,
+            'Approving a page failed with standard options.'
+        );
+
+        sleep(1); // create a different timestamp
+        saveWikiText('foo', 'This should be a DRAFT', 'draft');
+        $draft_rev = @filemtime(wikiFN('foo'));
+
+        // a user with AUTH_EDIT or better will see the latest revision of a page
+        // @admin should see the draft
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=foo');
+        $this->assertTrue(
+            strpos($response->getContent(), 'denied') === false,
+            'Visiting a page with draft with @admin returns denied message.'
+        );
+        $this->assertTrue(
+            strpos($response->getContent(), 'This should be a DRAFT') !== false,
+            'Visiting a page with draft with @admin did not return draft revision.'
+        );
+
+        // switch to @ALL - AUTH_READ
+        $this->logout();
+
+        // @ALL should see approved revision
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=foo');
+        $this->assertTrue(
+            strpos($response->getContent(), 'denied') === false,
+            'Visiting a page with draft with AUTH_READ returns denied message.'
+        );
+        $this->assertTrue(
+            strpos($response->getContent(), 'This should get APPROVED') !== false,
+            'Visiting a page with draft with AUTH_READ did not return approved revision.'
+        );
+
+        return $draft_rev;
+    }
+
+    /**
+     * @coversNothing
+     */
+    public function test_show_draft_only_revision(){
+        // draft-only page
+        saveWikiText('draft_only', 'This should be a DRAFT', 'draft');
+
+        // switch to @ALL - AUTH_READ
+        $this->logout();
+
+        // someone with only AUTH_READ will see the latest approved revision by default (unless there isn't one)
+        // page with no approved revision: show draft
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=draft_only');
+        $this->assertTrue(
+            strpos($response->getContent(), 'mode_show') !== false,
+            'Visiting a draft-only page did not return in show mode.'
+        );
+        $this->assertTrue(
+            strpos($response->getContent(), 'This should be a DRAFT') !== false,
+            'Visiting a draft-only page with AUTH_READ did not return draft revision.'
+        );
+    }
+
+    /**
+     * @coversNothing
+     */
+    public function test_show_draft_only_revision_hide_drafts(){
+        global $conf;
+        $conf['plugin']['publish']['hide drafts'] = 1;
+
+        // draft-only page
+        saveWikiText('draft_only', 'This should be a DRAFT', 'draft');
+
+        // switch to @ALL - AUTH_READ
+        $this->logout();
+
+        // page with no approved revision: hide draft
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=draft_only');
+        $this->assertTrue(
+            strpos($response->getContent(), 'denied') !== false,
+            'Visiting a draft-only page with hide_drafts on did not return in denied mode.'
+        );
+        $this->assertTrue(
+            strpos($response->getContent(), 'This should be a DRAFT') === false,
+            'Visiting a draft-only page with hide_drafts on with AUTH_READ returns draft content.'
+        );
+    }
+
+    /**
+     * @coversNothing
+     */
+    public function test_show_draft_only_revision_hide_drafts_apr_namespaces(){
+        global $conf;
+        $conf['plugin']['publish']['hide drafts'] = 1;
+        $conf['plugin']['publish']['apr_namespaces'] = 'apr';
+
+        // draft-only page
+        saveWikiText('apr:draft', 'This should be a DRAFT', 'apr:draft');
+        saveWikiText('noapr:draft', 'This should not be applied', 'noapr:draft');
+
+        // switch to @ALL - AUTH_READ
+        $this->logout();
+
+        // unaffected page
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=noapr:draft');
+        $this->assertTrue(
+            strpos($response->getContent(), 'This should not be applied') !== false,
+            'Pages outside apr_namespaces is affected by the plugin'
+        );
+
+        // page with no approved revision: hide draft
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=apr:draft');
+        $this->assertTrue(
+            strpos($response->getContent(), 'denied') !== false,
+            'Visiting a draft-only page with hide_drafts on did not return in denied mode.'
+        );
+        $this->assertTrue(
+            strpos($response->getContent(), 'This should be a DRAFT') === false,
+            'Visiting a draft-only page with hide_drafts on with AUTH_READ returns draft content.'
+        );
+
+        // switch to @ALL - AUTH_READ
+        $this->logout();
+
+        // page with no approved revision: hide draft
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=apr:draft');
+        $this->assertTrue(
+            strpos($response->getContent(), 'denied') !== false,
+            'Visiting a draft-only page with hide_drafts on did not return in denied mode.'
+        );
+        $this->assertTrue(
+            strpos($response->getContent(), 'This should be a DRAFT') === false,
+            'Visiting a draft-only page with hide_drafts on with AUTH_READ returns draft content.'
+        );
+
+        // unaffected page
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=noapr:draft');
+        $this->assertTrue(
+            strpos($response->getContent(), 'This should not be applied') !== false
+        );
+    }
+
+    /**
+     * @coversNothing
+     */
+    public function test_show_expected_revision(){
+        $draft_rev = $this->_prepare_pub_draft_revisions_and_test_common();
+
+        // all users with AUTH_READ or better can view any revision of a page if they specifically request it – whether or not it is approved
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=foo&rev='.$draft_rev);
+        $this->assertTrue(
+            strpos($response->getContent(), 'mode_show') !== false,
+            'Visiting a draft revision did not return in show mode.'
+        );
+        $this->assertTrue(
+            strpos($response->getContent(), 'This should be a DRAFT') !== false,
+            'Visiting a draft revision with AUTH_READ did not return draft content.'
+        );
+    }
+
+    /**
+     * @coversNothing
+     */
+    public function test_show_expected_revision_hide_drafts(){
+        global $conf;
+        $conf['plugin']['publish']['hide drafts'] = 1;
+
+        $draft_rev = $this->_prepare_pub_draft_revisions_and_test_common();
+
+        // specifically request revision: without approval permission, the best is to deny it
+        // but the current code redirect it to
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=foo&rev='.$draft_rev);
+        $this->assertTrue(
+            strpos($response->getContent(), 'denied') !== false,
+            'Visiting a draft revision with hide_drafts on did not return in denied mode.'
+        );
+        $this->assertTrue(
+            strpos($response->getContent(), 'This should be a DRAFT') === false,
+            'Visiting a draft revision with hide_drafts on with AUTH_READ returns draft content.'
+        );
+    }
+
+    private function _test_correct_404(){
+        // nothing, @admin should see 404
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=apr:nonexist');
+        $this->assertTrue(
+            strpos($response->getContent(), 'denied') === false,
+            'Visiting a non-exist page with admin returns denied message.'
+        );
+        $this->assertTrue(
+            strpos($response->getContent(), 'notFound') !== false,
+            'Visiting a non-exist page with admin did not return notFound message.'
+        );
+
+        // switch to @ALL - AUTH_READ
+        $this->logout();
+
+        // nothing, @ALL should see 404
+        $request = new TestRequest();
+        $response = $request->get(array(), '/doku.php?id=apr:nonexist');
+        $this->assertTrue(
+            strpos($response->getContent(), 'denied') === false,
+            'Visiting a non-exist page without login returns denied message.'
+        );
+        $this->assertTrue(
+            strpos($response->getContent(), 'notFound') !== false,
+            'Visiting a non-exist page without login did not return notFound message.'
+        );
+    }
+
+    public function test_correct_404(){
+        $this->_test_correct_404();
+    }
+
+    public function test_correct_404_hide_drafts(){
+        $conf['plugin']['publish']['hide drafts'] = 1;
+        $this->_test_correct_404();
+    }
+
+    public function test_correct_404_hide_drafts_apr_namespaces(){
+        $conf['plugin']['publish']['hide drafts'] = 1;
+        $conf['plugin']['publish']['apr_namespaces'] = 'apr';
+        $this->_test_correct_404();
+    }
 
+    public function test_correct_404_hide_drafts_no_apr_namespaces(){
+        $conf['plugin']['publish']['hide drafts'] = 1;
+        $conf['plugin']['publish']['no_apr_namespaces'] = 'noapr';
+        $this->_test_correct_404();
     }
 }

action/start.php

@@ -22,6 +22,7 @@ function handle_start(&$event, $param) {
         global $REV;
         global $INFO;
         global $ID;
+        global $INPUT;
 
         if ($ACT !== 'show') {
             return;
@@ -44,7 +45,8 @@ function handle_start(&$event, $param) {
             return;
         }
 
-        if (!$this->hlp->isCurrentRevisionApproved()) {
+        if (!$this->hlp->isCurrentRevisionApproved() && !$INPUT->has('rev')){
+            // if rev is present, no redirect
             $latestApproved = $this->hlp->getLatestApprovedRevision();
             if ($latestApproved) {
                 $REV = $latestApproved;

helper.php

@@ -193,7 +193,7 @@ function getSortedApprovedRevisions($id = null) {
         }
 
         static $sortedApprovedRevisions = array();
-        if (!isset($sortedApprovedRevisions[$id])) {
+        if (!isset($sortedApprovedRevisions[$id]) || defined('DOKU_UNITTEST')) {
             $approvals = $this->getApprovals($id);
             krsort($approvals);
             $sortedApprovedRevisions[$id] = $approvals;
@@ -286,6 +286,7 @@ function getPreviousApprovedRevision() {
     }
 
     function isHidden($id = null) {
+        // if it is false, everyone can see drafts
         if (!$this->getConf('hide drafts')) {
             return false;
         }
@@ -299,20 +300,28 @@ function isHidden($id = null) {
             return false;
         }
 
-        if ($this->getLatestApprovedRevision($id)) {
-            return false;
-        }
         return true;
     }
 
-    function isHiddenForUser($id = null) {
+    function isHiddenForUser($id = null, $rev = null) {
         if (!$this->isHidden($id)) {
             return false;
         }
 
         if ($id == null) {
             global $ID;
             $id = $ID;
+            if ($rev == null){
+                global $REV;
+                $rev = $REV;
+            }
+        }
+
+        $revlist = $this->getSortedApprovedRevisions($id);
+        if($rev){
+            if(isset($revlist[$rev]) && $this->isRevisionApproved($rev, $id)){
+                return false;
+            }
         }
 
         $allowedGroups = array_filter(explode(' ', trim($this->getConf('author groups'))));