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.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;
… …
126 } 126 }
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], 132 "!" . unpack "H*", $_[0]
133 join '',
134 ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
135} 133}
136 134
137# delete a player directory, be non-blocking AND synchronous... 135sub compare_password($$) {
138# (that's hard, so we crap out and fork). 136 my ($pass, $token) = @_;
137
138 if ($token =~ /!!(.*)/) {
139 return +(substr $pass, 0, 8) eq pack "H*", $1;
140 } elsif ($token =~ /!(.*)/) {
141 return $pass eq pack "H*", $1;
142 } else {
143 return $token eq crypt $pass, $token;
144 }
145}
146
147# delete a player directory
139sub nuke_playerdir { 148sub nuke_playerdir {
140 my ($user) = @_; 149 my ($user) = @_;
141 150
151 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
152
142 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 153 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
143
144 cf::fork_call {
145 rename "$PLAYERDIR/$user", $temp; 154 aio_rename "$PLAYERDIR/$user", $temp;
146 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);
147 }; 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};
148} 248}
149 249
150cf::client->attach (on_addme => sub { 250cf::client->attach (on_addme => sub {
151 my ($ns) = @_; 251 my ($ns) = @_;
152 252
… …
230 330
231 # try to read the user file and check the password 331 # try to read the user file and check the password
232 if (my $pl = cf::player::find $user) { 332 if (my $pl = cf::player::find $user) {
233 aio_stat $pl->path and next; 333 aio_stat $pl->path and next;
234 my $mtime = (stat _)[9]; 334 my $mtime = (stat _)[9];
235 my $hash = $pl->password; 335 my $token = $pl->password;
236 336
237 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 337 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
238 nuke_str $pass; 338 # player exists and passwords match - we can proceed
339
340 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
239 # password matches, wonderful 341 # password matches, wonderful
240 my $pl = cf::player::find $user or next; 342 my $pl = cf::player::find $user or next;
241 $pl->connect ($ns); 343 $pl->connect ($ns);
242 enter_map $pl; 344 enter_map $pl;
345 login_done $pl;
243 last; 346 return;
244 } elsif (can_cleanup $pl, $mtime) { 347 } elsif (can_cleanup $pl, $mtime) {
245 Coro::Timer::sleep 1; 348 Coro::Timer::sleep 1;
246 349
247 $ns->send_drawinfo ( 350 $ns->send_drawinfo (
248 "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, "
249 . "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 "
250 . "because it has not been in-use for some time.", 353 . "because it has not been in-use for some time.",
251 cf::NDI_RED 354 cf::NDI_RED
252 ); 355 );
253 356
254 #TODO: nuke_str
255 (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]/
256 or next; 358 or next;
257 359
258 # check if the file hasn't changed 360 # check if the file hasn't changed
259 aio_stat cf::player::path $user and next; 361 aio_stat cf::player::path $user and next;
… …
261 363
262 $pl->quit_character; 364 $pl->quit_character;
263 365
264 # fall through to creation 366 # fall through to creation
265 } else { 367 } else {
266 nuke_str $pass;
267
268 Coro::Timer::sleep 1; 368 Coro::Timer::sleep 1;
269 369
270 $ns->send_drawinfo ( 370 $ns->send_drawinfo (
271 "Wrong username or password. Please try again " 371 "Wrong username or password. Please try again "
272 . "(check for Numlock and other semi-obvious error sources).", 372 . "(check for Numlock and other semi-obvious error sources).",
… …
274 ); 374 );
275 next; 375 next;
276 } 376 }
277 } else { 377 } else {
278 # unable to load the playerfile: 378 # unable to load the playerfile:
279 # 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
280 # something very similar. 380 # something very similar.
281 if (!aio_stat cf::player::playerdir $user) { 381 if (!aio_stat cf::player::playerdir $user) {
282 $ns->send_drawinfo ( 382 $ns->send_drawinfo (
283 "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. "
284 . "If this is your account, ask a dungeon master for assistance. " 384 . "If this is your account, ask a dungeon master for assistance. "
… …
287 ); 387 );
288 next; 388 next;
289 } 389 }
290 } 390 }
291 391
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."; 392 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
299 393
300 if ($pass2 ne $pass) { 394 if ($pass2 ne $pass) {
301 nuke_str $pass;
302 nuke_str $pass2;
303 $ns->send_drawinfo ( 395 $ns->send_drawinfo (
304 "The passwords do not match, please try again.", 396 "The passwords do not match, please try again.",
305 cf::NDI_RED 397 cf::NDI_RED
306 ); 398 );
307 Coro::Timer::sleep 0.5; 399 Coro::Timer::sleep 0.5;
308 next; 400 next;
309 } 401 }
310 402
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; 403 last;
388 } 404 }
389 405
390 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 406 # lock again, too layz to make this nicer
391 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR); 407 local $cf::LOGIN_LOCK{$user} = 1;
392 } 408
409 chargen $ns, $user, $pass;
410 login_done $ns->pl;
393 }); 411 });
394}); 412});
395 413
396cf::register_command password => sub { 414cf::register_command password => sub {
397 my ($pl, $arg) = @_; 415 my ($pl, $arg) = @_;
398 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
399 my (@args) = split /\s+/, $arg; 424 my (@args) = split /\s+/, $arg;
400
401 my ($new_pw, $player);
402
403 if ($pl->flag (cf::FLAG_WIZ)) {
404 ($player, $new_pw) = @args; 425 my ($player, $new_pw) = @args;
405 } else {
406 $new_pw = $args[0];
407 }
408 426
409 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 427 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
410 $pl->message ( 428 $pl->message (
411 "Usage: password <player> [<new password>]", 429 "Usage: password <player> [<new password>]",
412 cf::NDI_UNIQUE | cf::NDI_REPLY); 430 cf::NDI_UNIQUE | cf::NDI_REPLY);
413 return; 431 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 } 432 }
420 433
421 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
422 unless ($new_pw ne '') { 434 if ($new_pw eq '') {
423 $new_pw = 435 $new_pw =
424 join '', 436 join '',
425 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] } 437 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
426 1..9; 438 1..9;
427 } 439 }
428 440
429 cf::async { 441 cf::async {
430 my $plc = cf::player::find $player; 442 my $plc = cf::player::find $player;
431 if ($plc) { 443 if ($plc) {
432 $plc->password (encode_password $new_pw); 444 $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 ( 445 $pl->message (
448 "Ok, changed your password!", 446 "Ok, changed password of '$player' to '$new_pw'!",
449 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 447 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
450 $pl->contr->password (encode_password $new_pw);
451
452 } else { 448 } else {
453 $pl->message ( 449 $pl->message (
454 "Ok, please confirm your new password by sending " 450 "Fail! Couldn't set password for '$player', "
455 . "the command again within one minute!", 451 . "he doesn't seem to exist!",
456 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 452 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
457 $pl->{password_change} = [time, $new_pw];
458 } 453 }
459 } 454 };
460}; 455};
461 456
462cf::register_command quit => sub { 457cf::register_command quit => sub {
463 my ($ob, $arg) = @_; 458 my ($ob, $arg) = @_;
464 459
… …
476 $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 {
477 if ($_[0] !~ /^[yY]/) { 472 if ($_[0] !~ /^[yY]/) {
478 $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);
479 } else { 474 } else {
480 $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);
481 $pl->ns->flush;
482 cf::async { 476 cf::async {
483 ext::highscore::check $pl->ob;
484 $pl->quit_character; 477 $pl->quit_character;
485 }; 478 };
486 } 479 }
487 }); 480 });
488}; 481};
… …
496 489
497 my $pl = $ob->contr; 490 my $pl = $ob->contr;
498 491
499 # update respawn position 492 # update respawn position
500 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 493 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
501 cf::async { $pl->save };
502 494
495 cf::async {
503 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;
504 ext::highscore::check $ob; 497 ext::highscore::check $ob;
505 498
499 $pl->save;
500
506 $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);
507 502
503 my $ns = $pl->ns
504 or return;
505
508 $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 {
509 if ($_[0] !~ /^[yY]/) { 507 if ($_[0] !~ /^[yY]/) {
510 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 508 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
511 $pl->deactivate; 509 $pl->deactivate;
512 $pl->ns->destroy; 510 $pl->ns->destroy;
513 } else { 511 }
514 cf::async { $pl->save };
515 } 512 });
516 }); 513 };
517 }, 514 },
518); 515);
519 516
520cf::player->attach ( 517cf::player->attach (
521 on_login => sub { 518 on_login => sub {

Diff Legend

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