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.78 by root, Mon Jan 7 01:55:19 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
… …
52 ); 49 );
53 50
54 1 51 1
55} 52}
56 53
57sub safe_spot($$$) { 54sub safe_spot($) {
58 my ($m, $x, $y) = @_; 55 my ($pl) = @_;
56
57 my $ob = $pl->ob;
59 58
59 my $m = $ob->map
60 or return;
61 my $x = $ob->x;
62 my $y = $ob->y;
63
60 return 0; 64# return 0;#d#
61 warn join ":", $m->at ($x, $y);#d# 65# warn join ":", $m->at ($x, $y);#d#
62 warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
63 return 0; 67# return 0;
64 68
65 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
66} 70}
67 71
68sub enter_map { 72sub enter_map {
… …
78 $ob->enter_link; 82 $ob->enter_link;
79 83
80 my $m = cf::map::find $map; 84 my $m = cf::map::find $map;
81 my $time = delete $pl->{unclean_save}; 85 my $time = delete $pl->{unclean_save};
82 86
83 if ($time && $m && !safe_spot $m, $x, $y) { 87 if ($time && $m) {
84 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
85 # the map was reset in the meantime 89 # the map was reset in the meantime
86 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
87 91
88 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#
89
90 ($map, $x, $y) = $pl->savebed;
91 93
92 if ($age >= $MAX_DISCONNECT_TIME) { 94 if ($age >= $MAX_DISCONNECT_TIME) {
93 $ob->message ( 95 $ob->message (
94 "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. "
95 . "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. "
… …
98 cf::NDI_RED 100 cf::NDI_RED
99 ); 101 );
100 # kill them. 102 # kill them.
101 # reminds me of the famous badness 10000 syndrome... 103 # reminds me of the famous badness 10000 syndrome...
102 $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
103 $pl->killer ("a cave-in"); 105 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
104 } else { 106 } else {
107 ($map, $x, $y) = $pl->savebed;
108
105 $ob->message ( 109 $ob->message (
106 "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. "
107 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 111 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
108 . "Better use a savebed next time, much worse things could have happened... " 112 . "Better use a savebed next time, much worse things could have happened... "
109 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>", 113 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
… …
122 } 126 }
123 127
124 $ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
125} 129}
126 130
127# delete a player directory, be non-blocking AND synchronous... 131sub encode_password($) {
128# (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
129sub nuke_playerdir { 149sub nuke_playerdir {
130 my ($user) = @_; 150 my ($user) = @_;
131 151
152 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
153
132 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 154 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
133
134 cf::fork_call {
135 rename "$PLAYERDIR/$user", $temp; 155 aio_rename "$PLAYERDIR/$user", $temp;
136 system "rm", "-rf", $temp; 156 IO::AIO::aio_rmtree $temp;
137 };
138} 157}
139 158
140cf::client->attach (on_addme => sub { 159cf::client->attach (on_addme => sub {
141 my ($ns) = @_; 160 my ($ns) = @_;
142
143 if (!$ns->facecache)
144 {
145 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
146
147
148***
149*** WARNING:
150*** Your client does not support face/image caching,
151*** or it has been disabled. Face caching is mandatory
152*** so please enable it or use a newer client.
153***
154*** Look at your client preferences:
155***
156*** CFPlus: all known versions automatically enable the facecache.
157*** cfclient: use the -cache commandline option.
158*** cfclient: map will not redraw automatically (bug).
159*** gcfclient: use -cache commandline option, or enable
160*** gcfclient: Client => Configure => Map & Image => Cache Images.
161*** jcrossclient: your client is broken, use CFPlus or gcfclient.
162***
163***
164EOF
165 if ($ns->version =~ /jcrossclient/) {
166 # let them, for now
167 } else {
168 $ns->flush;
169 return $ns->destroy;
170 }
171
172 # $ns->facecache = true;
173 }
174
175 if ($ns->mapmode < cf::Map1aCmd) {
176 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
177
178
179***
180*** WARNING:
181*** Your client is too old. Please upgrade to a newer version.
182EOF
183
184 $ns->flush;
185 return $ns->destroy;
186 }
187 161
188 $ns->pl and return $ns->destroy; 162 $ns->pl and return $ns->destroy;
189 163
190 $ns->async (sub { 164 $ns->async (sub {
191 $Coro::current->{desc} = "addme init"; 165 $Coro::current->{desc} = "addme init";
… …
202 cf::NDI_BLUE 176 cf::NDI_BLUE
203 ); 177 );
204 178
205 # read username 179 # read username
206 while () { 180 while () {
207 $user = query $ns, 0, "What is your name?\n:"; 181 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
208 182
209 if ($cf::LOGIN_LOCK{$user}) { 183 if ($cf::LOGIN_LOCK{$user}) {
210 $ns->send_drawinfo ( 184 $ns->send_drawinfo (
211 "That username is currently used in another login session. " 185 "That username is currently used in another login session. "
212 . "Chose another, or wait till the other session has ended.", 186 . "Chose another, or wait till the other session has ended.",
213 cf::NDI_RED 187 cf::NDI_RED
214 ); 188 );
215 } 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/) {
216 last; 190 last;
217 } else { 191 } else {
218 $ns->send_drawinfo ( 192 $ns->send_drawinfo (
219 "Your username contains illegal characters " 193 "Your username contains illegal characters "
220 . "(only a-z, A-Z and 0-9 are allowed), " 194 . "(only a-z, A-Z and 0-9 are allowed), "
221 . "or is not between 3 and 18 characters in length.", 195 . "or is not between 3 and 20 characters in length.",
222 cf::NDI_RED 196 cf::NDI_RED
223 ); 197 );
224 } 198 }
225 Coro::Timer::sleep 0.4; 199 Coro::Timer::sleep 0.4;
226 } 200 }
… …
265 239
266 # try to read the user file and check the password 240 # try to read the user file and check the password
267 if (my $pl = cf::player::find $user) { 241 if (my $pl = cf::player::find $user) {
268 aio_stat $pl->path and next; 242 aio_stat $pl->path and next;
269 my $mtime = (stat _)[9]; 243 my $mtime = (stat _)[9];
270 my $hash = $pl->password; 244 my $token = $pl->password;
271 245
272 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#
273 nuke_str $pass; 248 nuke_str $pass;
274 # password matches, wonderful 249 # password matches, wonderful
275 my $pl = cf::player::find $user or next; 250 my $pl = cf::player::find $user or next;
276 $pl->connect ($ns); 251 $pl->connect ($ns);
277 enter_map $pl; 252 enter_map $pl;
… …
326 301
327 # the rest of this function is character creation 302 # the rest of this function is character creation
328 $Coro::current->{desc} = "addme($user) chargen"; 303 $Coro::current->{desc} = "addme($user) chargen";
329 304
330 # just to make sure nothing is left over 305 # just to make sure nothing is left over
306 # normally, nothing is there.
331 nuke_playerdir $user; 307 nuke_playerdir $user;
332 308
333 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.";
334 310
335 if ($pass2 ne $pass) { 311 if ($pass2 ne $pass) {
… …
344 } 320 }
345 321
346 nuke_str $pass2; 322 nuke_str $pass2;
347 323
348 my $pl = cf::player::new $user; 324 my $pl = cf::player::new $user;
349 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 325 $pl->password (encode_password $pass);
350 nuke_str $pass; 326 nuke_str $pass;
351 $pl->connect ($ns); 327 $pl->connect ($ns);
352 my $ob = $pl->ob; 328 my $ob = $pl->ob;
353 329
354 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 330 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
370 } 346 }
371 } else { 347 } else {
372 $ob->roll_stats; 348 $ob->roll_stats;
373 } 349 }
374 350
375 Coro::Timer::sleep 0.2; 351 Coro::Timer::sleep 0.05;
376 } 352 }
377 353
378 $ob->set_animation (2); 354 $ob->set_animation (2);
379 $ob->add_statbonus; 355 $ob->add_statbonus;
380 356
… …
388 "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";
389 365
390 last if $res =~ /[dD]/; 366 last if $res =~ /[dD]/;
391 367
392 $pl->chargen_race_next; 368 $pl->chargen_race_next;
393 Coro::Timer::sleep 0.2; 369 Coro::Timer::sleep 0.05;
394 } 370 }
395 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;
396 $pl->chargen_race_done; 375 $pl->chargen_race_done;
397 376
398 while () { 377 while () {
399 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 378 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
400 "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";
… …
404 last; 383 last;
405 } elsif ($res =~ /^[mM]/) { 384 } elsif ($res =~ /^[mM]/) {
406 $pl->gender (0); 385 $pl->gender (0);
407 last; 386 last;
408 } 387 }
409 Coro::Timer::sleep 0.2; 388 Coro::Timer::sleep 0.05;
410 } 389 }
411 390
412 $ob->reply (undef, "Welcome to Deliantra!"); 391 $ob->reply (undef, "Welcome to Deliantra!");
413 392
393 # XXX: Workaround for delayed client ext protocol handshake
394 $pl->esrv_new_player;
395
414 delete $pl->{deny_save}; 396 delete $pl->{deny_save};
415 397
416 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);
417 } 403 }
418 }); 404 });
419}); 405});
420 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
421cf::register_command quit => sub { 473cf::register_command quit => sub {
422 my ($ob, $arg) = @_; 474 my ($ob, $arg) = @_;
423 475
424 $ob->reply (undef, 476 $ob->send_msg (undef,
425 "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. "
426 . "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.",
427 cf::NDI_UNIQUE | cf::NDI_RED); 479 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
428}; 480};
429 481
430cf::register_command quit_character => sub { 482cf::register_command quit_character => sub {
431 my ($ob, $arg) = @_; 483 my ($ob, $arg) = @_;
432 484
433 my $pl = $ob->contr; 485 my $pl = $ob->contr;
434 486
435 $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 {
436 if ($_[0] !~ /^[yY]/) { 488 if ($_[0] !~ /^[yY]/) {
437 $ob->reply (undef, 489 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
438 "Ok, not not quitting then.",
439 cf::NDI_UNIQUE | cf::NDI_RED);
440 } else { 490 } else {
441 $ob->reply (undef, 491 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
442 "Ok, quitting, hope to see you again.", 492 cf::async {
443 cf::NDI_UNIQUE | cf::NDI_RED);
444 $pl->ns->flush;
445 cf::async { $pl->quit_character }; 493 $pl->quit_character;
494 };
446 } 495 }
447 }); 496 });
448}; 497};
449 498
450cf::object->attach ( 499cf::object->attach (
… …
456 505
457 my $pl = $ob->contr; 506 my $pl = $ob->contr;
458 507
459 # update respawn position 508 # update respawn position
460 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 509 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
461 cf::async { $pl->save };
462 510
463 $pl->killer ("left"); 511 cf::async {
464 $ob->check_score; 512 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
513 ext::highscore::check $ob;
465 514
466 $ob->reply (undef, "In the future, you will wake up here when you die."); 515 $pl->save;
467 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
468 $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 {
469 if ($_[0] !~ /^[yY]/) { 520 if ($_[0] !~ /^[yY]/) {
470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
471 $pl->deactivate; 522 $pl->deactivate;
472 $pl->ns->destroy; 523 $pl->ns->destroy;
473 } else { 524 }
474 cf::async { $pl->save };
475 } 525 });
476 }); 526 };
477 }, 527 },
478); 528);
479 529
480cf::player->attach ( 530cf::player->attach (
481 on_login => sub { 531 on_login => sub {
… …
490 540
491 if ($cleanly) { 541 if ($cleanly) {
492 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 542 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
493 } else { 543 } else {
494 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 544 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
495 $pl->{unclean_save} = $cf::RUNTIME; 545 $pl->{unclean_save} = $cf::RUNTIME
546 unless safe_spot $pl;
496 } 547 }
497 }, 548 },
498); 549);
499 550
500#############################################################################
501
502our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
503our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
504
505our $SCHEDULER = cf::async_ext {
506 $Coro::current->{desc} = "player scheduler";
507
508 while () {
509 Coro::EV::timer_once $SCHEDULE_INTERVAL;
510
511 # this weird form of iteration over values is used because
512 # the hash changes underneath us frequently, and for
513 # keeps a direct reference to the value without (in 5.8 perls)
514 # keeping a reference, so this is prone to crashes or worse.
515 my @players = keys %cf::PLAYER;
516 for (@players) {
517 my $pl = $cf::PLAYER{$_}
518 or next;
519 $pl->valid or next;
520
521 eval {
522 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
523 $pl->save;
524
525 unless ($pl->active || $pl->ns) {
526 # check refcounts, this is tricky and needs to be adjusted to fit server internals
527 my $ob = $pl->ob;
528
529 my $pl_ref = $pl->refcnt_cnt;
530 my $ob_ref = $ob->refcnt_cnt;
531
532 ## pl_ref == $pl + ob->contr + %cf::PLAYER
533 ## ob_ref == $ob + pl->observe + simply being an object
534 if ($pl_ref == 3 && $ob_ref == 3) {
535 warn "player-scheduler destroy ", $ob->name;#d#
536
537 # remove from sight and get fresh "copies"
538 $pl = delete $cf::PLAYER{$ob->name};
539 $ob = $pl->ob;
540
541 $pl->destroy; # destroys $ob
542 } else {
543 my $a_ = $pl->refcnt;#d#
544 my $b_ = $ob->refcnt;#d#
545
546 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
547 }
548 }
549 }
550 };
551 warn $@ if $@;
552 Coro::cede;
553 };
554 }
555};
556
557$SCHEDULER->prio (1);
558

Diff Legend

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