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.98 by root, Sun Jun 28 16:46:50 2009 UTC vs.
Revision 1.114 by root, Fri Jan 21 19:45:07 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;
… …
59 my $m = $ob->map 59 my $m = $ob->map
60 or return; 60 or return;
61 my $x = $ob->x; 61 my $x = $ob->x;
62 my $y = $ob->y; 62 my $y = $ob->y;
63 63
64 # never happens normally, but helps when shell users make mistakes
65 $m->in_memory == cf::MAP_ACTIVE
66 or return 1;
67
64# return 0;#d# 68# return 0;#d#
65# warn join ":", $m->at ($x, $y);#d# 69# warn join ":", $m->at ($x, $y);#d#
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 70# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
67# return 0; 71# return 0;
68 72
… …
70} 74}
71 75
72sub enter_map { 76sub enter_map {
73 my ($pl) = @_; 77 my ($pl) = @_;
74 78
75 warn $pl->ob->name, ": enter map 1\n";#d#
76 my $ob = $pl->ob; 79 my $ob = $pl->ob;
77 80
78 my ($map, $x, $y) 81 my ($map, $x, $y)
79 = $ob->{_link_pos} 82 = $ob->{_link_pos}
80 ? @{delete $ob->{_link_pos}} 83 ? @{delete $ob->{_link_pos}}
81 : ($pl->maplevel, $ob->x, $ob->y); 84 : ($pl->maplevel, $ob->x, $ob->y);
82 85
83 warn $pl->ob->name, ": enter map 2\n";#d#
84 $ob->enter_link; 86 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
86 87
87 my $m = cf::map::find $map; 88 my $m = cf::map::find $map;
88 my $time = delete $pl->{unclean_save}; 89 my $time = delete $pl->{unclean_save};
89 warn $pl->ob->name, ": enter map 4\n";#d#
90 90
91 if ($time && $m) { 91 if ($time && $m) {
92 if ($time < $m->{instantiate_time}) { 92 if ($time < $m->{instantiate_time}) {
93 # the map was reset in the meantime 93 # the map was reset in the meantime
94 my $age = $cf::RUNTIME - $time; 94 my $age = $cf::RUNTIME - $time;
95 95
96 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#
97 97
98 if ($age >= $MAX_DISCONNECT_TIME) { 98 if ($age >= $MAX_DISCONNECT_TIME) {
99 $ob->message ( 99 $ob->message (
100 "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. "
101 . "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. "
… …
127 cf::NDI_RED 127 cf::NDI_RED
128 ); 128 );
129 } 129 }
130 } 130 }
131 131
132 warn $pl->ob->name, ": enter map 5\n";#d#
133 #$ob->goto ($map, $x, $y); 132 $ob->goto ($map, $x, $y);
134 $ob->goto ($map, $x, $y, sub { 133}
135 warn $pl->ob->name, ": enter map check\n";#d# 134
136 $_[0] 135sub encode_password($) {
137 }, sub { 136# crypt $_[0],
138 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;
139 }); 149 }
140 warn $pl->ob->name, ": enter map 6\n";#d#
141
142} 150}
143 151
144# delete a player directory, be non-blocking AND synchronous... 152# delete a player directory
145# (that's hard, so we crap out and fork).
146sub nuke_playerdir { 153sub nuke_playerdir {
147 my ($user) = @_; 154 my ($user) = @_;
148 155
156 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
157
149 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 158 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
150
151 cf::fork_call {
152 rename "$PLAYERDIR/$user", $temp; 159 aio_rename "$PLAYERDIR/$user", $temp;
153 system "rm", "-rf", $temp; 160 IO::AIO::aio_rmtree $temp;
154 };
155} 161}
156 162
157cf::client->attach (on_addme => sub { 163cf::client->attach (on_addme => sub {
158 my ($ns) = @_; 164 my ($ns) = @_;
159 165
… …
237 243
238 # try to read the user file and check the password 244 # try to read the user file and check the password
239 if (my $pl = cf::player::find $user) { 245 if (my $pl = cf::player::find $user) {
240 aio_stat $pl->path and next; 246 aio_stat $pl->path and next;
241 my $mtime = (stat _)[9]; 247 my $mtime = (stat _)[9];
242 my $hash = $pl->password; 248 my $token = $pl->password;
243 249
244 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#
245 nuke_str $pass; 252 nuke_str $pass;
246 # password matches, wonderful 253 # password matches, wonderful
247 my $pl = cf::player::find $user or next; 254 my $pl = cf::player::find $user or next;
248 $pl->connect ($ns); 255 $pl->connect ($ns);
249 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
250 #d# Coro::Timer::sleep 60;#d# log out here to trigger DEBUG bug
251 enter_map $pl; 256 enter_map $pl;
252 last; 257 last;
253 } elsif (can_cleanup $pl, $mtime) { 258 } elsif (can_cleanup $pl, $mtime) {
254 Coro::Timer::sleep 1; 259 Coro::Timer::sleep 1;
255 260
… …
283 ); 288 );
284 next; 289 next;
285 } 290 }
286 } else { 291 } else {
287 # unable to load the playerfile: 292 # unable to load the playerfile:
288 # 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
289 # something very similar. 294 # something very similar.
290 if (!aio_stat cf::player::playerdir $user) { 295 if (!aio_stat cf::player::playerdir $user) {
291 $ns->send_drawinfo ( 296 $ns->send_drawinfo (
292 "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. "
293 . "If this is your account, ask a dungeon master for assistance. " 298 . "If this is your account, ask a dungeon master for assistance. "
… …
300 305
301 # the rest of this function is character creation 306 # the rest of this function is character creation
302 $Coro::current->{desc} = "addme($user) chargen"; 307 $Coro::current->{desc} = "addme($user) chargen";
303 308
304 # just to make sure nothing is left over 309 # just to make sure nothing is left over
310 # normally, nothing is there.
305 nuke_playerdir $user; 311 nuke_playerdir $user;
306 312
307 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.";
308 314
309 if ($pass2 ne $pass) { 315 if ($pass2 ne $pass) {
… …
318 } 324 }
319 325
320 nuke_str $pass2; 326 nuke_str $pass2;
321 327
322 my $pl = cf::player::new $user; 328 my $pl = cf::player::new $user;
323 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 329 $pl->password (encode_password $pass);
324 nuke_str $pass; 330 nuke_str $pass;
325 $pl->connect ($ns); 331 $pl->connect ($ns);
326 my $ob = $pl->ob; 332 my $ob = $pl->ob;
327 333
328 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 334 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
362 "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";
363 369
364 last if $res =~ /[dD]/; 370 last if $res =~ /[dD]/;
365 371
366 $pl->chargen_race_next; 372 $pl->chargen_race_next;
367 Coro::Timer::sleep 0.2; 373 Coro::Timer::sleep 0.05;
368 } 374 }
369 375
370 # 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
371 # presumably because of unique maps 377 # presumably because of unique maps
372 aio_mkdir playerdir $pl, 0770; 378 aio_mkdir playerdir $pl, 0770;
… …
381 last; 387 last;
382 } elsif ($res =~ /^[mM]/) { 388 } elsif ($res =~ /^[mM]/) {
383 $pl->gender (0); 389 $pl->gender (0);
384 last; 390 last;
385 } 391 }
386 Coro::Timer::sleep 0.2; 392 Coro::Timer::sleep 0.05;
387 } 393 }
388 394
389 $ob->reply (undef, "Welcome to Deliantra!"); 395 $ob->reply (undef, "Welcome to Deliantra!");
390 396
391 # XXX: Workaround for delayed client ext protocol handshake 397 # XXX: Workaround for delayed client ext protocol handshake
392 $pl->esrv_new_player; 398 $pl->esrv_new_player;
393 399
394 delete $pl->{deny_save}; 400 delete $pl->{deny_save};
395 401
396 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);
397 } 407 }
398 }); 408 });
399}); 409});
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};
400 453
401cf::register_command quit => sub { 454cf::register_command quit => sub {
402 my ($ob, $arg) = @_; 455 my ($ob, $arg) = @_;
403 456
404 $ob->send_msg (undef, 457 $ob->send_msg (undef,
… …
415 $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 {
416 if ($_[0] !~ /^[yY]/) { 469 if ($_[0] !~ /^[yY]/) {
417 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 470 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
418 } else { 471 } else {
419 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 472 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
420 $pl->ns->flush; 473 cf::async {
421 cf::async { $pl->quit_character }; 474 $pl->quit_character;
475 };
422 } 476 }
423 }); 477 });
424}; 478};
425 479
426cf::object->attach ( 480cf::object->attach (
… …
432 486
433 my $pl = $ob->contr; 487 my $pl = $ob->contr;
434 488
435 # update respawn position 489 # update respawn position
436 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 490 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
437 cf::async { $pl->save };
438 491
492 cf::async {
439 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;
440 $ob->check_score; 494 ext::highscore::check $ob;
441 495
496 $pl->save;
497
442 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY); 498 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
443 499
444 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 500 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
445 if ($_[0] !~ /^[yY]/) { 501 if ($_[0] !~ /^[yY]/) {
446 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 502 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
447 $pl->deactivate; 503 $pl->deactivate;
448 $pl->ns->destroy; 504 $pl->ns->destroy;
449 } else { 505 }
450 cf::async { $pl->save };
451 } 506 });
452 }); 507 };
453 }, 508 },
454); 509);
455 510
456cf::player->attach ( 511cf::player->attach (
457 on_login => sub { 512 on_login => sub {
… …
472 unless safe_spot $pl; 527 unless safe_spot $pl;
473 } 528 }
474 }, 529 },
475); 530);
476 531
477

Diff Legend

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