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.99 by root, Mon Jun 29 06:11:01 2009 UTC vs.
Revision 1.118 by root, Thu Nov 8 00:16:07 2012 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;
7 7
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600; 8CONF MAX_DISCONNECT_TIME = 3600;
9 9
10# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
11sub nuke_str { 11sub nuke_str {
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
13} 13}
… …
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->linkable
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 +(substr $pass, 0, 8) eq pack "H*", $1;
147 } elsif ($token =~ /!(.*)/) {
148 return $pass eq pack "H*", $1;
149 } else {
150 return $token eq crypt $pass, $token;
139 }); 151 }
140 warn $pl->ob->name, ": enter map 6\n";#d#
141
142} 152}
143 153
144# delete a player directory, be non-blocking AND synchronous... 154# delete a player directory
145# (that's hard, so we crap out and fork).
146sub nuke_playerdir { 155sub nuke_playerdir {
147 my ($user) = @_; 156 my ($user) = @_;
148 157
158 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
159
149 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 160 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
150
151 cf::fork_call {
152 rename "$PLAYERDIR/$user", $temp; 161 aio_rename "$PLAYERDIR/$user", $temp;
153 system "rm", "-rf", $temp; 162 IO::AIO::aio_rmtree $temp;
154 };
155} 163}
156 164
157cf::client->attach (on_addme => sub { 165cf::client->attach (on_addme => sub {
158 my ($ns) = @_; 166 my ($ns) = @_;
159 167
… …
237 245
238 # try to read the user file and check the password 246 # try to read the user file and check the password
239 if (my $pl = cf::player::find $user) { 247 if (my $pl = cf::player::find $user) {
240 aio_stat $pl->path and next; 248 aio_stat $pl->path and next;
241 my $mtime = (stat _)[9]; 249 my $mtime = (stat _)[9];
242 my $hash = $pl->password; 250 my $token = $pl->password;
243 251
244 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 252 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
253 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
245 nuke_str $pass; 254 nuke_str $pass;
246 # password matches, wonderful 255 # password matches, wonderful
247 my $pl = cf::player::find $user or next; 256 my $pl = cf::player::find $user or next;
248 $pl->connect ($ns); 257 $pl->connect ($ns);
249 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
250 enter_map $pl; 258 enter_map $pl;
251 last; 259 last;
252 } elsif (can_cleanup $pl, $mtime) { 260 } elsif (can_cleanup $pl, $mtime) {
253 Coro::Timer::sleep 1; 261 Coro::Timer::sleep 1;
254 262
… …
282 ); 290 );
283 next; 291 next;
284 } 292 }
285 } else { 293 } else {
286 # unable to load the playerfile: 294 # unable to load the playerfile:
287 # check wether the player dir exists, which means the file is corrupted or 295 # check whether the player dir exists, which means the file is corrupted or
288 # something very similar. 296 # something very similar.
289 if (!aio_stat cf::player::playerdir $user) { 297 if (!aio_stat cf::player::playerdir $user) {
290 $ns->send_drawinfo ( 298 $ns->send_drawinfo (
291 "Unable to retrieve this player. It might be a locked or broken account. " 299 "Unable to retrieve this player. It might be a locked or broken account. "
292 . "If this is your account, ask a dungeon master for assistance. " 300 . "If this is your account, ask a dungeon master for assistance. "
… …
299 307
300 # the rest of this function is character creation 308 # the rest of this function is character creation
301 $Coro::current->{desc} = "addme($user) chargen"; 309 $Coro::current->{desc} = "addme($user) chargen";
302 310
303 # just to make sure nothing is left over 311 # just to make sure nothing is left over
312 # normally, nothing is there.
304 nuke_playerdir $user; 313 nuke_playerdir $user;
305 314
306 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 315 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
307 316
308 if ($pass2 ne $pass) { 317 if ($pass2 ne $pass) {
… …
317 } 326 }
318 327
319 nuke_str $pass2; 328 nuke_str $pass2;
320 329
321 my $pl = cf::player::new $user; 330 my $pl = cf::player::new $user;
322 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 331 $pl->password (encode_password $pass);
323 nuke_str $pass; 332 nuke_str $pass;
324 $pl->connect ($ns); 333 $pl->connect ($ns);
325 my $ob = $pl->ob; 334 my $ob = $pl->ob;
326 335
327 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 336 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
361 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 370 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
362 371
363 last if $res =~ /[dD]/; 372 last if $res =~ /[dD]/;
364 373
365 $pl->chargen_race_next; 374 $pl->chargen_race_next;
366 Coro::Timer::sleep 0.2; 375 Coro::Timer::sleep 0.05;
367 } 376 }
368 377
369 # create the playerdir, if necessary, as chargen_race_done did it before 378 # create the playerdir, if necessary, as chargen_race_done did it before
370 # presumably because of unique maps 379 # presumably because of unique maps
371 aio_mkdir playerdir $pl, 0770; 380 aio_mkdir playerdir $pl, 0770;
… …
380 last; 389 last;
381 } elsif ($res =~ /^[mM]/) { 390 } elsif ($res =~ /^[mM]/) {
382 $pl->gender (0); 391 $pl->gender (0);
383 last; 392 last;
384 } 393 }
385 Coro::Timer::sleep 0.2; 394 Coro::Timer::sleep 0.05;
386 } 395 }
387 396
388 $ob->reply (undef, "Welcome to Deliantra!"); 397 $ob->reply (undef, "Welcome to Deliantra!");
389 398
390 # XXX: Workaround for delayed client ext protocol handshake 399 # XXX: Workaround for delayed client ext protocol handshake
391 $pl->esrv_new_player; 400 $pl->esrv_new_player;
392 401
393 delete $pl->{deny_save}; 402 delete $pl->{deny_save};
394 403
395 last; 404 last;
405 }
406
407 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
408 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
396 } 409 }
397 }); 410 });
398}); 411});
412
413cf::register_command password => sub {
414 my ($pl, $arg) = @_;
415
416 unless ($pl->flag (cf::FLAG_WIZ)) {
417 $pl->message (
418 "The password can currently only changed by a DM.",
419 cf::NDI_UNIQUE | cf::NDI_REPLY);
420 return;
421 }
422
423 my (@args) = split /\s+/, $arg;
424 my ($player, $new_pw) = @args;
425
426 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
427 $pl->message (
428 "Usage: password <player> [<new password>]",
429 cf::NDI_UNIQUE | cf::NDI_REPLY);
430 return;
431 }
432
433 if ($new_pw eq '') {
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};
399 455
400cf::register_command quit => sub { 456cf::register_command quit => sub {
401 my ($ob, $arg) = @_; 457 my ($ob, $arg) = @_;
402 458
403 $ob->send_msg (undef, 459 $ob->send_msg (undef,
… …
414 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 470 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
415 if ($_[0] !~ /^[yY]/) { 471 if ($_[0] !~ /^[yY]/) {
416 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 472 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
417 } else { 473 } else {
418 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 474 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
419 $pl->ns->flush; 475 cf::async {
420 cf::async { $pl->quit_character }; 476 $pl->quit_character;
477 };
421 } 478 }
422 }); 479 });
423}; 480};
424 481
425cf::object->attach ( 482cf::object->attach (
… …
431 488
432 my $pl = $ob->contr; 489 my $pl = $ob->contr;
433 490
434 # update respawn position 491 # update respawn position
435 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 492 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
436 cf::async { $pl->save };
437 493
494 cf::async {
438 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 495 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
439 $ob->check_score; 496 ext::highscore::check $ob;
440 497
498 $pl->save;
499
441 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY); 500 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
442 501
502 my $ns = $pl->ns
503 or return;
504
443 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 505 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
444 if ($_[0] !~ /^[yY]/) { 506 if ($_[0] !~ /^[yY]/) {
445 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 507 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
446 $pl->deactivate; 508 $pl->deactivate;
447 $pl->ns->destroy; 509 $pl->ns->destroy;
448 } else { 510 }
449 cf::async { $pl->save };
450 } 511 });
451 }); 512 };
452 }, 513 },
453); 514);
454 515
455cf::player->attach ( 516cf::player->attach (
456 on_login => sub { 517 on_login => sub {
… …
471 unless safe_spot $pl; 532 unless safe_spot $pl;
472 } 533 }
473 }, 534 },
474); 535);
475 536
476

Diff Legend

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