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.84 by root, Wed Apr 30 06:40:28 2008 UTC vs.
Revision 1.111 by root, Sun May 9 22:51:13 2010 UTC

1#! perl # mandatory 1#! perl # mandatory depends=highscore
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
… …
13} 13}
14 14
15sub query { 15sub query {
16 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
17 17
18 my $current = $Coro::current; 18 $ns->query ($flags, $text, Coro::rouse_cb);
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 19 Coro::rouse_wait
20 Coro::schedule while ref $current;
21
22 $current
23} 20}
24 21
25sub can_cleanup { 22sub can_cleanup {
26 my ($pl, $mtime) = @_; 23 my ($pl, $mtime) = @_;
27 24
… …
90 if ($time && $m) { 87 if ($time && $m) {
91 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
92 # the map was reset in the meantime 89 # the map was reset in the meantime
93 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
94 91
95 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 92 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
96 93
97 if ($age >= $MAX_DISCONNECT_TIME) { 94 if ($age >= $MAX_DISCONNECT_TIME) {
98 $ob->message ( 95 $ob->message (
99 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 96 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
100 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " 97 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
103 cf::NDI_RED 100 cf::NDI_RED
104 ); 101 );
105 # kill them. 102 # kill them.
106 # reminds me of the famous badness 10000 syndrome... 103 # reminds me of the famous badness 10000 syndrome...
107 $ob->stats->hp (-10000); #] if they survive this they deserved to live 104 $ob->stats->hp (-10000); #] if they survive this they deserved to live
108 my $killer = cf::arch::get "killer_login"; 105 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
109 $pl->killer ($killer);
110 $killer->destroy;
111 } else { 106 } else {
112 ($map, $x, $y) = $pl->savebed; 107 ($map, $x, $y) = $pl->savebed;
113 108
114 $ob->message ( 109 $ob->message (
115 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 110 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
… …
131 } 126 }
132 127
133 $ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
134} 129}
135 130
136# delete a player directory, be non-blocking AND synchronous... 131sub encode_password($) {
137# (thats hard, so we crap out and fork). 132# crypt $_[0],
133# join '',
134# ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
135 "!" . unpack "H*", $_[0]
136}
137
138sub compare_password($$) {
139 my ($pass, $token) = @_;
140
141 if ($token =~ /\!(.*)/) {
142 return $pass eq pack "H*", $1;
143 } else {
144 return $token eq crypt $pass, $token;
145 }
146}
147
148# delete a player directory
138sub nuke_playerdir { 149sub nuke_playerdir {
139 my ($user) = @_; 150 my ($user) = @_;
140 151
152 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
153
141 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 154 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
142
143 cf::fork_call {
144 rename "$PLAYERDIR/$user", $temp; 155 aio_rename "$PLAYERDIR/$user", $temp;
145 system "rm", "-rf", $temp; 156 IO::AIO::aio_rmtree $temp;
146 };
147} 157}
148 158
149cf::client->attach (on_addme => sub { 159cf::client->attach (on_addme => sub {
150 my ($ns) = @_; 160 my ($ns) = @_;
151
152 if (!$ns->facecache)
153 {
154 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
155
156
157***
158*** WARNING:
159*** Your client does not support face/image caching,
160*** or it has been disabled. Face caching is mandatory
161*** so please enable it or use a newer client.
162***
163*** Look at your client preferences:
164***
165*** deliantra: all known versions automatically enable the facecache.
166*** cfclient: use the -cache commandline option.
167*** cfclient: map will not redraw automatically (bug).
168*** gcfclient: use -cache commandline option, or enable
169*** gcfclient: Client => Configure => Map & Image => Cache Images.
170*** jcrossclient: your client is broken, use deliantra or gcfclient.
171***
172***
173EOF
174 if ($ns->version =~ /jcrossclient/) {
175 # let them, for now
176 } else {
177 $ns->flush;
178 return $ns->destroy;
179 }
180
181 # $ns->facecache = true;
182 }
183
184 if ($ns->mapmode < cf::Map1aCmd) {
185 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
186
187
188***
189*** WARNING:
190*** Your client is too old. Please upgrade to a newer version.
191EOF
192
193 $ns->flush;
194 return $ns->destroy;
195 }
196 161
197 $ns->pl and return $ns->destroy; 162 $ns->pl and return $ns->destroy;
198 163
199 $ns->async (sub { 164 $ns->async (sub {
200 $Coro::current->{desc} = "addme init"; 165 $Coro::current->{desc} = "addme init";
… …
211 cf::NDI_BLUE 176 cf::NDI_BLUE
212 ); 177 );
213 178
214 # read username 179 # read username
215 while () { 180 while () {
216 $user = query $ns, 0, "What is your name?\n:"; 181 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
217 182
218 if ($cf::LOGIN_LOCK{$user}) { 183 if ($cf::LOGIN_LOCK{$user}) {
219 $ns->send_drawinfo ( 184 $ns->send_drawinfo (
220 "That username is currently used in another login session. " 185 "That username is currently used in another login session. "
221 . "Chose another, or wait till the other session has ended.", 186 . "Chose another, or wait till the other session has ended.",
222 cf::NDI_RED 187 cf::NDI_RED
223 ); 188 );
224 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 189 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
225 last; 190 last;
226 } else { 191 } else {
227 $ns->send_drawinfo ( 192 $ns->send_drawinfo (
228 "Your username contains illegal characters " 193 "Your username contains illegal characters "
229 . "(only a-z, A-Z and 0-9 are allowed), " 194 . "(only a-z, A-Z and 0-9 are allowed), "
230 . "or is not between 3 and 18 characters in length.", 195 . "or is not between 3 and 20 characters in length.",
231 cf::NDI_RED 196 cf::NDI_RED
232 ); 197 );
233 } 198 }
234 Coro::Timer::sleep 0.4; 199 Coro::Timer::sleep 0.4;
235 } 200 }
… …
274 239
275 # try to read the user file and check the password 240 # try to read the user file and check the password
276 if (my $pl = cf::player::find $user) { 241 if (my $pl = cf::player::find $user) {
277 aio_stat $pl->path and next; 242 aio_stat $pl->path and next;
278 my $mtime = (stat _)[9]; 243 my $mtime = (stat _)[9];
279 my $hash = $pl->password; 244 my $token = $pl->password;
280 245
281 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 246 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
247 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
282 nuke_str $pass; 248 nuke_str $pass;
283 # password matches, wonderful 249 # password matches, wonderful
284 my $pl = cf::player::find $user or next; 250 my $pl = cf::player::find $user or next;
285 $pl->connect ($ns); 251 $pl->connect ($ns);
286 enter_map $pl; 252 enter_map $pl;
… …
335 301
336 # the rest of this function is character creation 302 # the rest of this function is character creation
337 $Coro::current->{desc} = "addme($user) chargen"; 303 $Coro::current->{desc} = "addme($user) chargen";
338 304
339 # just to make sure nothing is left over 305 # just to make sure nothing is left over
306 # normally, nothing is there.
340 nuke_playerdir $user; 307 nuke_playerdir $user;
341 308
342 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 309 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
343 310
344 if ($pass2 ne $pass) { 311 if ($pass2 ne $pass) {
… …
353 } 320 }
354 321
355 nuke_str $pass2; 322 nuke_str $pass2;
356 323
357 my $pl = cf::player::new $user; 324 my $pl = cf::player::new $user;
358 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 325 $pl->password (encode_password $pass);
359 nuke_str $pass; 326 nuke_str $pass;
360 $pl->connect ($ns); 327 $pl->connect ($ns);
361 my $ob = $pl->ob; 328 my $ob = $pl->ob;
362 329
363 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 330 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
379 } 346 }
380 } else { 347 } else {
381 $ob->roll_stats; 348 $ob->roll_stats;
382 } 349 }
383 350
384 Coro::Timer::sleep 0.2; 351 Coro::Timer::sleep 0.05;
385 } 352 }
386 353
387 $ob->set_animation (2); 354 $ob->set_animation (2);
388 $ob->add_statbonus; 355 $ob->add_statbonus;
389 356
… …
397 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 364 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
398 365
399 last if $res =~ /[dD]/; 366 last if $res =~ /[dD]/;
400 367
401 $pl->chargen_race_next; 368 $pl->chargen_race_next;
402 Coro::Timer::sleep 0.2; 369 Coro::Timer::sleep 0.05;
403 } 370 }
404 371
372 # create the playerdir, if necessary, as chargen_race_done did it before
373 # presumably because of unique maps
374 aio_mkdir playerdir $pl, 0770;
405 $pl->chargen_race_done; 375 $pl->chargen_race_done;
406 376
407 while () { 377 while () {
408 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 378 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
409 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 379 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
… …
413 last; 383 last;
414 } elsif ($res =~ /^[mM]/) { 384 } elsif ($res =~ /^[mM]/) {
415 $pl->gender (0); 385 $pl->gender (0);
416 last; 386 last;
417 } 387 }
418 Coro::Timer::sleep 0.2; 388 Coro::Timer::sleep 0.05;
419 } 389 }
420 390
421 $ob->reply (undef, "Welcome to Deliantra!"); 391 $ob->reply (undef, "Welcome to Deliantra!");
422 392
393 # XXX: Workaround for delayed client ext protocol handshake
394 $pl->esrv_new_player;
395
423 delete $pl->{deny_save}; 396 delete $pl->{deny_save};
424 397
425 last; 398 last;
399 }
400
401 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
402 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
426 } 403 }
427 }); 404 });
428}); 405});
429 406
407cf::register_command password => sub {
408 my ($pl, $arg) = @_;
409
410 my (@args) = split /\s+/, $arg;
411
412 my ($new_pw, $player);
413
414 if ($pl->flag (cf::FLAG_WIZ)) {
415 ($player, $new_pw) = @args;
416 } else {
417 $new_pw = $args[0];
418 }
419
420 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
421 $pl->message (
422 "Usage: password <player> [<new password>]",
423 cf::NDI_UNIQUE | cf::NDI_REPLY);
424 return;
425 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
426 $pl->message (
427 "Usage: password <new password>",
428 cf::NDI_UNIQUE | cf::NDI_REPLY);
429 return;
430 }
431
432 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
433 unless ($new_pw ne '') {
434 $new_pw =
435 join '',
436 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
437 1..9;
438 }
439
440 cf::async {
441 my $plc = cf::player::find $player;
442 if ($plc) {
443 $plc->password (encode_password $new_pw);
444 $pl->message (
445 "Ok, changed password of '$player' to '$new_pw'!",
446 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
447 } else {
448 $pl->message (
449 "Fail! Couldn't set password for '$player', "
450 . "he doesn't seem to exist!",
451 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
452 }
453 };
454 } else {
455 my $change = delete $pl->{password_change};
456
457 if ($change && (time - $change->[0]) < 60) {
458 $pl->message (
459 "Ok, changed your password!",
460 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
461 $pl->contr->password (encode_password $new_pw);
462
463 } else {
464 $pl->message (
465 "Ok, please confirm your new password by sending "
466 . "the command again within one minute!",
467 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
468 $pl->{password_change} = [time, $new_pw];
469 }
470 }
471};
472
430cf::register_command quit => sub { 473cf::register_command quit => sub {
431 my ($ob, $arg) = @_; 474 my ($ob, $arg) = @_;
432 475
433 $ob->reply (undef, 476 $ob->send_msg (undef,
434 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 477 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
435 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 478 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
436 cf::NDI_UNIQUE | cf::NDI_RED); 479 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
437}; 480};
438 481
439cf::register_command quit_character => sub { 482cf::register_command quit_character => sub {
440 my ($ob, $arg) = @_; 483 my ($ob, $arg) = @_;
441 484
442 my $pl = $ob->contr; 485 my $pl = $ob->contr;
443 486
444 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 487 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
445 if ($_[0] !~ /^[yY]/) { 488 if ($_[0] !~ /^[yY]/) {
446 $ob->reply (undef, 489 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
447 "Ok, not not quitting then.",
448 cf::NDI_UNIQUE | cf::NDI_RED);
449 } else { 490 } else {
450 $ob->reply (undef, 491 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
451 "Ok, quitting, hope to see you again.", 492 cf::async {
452 cf::NDI_UNIQUE | cf::NDI_RED);
453 $pl->ns->flush;
454 cf::async { $pl->quit_character }; 493 $pl->quit_character;
494 };
455 } 495 }
456 }); 496 });
457}; 497};
458 498
459cf::object->attach ( 499cf::object->attach (
… …
465 505
466 my $pl = $ob->contr; 506 my $pl = $ob->contr;
467 507
468 # update respawn position 508 # update respawn position
469 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 509 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
470 cf::async { $pl->save };
471 510
472 my $killer = cf::arch::get "killer_logout"; 511 cf::async {
473 $pl->killer ($killer); 512 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
474 $killer->destroy; 513 ext::highscore::check $ob;
475 $ob->check_score;
476 514
477 $ob->reply (undef, "In the future, you will wake up here when you die."); 515 $pl->save;
478 516
517 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
518
479 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 519 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
480 if ($_[0] !~ /^[yY]/) { 520 if ($_[0] !~ /^[yY]/) {
481 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
482 $pl->deactivate; 522 $pl->deactivate;
483 $pl->ns->destroy; 523 $pl->ns->destroy;
484 } else { 524 }
485 cf::async { $pl->save };
486 } 525 });
487 }); 526 };
488 }, 527 },
489); 528);
490 529
491cf::player->attach ( 530cf::player->attach (
492 on_login => sub { 531 on_login => sub {
… …
507 unless safe_spot $pl; 546 unless safe_spot $pl;
508 } 547 }
509 }, 548 },
510); 549);
511 550
512#############################################################################
513
514our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
515our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
516
517our $SCHEDULER = cf::async_ext {
518 $Coro::current->{desc} = "player scheduler";
519
520 while () {
521 Coro::EV::timer_once $SCHEDULE_INTERVAL;
522
523 # this weird form of iteration over values is used because
524 # the hash changes underneath us frequently, and for
525 # keeps a direct reference to the value without (in 5.8 perls)
526 # keeping a reference, so this is prone to crashes or worse.
527 my @players = keys %cf::PLAYER;
528 for (@players) {
529 my $pl = $cf::PLAYER{$_}
530 or next;
531 $pl->valid or next;
532
533 eval {
534 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
535 $pl->save;
536
537 unless ($pl->active || $pl->ns) {
538 # check refcounts, this is tricky and needs to be adjusted to fit server internals
539 my $ob = $pl->ob;
540
541 my $pl_ref = $pl->refcnt_cnt;
542 my $ob_ref = $ob->refcnt_cnt;
543
544 ## pl_ref == $pl + ob->contr + %cf::PLAYER
545 ## ob_ref == $ob + pl->observe + simply being an object
546 if ($pl_ref == 3 && $ob_ref == 3) {
547 warn "player-scheduler destroy ", $ob->name;#d#
548
549 # remove from sight and get fresh "copies"
550 $pl = delete $cf::PLAYER{$ob->name};
551 $ob = $pl->ob;
552
553 $pl->destroy; # destroys $ob
554 } else {
555 my $a_ = $pl->refcnt;#d#
556 my $b_ = $ob->refcnt;#d#
557
558 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
559 }
560 }
561 }
562 };
563 warn $@ if $@;
564 cf::cede_to_tick;
565 };
566 }
567};
568
569$SCHEDULER->prio (1);
570

Diff Legend

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