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.109 by root, Tue May 4 21:45:42 2010 UTC vs.
Revision 1.119 by root, Thu Nov 15 05:54:02 2012 UTC

… …
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
10# paranoia function to overwrite a string-in-place
11sub nuke_str {
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
13}
14 9
15sub query { 10sub query {
16 my ($ns, $flags, $text) = @_; 11 my ($ns, $flags, $text) = @_;
17 12
18 $ns->query ($flags, $text, Coro::rouse_cb); 13 $ns->query ($flags, $text, Coro::rouse_cb);
… …
58 53
59 my $m = $ob->map 54 my $m = $ob->map
60 or return; 55 or return;
61 my $x = $ob->x; 56 my $x = $ob->x;
62 my $y = $ob->y; 57 my $y = $ob->y;
58
59 # never happens normally, but helps when shell users make mistakes
60 $m->linkable
61 or return 1;
63 62
64# return 0;#d# 63# return 0;#d#
65# warn join ":", $m->at ($x, $y);#d# 64# warn join ":", $m->at ($x, $y);#d#
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 65# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
67# return 0; 66# return 0;
… …
126 } 125 }
127 126
128 $ob->goto ($map, $x, $y); 127 $ob->goto ($map, $x, $y);
129} 128}
130 129
131sub encode_password { 130sub encode_password($) {
132 crypt $_[0], 131 "!" . unpack "H*", $_[0]
133 join '',
134 ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
135} 132}
136 133
137# delete a player directory, be non-blocking AND synchronous... 134sub compare_password($$) {
138# (that's hard, so we crap out and fork). 135 my ($pass, $token) = @_;
136
137 if ($token =~ /!!(.*)/) {
138 return +(substr $pass, 0, 8) eq pack "H*", $1;
139 } elsif ($token =~ /!(.*)/) {
140 return $pass eq pack "H*", $1;
141 } else {
142 return $token eq crypt $pass, $token;
143 }
144}
145
146# delete a player directory
139sub nuke_playerdir { 147sub nuke_playerdir {
140 my ($user) = @_; 148 my ($user) = @_;
141 149
150 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
151
142 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
143
144 cf::fork_call {
145 rename "$PLAYERDIR/$user", $temp; 153 aio_rename "$PLAYERDIR/$user", $temp;
146 system "rm", "-rf", $temp; 154 IO::AIO::aio_rmtree $temp;
155}
156
157sub login_done {
158 my ($pl) = @_;
159
160 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
161 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
147 }; 162 }
163}
164
165sub chargen {
166 my ($ns, $user, $pass) = @_;
167
168 # the rest of this function is character creation
169 $Coro::current->{desc} = "addme($user) chargen";
170
171 # just to make sure nothing is left over
172 # normally, nothing is there.
173 nuke_playerdir $user;
174
175 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
176
177 if ($pass2 ne $pass) {
178 $ns->send_drawinfo (
179 "The passwords do not match, please try again.",
180 cf::NDI_RED
181 );
182 Coro::Timer::sleep 0.5;
183 next;
184 }
185
186 my $pl = cf::player::new $user;
187 $pl->password (encode_password $pass);
188 $pl->connect ($ns);
189 my $ob = $pl->ob;
190
191 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
192
193 while () {
194 $ob->update_stats;
195 $pl->save_stats;
196
197 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
198 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
199
200 if ($res =~ /^[Nn]/) {
201 last;
202 } elsif ($res > 0 && $res <= 7) {
203 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
204
205 if ($swap > 0 && $swap <= 7) {
206 $ob->swap_stats ($res - 1, $swap - 1);
207 }
208 } else {
209 $ob->roll_stats;
210 }
211
212 Coro::Timer::sleep 0.05;
213 }
214
215 $ob->set_animation (2);
216 $ob->add_statbonus;
217
218 while () {
219 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
220 my $msg = $ob->msg;
221 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
222 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
223
224 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
225 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
226
227 last if $res =~ /[dD]/;
228
229 $pl->chargen_race_next;
230 Coro::Timer::sleep 0.05;
231 }
232
233 # create the playerdir, if necessary, as chargen_race_done did it before
234 # presumably because of unique maps
235 aio_mkdir playerdir $pl, 0770;
236 $pl->chargen_race_done;
237
238 while () {
239 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
240 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
241
242 if ($res =~ /^[fF]/) {
243 $pl->gender (1);
244 last;
245 } elsif ($res =~ /^[mM]/) {
246 $pl->gender (0);
247 last;
248 }
249 Coro::Timer::sleep 0.05;
250 }
251
252 $ob->reply (undef, "Welcome to Deliantra!");
253
254 # XXX: Workaround for delayed client ext protocol handshake
255 $pl->esrv_new_player;
256
257 delete $pl->{deny_save};
148} 258}
149 259
150cf::client->attach (on_addme => sub { 260cf::client->attach (on_addme => sub {
151 my ($ns) = @_; 261 my ($ns) = @_;
152 262
… …
230 340
231 # try to read the user file and check the password 341 # try to read the user file and check the password
232 if (my $pl = cf::player::find $user) { 342 if (my $pl = cf::player::find $user) {
233 aio_stat $pl->path and next; 343 aio_stat $pl->path and next;
234 my $mtime = (stat _)[9]; 344 my $mtime = (stat _)[9];
235 my $hash = $pl->password; 345 my $token = $pl->password;
236 346
237 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 347 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
238 nuke_str $pass; 348 # player exists and passwords match - we can proceed
349
350 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
239 # password matches, wonderful 351 # password matches, wonderful
240 my $pl = cf::player::find $user or next; 352 my $pl = cf::player::find $user or next;
241 $pl->connect ($ns); 353 $pl->connect ($ns);
242 enter_map $pl; 354 enter_map $pl;
355 login_done $pl;
243 last; 356 return;
244 } elsif (can_cleanup $pl, $mtime) { 357 } elsif (can_cleanup $pl, $mtime) {
245 Coro::Timer::sleep 1; 358 Coro::Timer::sleep 1;
246 359
247 $ns->send_drawinfo ( 360 $ns->send_drawinfo (
248 "Player exists, but password does not match. If this is your account, " 361 "Player exists, but password does not match. If this is your account, "
249 . "please try again. If not, you can now decide to take over this account " 362 . "please try again. If not, you can now decide to take over this account "
250 . "because it has not been in-use for some time.", 363 . "because it has not been in-use for some time.",
251 cf::NDI_RED 364 cf::NDI_RED
252 ); 365 );
253 366
254 #TODO: nuke_str
255 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/ 367 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
256 or next; 368 or next;
257 369
258 # check if the file hasn't changed 370 # check if the file hasn't changed
259 aio_stat cf::player::path $user and next; 371 aio_stat cf::player::path $user and next;
… …
261 373
262 $pl->quit_character; 374 $pl->quit_character;
263 375
264 # fall through to creation 376 # fall through to creation
265 } else { 377 } else {
266 nuke_str $pass;
267
268 Coro::Timer::sleep 1; 378 Coro::Timer::sleep 1;
269 379
270 $ns->send_drawinfo ( 380 $ns->send_drawinfo (
271 "Wrong username or password. Please try again " 381 "Wrong username or password. Please try again "
272 . "(check for Numlock and other semi-obvious error sources).", 382 . "(check for Numlock and other semi-obvious error sources).",
… …
274 ); 384 );
275 next; 385 next;
276 } 386 }
277 } else { 387 } else {
278 # unable to load the playerfile: 388 # unable to load the playerfile:
279 # check wether the player dir exists, which means the file is corrupted or 389 # check whether the player dir exists, which means the file is corrupted or
280 # something very similar. 390 # something very similar.
281 if (!aio_stat cf::player::playerdir $user) { 391 if (!aio_stat cf::player::playerdir $user) {
282 $ns->send_drawinfo ( 392 $ns->send_drawinfo (
283 "Unable to retrieve this player. It might be a locked or broken account. " 393 "Unable to retrieve this player. It might be a locked or broken account. "
284 . "If this is your account, ask a dungeon master for assistance. " 394 . "If this is your account, ask a dungeon master for assistance. "
… …
287 ); 397 );
288 next; 398 next;
289 } 399 }
290 } 400 }
291 401
292 # the rest of this function is character creation
293 $Coro::current->{desc} = "addme($user) chargen";
294
295 # just to make sure nothing is left over
296 nuke_playerdir $user;
297
298 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
299
300 if ($pass2 ne $pass) {
301 nuke_str $pass;
302 nuke_str $pass2;
303 $ns->send_drawinfo (
304 "The passwords do not match, please try again.",
305 cf::NDI_RED
306 );
307 Coro::Timer::sleep 0.5;
308 next;
309 }
310
311 nuke_str $pass2;
312
313 my $pl = cf::player::new $user;
314 $pl->password (encode_password $pass);
315 nuke_str $pass;
316 $pl->connect ($ns);
317 my $ob = $pl->ob;
318
319 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
320
321 while () {
322 $ob->update_stats;
323 $pl->save_stats;
324
325 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
326 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
327
328 if ($res =~ /^[Nn]/) {
329 last;
330 } elsif ($res > 0 && $res <= 7) {
331 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
332
333 if ($swap > 0 && $swap <= 7) {
334 $ob->swap_stats ($res - 1, $swap - 1);
335 }
336 } else {
337 $ob->roll_stats;
338 }
339
340 Coro::Timer::sleep 0.05;
341 }
342
343 $ob->set_animation (2);
344 $ob->add_statbonus;
345
346 while () {
347 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
348 my $msg = $ob->msg;
349 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
350 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
351
352 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
353 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
354
355 last if $res =~ /[dD]/;
356
357 $pl->chargen_race_next;
358 Coro::Timer::sleep 0.05;
359 }
360
361 # create the playerdir, if necessary, as chargen_race_done did it before
362 # presumably because of unique maps
363 aio_mkdir playerdir $pl, 0770;
364 $pl->chargen_race_done;
365
366 while () {
367 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
368 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
369
370 if ($res =~ /^[fF]/) {
371 $pl->gender (1);
372 last;
373 } elsif ($res =~ /^[mM]/) {
374 $pl->gender (0);
375 last;
376 }
377 Coro::Timer::sleep 0.05;
378 }
379
380 $ob->reply (undef, "Welcome to Deliantra!");
381
382 # XXX: Workaround for delayed client ext protocol handshake
383 $pl->esrv_new_player;
384
385 delete $pl->{deny_save};
386
387 last; 402 last;
388 } 403 }
389 404
390 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 405 # lock again, too layz to make this nicer
391 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR); 406 local $cf::LOGIN_LOCK{$user} = 1;
392 } 407 chargen $ns, $user, $pass;
408 login_done $ns->pl;
393 }); 409 });
394}); 410});
395 411
396cf::register_command password => sub { 412cf::register_command password => sub {
397 my ($pl, $arg) = @_; 413 my ($pl, $arg) = @_;
398 414
415 unless ($pl->flag (cf::FLAG_WIZ)) {
416 $pl->message (
417 "The password can currently only changed by a DM.",
418 cf::NDI_UNIQUE | cf::NDI_REPLY);
419 return;
420 }
421
399 my (@args) = split /\s+/, $arg; 422 my (@args) = split /\s+/, $arg;
400
401 my ($new_pw, $player);
402
403 if ($pl->flag (cf::FLAG_WIZ)) {
404 ($player, $new_pw) = @args; 423 my ($player, $new_pw) = @args;
405 } else {
406 $new_pw = $args[0];
407 }
408 424
409 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 425 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
410 $pl->message ( 426 $pl->message (
411 "Usage: password <player> [<new password>]", 427 "Usage: password <player> [<new password>]",
412 cf::NDI_UNIQUE | cf::NDI_REPLY); 428 cf::NDI_UNIQUE | cf::NDI_REPLY);
413 return; 429 return;
414 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
415 $pl->message (
416 "Usage: password <new password>",
417 cf::NDI_UNIQUE | cf::NDI_REPLY);
418 return;
419 } 430 }
420 431
421 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
422 unless ($new_pw ne '') { 432 if ($new_pw eq '') {
423 $new_pw = 433 $new_pw =
424 join '', 434 join '',
425 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] } 435 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
426 1..9; 436 1..9;
427 } 437 }
428 438
429 cf::async { 439 cf::async {
430 my $plc = cf::player::find $player; 440 my $plc = cf::player::find $player;
431 if ($plc) { 441 if ($plc) {
432 $plc->password (encode_password $new_pw); 442 $plc->password (encode_password $new_pw);
433 $pl->message (
434 "Ok, changed password of '$player' to '$new_pw'!",
435 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
436 } else {
437 $pl->message (
438 "Fail! Couldn't set password for '$player', "
439 . "he doesn't seem to exist!",
440 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
441 }
442 };
443 } else {
444 my $change = delete $pl->{password_change};
445
446 if ($change && (time - $change->[0]) < 60) {
447 $pl->message ( 443 $pl->message (
448 "Ok, changed your password!", 444 "Ok, changed password of '$player' to '$new_pw'!",
449 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 445 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
450 $pl->contr->password (encode_password $new_pw);
451
452 } else { 446 } else {
453 $pl->message ( 447 $pl->message (
454 "Ok, please confirm your new password by sending " 448 "Fail! Couldn't set password for '$player', "
455 . "the command again within one minute!", 449 . "he doesn't seem to exist!",
456 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 450 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
457 $pl->{password_change} = [time, $new_pw];
458 } 451 }
459 } 452 };
460}; 453};
461 454
462cf::register_command quit => sub { 455cf::register_command quit => sub {
463 my ($ob, $arg) = @_; 456 my ($ob, $arg) = @_;
464 457
… …
476 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 469 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
477 if ($_[0] !~ /^[yY]/) { 470 if ($_[0] !~ /^[yY]/) {
478 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 471 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
479 } else { 472 } else {
480 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 473 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
481 $pl->ns->flush;
482 cf::async { 474 cf::async {
483 ext::highscore::check $pl->ob;
484 $pl->quit_character; 475 $pl->quit_character;
485 }; 476 };
486 } 477 }
487 }); 478 });
488}; 479};
… …
496 487
497 my $pl = $ob->contr; 488 my $pl = $ob->contr;
498 489
499 # update respawn position 490 # update respawn position
500 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 491 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
501 cf::async { $pl->save };
502 492
493 cf::async {
503 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 494 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
504 ext::highscore::check $ob; 495 ext::highscore::check $ob;
505 496
497 $pl->save;
498
506 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY); 499 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
507 500
501 my $ns = $pl->ns
502 or return;
503
508 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 504 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
509 if ($_[0] !~ /^[yY]/) { 505 if ($_[0] !~ /^[yY]/) {
510 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 506 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
511 $pl->deactivate; 507 $pl->deactivate;
512 $pl->ns->destroy; 508 $pl->ns->destroy;
513 } else { 509 }
514 cf::async { $pl->save };
515 } 510 });
516 }); 511 };
517 }, 512 },
518); 513);
519 514
520cf::player->attach ( 515cf::player->attach (
521 on_login => sub { 516 on_login => sub {

Diff Legend

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