ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/login.ext
(Generate patch)

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.109 by root, Tue May 4 21:45:42 2010 UTC vs.
Revision 1.129 by root, Sun Nov 18 09:53:46 2012 UTC

… …
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use Deliantra::Util ();
7 8
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600; 9CONF MAX_DISCONNECT_TIME = 3600;
9 10
10# paranoia function to overwrite a string-in-place 11our $VALID_LOGIN = qr<^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z>;
11sub nuke_str { 12our %LOGIN_LOCK;
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 13
14# HACK: remove when done
15sub cf::client::send_drawinfo {
16 my ($self, $text, $flags) = @_;
17
18 utf8::encode $text;
19 $self->send_packet (sprintf "msg %d log %s", $flags || cf::NDI_BLACK, $text);
13} 20}
14 21
15sub query { 22sub query {
16 my ($ns, $flags, $text) = @_; 23 my ($ns, $flags, $text) = @_;
17 24
… …
29 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9 36 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9
30 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20 37 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20
31 || $age > 700 * 86400 # 2 years for everybody else 38 || $age > 700 * 86400 # 2 years for everybody else
32} 39}
33 40
34sub check_playing { 41# return a guard object for a lock on the given username, if available
42sub login_guard {
35 my ($ns, $user) = @_; 43 my ($user) = @_;
36 44
45 exists $LOGIN_LOCK{$user}
46 and return undef;
47
37 return unless cf::player::find_active $user; 48 cf::player::find_active $user
49 and return undef;
38 50
39 $ns->send_drawinfo ( 51 undef $LOGIN_LOCK{$user};
40 "That player is already logged in on this server. " 52 Guard::guard { delete $LOGIN_LOCK{$user} }
41 . "If you want to create a new player, choose another name. "
42 . "If you have already a registered, make sure nobody "
43 . "else is using your account at this time. If you lost your connection "
44 . "then the server will likely timeout within a minute. If you still "
45 . "cannot log-in after a minute, you are still logged in. Make sure "
46 . "you do not have another client running. If you use windows, reboot, "
47 . "this will fix anything.",
48 cf::NDI_RED
49 );
50
51 1
52} 53}
53 54
54sub safe_spot($) { 55sub safe_spot($) {
55 my ($pl) = @_; 56 my ($pl) = @_;
56 57
… …
59 my $m = $ob->map 60 my $m = $ob->map
60 or return; 61 or return;
61 my $x = $ob->x; 62 my $x = $ob->x;
62 my $y = $ob->y; 63 my $y = $ob->y;
63 64
64# return 0;#d# 65 # never happens normally, but helps when shell users make mistakes
65# warn join ":", $m->at ($x, $y);#d# 66 $m->linkable
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 67 or return 1;
67# return 0;
68 68
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70} 70}
71 71
72sub enter_map { 72sub enter_map {
… …
126 } 126 }
127 127
128 $ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
129} 129}
130 130
131sub encode_password { 131sub encode_password($) {
132 crypt $_[0], 132 unpack "H*", Deliantra::Util::hash_pw $_[0]
133 join '',
134 ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
135} 133}
136 134
137# delete a player directory, be non-blocking AND synchronous... 135sub compare_password($$) {
138# (that's hard, so we crap out and fork). 136 my ($pass, $token) = @_;
137
138 if ($token =~ /!!(.*)/) {
139 return +(substr $pass, 0, 8) eq pack "H*", $1;
140 } elsif ($token =~ /!(.*)/) {
141 return $pass eq pack "H*", $1;
142 } else {
143 return $token eq crypt $pass, $token;
144 }
145}
146
147# delete a player directory
139sub nuke_playerdir { 148sub nuke_playerdir {
140 my ($user) = @_; 149 my ($user) = @_;
141 150
151 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
152
142 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 153 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
143
144 cf::fork_call {
145 rename "$PLAYERDIR/$user", $temp; 154 aio_rename "$PLAYERDIR/$user", $temp;
146 system "rm", "-rf", $temp; 155 IO::AIO::aio_rmtree $temp;
156}
157
158sub login {
159 my ($pl) = @_;
160
161 # handle character creation, if neccessary
162 # the rest of this function is character creation
163
164 my $ns = $pl->ns;
165 my $ob = $pl->ob;
166
167 if ($pl->{chargen} eq "init") {
168 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
169
170 # create the playerdir, if necessary, as chargen_race_done did it before
171 # presumably because of unique maps
172 aio_mkdir playerdir $pl, 0770;
173 delete $pl->{deny_save}; # set by new
174 $pl->save;
175
176 $pl->{chargen} = "stats";
147 }; 177 }
178
179 if ($pl->{chargen} eq "stats") {
180 while () {
181 $ob->update_stats;
182 $pl->save_stats;
183
184 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
185 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
186
187 if ($res =~ /^[Nn]/) {
188 last;
189 } elsif ($res > 0 && $res <= 7) {
190 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
191
192 if ($swap > 0 && $swap <= 7) {
193 $ob->swap_stats ($res - 1, $swap - 1);
194 }
195 } else {
196 $ob->roll_stats;
197 }
198
199 Coro::Timer::sleep 0.05;
200 }
201
202 $ob->set_animation (2);
203 $ob->add_statbonus;
204
205 $pl->{chargen} = "race";
206 }
207
208 if ($pl->{chargen} eq "race") {
209 while () {
210 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
211 my $msg = $ob->msg;
212 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
213 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
214
215 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
216 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
217
218 last if $res =~ /[dD]/;
219
220 $pl->chargen_race_next;
221 Coro::Timer::sleep 0.05;
222 }
223
224 $pl->chargen_race_done;
225 $pl->{chargen} = "gender";
226 }
227
228 if ($pl->{chargen} eq "race") {
229 while () {
230 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
231 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
232
233 if ($res =~ /^[fF]/) {
234 $pl->gender (1);
235 last;
236 } elsif ($res =~ /^[mM]/) {
237 $pl->gender (0);
238 last;
239 }
240 Coro::Timer::sleep 0.05;
241 }
242 $pl->{chargen} = "done";
243 }
244
245 $ns->state (cf::ST_PLAYING);
246
247 if ($pl->{chargen} eq "done") {
248 # XXX: Workaround for delayed client ext protocol handshake
249 $pl->esrv_new_player;
250
251 $pl->{chargen} = "done";
252 }
253
254 $ob->reply (undef, "Welcome to Deliantra!");
255
256 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
257 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
258 }
259}
260
261sub chargen {
262 my ($ns, $user, $hash) = @_;
263
264 # just to make sure nothing is left over
265 # normally, nothing is there.
266 nuke_playerdir $user;
267
268 my $pl = cf::player::new $user;
269 $pl->password (unpack "H*", $hash);
270 $pl->connect ($ns);
271
272 $pl->{chargen} = "init";
273
274 login $pl;
148} 275}
149 276
150cf::client->attach (on_addme => sub { 277cf::client->attach (on_addme => sub {
151 my ($ns) = @_; 278 my ($ns) = @_;
152 279
153 $ns->pl and return $ns->destroy; 280 $ns->{addme}++ and return $ns->destroy;
154 281
155 $ns->async (sub { 282 $ns->async (sub {
156 $Coro::current->{desc} = "addme init"; 283 $Coro::current->{desc} = "addme init";
157 284
158 my ($user, $pass); 285 my ($user, $pass);
159 286
160 $ns->send_packet ("addme_success"); 287 $ns->send_packet ("addme_success");
161 288
162 for (;;) { 289 for (;;) {
290 delete $ns->{login_guard};
291
163 $ns->send_drawinfo ( 292 $ns->send_drawinfo (
164 "Please enter your username now. If you are a new user, " 293 "Please enter your username now. If you are a new user, "
165 . "make one up that describes your character best. " 294 . "make one up that describes your character best. "
166 . "Only letters and digits are allowed, though.", 295 . "Only letters and digits are allowed, though.",
167 cf::NDI_BLUE 296 cf::NDI_BLUE
… …
169 298
170 # read username 299 # read username
171 while () { 300 while () {
172 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:"; 301 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
173 302
174 if ($cf::LOGIN_LOCK{$user}) { 303 if ($user =~ $VALID_LOGIN) {
175 $ns->send_drawinfo (
176 "That username is currently used in another login session. "
177 . "Chose another, or wait till the other session has ended.",
178 cf::NDI_RED
179 );
180 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
181 last; 304 last;
182 } else { 305 } else {
183 $ns->send_drawinfo ( 306 $ns->send_drawinfo (
184 "Your username contains illegal characters " 307 "Your username contains illegal characters "
185 . "(only a-z, A-Z and 0-9 are allowed), " 308 . "(only a-z, A-Z and 0-9 are allowed), "
… …
188 ); 311 );
189 } 312 }
190 Coro::Timer::sleep 0.4; 313 Coro::Timer::sleep 0.4;
191 } 314 }
192 315
193 check_playing $ns, $user and next;
194
195 $Coro::current->{desc} = "addme($user) pass"; 316 $Coro::current->{desc} = "addme($user)";
196 317
197 $ns->send_drawinfo ( 318 $ns->send_drawinfo (
198 "Welcome $user, please enter your password now. " 319 "Welcome $user, please enter your password now. "
199 . "New users should now choose a password. " 320 . "New users should now choose a password. "
200 . "Anything your client lets you enter is fine.", 321 . "Anything your client lets you enter is fine.",
… …
211 cf::NDI_RED 332 cf::NDI_RED
212 ); 333 );
213 Coro::Timer::sleep 0.4; 334 Coro::Timer::sleep 0.4;
214 } 335 }
215 336
216 # lock this username for the remainder of this login session 337 $ns->{login_guard} = login_guard $user
217 if ($cf::LOGIN_LOCK{$user}) { 338 or do {
218 $ns->send_drawinfo ( 339 $ns->send_drawinfo (
219 "That username is currently used in another login session. " 340 "That user is already logged in (or is logging in)."
220 . "Chose another, or wait till the other session has ended.", 341 . "Chose another, or wait till the other session has ended.",
221 cf::NDI_RED 342 cf::NDI_RED
343 );
344 next;
222 ); 345 };
223 next;
224 }
225 local $cf::LOGIN_LOCK{$user} = 1;
226
227 check_playing $ns, $user and next;
228
229 $Coro::current->{desc} = "addme($user) check";
230 346
231 # try to read the user file and check the password 347 # try to read the user file and check the password
232 if (my $pl = cf::player::find $user) { 348 if (my $pl = cf::player::find $user) {
233 aio_stat $pl->path and next; 349 aio_stat $pl->path and next;
234 my $mtime = (stat _)[9]; 350 my $mtime = (stat _)[9];
235 my $hash = $pl->password; 351 my $token = $pl->password;
236 352
237 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 353 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
238 nuke_str $pass; 354 # player exists and passwords match - we can proceed
355
239 # password matches, wonderful 356 # password matches, wonderful
240 my $pl = cf::player::find $user or next; 357 my $pl = cf::player::find $user or next;
241 $pl->connect ($ns); 358 $pl->connect ($ns);
242 enter_map $pl; 359 enter_map $pl;
360 login $pl;
243 last; 361 return;
244 } elsif (can_cleanup $pl, $mtime) { 362 } elsif (can_cleanup $pl, $mtime) {
245 Coro::Timer::sleep 1; 363 Coro::Timer::sleep 1;
246 364
247 $ns->send_drawinfo ( 365 $ns->send_drawinfo (
248 "Player exists, but password does not match. If this is your account, " 366 "Player exists, but password does not match. If this is your account, "
249 . "please try again. If not, you can now decide to take over this account " 367 . "please try again. If not, you can now decide to take over this account "
250 . "because it has not been in-use for some time.", 368 . "because it has not been in-use for some time.",
251 cf::NDI_RED 369 cf::NDI_RED
252 ); 370 );
253 371
254 #TODO: nuke_str
255 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/ 372 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
256 or next; 373 or next;
257 374
258 # check if the file hasn't changed 375 # check if the file hasn't changed
259 aio_stat cf::player::path $user and next; 376 aio_stat cf::player::path $user and next;
… …
261 378
262 $pl->quit_character; 379 $pl->quit_character;
263 380
264 # fall through to creation 381 # fall through to creation
265 } else { 382 } else {
266 nuke_str $pass;
267
268 Coro::Timer::sleep 1; 383 Coro::Timer::sleep 1;
269 384
270 $ns->send_drawinfo ( 385 $ns->send_drawinfo (
271 "Wrong username or password. Please try again " 386 "Wrong username or password. Please try again "
272 . "(check for Numlock and other semi-obvious error sources).", 387 . "(check for Numlock and other semi-obvious error sources).",
… …
274 ); 389 );
275 next; 390 next;
276 } 391 }
277 } else { 392 } else {
278 # unable to load the playerfile: 393 # unable to load the playerfile:
279 # check wether the player dir exists, which means the file is corrupted or 394 # check whether the player dir exists, which means the file is corrupted or
280 # something very similar. 395 # something very similar.
281 if (!aio_stat cf::player::playerdir $user) { 396 if (!aio_stat cf::player::playerdir $user) {
282 $ns->send_drawinfo ( 397 $ns->send_drawinfo (
283 "Unable to retrieve this player. It might be a locked or broken account. " 398 "Unable to retrieve this player. It might be a locked or broken account. "
284 . "If this is your account, ask a dungeon master for assistance. " 399 . "If this is your account, ask a dungeon master for assistance. "
… …
287 ); 402 );
288 next; 403 next;
289 } 404 }
290 } 405 }
291 406
292 # the rest of this function is character creation
293 $Coro::current->{desc} = "addme($user) chargen";
294
295 # just to make sure nothing is left over
296 nuke_playerdir $user;
297
298 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 407 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
299 408
300 if ($pass2 ne $pass) { 409 if ($pass2 ne $pass) {
301 nuke_str $pass;
302 nuke_str $pass2;
303 $ns->send_drawinfo ( 410 $ns->send_drawinfo (
304 "The passwords do not match, please try again.", 411 "The passwords do not match, please try again.",
305 cf::NDI_RED 412 cf::NDI_RED
306 ); 413 );
307 Coro::Timer::sleep 0.5; 414 Coro::Timer::sleep 0.5;
308 next; 415 next;
309 } 416 }
310 417
311 nuke_str $pass2;
312
313 my $pl = cf::player::new $user;
314 $pl->password (encode_password $pass);
315 nuke_str $pass;
316 $pl->connect ($ns);
317 my $ob = $pl->ob;
318
319 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
320
321 while () {
322 $ob->update_stats;
323 $pl->save_stats;
324
325 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
326 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
327
328 if ($res =~ /^[Nn]/) {
329 last;
330 } elsif ($res > 0 && $res <= 7) {
331 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
332
333 if ($swap > 0 && $swap <= 7) {
334 $ob->swap_stats ($res - 1, $swap - 1);
335 }
336 } else {
337 $ob->roll_stats;
338 }
339
340 Coro::Timer::sleep 0.05;
341 }
342
343 $ob->set_animation (2);
344 $ob->add_statbonus;
345
346 while () {
347 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
348 my $msg = $ob->msg;
349 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
350 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
351
352 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
353 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
354
355 last if $res =~ /[dD]/;
356
357 $pl->chargen_race_next;
358 Coro::Timer::sleep 0.05;
359 }
360
361 # create the playerdir, if necessary, as chargen_race_done did it before
362 # presumably because of unique maps
363 aio_mkdir playerdir $pl, 0770;
364 $pl->chargen_race_done;
365
366 while () {
367 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
368 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
369
370 if ($res =~ /^[fF]/) {
371 $pl->gender (1);
372 last;
373 } elsif ($res =~ /^[mM]/) {
374 $pl->gender (0);
375 last;
376 }
377 Coro::Timer::sleep 0.05;
378 }
379
380 $ob->reply (undef, "Welcome to Deliantra!");
381
382 # XXX: Workaround for delayed client ext protocol handshake
383 $pl->esrv_new_player;
384
385 delete $pl->{deny_save};
386
387 last; 418 last;
388 } 419 }
389 420
390 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 421 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
391 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
392 }
393 }); 422 });
394}); 423});
395 424
425cf::client->attach (
426 on_version => sub {
427 my ($ns, $arg) = @_;
428
429 # perl probably uses lrand48, which is not secure at all
430 # maybe require linux and use /dev/urandom.
431 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
432 $ns->ext_msg (nonces => @{ $ns->{nonces} });
433 },
434);
435
436cf::register_async_exticmd create_login => sub {
437 my ($ns, $reply, $user, $pass) = @_;
438
439 $ns->{addme}++ and return $ns->destroy;
440
441 $ns->async (sub {
442 my $fail = sub {
443 $reply->(0, $_[0]);
444 $ns->flush; # does not ensure that the data reaches the client - TODO
445 # need to do this in another thread, as this one gets canceled
446 Coro::async_pool {
447 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
448 $ns->destroy if $ns->valid;
449 };
450 Coro::schedule; # do the destroy, should not return
451 };
452
453 $user =~ $VALID_LOGIN
454 or return $fail (
455 "Your username contains illegal characters (only a-z, A-Z and 0-9 are allowed), "
456 . "or is not between 3 and 20 characters in length."
457 );
458
459 $ns->{login_guard} = login_guard $user
460 or return $fail->("User name '$user' is in use - try another login name.");
461
462 cf::player::find $user
463 and return $fail->("User name '$user' is already registered - choose another login name.");
464
465 $reply->(1, "Account Created");
466
467 chargen $ns, $user, $pass;
468 });
469};
470
471cf::register_async_exticmd login => sub {
472 my ($ns, $reply, $user, $hash) = @_;
473
474 $ns->{addme}++ and return $ns->destroy;
475
476 $ns->async (sub {
477 $Coro::current->{desc} = "login($user)";
478
479 my $fail = sub {
480 $reply->(0, $_[0]);
481 $ns->flush; # does not ensure that the data reaches the client - TODO
482 # need to do this in another thread, as this one gets canceled
483 Coro::async_pool {
484 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
485 $ns->destroy if $ns->valid;
486 };
487 Coro::schedule; # do the destroy, should not return
488 };
489
490 $ns->{login_guard} = login_guard $user
491 or return $fail->("User '$user' is currently playing or logging in in another session. If that is your "
492 . "user name, make sure you are not running two clients. When in doubt, reboot.");
493
494 # try to read the user file and check the password
495 my $pl = cf::player::find $user
496 or return $fail->("User '$user' does not exist - wrong spelling?");
497
498 aio_stat $pl->path
499 and return $ns->destroy;
500
501 my $mtime = (stat _)[9];
502 my $token = $pl->password;
503
504 $token = $token =~ /^!/
505 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
506 : pack "H*", $token;
507
508 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
509
510 $token eq $hash
511 or $cf::CFG{ext_login_nocheck}
512 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
513
514 # player exists and passwords match - we can proceed
515
516 $reply->(1, "Success");
517
518 $pl->connect ($ns);
519 enter_map $pl;
520 login $pl;
521 });
522};
523
396cf::register_command password => sub { 524cf::register_command password => sub {
397 my ($pl, $arg) = @_; 525 my ($pl, $arg) = @_;
398 526
527 unless ($pl->flag (cf::FLAG_WIZ)) {
528 $pl->message (
529 "The password can currently only changed by a DM.",
530 cf::NDI_UNIQUE | cf::NDI_REPLY);
531 return;
532 }
533
534 $pl->message (#d#
535 "Passwords cannot currently be changed.",#d#
536 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
537 return;#d#
538
399 my (@args) = split /\s+/, $arg; 539 my (@args) = split /\s+/, $arg;
400
401 my ($new_pw, $player);
402
403 if ($pl->flag (cf::FLAG_WIZ)) {
404 ($player, $new_pw) = @args; 540 my ($player, $new_pw) = @args;
405 } else {
406 $new_pw = $args[0];
407 }
408 541
409 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 542 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
410 $pl->message ( 543 $pl->message (
411 "Usage: password <player> [<new password>]", 544 "Usage: password <player> [<new password>]",
412 cf::NDI_UNIQUE | cf::NDI_REPLY); 545 cf::NDI_UNIQUE | cf::NDI_REPLY);
413 return; 546 return;
414 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
415 $pl->message (
416 "Usage: password <new password>",
417 cf::NDI_UNIQUE | cf::NDI_REPLY);
418 return;
419 } 547 }
420 548
421 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
422 unless ($new_pw ne '') { 549 if ($new_pw eq '') {
423 $new_pw = 550 $new_pw =
424 join '', 551 join '',
425 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] } 552 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
426 1..9; 553 1..9;
427 } 554 }
428 555
429 cf::async { 556 cf::async {
430 my $plc = cf::player::find $player; 557 my $plc = cf::player::find $player;
431 if ($plc) { 558 if ($plc) {
432 $plc->password (encode_password $new_pw); 559 $plc->password (encode_password $new_pw);
433 $pl->message (
434 "Ok, changed password of '$player' to '$new_pw'!",
435 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
436 } else {
437 $pl->message (
438 "Fail! Couldn't set password for '$player', "
439 . "he doesn't seem to exist!",
440 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
441 }
442 };
443 } else {
444 my $change = delete $pl->{password_change};
445
446 if ($change && (time - $change->[0]) < 60) {
447 $pl->message ( 560 $pl->message (
448 "Ok, changed your password!", 561 "Ok, changed password of '$player' to '$new_pw'!",
449 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 562 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
450 $pl->contr->password (encode_password $new_pw);
451
452 } else { 563 } else {
453 $pl->message ( 564 $pl->message (
454 "Ok, please confirm your new password by sending " 565 "Fail! Couldn't set password for '$player', "
455 . "the command again within one minute!", 566 . "he doesn't seem to exist!",
456 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 567 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
457 $pl->{password_change} = [time, $new_pw];
458 } 568 }
459 } 569 };
460}; 570};
461 571
462cf::register_command quit => sub { 572cf::register_command quit => sub {
463 my ($ob, $arg) = @_; 573 my ($ob, $arg) = @_;
464 574
… …
476 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 586 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
477 if ($_[0] !~ /^[yY]/) { 587 if ($_[0] !~ /^[yY]/) {
478 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 588 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
479 } else { 589 } else {
480 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 590 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
481 $pl->ns->flush;
482 cf::async { 591 cf::async {
483 ext::highscore::check $pl->ob;
484 $pl->quit_character; 592 $pl->quit_character;
485 }; 593 };
486 } 594 }
487 }); 595 });
488}; 596};
… …
496 604
497 my $pl = $ob->contr; 605 my $pl = $ob->contr;
498 606
499 # update respawn position 607 # update respawn position
500 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 608 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
501 cf::async { $pl->save };
502 609
610 cf::async {
503 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 611 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
504 ext::highscore::check $ob; 612 ext::highscore::check $ob;
505 613
614 $pl->save;
615
506 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY); 616 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
507 617
618 my $ns = $pl->ns
619 or return;
620
508 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 621 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
509 if ($_[0] !~ /^[yY]/) { 622 if ($_[0] !~ /^[yY]/) {
510 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 623 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
511 $pl->deactivate; 624 $pl->deactivate;
512 $pl->ns->destroy; 625 $pl->ns->destroy;
513 } else { 626 }
514 cf::async { $pl->save };
515 } 627 });
516 }); 628 };
517 }, 629 },
518); 630);
519 631
520cf::player->attach ( 632cf::player->attach (
521 on_login => sub { 633 on_login => sub {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines