Skip to content

Commit

Permalink
Item1415: set permissions of a newly created web to the web creator, …
Browse files Browse the repository at this point in the history 
…restrict access to _empty and _default to admin group

git-svn-id: http://svn.foswiki.org/branches/Release01x00@3634 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
CrawfordCurrie authored and CrawfordCurrie committed Apr 23, 2009
1 parent 95f63a7 commit 4d21e9e
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 44 deletions.
59 changes: 31 additions & 28 deletions UnitTestContrib/test/unit/StoreTests.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ sub test_CreateEmptyWeb {
$this->assert_not_null( $this->{twiki}->{store} );

#create an empty web
$this->assert( ! $this->{twiki}->{store}->createWeb($this->{twiki}->{user},$web)); #TODO: how can this succeed without a user? to check perms?
$this->assert( $this->{twiki}->{store}->webExists($web) );
$this->assert( ! $this->{twiki}->{store}->createWeb($this->{twiki}->{user},$web));
my @topics = $this->{twiki}->{store}->getTopicNames($web);
$this->assert_equals( 1, scalar(@topics), join(" ",@topics) );#we expect there to be only the home topic
$this->{twiki}->{store}->removeWeb($this->{twiki}->{user}, $web);
Expand All @@ -76,8 +75,7 @@ sub test_CreateWeb {

#create a web using _default
#TODO how should this fail if we are testing a store impl that does not have a _deault web ?
$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web, '_default');
$this->assert( $this->{twiki}->{store}->webExists($web) );
$this->createTestWeb();
my @topics = $this->{twiki}->{store}->getTopicNames($web);
my @defaultTopics = $this->{twiki}->{store}->getTopicNames('_default');
$this->assert_equals( $#topics, $#defaultTopics,
Expand Down Expand Up @@ -105,8 +103,7 @@ sub test_CreateWebWithNonExistantBaseWeb {
sub test_CreateSimpleTopic {
my $this = shift;

$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web, '_default');
$this->assert( $this->{twiki}->{store}->webExists($web) );
$this->createTestWeb();
$this->assert( ! $this->{twiki}->{store}->topicExists($web, $topic) );

my $meta = undef;
Expand All @@ -125,8 +122,7 @@ sub test_CreateSimpleTopic {
sub test_CreateSimpleMetaTopic {
my $this = shift;

$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web, '_default');
$this->assert( $this->{twiki}->{store}->webExists($web) );
$this->createTestWeb();
$this->assert( ! $this->{twiki}->{store}->topicExists($web, $topic) );

my $text = '';
Expand All @@ -150,8 +146,7 @@ sub test_CreateSimpleMetaTopic {
sub test_CreateSimpleCompoundTopic {
my $this = shift;

$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web, '_default');
$this->assert( $this->{twiki}->{store}->webExists($web) );
$this->createTestWeb();
$this->assert( ! $this->{twiki}->{store}->topicExists($web, $topic) );

my $text = "This is some test text\n * some list\n * content\n :) :)";
Expand All @@ -174,27 +169,39 @@ sub test_CreateSimpleCompoundTopic {
$this->{twiki}->{store}->removeWeb($this->{twiki}->{user}, $web);
}

sub test_getRevisionInfo {
sub createTestWeb {
my $this = shift;

$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web, '_default');
my $me = $this->{twiki}->{users}->getWikiName($this->{twiki}->{user});
$this->{twiki}->{store}->createWeb(
$this->{twiki}->{user}, $web, '_default',
{
ALLOWTOPICCHANGE => $me,
ALLOWTOPICRENAME => 'nobody',
ALLOWWEBCHANGE => $me,
ALLOWWEBRENAME => $me,
});
$this->assert( $this->{twiki}->{store}->webExists($web) );
}

sub test_getRevisionInfo {
my $this = shift;
$this->createTestWeb();
my $text = "This is some test text\n * some list\n * content\n :) :)";
my $meta = new Foswiki::Meta($this->{twiki}, $web, $topic);
$this->{twiki}->{store}->saveTopic( $this->{test_user_login}, $web, $topic, $text, $meta );
$this->{twiki}->{store}->saveTopic( $this->{twiki}->{user}, $web, $topic, $text, $meta );

$this->assert_equals(1, $this->{twiki}->{store}->getRevisionNumber($web, $topic));

$text .= "\nnewline";
$this->{twiki}->{store}->saveTopic( $this->{test_user_login}, $web, $topic, $text, $meta, { forcenewrevision => 1 } );
$this->{twiki}->{store}->saveTopic( $this->{twiki}->{user}, $web, $topic, $text, $meta, { forcenewrevision => 1 } );

my ($readMeta, $readText) = $this->{twiki}->{store}->readTopic($this->{test_user_login}, $web, $topic);
my ($readMeta, $readText) = $this->{twiki}->{store}->readTopic(undef, $web, $topic);
# ignore whitspace at end of data
$readText =~ s/\s*$//s;
$this->assert_equals($text, $readText);
$this->assert_equals(2, $this->{twiki}->{store}->getRevisionNumber($web, $topic));
my ( $infodate, $infouser, $inforev, $infocomment ) = $this->{twiki}->{store}->getRevisionInfo($web, $topic);
$this->assert_equals($this->{test_user_login}, $infouser);
$this->assert_equals($this->{twiki}->{user}, $infouser);
$this->assert_equals(2, $inforev);

#TODO
Expand All @@ -205,8 +212,7 @@ sub test_getRevisionInfo {
sub test_moveTopic {
my $this = shift;

$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web, '_default');
$this->assert( $this->{twiki}->{store}->webExists($web) );
$this->createTestWeb();
my $text = "This is some test text\n * some list\n * content\n :) :)";
my $meta = new Foswiki::Meta($this->{twiki}, $web, $topic);
$this->{twiki}->{store}->saveTopic( $this->{test_user_login}, $web, $topic, $text, $meta );
Expand All @@ -229,7 +235,7 @@ sub test_moveTopic {
sub test_leases {
my $this = shift;

$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web, '_default');
$this->createTestWeb();
my $testtopic = $Foswiki::cfg{HomeTopicName};

my $lease = $this->{twiki}->{store}->getLease($web, $testtopic);
Expand Down Expand Up @@ -273,8 +279,7 @@ sub test_beforeSaveHandlerChangeText {
value => "fieldvalue",
};

$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web, '_default');
$this->assert( $this->{twiki}->{store}->webExists($web) );
$this->createTestWeb();
$this->assert( ! $this->{twiki}->{store}->topicExists($web, $topic) );

# inject a handler directly into the plugins object
Expand Down Expand Up @@ -311,8 +316,7 @@ sub test_beforeSaveHandlerChangeMeta {
value => "fieldvalue",
};

$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web, '_default');
$this->assert( $this->{twiki}->{store}->webExists($web) );
$this->createTestWeb();
$this->assert( ! $this->{twiki}->{store}->topicExists($web, $topic) );

# inject a handler directly into the plugins object
Expand Down Expand Up @@ -346,8 +350,7 @@ sub test_beforeSaveHandlerChangeBoth {
value => "fieldvalue",
};

$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web, '_default');
$this->assert( $this->{twiki}->{store}->webExists($web) );
$this->createTestWeb();
$this->assert( ! $this->{twiki}->{store}->topicExists($web, $topic) );

# inject a handler directly into the plugins object
Expand Down Expand Up @@ -410,7 +413,7 @@ sub test_attachmentSaveHandlers {
value => "fieldvalue",
};

$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web, '_default');
$this->createTestWeb();
$this->{twiki}->{store}->saveTopic( $this->{twiki}->{user}, $web, $topic, "", undef );

# SMELL: assumed implementation
Expand All @@ -434,7 +437,7 @@ sub test_attachmentSaveHandlers {

sub test_eachChange {
my $this = shift;
$this->{twiki}->{store}->createWeb($this->{twiki}->{user}, $web);
$this->createTestWeb();
$Foswiki::cfg{Store}{RememberChangesFor} = 5; # very bad memory
sleep(1);
my $start = time();
Expand Down
27 changes: 12 additions & 15 deletions core/lib/Foswiki/Store.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1767,22 +1767,19 @@ sub createWeb {
}

foreach my $topic (@topicList) {
$this->copyTopic( $user, $baseWeb, $topic, $newWeb, $topic );
}

# patch WebPreferences in new web
my $wpt = $Foswiki::cfg{WebPrefsTopicName};

return unless $this->topicExists( $newWeb, $wpt );

if ($opts) {
my ( $meta, $text ) = $this->readTopic( undef, $newWeb, $wpt, undef );
foreach my $key (keys %$opts) {
$text =~
s/($Foswiki::regex{setRegex}$key\s*=).*?$/$1 $opts->{$key}/gm
if defined $opts->{$key};
if ($topic eq $Foswiki::cfg{WebPrefsTopicName} && $opts) {
# patch WebPreferences in new web
my ( $meta, $text ) = $this->readTopic(
undef, $baseWeb, $topic, undef );
foreach my $key (keys %$opts) {
$text =~
s/($Foswiki::regex{setRegex}$key\s*=).*?$/$1 $opts->{$key}/gm
if defined $opts->{$key};
}
$this->saveTopic( $user, $newWeb, $topic, $text, $meta );
} else {
$this->copyTopic( $user, $baseWeb, $topic, $newWeb, $topic );
}
$this->saveTopic( $user, $newWeb, $wpt, $text, $meta );
}
}

Expand Down
5 changes: 4 additions & 1 deletion core/lib/Foswiki/UI/Manage.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,15 @@ sub _action_createweb {
# Get options from the form (only those options that are already
# set in the template WebPreferences topic are changed, so we can
# just copy everything)
my $me = $session->{users}->getWikiName($cUID);
my $opts = {

# Set permissions such that only the creating user can modify the
# web preferences
ALLOWTOPICCHANGE => $session->{users}->getWikiName($cUID),
ALLOWTOPICCHANGE => $me,
ALLOWTOPICRENAME => 'nobody',
ALLOWWEBCHANGE => $me,
ALLOWWEBRENAME => $me,
};
foreach my $p ( $query->param() ) {
$opts->{ uc($p) } = $query->param($p);
Expand Down

0 comments on commit 4d21e9e

Please sign in to comment.