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.111 by root, Sun May 9 22:51:13 2010 UTC vs.
Revision 1.127 by root, Sat Nov 17 12:00:31 2012 UTC

… …
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use Deliantra::Util ();
7 8
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600; 9CONF MAX_DISCONNECT_TIME = 3600;
9 10
10# paranoia function to overwrite a string-in-place 11our $VALID_LOGIN = qr<^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z>;
11sub nuke_str {
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
13}
14 12
15sub query { 13sub query {
16 my ($ns, $flags, $text) = @_; 14 my ($ns, $flags, $text) = @_;
17 15
18 $ns->query ($flags, $text, Coro::rouse_cb); 16 $ns->query ($flags, $text, Coro::rouse_cb);
… …
59 my $m = $ob->map 57 my $m = $ob->map
60 or return; 58 or return;
61 my $x = $ob->x; 59 my $x = $ob->x;
62 my $y = $ob->y; 60 my $y = $ob->y;
63 61
64# return 0;#d# 62 # never happens normally, but helps when shell users make mistakes
65# warn join ":", $m->at ($x, $y);#d# 63 $m->linkable
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 64 or return 1;
67# return 0;
68 65
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 66 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70} 67}
71 68
72sub enter_map { 69sub enter_map {
… …
127 124
128 $ob->goto ($map, $x, $y); 125 $ob->goto ($map, $x, $y);
129} 126}
130 127
131sub encode_password($) { 128sub encode_password($) {
132# crypt $_[0], 129 unpack "H*", Deliantra::Util::hash_pw $_[0]
133# join '',
134# ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
135 "!" . unpack "H*", $_[0]
136} 130}
137 131
138sub compare_password($$) { 132sub compare_password($$) {
139 my ($pass, $token) = @_; 133 my ($pass, $token) = @_;
140 134
141 if ($token =~ /\!(.*)/) { 135 if ($token =~ /!!(.*)/) {
136 return +(substr $pass, 0, 8) eq pack "H*", $1;
137 } elsif ($token =~ /!(.*)/) {
142 return $pass eq pack "H*", $1; 138 return $pass eq pack "H*", $1;
143 } else { 139 } else {
144 return $token eq crypt $pass, $token; 140 return $token eq crypt $pass, $token;
145 } 141 }
146} 142}
… …
154 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 150 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
155 aio_rename "$PLAYERDIR/$user", $temp; 151 aio_rename "$PLAYERDIR/$user", $temp;
156 IO::AIO::aio_rmtree $temp; 152 IO::AIO::aio_rmtree $temp;
157} 153}
158 154
155sub login {
156 my ($pl) = @_;
157
158 # handle character creation, if neccessary
159 # the rest of this function is character creation
160
161 my $ns = $pl->ns;
162 my $ob = $pl->ob;
163
164 $Coro::current->{desc} = "addme(" . $ob->name . ") login";
165
166 if ($pl->{chargen} eq "init") {
167 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
168
169 # create the playerdir, if necessary, as chargen_race_done did it before
170 # presumably because of unique maps
171 aio_mkdir playerdir $pl, 0770;
172 delete $pl->{deny_save}; # set by new
173 $pl->save;
174
175 $pl->{chargen} = "stats";
176 }
177
178 if ($pl->{chargen} eq "stats") {
179 while () {
180 $ob->update_stats;
181 $pl->save_stats;
182
183 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
184 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
185
186 if ($res =~ /^[Nn]/) {
187 last;
188 } elsif ($res > 0 && $res <= 7) {
189 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
190
191 if ($swap > 0 && $swap <= 7) {
192 $ob->swap_stats ($res - 1, $swap - 1);
193 }
194 } else {
195 $ob->roll_stats;
196 }
197
198 Coro::Timer::sleep 0.05;
199 }
200
201 $ob->set_animation (2);
202 $ob->add_statbonus;
203
204 $pl->{chargen} = "race";
205 }
206
207 if ($pl->{chargen} eq "race") {
208 while () {
209 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
210 my $msg = $ob->msg;
211 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
212 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
213
214 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
215 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
216
217 last if $res =~ /[dD]/;
218
219 $pl->chargen_race_next;
220 Coro::Timer::sleep 0.05;
221 }
222
223 $pl->chargen_race_done;
224 $pl->{chargen} = "gender";
225 }
226
227 if ($pl->{chargen} eq "race") {
228 while () {
229 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
230 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
231
232 if ($res =~ /^[fF]/) {
233 $pl->gender (1);
234 last;
235 } elsif ($res =~ /^[mM]/) {
236 $pl->gender (0);
237 last;
238 }
239 Coro::Timer::sleep 0.05;
240 }
241 $pl->{chargen} = "done";
242 }
243
244 $ns->state (cf::ST_PLAYING);
245
246 if ($pl->{chargen} eq "done") {
247 # XXX: Workaround for delayed client ext protocol handshake
248 $pl->esrv_new_player;
249
250 $pl->{chargen} = "done";
251 }
252
253 $ob->reply (undef, "Welcome to Deliantra!");
254
255 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
256 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
257 }
258}
259
260sub chargen {
261 my ($ns, $user, $hash) = @_;
262
263 # lock again, too lazy to make this nicer
264 local $cf::LOGIN_LOCK{$user} = 1;
265
266 # just to make sure nothing is left over
267 # normally, nothing is there.
268 nuke_playerdir $user;
269
270 my $pl = cf::player::new $user;
271 $pl->password (unpack "H*", $hash);
272 $pl->connect ($ns);
273
274 $pl->{chargen} = "init";
275
276 login $pl;
277}
278
159cf::client->attach (on_addme => sub { 279cf::client->attach (on_addme => sub {
160 my ($ns) = @_; 280 my ($ns) = @_;
161 281
162 $ns->pl and return $ns->destroy; 282 $ns->{addme}++ and return $ns->destroy;
163 283
164 $ns->async (sub { 284 $ns->async (sub {
165 $Coro::current->{desc} = "addme init"; 285 $Coro::current->{desc} = "addme init";
166 286
167 my ($user, $pass); 287 my ($user, $pass);
… …
184 $ns->send_drawinfo ( 304 $ns->send_drawinfo (
185 "That username is currently used in another login session. " 305 "That username is currently used in another login session. "
186 . "Chose another, or wait till the other session has ended.", 306 . "Chose another, or wait till the other session has ended.",
187 cf::NDI_RED 307 cf::NDI_RED
188 ); 308 );
189 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) { 309 } elsif ($user =~ $VALID_LOGIN) {
190 last; 310 last;
191 } else { 311 } else {
192 $ns->send_drawinfo ( 312 $ns->send_drawinfo (
193 "Your username contains illegal characters " 313 "Your username contains illegal characters "
194 . "(only a-z, A-Z and 0-9 are allowed), " 314 . "(only a-z, A-Z and 0-9 are allowed), "
… …
242 aio_stat $pl->path and next; 362 aio_stat $pl->path and next;
243 my $mtime = (stat _)[9]; 363 my $mtime = (stat _)[9];
244 my $token = $pl->password; 364 my $token = $pl->password;
245 365
246 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) { 366 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
247 $pl->password (encode_password $pass); # make sure we store the new encoding #d# 367 # player exists and passwords match - we can proceed
248 nuke_str $pass; 368
249 # password matches, wonderful 369 # password matches, wonderful
250 my $pl = cf::player::find $user or next; 370 my $pl = cf::player::find $user or next;
251 $pl->connect ($ns); 371 $pl->connect ($ns);
252 enter_map $pl; 372 enter_map $pl;
373 login $pl;
253 last; 374 return;
254 } elsif (can_cleanup $pl, $mtime) { 375 } elsif (can_cleanup $pl, $mtime) {
255 Coro::Timer::sleep 1; 376 Coro::Timer::sleep 1;
256 377
257 $ns->send_drawinfo ( 378 $ns->send_drawinfo (
258 "Player exists, but password does not match. If this is your account, " 379 "Player exists, but password does not match. If this is your account, "
259 . "please try again. If not, you can now decide to take over this account " 380 . "please try again. If not, you can now decide to take over this account "
260 . "because it has not been in-use for some time.", 381 . "because it has not been in-use for some time.",
261 cf::NDI_RED 382 cf::NDI_RED
262 ); 383 );
263 384
264 #TODO: nuke_str
265 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/ 385 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
266 or next; 386 or next;
267 387
268 # check if the file hasn't changed 388 # check if the file hasn't changed
269 aio_stat cf::player::path $user and next; 389 aio_stat cf::player::path $user and next;
… …
271 391
272 $pl->quit_character; 392 $pl->quit_character;
273 393
274 # fall through to creation 394 # fall through to creation
275 } else { 395 } else {
276 nuke_str $pass;
277
278 Coro::Timer::sleep 1; 396 Coro::Timer::sleep 1;
279 397
280 $ns->send_drawinfo ( 398 $ns->send_drawinfo (
281 "Wrong username or password. Please try again " 399 "Wrong username or password. Please try again "
282 . "(check for Numlock and other semi-obvious error sources).", 400 . "(check for Numlock and other semi-obvious error sources).",
… …
284 ); 402 );
285 next; 403 next;
286 } 404 }
287 } else { 405 } else {
288 # unable to load the playerfile: 406 # unable to load the playerfile:
289 # check wether the player dir exists, which means the file is corrupted or 407 # check whether the player dir exists, which means the file is corrupted or
290 # something very similar. 408 # something very similar.
291 if (!aio_stat cf::player::playerdir $user) { 409 if (!aio_stat cf::player::playerdir $user) {
292 $ns->send_drawinfo ( 410 $ns->send_drawinfo (
293 "Unable to retrieve this player. It might be a locked or broken account. " 411 "Unable to retrieve this player. It might be a locked or broken account. "
294 . "If this is your account, ask a dungeon master for assistance. " 412 . "If this is your account, ask a dungeon master for assistance. "
… …
297 ); 415 );
298 next; 416 next;
299 } 417 }
300 } 418 }
301 419
302 # the rest of this function is character creation
303 $Coro::current->{desc} = "addme($user) chargen";
304
305 # just to make sure nothing is left over
306 # normally, nothing is there.
307 nuke_playerdir $user;
308
309 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 420 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
310 421
311 if ($pass2 ne $pass) { 422 if ($pass2 ne $pass) {
312 nuke_str $pass;
313 nuke_str $pass2;
314 $ns->send_drawinfo ( 423 $ns->send_drawinfo (
315 "The passwords do not match, please try again.", 424 "The passwords do not match, please try again.",
316 cf::NDI_RED 425 cf::NDI_RED
317 ); 426 );
318 Coro::Timer::sleep 0.5; 427 Coro::Timer::sleep 0.5;
319 next; 428 next;
320 } 429 }
321 430
322 nuke_str $pass2;
323
324 my $pl = cf::player::new $user;
325 $pl->password (encode_password $pass);
326 nuke_str $pass;
327 $pl->connect ($ns);
328 my $ob = $pl->ob;
329
330 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
331
332 while () {
333 $ob->update_stats;
334 $pl->save_stats;
335
336 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
337 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
338
339 if ($res =~ /^[Nn]/) {
340 last;
341 } elsif ($res > 0 && $res <= 7) {
342 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
343
344 if ($swap > 0 && $swap <= 7) {
345 $ob->swap_stats ($res - 1, $swap - 1);
346 }
347 } else {
348 $ob->roll_stats;
349 }
350
351 Coro::Timer::sleep 0.05;
352 }
353
354 $ob->set_animation (2);
355 $ob->add_statbonus;
356
357 while () {
358 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
359 my $msg = $ob->msg;
360 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
361 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
362
363 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
364 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
365
366 last if $res =~ /[dD]/;
367
368 $pl->chargen_race_next;
369 Coro::Timer::sleep 0.05;
370 }
371
372 # create the playerdir, if necessary, as chargen_race_done did it before
373 # presumably because of unique maps
374 aio_mkdir playerdir $pl, 0770;
375 $pl->chargen_race_done;
376
377 while () {
378 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
379 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
380
381 if ($res =~ /^[fF]/) {
382 $pl->gender (1);
383 last;
384 } elsif ($res =~ /^[mM]/) {
385 $pl->gender (0);
386 last;
387 }
388 Coro::Timer::sleep 0.05;
389 }
390
391 $ob->reply (undef, "Welcome to Deliantra!");
392
393 # XXX: Workaround for delayed client ext protocol handshake
394 $pl->esrv_new_player;
395
396 delete $pl->{deny_save};
397
398 last; 431 last;
399 } 432 }
400 433
401 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 434 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
402 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
403 }
404 }); 435 });
405}); 436});
406 437
438cf::client->attach (
439 on_version => sub {
440 my ($ns, $arg) = @_;
441
442 # perl probably uses lrand48, which is not secure at all
443 # maybe require linux and use /dev/urandom.
444 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
445 $ns->ext_msg (nonces => @{ $ns->{nonces} });
446 },
447);
448
449cf::register_async_exticmd create_login => sub {
450 my ($ns, $reply, $user, $pass) = @_;
451
452 $ns->{addme}++ and return $ns->destroy;
453
454 $ns->async (sub {
455 my $fail = sub {
456 $reply->(0, $_[0]);
457 $ns->flush; # does not ensure that the data reaches the client - TODO
458 # need to do this in another thread, as this one gets canceled
459 Coro::async_pool {
460 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
461 $ns->destroy if $ns->valid;
462 };
463 Coro::schedule; # do the destroy, should not return
464 };
465
466 $user =~ $VALID_LOGIN
467 or return $fail (
468 "Your username contains illegal characters (only a-z, A-Z and 0-9 are allowed), "
469 . "or is not between 3 and 20 characters in length."
470 );
471
472 cf::player::find $user
473 and return $fail->("User '$user' already exists - choose another login name.");
474
475 chargen $ns, $user, $pass;
476 });
477};
478
479cf::register_async_exticmd login => sub {
480 my ($ns, $reply, $user, $hash) = @_;
481
482 $ns->{addme}++ and return $ns->destroy;
483
484 $ns->async (sub {
485 local $cf::LOGIN_LOCK{$user} = 1;
486
487 $Coro::current->{desc} = "login($user) check";
488
489 my $fail = sub {
490 $reply->(0, $_[0]);
491 $ns->flush; # does not ensure that the data reaches the client - TODO
492 # need to do this in another thread, as this one gets canceled
493 Coro::async_pool {
494 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
495 $ns->destroy if $ns->valid;
496 };
497 Coro::schedule; # do the destroy, should not return
498 };
499
500 # try to read the user file and check the password
501 my $pl = cf::player::find $user
502 or return $fail->("User '$user' does not exist - wrong spelling?");
503
504 aio_stat $pl->path
505 and return $ns->destroy;
506
507 my $mtime = (stat _)[9];
508 my $token = $pl->password;
509
510 $token = $token =~ /^!/
511 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
512 : pack "H*", $token;
513
514 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
515
516 $token eq $hash
517 or $cf::CFG{ext_login_nocheck}
518 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
519
520 # player exists and passwords match - we can proceed
521
522 $reply->(1, "Success");
523
524 $pl->connect ($ns);
525 enter_map $pl;
526 login $pl;
527 });
528};
529
407cf::register_command password => sub { 530cf::register_command password => sub {
408 my ($pl, $arg) = @_; 531 my ($pl, $arg) = @_;
409 532
533 unless ($pl->flag (cf::FLAG_WIZ)) {
534 $pl->message (
535 "The password can currently only changed by a DM.",
536 cf::NDI_UNIQUE | cf::NDI_REPLY);
537 return;
538 }
539
540 $pl->message (#d#
541 "Passwords cannot currently be changed.",#d#
542 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
543 return;#d#
544
410 my (@args) = split /\s+/, $arg; 545 my (@args) = split /\s+/, $arg;
411
412 my ($new_pw, $player);
413
414 if ($pl->flag (cf::FLAG_WIZ)) {
415 ($player, $new_pw) = @args; 546 my ($player, $new_pw) = @args;
416 } else {
417 $new_pw = $args[0];
418 }
419 547
420 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 548 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
421 $pl->message ( 549 $pl->message (
422 "Usage: password <player> [<new password>]", 550 "Usage: password <player> [<new password>]",
423 cf::NDI_UNIQUE | cf::NDI_REPLY); 551 cf::NDI_UNIQUE | cf::NDI_REPLY);
424 return; 552 return;
425 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
426 $pl->message (
427 "Usage: password <new password>",
428 cf::NDI_UNIQUE | cf::NDI_REPLY);
429 return;
430 } 553 }
431 554
432 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
433 unless ($new_pw ne '') { 555 if ($new_pw eq '') {
434 $new_pw = 556 $new_pw =
435 join '', 557 join '',
436 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] } 558 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
437 1..9; 559 1..9;
438 } 560 }
439 561
440 cf::async { 562 cf::async {
441 my $plc = cf::player::find $player; 563 my $plc = cf::player::find $player;
442 if ($plc) { 564 if ($plc) {
443 $plc->password (encode_password $new_pw); 565 $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 } else {
455 my $change = delete $pl->{password_change};
456
457 if ($change && (time - $change->[0]) < 60) {
458 $pl->message ( 566 $pl->message (
459 "Ok, changed your password!", 567 "Ok, changed password of '$player' to '$new_pw'!",
460 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 568 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
461 $pl->contr->password (encode_password $new_pw);
462
463 } else { 569 } else {
464 $pl->message ( 570 $pl->message (
465 "Ok, please confirm your new password by sending " 571 "Fail! Couldn't set password for '$player', "
466 . "the command again within one minute!", 572 . "he doesn't seem to exist!",
467 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 573 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
468 $pl->{password_change} = [time, $new_pw];
469 } 574 }
470 } 575 };
471}; 576};
472 577
473cf::register_command quit => sub { 578cf::register_command quit => sub {
474 my ($ob, $arg) = @_; 579 my ($ob, $arg) = @_;
475 580
… …
514 619
515 $pl->save; 620 $pl->save;
516 621
517 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY); 622 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
518 623
624 my $ns = $pl->ns
625 or return;
626
519 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 627 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
520 if ($_[0] !~ /^[yY]/) { 628 if ($_[0] !~ /^[yY]/) {
521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 629 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
522 $pl->deactivate; 630 $pl->deactivate;
523 $pl->ns->destroy; 631 $pl->ns->destroy;
524 } 632 }

Diff Legend

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