Changeset 624
- Timestamp:
- 11/14/08 05:28:23 (4 years ago)
- Location:
- branches/Release04x02
- Files:
-
- 13 edited
- 1 moved
-
data/TWiki/TWikiUpgradeGuide.txt (modified) (1 diff)
-
data/TWiki/UserAuthentication.txt (modified) (1 diff)
-
lib/TWiki/UI/Register.pm (modified) (1 diff)
-
lib/TWiki/Users/BaseUserMapping.pm (modified) (5 diffs)
-
tools/TWikiKernel/MANIFEST (modified) (1 diff)
-
twikiplugins/TWikiUserMappingContrib/data/Main/RegistrationAgent.txt (moved) (moved from branches/Release04x02/twikiplugins/TWikiUserMappingContrib/data/Main/TWikiRegistrationAgent.txt) (1 diff, 1 prop)
-
twikiplugins/TWikiUserMappingContrib/data/TWiki/TWikiUserMappingContrib.txt (modified) (1 diff)
-
twikiplugins/TWikiUserMappingContrib/data/TWiki/TWikiUsersTemplate.txt (modified) (2 diffs)
-
twikiplugins/TWikiUserMappingContrib/lib/TWiki/Contrib/TWikiUserMappingContrib/MANIFEST (modified) (1 diff)
-
twikiplugins/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingContribTests.pm (modified) (4 diffs)
-
twikiplugins/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm (modified) (4 diffs)
-
twikiplugins/UnitTestContrib/test/unit/ClientTests.pm (modified) (1 diff)
-
twikiplugins/UnitTestContrib/test/unit/Fn_GROUPS.pm (modified) (1 diff)
-
twikiplugins/UnitTestContrib/test/unit/FuncUsersTests.pm (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/Release04x02/data/TWiki/TWikiUpgradeGuide.txt
r617 r624 140 140 * *ProjectContributor* - placeholder for a TWiki developer, and is used in TWiki documentation 141 141 * *TWikiGuest* - guest user, used as a fallback if the user can't be identified 142 * * TWikiRegistrationAgent* - special user used during the new user registration process142 * *RegistrationAgent* - special user used during the new user registration process 143 143 * *UnknownUser* - used where the author of a previously stored piece of data can't be determined 144 144 145 146 You additionally need to ensure that !TWikiUsers has the =Set ALLOWTOPICCHANGE = !TWikiAdminGroup, !TWikiRegistrationAgent=. Otherwise people will not be able to register.147 145 148 146 ---++ Important Changes since 4.0.5 -
branches/Release04x02/data/TWiki/UserAuthentication.txt
r610 r624 52 52 53 53 The registration process is also responsible for creating user topics, and setting up the mapping information used by the User Mapping support. 54 55 __%X% Note:__ You *must* allow the pseudo-user !TWikiRegistrationAgent to ALLOWWEBCHANGE in your =%USERSWEB%= web. If you block this user, then new users will see errors when they try to register.56 54 57 55 #LoginManagement -
branches/Release04x02/lib/TWiki/UI/Register.pm
r406 r624 46 46 require TWiki::Sandbox; 47 47 48 my $agent = ' TWikiRegistrationAgent';48 my $agent = 'RegistrationAgent'; 49 49 50 50 # Keys from the user data that should *not* be included in -
branches/Release04x02/lib/TWiki/Users/BaseUserMapping.pm
r608 r624 34 34 * UnknownUser 35 35 * ProjectContributor - 1 Jan 2005 36 * TWikiRegistrationAgent - 1 Jan 200536 * RegistrationAgent - 1 Jan 2005 37 37 38 38 ---+++ Groups … … 70 70 unknown => $this->{mapping_id} . '999', 71 71 ProjectContributor => $this->{mapping_id} . '111', 72 TWikiRegistrationAgent => $this->{mapping_id} . '222'72 RegistrationAgent => $this->{mapping_id} . '222' 73 73 }; 74 74 $this->{U2L} = { … … 77 77 $this->{mapping_id} . '999' => 'unknown', 78 78 $this->{mapping_id} . '111' => 'ProjectContributor', 79 $this->{mapping_id} . '222' => ' TWikiRegistrationAgent'79 $this->{mapping_id} . '222' => 'RegistrationAgent' 80 80 }; 81 81 $this->{U2W} = { … … 84 84 $this->{mapping_id} . '999' => 'UnknownUser', 85 85 $this->{mapping_id} . '111' => 'ProjectContributor', 86 $this->{mapping_id} . '222' => ' TWikiRegistrationAgent'86 $this->{mapping_id} . '222' => 'RegistrationAgent' 87 87 }; 88 88 $this->{W2U} = { … … 91 91 UnknownUser => $this->{mapping_id} . '999', 92 92 ProjectContributor => $this->{mapping_id} . '111', 93 TWikiRegistrationAgent => $this->{mapping_id} . '222'93 RegistrationAgent => $this->{mapping_id} . '222' 94 94 }; 95 95 $this->{U2E} = -
branches/Release04x02/tools/TWikiKernel/MANIFEST
r616 r624 40 40 data/Main/TWikiGroups.txt 0660 41 41 data/Main/TWikiGuest.txt 0660 42 data/Main/ TWikiRegistrationAgent.txt 066042 data/Main/RegistrationAgent.txt 0660 43 43 data/Main/TWikiUsers.txt 0660 44 44 data/Main/UnknownUser.txt 0660 -
branches/Release04x02/twikiplugins/TWikiUserMappingContrib/data/Main/RegistrationAgent.txt
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/TWikiUserMappingContrib/data/Main/TWikiRegistrationAgent.txt merged eligible /trunk/TWikiUserMappingContrib/TWikiUserMappingContrib/data/Main/TWikiRegistrationAgent.txt 484 /trunk/core/twikiplugins/TWikiUserMappingContrib/data/Main/TWikiRegistrationAgent.txt 484-485
r481 r624 1 1 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 16686 $"}% 2 ---+ The <nop> TWikiRegistrationAgent User2 ---+ The <nop>RegistrationAgent User 3 3 4 4 This is a TWiki User used by TWiki when it registers new users. This user has special access to write to [[%WIKIUSERSTOPIC%]], and does not need an entry in the password system. -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/Release04x02/twikiplugins/TWikiUserMappingContrib/data/TWiki/TWikiUserMappingContrib.txt
r3 r624 33 33 * Main.NobodyGroup 34 34 * Main.TWikiAdminGroup 35 * Main. TWikiRegistrationAgent35 * Main.RegistrationAgent 36 36 * User lists 37 37 * Main.UserList -
branches/Release04x02/twikiplugins/TWikiUserMappingContrib/data/TWiki/TWikiUsersTemplate.txt
r481 r624 34 34 * ProjectContributor - 1 Jan 2005 35 35 * TWikiGuest - guest - 10 Feb 1999 36 * TWikiRegistrationAgent - 1 Jan 200536 * RegistrationAgent - 1 Jan 2005 37 37 * U - <a name="U">- - - -</a> 38 38 * UnknownUser - 1 Jan 2005 … … 46 46 * *ProjectContributor* - placeholder for a TWiki developer, and is used in TWiki documentation 47 47 * *TWikiGuest* - guest user, used as a fallback if the user can't be identified 48 * * TWikiRegistrationAgent* - special user used during the new user registration process48 * *RegistrationAgent* - special user used during the new user registration process 49 49 * *UnknownUser* - used where the author of a previously stored piece of data can't be determined 50 50 51 51 __Access Control:__ 52 * Set ALLOWTOPICCHANGE = TWikiAdminGroup, TWikiRegistrationAgent52 * Set ALLOWTOPICCHANGE = TWikiAdminGroup, RegistrationAgent -
branches/Release04x02/twikiplugins/TWikiUserMappingContrib/lib/TWiki/Contrib/TWikiUserMappingContrib/MANIFEST
r486 r624 5 5 6 6 # Topic based Usermapping topics 7 data/Main/ TWikiRegistrationAgent.txt 06447 data/Main/RegistrationAgent.txt 0644 8 8 data/Main/UserListByPhotograph.txt 0644 9 9 data/Main/UserListHeader.txt 0644 -
branches/Release04x02/twikiplugins/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingContribTests.pm
r551 r624 88 88 my $this = shift; 89 89 90 my $agent = ' TWikiRegistrationAgent';90 my $agent = 'RegistrationAgent'; 91 91 my $userLogin; 92 92 my $userWikiName; … … 291 291 $this->assert( $basemapping->handlesUser( undef, 'ProjectContributor' ) ); 292 292 $this->assert( 293 $basemapping->handlesUser( undef, ' TWikiRegistrationAgent' ) );293 $basemapping->handlesUser( undef, 'RegistrationAgent' ) ); 294 294 295 295 $this->assert( … … 307 307 $basemapping->handlesUser( undef, undef, 'ProjectContributor' ) ); 308 308 $this->assert( 309 $basemapping->handlesUser( undef, undef, ' TWikiRegistrationAgent' ) );309 $basemapping->handlesUser( undef, undef, 'RegistrationAgent' ) ); 310 310 311 311 $this->assert( … … 330 330 $this->assert( 331 331 $basemapping->handlesUser( 332 undef, ' TWikiRegistrationAgent', 'TWikiRegistrationAgent'332 undef, 'RegistrationAgent', 'RegistrationAgent' 333 333 ) 334 334 ); -
branches/Release04x02/twikiplugins/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm
r536 r624 174 174 my $ttpath = 175 175 "$TWiki::cfg{DataDir}/$TWiki::cfg{UsersWebName}/$TWiki::cfg{UsersTopicName}.txt"; 176 my $me = " TWikiRegistrationAgent";176 my $me = "RegistrationAgent"; 177 177 178 178 open( F, ">$ttpath" ) || $this->assert( 0, "open $ttpath failed" ); … … 204 204 my $this = shift; 205 205 206 my $me = " TWikiRegistrationAgent";206 my $me = "RegistrationAgent"; 207 207 $ttpath = 208 208 "$TWiki::cfg{DataDir}/$TWiki::cfg{UsersWebName}/$TWiki::cfg{UsersTopicName}.txt"; … … 243 243 $this->assert( $k =~ s/^GungaDin,//, $k ); 244 244 $this->assert( $k =~ s/^ProjectContributor,//, $k ); 245 $this->assert( $k =~ s/^RegistrationAgent,//, $k ); 245 246 $this->assert( $k =~ s/^SadOldMan,//, $k ); 246 247 $this->assert( $k =~ s/^SorryOldMan,//, $k ); 247 248 $this->assert( $k =~ s/^StupidOldMan,//, $k ); 248 249 $this->assert( $k =~ s/^TWikiGuest,//, $k ); 249 $this->assert( $k =~ s/^TWikiRegistrationAgent,//, $k );250 250 $this->assert( $k =~ s/^UnknownUser,//, $k ); 251 251 $this->assert( $k =~ s/^ZebediahUser//, $k ); … … 255 255 sub groupFix { 256 256 my $this = shift; 257 my $me = " TWikiRegistrationAgent";257 my $me = "RegistrationAgent"; 258 258 $twiki->{users}->{mapping}->addUser( "auser", "AaronUser", $me ); 259 259 $twiki->{users}->{mapping}->addUser( "guser", "GeorgeUser", $me ); -
branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/ClientTests.pm
r408 r624 17 17 use TWiki::UI::Edit; 18 18 19 my $agent = ' TWikiRegistrationAgent';19 my $agent = 'RegistrationAgent'; 20 20 my $userLogin; 21 21 my $userWikiName; -
branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/Fn_GROUPS.pm
r487 r624 31 31 $this->assert_str_equals( <<HUMPH, "$ui\n" ); 32 32 | *Group* | *Members* | 33 | <nop>AdminGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] |34 | <nop>TWikiBaseGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] [[TemporaryGROUPSUsersWeb.TWikiGuest][TWikiGuest]] [[TemporaryGROUPSUsersWeb.UnknownUser][UnknownUser]] [[TemporaryGROUPSUsersWeb.ProjectContributor][ProjectContributor]] [[TemporaryGROUPSUsersWeb. TWikiRegistrationAgent][TWikiRegistrationAgent]] |33 | <nop>AdminGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] [[TemporaryGROUPSUsersWeb.RegistrationAgent][RegistrationAgent]] | 34 | <nop>TWikiBaseGroup | [[TemporaryGROUPSUsersWeb.AdminUser][AdminUser]] [[TemporaryGROUPSUsersWeb.TWikiGuest][TWikiGuest]] [[TemporaryGROUPSUsersWeb.UnknownUser][UnknownUser]] [[TemporaryGROUPSUsersWeb.ProjectContributor][ProjectContributor]] [[TemporaryGROUPSUsersWeb.RegistrationAgent][RegistrationAgent]] | 35 35 | [[TemporaryGROUPSUsersWeb.GropeGroup][GropeGroup]] | [[TemporaryGROUPSUsersWeb.ScumBag][ScumBag]] [[TemporaryGROUPSUsersWeb.TWikiGuest][TWikiGuest]] | 36 36 HUMPH -
branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/FuncUsersTests.pm
r487 r624 216 216 if ( $TWiki::cfg{UserMappingManager} eq 'TWiki::Users::BaseUserMapping' ) { 217 217 @correctList = 218 qw/ProjectContributor TWikiGuest TWikiRegistrationAgent UnknownUser/;218 qw/ProjectContributor TWikiGuest RegistrationAgent UnknownUser/; 219 219 } 220 220 else { 221 221 @correctList = 222 qw/ProjectContributor TWikiGuest TWikiRegistrationAgent UnknownUser User86A UserA UserA86 UserB UserC UserZ/;222 qw/ProjectContributor TWikiGuest RegistrationAgent UnknownUser User86A UserA UserA86 UserB UserC UserZ/; 223 223 if ( $TWiki::cfg{Register}{AllowLoginName} == 1 ) { 224 224 push @correctList, 'ScumBag' … … 304 304 $TWiki::Plugins::SESSION->{user} = $u; 305 305 my $sadmin = TWiki::Func::isAnAdmin($u); 306 if ( $u eq $TWiki::cfg{AdminUserWikiName} || $u eq 'UserA' ) { 306 if ( $u eq $TWiki::cfg{AdminUserWikiName} || 307 $u eq 'RegistrationAgent' || 308 $u eq 'UserA' ) { 307 309 $this->assert( $sadmin, $u ); 308 310 }
Note: See TracChangeset
for help on using the changeset viewer.
