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.91 by root, Sat Sep 20 00:09:26 2008 UTC vs.
Revision 1.110 by root, Sat May 8 10:49:44 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
… …
73} 70}
74 71
75sub enter_map { 72sub enter_map {
76 my ($pl) = @_; 73 my ($pl) = @_;
77 74
78 warn $pl->ob->name, ": enter map 1\n";#d#
79 my $ob = $pl->ob; 75 my $ob = $pl->ob;
80 76
81 my ($map, $x, $y) 77 my ($map, $x, $y)
82 = $ob->{_link_pos} 78 = $ob->{_link_pos}
83 ? @{delete $ob->{_link_pos}} 79 ? @{delete $ob->{_link_pos}}
84 : ($pl->maplevel, $ob->x, $ob->y); 80 : ($pl->maplevel, $ob->x, $ob->y);
85 81
86 warn $pl->ob->name, ": enter map 2\n";#d#
87 $ob->enter_link; 82 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
89 83
90 my $m = cf::map::find $map; 84 my $m = cf::map::find $map;
91 my $time = delete $pl->{unclean_save}; 85 my $time = delete $pl->{unclean_save};
92 warn $pl->ob->name, ": enter map 4\n";#d#
93 86
94 if ($time && $m) { 87 if ($time && $m) {
95 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
96 # the map was reset in the meantime 89 # the map was reset in the meantime
97 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
98 91
99 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#
100 93
101 if ($age >= $MAX_DISCONNECT_TIME) { 94 if ($age >= $MAX_DISCONNECT_TIME) {
102 $ob->message ( 95 $ob->message (
103 "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. "
104 . "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. "
… …
130 cf::NDI_RED 123 cf::NDI_RED
131 ); 124 );
132 } 125 }
133 } 126 }
134 127
135 warn $pl->ob->name, ": enter map 5\n";#d#
136 #$ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
137 $ob->goto ($map, $x, $y, sub { 129}
138 warn $pl->ob->name, ": enter map check\n";#d# 130
139 $_[0] 131sub encode_password($) {
140 }, sub { 132# crypt $_[0],
141 warn $pl->ob->name, ": enter map done\n";#d# 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;
142 }); 145 }
143 warn $pl->ob->name, ": enter map 6\n";#d#
144
145} 146}
146 147
147# delete a player directory, be non-blocking AND synchronous... 148# delete a player directory, be non-blocking AND synchronous...
148# (thats hard, so we crap out and fork). 149# (that's hard, so we crap out and fork).
149sub nuke_playerdir { 150sub nuke_playerdir {
150 my ($user) = @_; 151 my ($user) = @_;
151 152
152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 153 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
153 154
… …
157 }; 158 };
158} 159}
159 160
160cf::client->attach (on_addme => sub { 161cf::client->attach (on_addme => sub {
161 my ($ns) = @_; 162 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 163
208 $ns->pl and return $ns->destroy; 164 $ns->pl and return $ns->destroy;
209 165
210 $ns->async (sub { 166 $ns->async (sub {
211 $Coro::current->{desc} = "addme init"; 167 $Coro::current->{desc} = "addme init";
… …
230 $ns->send_drawinfo ( 186 $ns->send_drawinfo (
231 "That username is currently used in another login session. " 187 "That username is currently used in another login session. "
232 . "Chose another, or wait till the other session has ended.", 188 . "Chose another, or wait till the other session has ended.",
233 cf::NDI_RED 189 cf::NDI_RED
234 ); 190 );
235 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 191 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
236 last; 192 last;
237 } else { 193 } else {
238 $ns->send_drawinfo ( 194 $ns->send_drawinfo (
239 "Your username contains illegal characters " 195 "Your username contains illegal characters "
240 . "(only a-z, A-Z and 0-9 are allowed), " 196 . "(only a-z, A-Z and 0-9 are allowed), "
241 . "or is not between 3 and 18 characters in length.", 197 . "or is not between 3 and 20 characters in length.",
242 cf::NDI_RED 198 cf::NDI_RED
243 ); 199 );
244 } 200 }
245 Coro::Timer::sleep 0.4; 201 Coro::Timer::sleep 0.4;
246 } 202 }
… …
285 241
286 # try to read the user file and check the password 242 # try to read the user file and check the password
287 if (my $pl = cf::player::find $user) { 243 if (my $pl = cf::player::find $user) {
288 aio_stat $pl->path and next; 244 aio_stat $pl->path and next;
289 my $mtime = (stat _)[9]; 245 my $mtime = (stat _)[9];
290 my $hash = $pl->password; 246 my $token = $pl->password;
291 247
292 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 248 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
249 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
293 nuke_str $pass; 250 nuke_str $pass;
294 # password matches, wonderful 251 # password matches, wonderful
295 my $pl = cf::player::find $user or next; 252 my $pl = cf::player::find $user or next;
296 $pl->connect ($ns); 253 $pl->connect ($ns);
297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
298 enter_map $pl; 254 enter_map $pl;
299 last; 255 last;
300 } elsif (can_cleanup $pl, $mtime) { 256 } elsif (can_cleanup $pl, $mtime) {
301 Coro::Timer::sleep 1; 257 Coro::Timer::sleep 1;
302 258
… …
365 } 321 }
366 322
367 nuke_str $pass2; 323 nuke_str $pass2;
368 324
369 my $pl = cf::player::new $user; 325 my $pl = cf::player::new $user;
370 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 326 $pl->password (encode_password $pass);
371 nuke_str $pass; 327 nuke_str $pass;
372 $pl->connect ($ns); 328 $pl->connect ($ns);
373 my $ob = $pl->ob; 329 my $ob = $pl->ob;
374 330
375 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 331 $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"; 365 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
410 366
411 last if $res =~ /[dD]/; 367 last if $res =~ /[dD]/;
412 368
413 $pl->chargen_race_next; 369 $pl->chargen_race_next;
414 Coro::Timer::sleep 0.2; 370 Coro::Timer::sleep 0.05;
415 } 371 }
416 372
417 # create the playerdir, if necessary, as chargen_race_done did it before 373 # create the playerdir, if necessary, as chargen_race_done did it before
418 # presumably because of unique maps 374 # presumably because of unique maps
419 aio_mkdir playerdir $pl, 0770; 375 aio_mkdir playerdir $pl, 0770;
… …
428 last; 384 last;
429 } elsif ($res =~ /^[mM]/) { 385 } elsif ($res =~ /^[mM]/) {
430 $pl->gender (0); 386 $pl->gender (0);
431 last; 387 last;
432 } 388 }
433 Coro::Timer::sleep 0.2; 389 Coro::Timer::sleep 0.05;
434 } 390 }
435 391
436 $ob->reply (undef, "Welcome to Deliantra!"); 392 $ob->reply (undef, "Welcome to Deliantra!");
437 393
394 # XXX: Workaround for delayed client ext protocol handshake
395 $pl->esrv_new_player;
396
438 delete $pl->{deny_save}; 397 delete $pl->{deny_save};
439 398
440 last; 399 last;
400 }
401
402 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
403 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
441 } 404 }
442 }); 405 });
443}); 406});
444 407
408cf::register_command password => sub {
409 my ($pl, $arg) = @_;
410
411 my (@args) = split /\s+/, $arg;
412
413 my ($new_pw, $player);
414
415 if ($pl->flag (cf::FLAG_WIZ)) {
416 ($player, $new_pw) = @args;
417 } else {
418 $new_pw = $args[0];
419 }
420
421 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
422 $pl->message (
423 "Usage: password <player> [<new password>]",
424 cf::NDI_UNIQUE | cf::NDI_REPLY);
425 return;
426 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
427 $pl->message (
428 "Usage: password <new password>",
429 cf::NDI_UNIQUE | cf::NDI_REPLY);
430 return;
431 }
432
433 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
434 unless ($new_pw ne '') {
435 $new_pw =
436 join '',
437 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
438 1..9;
439 }
440
441 cf::async {
442 my $plc = cf::player::find $player;
443 if ($plc) {
444 $plc->password (encode_password $new_pw);
445 $pl->message (
446 "Ok, changed password of '$player' to '$new_pw'!",
447 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
448 } else {
449 $pl->message (
450 "Fail! Couldn't set password for '$player', "
451 . "he doesn't seem to exist!",
452 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
453 }
454 };
455 } else {
456 my $change = delete $pl->{password_change};
457
458 if ($change && (time - $change->[0]) < 60) {
459 $pl->message (
460 "Ok, changed your password!",
461 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462 $pl->contr->password (encode_password $new_pw);
463
464 } else {
465 $pl->message (
466 "Ok, please confirm your new password by sending "
467 . "the command again within one minute!",
468 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
469 $pl->{password_change} = [time, $new_pw];
470 }
471 }
472};
473
445cf::register_command quit => sub { 474cf::register_command quit => sub {
446 my ($ob, $arg) = @_; 475 my ($ob, $arg) = @_;
447 476
448 $ob->reply (undef, 477 $ob->send_msg (undef,
449 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 478 "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.", 479 . "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); 480 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
452}; 481};
453 482
454cf::register_command quit_character => sub { 483cf::register_command quit_character => sub {
455 my ($ob, $arg) = @_; 484 my ($ob, $arg) = @_;
456 485
457 my $pl = $ob->contr; 486 my $pl = $ob->contr;
458 487
459 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 488 $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]/) { 489 if ($_[0] !~ /^[yY]/) {
461 $ob->reply (undef, 490 $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 { 491 } else {
465 $ob->reply (undef, 492 $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.",
467 cf::NDI_UNIQUE | cf::NDI_RED);
468 $pl->ns->flush; 493 $pl->ns->flush;
494 cf::async {
495 ext::highscore::check $pl->ob;
469 cf::async { $pl->quit_character }; 496 $pl->quit_character;
497 };
470 } 498 }
471 }); 499 });
472}; 500};
473 501
474cf::object->attach ( 502cf::object->attach (
… …
483 # update respawn position 511 # update respawn position
484 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 512 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
485 cf::async { $pl->save }; 513 cf::async { $pl->save };
486 514
487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 515 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
488 $ob->check_score; 516 ext::highscore::check $ob;
489 517
490 $ob->reply (undef, "In the future, you will wake up here when you die."); 518 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
491 519
492 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 520 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
493 if ($_[0] !~ /^[yY]/) { 521 if ($_[0] !~ /^[yY]/) {
494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 522 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
495 $pl->deactivate; 523 $pl->deactivate;
… …
520 unless safe_spot $pl; 548 unless safe_spot $pl;
521 } 549 }
522 }, 550 },
523); 551);
524 552
525

Diff Legend

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