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.90 by root, Tue Sep 16 16:03:02 2008 UTC vs.
Revision 1.115 by root, Sun Jan 23 23:37:55 2011 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
… …
62 my $m = $ob->map 59 my $m = $ob->map
63 or return; 60 or return;
64 my $x = $ob->x; 61 my $x = $ob->x;
65 my $y = $ob->y; 62 my $y = $ob->y;
66 63
64 # never happens normally, but helps when shell users make mistakes
65 $m->in_memory == cf::MAP_ACTIVE
66 or return 1;
67
67# return 0;#d# 68# return 0;#d#
68# warn join ":", $m->at ($x, $y);#d# 69# warn join ":", $m->at ($x, $y);#d#
69# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 70# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
70# return 0; 71# return 0;
71 72
… …
73} 74}
74 75
75sub enter_map { 76sub enter_map {
76 my ($pl) = @_; 77 my ($pl) = @_;
77 78
78 warn $pl->ob->name, ": enter map 1\n";#d#
79 my $ob = $pl->ob; 79 my $ob = $pl->ob;
80 80
81 my ($map, $x, $y) 81 my ($map, $x, $y)
82 = $ob->{_link_pos} 82 = $ob->{_link_pos}
83 ? @{delete $ob->{_link_pos}} 83 ? @{delete $ob->{_link_pos}}
84 : ($pl->maplevel, $ob->x, $ob->y); 84 : ($pl->maplevel, $ob->x, $ob->y);
85 85
86 warn $pl->ob->name, ": enter map 2\n";#d#
87 $ob->enter_link; 86 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
89 87
90 my $m = cf::map::find $map; 88 my $m = cf::map::find $map;
91 my $time = delete $pl->{unclean_save}; 89 my $time = delete $pl->{unclean_save};
92 warn $pl->ob->name, ": enter map 4\n";#d#
93 90
94 if ($time && $m) { 91 if ($time && $m) {
95 if ($time < $m->{instantiate_time}) { 92 if ($time < $m->{instantiate_time}) {
96 # the map was reset in the meantime 93 # the map was reset in the meantime
97 my $age = $cf::RUNTIME - $time; 94 my $age = $cf::RUNTIME - $time;
98 95
99 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 96 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
100 97
101 if ($age >= $MAX_DISCONNECT_TIME) { 98 if ($age >= $MAX_DISCONNECT_TIME) {
102 $ob->message ( 99 $ob->message (
103 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 100 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
104 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " 101 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
130 cf::NDI_RED 127 cf::NDI_RED
131 ); 128 );
132 } 129 }
133 } 130 }
134 131
135 warn $pl->ob->name, ": enter map 5\n";#d#
136 #$ob->goto ($map, $x, $y); 132 $ob->goto ($map, $x, $y);
137 $ob->goto ($map, $x, $y, sub { 133}
138 warn $pl->ob->name, ": enter map check\n";#d# 134
139 $_[0] 135sub encode_password($) {
140 }, sub { 136# crypt $_[0],
141 warn $pl->ob->name, ": enter map done\n";#d# 137# join '',
138# ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
139 "!" . unpack "H*", $_[0]
140}
141
142sub compare_password($$) {
143 my ($pass, $token) = @_;
144
145 if ($token =~ /\!(.*)/) {
146 return $pass eq pack "H*", $1;
147 } else {
148 return $token eq crypt $pass, $token;
142 }); 149 }
143 warn $pl->ob->name, ": enter map 6\n";#d#
144
145} 150}
146 151
147# delete a player directory, be non-blocking AND synchronous... 152# delete a player directory
148# (thats hard, so we crap out and fork).
149sub nuke_playerdir { 153sub nuke_playerdir {
150 my ($user) = @_; 154 my ($user) = @_;
151 155
156 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
157
152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 158 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
153
154 cf::fork_call {
155 rename "$PLAYERDIR/$user", $temp; 159 aio_rename "$PLAYERDIR/$user", $temp;
156 system "rm", "-rf", $temp; 160 IO::AIO::aio_rmtree $temp;
157 };
158} 161}
159 162
160cf::client->attach (on_addme => sub { 163cf::client->attach (on_addme => sub {
161 my ($ns) = @_; 164 my ($ns) = @_;
162
163 if (!$ns->facecache)
164 {
165 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
166
167
168***
169*** WARNING:
170*** Your client does not support face/image caching,
171*** or it has been disabled. Face caching is mandatory
172*** so please enable it or use a newer client.
173***
174*** Look at your client preferences:
175***
176*** deliantra: all known versions automatically enable the facecache.
177*** cfclient: use the -cache commandline option.
178*** cfclient: map will not redraw automatically (bug).
179*** gcfclient: use -cache commandline option, or enable
180*** gcfclient: Client => Configure => Map & Image => Cache Images.
181*** jcrossclient: your client is broken, use deliantra or gcfclient.
182***
183***
184EOF
185 if ($ns->version =~ /jcrossclient/) {
186 # let them, for now
187 } else {
188 $ns->flush;
189 return $ns->destroy;
190 }
191
192 # $ns->facecache = true;
193 }
194
195 if ($ns->mapmode < cf::Map1aCmd) {
196 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
197
198
199***
200*** WARNING:
201*** Your client is too old. Please upgrade to a newer version.
202EOF
203
204 $ns->flush;
205 return $ns->destroy;
206 }
207 165
208 $ns->pl and return $ns->destroy; 166 $ns->pl and return $ns->destroy;
209 167
210 $ns->async (sub { 168 $ns->async (sub {
211 $Coro::current->{desc} = "addme init"; 169 $Coro::current->{desc} = "addme init";
… …
230 $ns->send_drawinfo ( 188 $ns->send_drawinfo (
231 "That username is currently used in another login session. " 189 "That username is currently used in another login session. "
232 . "Chose another, or wait till the other session has ended.", 190 . "Chose another, or wait till the other session has ended.",
233 cf::NDI_RED 191 cf::NDI_RED
234 ); 192 );
235 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 193 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
236 last; 194 last;
237 } else { 195 } else {
238 $ns->send_drawinfo ( 196 $ns->send_drawinfo (
239 "Your username contains illegal characters " 197 "Your username contains illegal characters "
240 . "(only a-z, A-Z and 0-9 are allowed), " 198 . "(only a-z, A-Z and 0-9 are allowed), "
241 . "or is not between 3 and 18 characters in length.", 199 . "or is not between 3 and 20 characters in length.",
242 cf::NDI_RED 200 cf::NDI_RED
243 ); 201 );
244 } 202 }
245 Coro::Timer::sleep 0.4; 203 Coro::Timer::sleep 0.4;
246 } 204 }
… …
285 243
286 # try to read the user file and check the password 244 # try to read the user file and check the password
287 if (my $pl = cf::player::find $user) { 245 if (my $pl = cf::player::find $user) {
288 aio_stat $pl->path and next; 246 aio_stat $pl->path and next;
289 my $mtime = (stat _)[9]; 247 my $mtime = (stat _)[9];
290 my $hash = $pl->password; 248 my $token = $pl->password;
291 249
292 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 250 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
251 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
293 nuke_str $pass; 252 nuke_str $pass;
294 # password matches, wonderful 253 # password matches, wonderful
295 my $pl = cf::player::find $user or next; 254 my $pl = cf::player::find $user or next;
296 $pl->connect ($ns); 255 $pl->connect ($ns);
297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
298 enter_map $pl; 256 enter_map $pl;
299 last; 257 last;
300 } elsif (can_cleanup $pl, $mtime) { 258 } elsif (can_cleanup $pl, $mtime) {
301 Coro::Timer::sleep 1; 259 Coro::Timer::sleep 1;
302 260
… …
330 ); 288 );
331 next; 289 next;
332 } 290 }
333 } else { 291 } else {
334 # unable to load the playerfile: 292 # unable to load the playerfile:
335 # check wether the player dir exists, which means the file is corrupted or 293 # check whether the player dir exists, which means the file is corrupted or
336 # something very similar. 294 # something very similar.
337 if (!aio_stat cf::player::playerdir $user) { 295 if (!aio_stat cf::player::playerdir $user) {
338 $ns->send_drawinfo ( 296 $ns->send_drawinfo (
339 "Unable to retrieve this player. It might be a locked or broken account. " 297 "Unable to retrieve this player. It might be a locked or broken account. "
340 . "If this is your account, ask a dungeon master for assistance. " 298 . "If this is your account, ask a dungeon master for assistance. "
… …
347 305
348 # the rest of this function is character creation 306 # the rest of this function is character creation
349 $Coro::current->{desc} = "addme($user) chargen"; 307 $Coro::current->{desc} = "addme($user) chargen";
350 308
351 # just to make sure nothing is left over 309 # just to make sure nothing is left over
310 # normally, nothing is there.
352 nuke_playerdir $user; 311 nuke_playerdir $user;
353 312
354 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 313 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
355 314
356 if ($pass2 ne $pass) { 315 if ($pass2 ne $pass) {
… …
365 } 324 }
366 325
367 nuke_str $pass2; 326 nuke_str $pass2;
368 327
369 my $pl = cf::player::new $user; 328 my $pl = cf::player::new $user;
370 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 329 $pl->password (encode_password $pass);
371 nuke_str $pass; 330 nuke_str $pass;
372 $pl->connect ($ns); 331 $pl->connect ($ns);
373 my $ob = $pl->ob; 332 my $ob = $pl->ob;
374 333
375 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 334 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
409 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 368 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
410 369
411 last if $res =~ /[dD]/; 370 last if $res =~ /[dD]/;
412 371
413 $pl->chargen_race_next; 372 $pl->chargen_race_next;
414 Coro::Timer::sleep 0.2; 373 Coro::Timer::sleep 0.05;
415 } 374 }
416 375
417 # create the playerdir, if necessary, as chargen_race_done did it before 376 # create the playerdir, if necessary, as chargen_race_done did it before
418 # presumably because of unique maps 377 # presumably because of unique maps
419 aio_mkdir playerdir $pl, 0770; 378 aio_mkdir playerdir $pl, 0770;
… …
428 last; 387 last;
429 } elsif ($res =~ /^[mM]/) { 388 } elsif ($res =~ /^[mM]/) {
430 $pl->gender (0); 389 $pl->gender (0);
431 last; 390 last;
432 } 391 }
433 Coro::Timer::sleep 0.2; 392 Coro::Timer::sleep 0.05;
434 } 393 }
435 394
436 $ob->reply (undef, "Welcome to Deliantra!"); 395 $ob->reply (undef, "Welcome to Deliantra!");
437 396
397 # XXX: Workaround for delayed client ext protocol handshake
398 $pl->esrv_new_player;
399
438 delete $pl->{deny_save}; 400 delete $pl->{deny_save};
439 401
440 last; 402 last;
403 }
404
405 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
406 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
441 } 407 }
442 }); 408 });
443}); 409});
444 410
411cf::register_command password => sub {
412 my ($pl, $arg) = @_;
413
414 unless ($pl->flag (cf::FLAG_WIZ)) {
415 $pl->message (
416 "The password can currently only changed by a DM.",
417 cf::NDI_UNIQUE | cf::NDI_REPLY);
418 return;
419 }
420
421 my (@args) = split /\s+/, $arg;
422 my ($player, $new_pw) = @args;
423
424 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
425 $pl->message (
426 "Usage: password <player> [<new password>]",
427 cf::NDI_UNIQUE | cf::NDI_REPLY);
428 return;
429 }
430
431 if ($new_pw eq '') {
432 $new_pw =
433 join '',
434 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
435 1..9;
436 }
437
438 cf::async {
439 my $plc = cf::player::find $player;
440 if ($plc) {
441 $plc->password (encode_password $new_pw);
442 $pl->message (
443 "Ok, changed password of '$player' to '$new_pw'!",
444 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
445 } else {
446 $pl->message (
447 "Fail! Couldn't set password for '$player', "
448 . "he doesn't seem to exist!",
449 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
450 }
451 };
452};
453
445cf::register_command quit => sub { 454cf::register_command quit => sub {
446 my ($ob, $arg) = @_; 455 my ($ob, $arg) = @_;
447 456
448 $ob->reply (undef, 457 $ob->send_msg (undef,
449 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 458 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
450 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 459 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
451 cf::NDI_UNIQUE | cf::NDI_RED); 460 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
452}; 461};
453 462
454cf::register_command quit_character => sub { 463cf::register_command quit_character => sub {
455 my ($ob, $arg) = @_; 464 my ($ob, $arg) = @_;
456 465
457 my $pl = $ob->contr; 466 my $pl = $ob->contr;
458 467
459 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 468 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
460 if ($_[0] !~ /^[yY]/) { 469 if ($_[0] !~ /^[yY]/) {
461 $ob->reply (undef, 470 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462 "Ok, not not quitting then.",
463 cf::NDI_UNIQUE | cf::NDI_RED);
464 } else { 471 } else {
465 $ob->reply (undef, 472 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
466 "Ok, quitting, hope to see you again.", 473 cf::async {
467 cf::NDI_UNIQUE | cf::NDI_RED);
468 $pl->ns->flush;
469 cf::async { $pl->quit_character }; 474 $pl->quit_character;
475 };
470 } 476 }
471 }); 477 });
472}; 478};
473 479
474cf::object->attach ( 480cf::object->attach (
… …
480 486
481 my $pl = $ob->contr; 487 my $pl = $ob->contr;
482 488
483 # update respawn position 489 # update respawn position
484 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 490 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
485 cf::async { $pl->save };
486 491
492 cf::async {
487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 493 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
488 $ob->check_score; 494 ext::highscore::check $ob;
489 495
490 $ob->reply (undef, "In the future, you will wake up here when you die."); 496 $pl->save;
491 497
498 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
499
500 my $ns = $pl->ns
501 or return;
502
492 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 503 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
493 if ($_[0] !~ /^[yY]/) { 504 if ($_[0] !~ /^[yY]/) {
494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 505 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
495 $pl->deactivate; 506 $pl->deactivate;
496 $pl->ns->destroy; 507 $pl->ns->destroy;
497 } else { 508 }
498 cf::async { $pl->save };
499 } 509 });
500 }); 510 };
501 }, 511 },
502); 512);
503 513
504cf::player->attach ( 514cf::player->attach (
505 on_login => sub { 515 on_login => sub {
… …
520 unless safe_spot $pl; 530 unless safe_spot $pl;
521 } 531 }
522 }, 532 },
523); 533);
524 534
525#############################################################################
526
527our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
528our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
529
530our $SCHEDULER = cf::async_ext {
531 $Coro::current->{desc} = "player scheduler";
532
533 while () {
534 Coro::EV::timer_once $SCHEDULE_INTERVAL;
535
536 # this weird form of iteration over values is used because
537 # the hash changes underneath us frequently, and for
538 # keeps a direct reference to the value without (in 5.8 perls)
539 # keeping a reference, so this is prone to crashes or worse.
540 my @players = keys %cf::PLAYER;
541 for (@players) {
542 my $pl = $cf::PLAYER{$_}
543 or next;
544 $pl->valid or next;
545
546 eval {
547 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
548 $pl->save;
549
550 unless ($pl->active || $pl->ns) {
551 # check refcounts, this is tricky and needs to be adjusted to fit server internals
552 my $ob = $pl->ob;
553
554 my $pl_ref = $pl->refcnt_cnt;
555 my $ob_ref = $ob->refcnt_cnt;
556
557 ## pl_ref == $pl + ob->contr + %cf::PLAYER
558 ## ob_ref == $ob + pl->observe + simply being an object
559 if ($pl_ref == 3 && $ob_ref == 3) {
560 warn "player-scheduler destroy ", $ob->name;#d#
561
562 # remove from sight and get fresh "copies"
563 $pl = delete $cf::PLAYER{$ob->name};
564 $ob = $pl->ob;
565
566 $pl->destroy; # destroys $ob
567 } else {
568 my $a_ = $pl->refcnt;#d#
569 my $b_ = $ob->refcnt;#d#
570
571 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
572 }
573 }
574 }
575 };
576 warn $@ if $@;
577 cf::cede_to_tick;
578 };
579 }
580};
581
582$SCHEDULER->prio (1);
583

Diff Legend

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