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

Diff Legend

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