-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Item14664: Add new checkers for WEB and TOPIC names
Also let Bootstrap find an existing SitePreferences and adjust config accordingly. Fix bug in SCRIPTHASH where on occasion the script directory path was not expanded.
- Loading branch information
Showing
10 changed files
with
492 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| # See bottom of file for license and copyright information | ||
| package Foswiki::Configure::Checkers::ConfigWebName; | ||
|
|
||
| use strict; | ||
| use warnings; | ||
|
|
||
| use Assert; | ||
| use Foswiki::Configure::Checkers::WEBTOPIC (); | ||
| our @ISA = ('Foswiki::Configure::Checkers::WEBTOPIC'); | ||
|
|
||
| use Foswiki::Configure::FileUtil (); | ||
|
|
||
| sub check_current_value { | ||
| my ( $this, $reporter ) = @_; | ||
|
|
||
| $this->SUPER::check_current_value($reporter); | ||
| } | ||
|
|
||
| =begin TML | ||
| ---++ ObjectMethod onSave() | ||
| This routine is called during the Save wizard, when !ConfigWebName is | ||
| saved, regardless of whether or not it has actually changed. This | ||
| is enabled by including the ONSAVE key in the Spec. | ||
| This routine will create a missing ConfigWebName, and migrate the obsolete | ||
| {RCS}{WorkAreaDir}. to the new ConfigWebName. | ||
| If compression is enabled, it also compresses the language file. | ||
| =cut | ||
|
|
||
| sub XXXonSave { | ||
| my ( $this, $reporter, $key, $d, $old_dir ) = @_; | ||
|
|
||
| $d =~ s/\$Foswiki::cfg(\{\w+\})+/eval( "\$Foswiki::cfg$1")/ge; | ||
| $old_dir =~ s/\$Foswiki::cfg(\{\w+\})+/eval( "\$Foswiki::cfg$1")/ge; | ||
|
|
||
| return if ( $d eq $old_dir ); | ||
|
|
||
| # SMELL: In a suexec environment, umask is forced to 077, blocking | ||
| # group and world access. This is probably not bad for the working | ||
| # directories. But noting smell if mismatched permissions are questioned. | ||
| # ... Enabled the umask override. | ||
|
|
||
| my $saveumask = umask( | ||
| ( oct(777) - $Foswiki::cfg{Store}{dirPermission} + 0 ) & oct(777) ); | ||
|
|
||
| unless ( -d $d ) { | ||
| mkdir( $d, oct(755) ) | ||
| || return $reporter->ERROR( | ||
| "$d does not exist, and I can't create it: $!"); | ||
| $reporter->NOTE("Created $d"); | ||
| } | ||
|
|
||
| unless ( -d "$d/tmp" ) { | ||
| if ( -e "$d/tmp" ) { | ||
| $reporter->ERROR("$d/tmp already exists, but is not a directory"); | ||
| } | ||
| elsif ( !mkdir( "$d/tmp", oct(1777) ) ) { | ||
| $reporter->ERROR("Could not create $d/tmp"); | ||
| } | ||
| else { | ||
| $reporter->NOTE("Created $d/tmp"); | ||
| } | ||
| } | ||
|
|
||
| unless ( -d "$d/logs" ) { | ||
| if ( -e "$d/logs" ) { | ||
| $reporter->ERROR("$d/logs already exists, but is not a directory"); | ||
| } | ||
| elsif ( !mkdir( "$d/logs", oct(755) ) ) { | ||
| $reporter->ERROR("Could not create $d/logs"); | ||
| } | ||
| else { | ||
| $reporter->NOTE("Created $d/logs"); | ||
| } | ||
| } | ||
|
|
||
| unless ( -d "$d/work_areas" ) { | ||
| if ( -e "$d/work_areas" ) { | ||
| $reporter->ERROR( | ||
| "$d/work_areas already exists, but is not a directory"); | ||
| } | ||
| elsif ( !mkdir( "$d/work_areas", oct(755) ) ) { | ||
| $reporter->ERROR("Could not create $d/work_areas"); | ||
| } | ||
| else { | ||
| $reporter->NOTE("Created $d/work_areas"); | ||
| } | ||
| } | ||
|
|
||
| # Automatic upgrade of work_areas | ||
| my $existing = $old_dir || $Foswiki::cfg{Store}{WorkAreaDir} || ''; | ||
| $existing =~ s/\$Foswiki::cfg(\{\w+\})+/eval( "$Foswiki::cfg$1")/ge; | ||
| if ( $existing && -d $existing ) { | ||
|
|
||
| # Try and move the contents of the old workarea | ||
| my @report = | ||
| Foswiki::Configure::FileUtil::copytree( $existing, "$d/work_areas" ); | ||
| if (@report) { | ||
| $reporter->ERROR(@report); | ||
| } | ||
| else { | ||
| $reporter->WARN( " | ||
| You have an existing {Store}{WorkAreaDir} ($Foswiki::cfg{Store}{WorkAreaDir}), | ||
| so I have copied the contents of that directory into the new | ||
| $d/work_areas. You should delete the old | ||
| $Foswiki::cfg{Store}{WorkAreaDir} when you are happy with | ||
| the upgrade." ); | ||
| delete( $Foswiki::cfg{Store}{WorkAreaDir} ); | ||
| } | ||
| } | ||
|
|
||
| unless ( -d "$d/registration_approvals" ) { | ||
| if ( -e "$d/registration_approvals" ) { | ||
| $reporter->ERROR( | ||
| "$d/registration_approvals already exists, but is not a directory" | ||
| ); | ||
| } | ||
| elsif ( !mkdir( "$d/registration_approvals", oct(755) ) ) { | ||
| $reporter->ERROR("Could not create $d/registration_approvals"); | ||
| } | ||
| } | ||
|
|
||
| umask($saveumask); | ||
|
|
||
| my $report = Foswiki::Configure::FileUtil::checkTreePerms( $d, 'rw', | ||
| filter => qr/configure\/backup\/|README/ ); | ||
| $reporter->ERROR( @{ $report->{messages} } ); | ||
| } | ||
|
|
||
| 1; | ||
| __END__ | ||
| Foswiki - The Free and Open Source Wiki, http://foswiki.org/ | ||
| Copyright (C) 2014-2018 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. |
Oops, something went wrong.