Item13351: Remove debug code from convertTopicSettings

And add a checker to remind during bootstrap that the ACL settings need to be migrated.
foswiki · Apr 4, 2015 · bbb09f4 · bbb09f4
1 parent b3c0205
commit bbb09f4
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/core/lib/Foswiki.spec b/core/lib/Foswiki.spec
@@ -552,7 +552,7 @@ $Foswiki::cfg{TopicUserMapping}{ForceManageEmails} = $FALSE;
 # for access permission, then it will not get blocked by these controls.
 $Foswiki::cfg{AccessControl} = 'Foswiki::Access::TopicACLAccess';
 
-# **BOOLEAN LABEL="Enable Deprecated Empty Deny" EXPERT**
+# **BOOLEAN LABEL="Enable Deprecated Empty Deny" EXPERT **
 # Optionally restore the deprecated empty =DENY= ACL behavior.
 # If this setting is enabled, the "Empty" =DENY= ACL is interpreted as 
 # "Deny nobody", which is equivalent to "Allow all".
@@ -562,6 +562,8 @@ $Foswiki::cfg{AccessControl} = 'Foswiki::Access::TopicACLAccess';
 #    * Set DENYTOPICVIEW =        Should be replaced with:
 #    * Set ALLOWTOPICVIEW = *
 # </verbatim>
+# See =tools/convertTopicSettings.pl= for a utility to migrate to the 
+# new ACL format.
 $Foswiki::cfg{AccessControlACL}{EnableDeprecatedEmptyDeny} = $FALSE;
 
 # **SELECT authenticated,acl,all LABEL="Access to  RAW" EXPERT**

diff --git a/core/lib/Foswiki/Configure/Checkers/AccessControlACL/EnableDeprecatedEmptyDeny.pm b/core/lib/Foswiki/Configure/Checkers/AccessControlACL/EnableDeprecatedEmptyDeny.pm
@@ -0,0 +1,42 @@
+# See bottom of file for license and copyright information
+package Foswiki::Configure::Checkers::AccessControlACL::EnableDeprecatedEmptyDeny;
+
+use strict;
+use warnings;
+
+use Assert;
+use Foswiki::Configure::Checker ();
+our @ISA = ('Foswiki::Configure::Checker');
+
+sub check_current_value {
+    my ( $this, $reporter ) = @_;
+
+    if ( $Foswiki::cfg{isBOOTSTRAPPING}
+        && !$Foswiki::cfg{AccessControlACL}{EnableDeprecatedEmptyDeny} )
+    {
+        $reporter->WARN(
+"If you plan to migrate data from a previous installation, you need to either convert empty DENY rules to ALLOW wildcards, or enable this setting to enable backwards compatibility!"
+        );
+    }
+
+}
+
+1;
+__END__
+Foswiki - The Free and Open Source Wiki, http://foswiki.org/
+
+Copyright (C) 2015 Foswiki Contributors. Foswiki Contributors
+are listed in the AUTHORS file in the root of this distribution.
+NOTE: Please extend that file, not this notice.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version. For
+more details read LICENSE in the root of this distribution.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+As per the GPL, removal of this notice is prohibited.
diff --git a/core/lib/Foswiki/Contrib/core/MANIFEST b/core/lib/Foswiki/Contrib/core/MANIFEST
@@ -409,6 +409,7 @@ lib/Foswiki/Compatibility.pm 0444
 lib/Foswiki/Configure/Auth.pm 0444
 lib/Foswiki/Configure/Checker.pm 0444
 lib/Foswiki/Configure/Checkers/AccessibleCFG.pm 0444
+lib/Foswiki/Configure/Checkers/AccessControlACL/EnableDeprecatedEmptyDeny.pm 0444
 lib/Foswiki/Configure/Checkers/AuthRealm.pm 0444
 lib/Foswiki/Configure/Checkers/AuthScripts.pm 0444
 lib/Foswiki/Configure/Checkers/Cache/Debug.pm 0444

diff --git a/core/tools/convertTopicSettings.pl b/core/tools/convertTopicSettings.pl
@@ -79,8 +79,6 @@
     my $topicCounter = 0;
     foreach my $topic ( Foswiki::Func::getTopicList($web) ) {
 
-        next unless ( $topic =~ /TestTopic/ );
-
         next if ( $topic eq $Foswiki::cfg{WebPrefsTopicName} );
         scanTopic( $web, $topic );
         $topicCounter++;