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.105 by root, Wed Apr 28 11:28:21 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);
… …
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;
63 58
59 # never happens normally, but helps when shell users make mistakes
60 $m->linkable
61 or return 1;
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;
68 67
… …
87 if ($time && $m) { 86 if ($time && $m) {
88 if ($time < $m->{instantiate_time}) { 87 if ($time < $m->{instantiate_time}) {
89 # the map was reset in the meantime 88 # the map was reset in the meantime
90 my $age = $cf::RUNTIME - $time; 89 my $age = $cf::RUNTIME - $time;
91 90
92 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 91 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
93 92
94 if ($age >= $MAX_DISCONNECT_TIME) { 93 if ($age >= $MAX_DISCONNECT_TIME) {
95 $ob->message ( 94 $ob->message (
96 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 95 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
97 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " 96 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
126 } 125 }
127 126
128 $ob->goto ($map, $x, $y); 127 $ob->goto ($map, $x, $y);
129} 128}
130 129
131# delete a player directory, be non-blocking AND synchronous... 130sub encode_password($) {
132# (that's hard, so we crap out and fork). 131 "!" . unpack "H*", $_[0]
132}
133
134sub compare_password($$) {
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
133sub nuke_playerdir { 147sub nuke_playerdir {
134 my ($user) = @_; 148 my ($user) = @_;
135 149
150 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
151
136 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
137
138 cf::fork_call {
139 rename "$PLAYERDIR/$user", $temp; 153 aio_rename "$PLAYERDIR/$user", $temp;
140 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);
141 }; 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};
142} 258}
143 259
144cf::client->attach (on_addme => sub { 260cf::client->attach (on_addme => sub {
145 my ($ns) = @_; 261 my ($ns) = @_;
146 262
… …
224 340
225 # try to read the user file and check the password 341 # try to read the user file and check the password
226 if (my $pl = cf::player::find $user) { 342 if (my $pl = cf::player::find $user) {
227 aio_stat $pl->path and next; 343 aio_stat $pl->path and next;
228 my $mtime = (stat _)[9]; 344 my $mtime = (stat _)[9];
229 my $hash = $pl->password; 345 my $token = $pl->password;
230 346
231 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 347 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
232 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#
233 # password matches, wonderful 351 # password matches, wonderful
234 my $pl = cf::player::find $user or next; 352 my $pl = cf::player::find $user or next;
235 $pl->connect ($ns); 353 $pl->connect ($ns);
236 enter_map $pl; 354 enter_map $pl;
355 login_done $pl;
237 last; 356 return;
238 } elsif (can_cleanup $pl, $mtime) { 357 } elsif (can_cleanup $pl, $mtime) {
239 Coro::Timer::sleep 1; 358 Coro::Timer::sleep 1;
240 359
241 $ns->send_drawinfo ( 360 $ns->send_drawinfo (
242 "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, "
243 . "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 "
244 . "because it has not been in-use for some time.", 363 . "because it has not been in-use for some time.",
245 cf::NDI_RED 364 cf::NDI_RED
246 ); 365 );
247 366
248 #TODO: nuke_str
249 (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]/
250 or next; 368 or next;
251 369
252 # check if the file hasn't changed 370 # check if the file hasn't changed
253 aio_stat cf::player::path $user and next; 371 aio_stat cf::player::path $user and next;
… …
255 373
256 $pl->quit_character; 374 $pl->quit_character;
257 375
258 # fall through to creation 376 # fall through to creation
259 } else { 377 } else {
260 nuke_str $pass;
261
262 Coro::Timer::sleep 1; 378 Coro::Timer::sleep 1;
263 379
264 $ns->send_drawinfo ( 380 $ns->send_drawinfo (
265 "Wrong username or password. Please try again " 381 "Wrong username or password. Please try again "
266 . "(check for Numlock and other semi-obvious error sources).", 382 . "(check for Numlock and other semi-obvious error sources).",
… …
268 ); 384 );
269 next; 385 next;
270 } 386 }
271 } else { 387 } else {
272 # unable to load the playerfile: 388 # unable to load the playerfile:
273 # 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
274 # something very similar. 390 # something very similar.
275 if (!aio_stat cf::player::playerdir $user) { 391 if (!aio_stat cf::player::playerdir $user) {
276 $ns->send_drawinfo ( 392 $ns->send_drawinfo (
277 "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. "
278 . "If this is your account, ask a dungeon master for assistance. " 394 . "If this is your account, ask a dungeon master for assistance. "
… …
281 ); 397 );
282 next; 398 next;
283 } 399 }
284 } 400 }
285 401
286 # the rest of this function is character creation
287 $Coro::current->{desc} = "addme($user) chargen";
288
289 # just to make sure nothing is left over
290 nuke_playerdir $user;
291
292 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
293
294 if ($pass2 ne $pass) {
295 nuke_str $pass;
296 nuke_str $pass2;
297 $ns->send_drawinfo (
298 "The passwords do not match, please try again.",
299 cf::NDI_RED
300 );
301 Coro::Timer::sleep 0.5;
302 next;
303 }
304
305 nuke_str $pass2;
306
307 my $pl = cf::player::new $user;
308 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]);
309 nuke_str $pass;
310 $pl->connect ($ns);
311 my $ob = $pl->ob;
312
313 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
314
315 while () {
316 $ob->update_stats;
317 $pl->save_stats;
318
319 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
320 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
321
322 if ($res =~ /^[Nn]/) {
323 last;
324 } elsif ($res > 0 && $res <= 7) {
325 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
326
327 if ($swap > 0 && $swap <= 7) {
328 $ob->swap_stats ($res - 1, $swap - 1);
329 }
330 } else {
331 $ob->roll_stats;
332 }
333
334 Coro::Timer::sleep 0.05;
335 }
336
337 $ob->set_animation (2);
338 $ob->add_statbonus;
339
340 while () {
341 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
342 my $msg = $ob->msg;
343 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
344 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
345
346 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
347 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
348
349 last if $res =~ /[dD]/;
350
351 $pl->chargen_race_next;
352 Coro::Timer::sleep 0.05;
353 }
354
355 # create the playerdir, if necessary, as chargen_race_done did it before
356 # presumably because of unique maps
357 aio_mkdir playerdir $pl, 0770;
358 $pl->chargen_race_done;
359
360 while () {
361 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
362 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
363
364 if ($res =~ /^[fF]/) {
365 $pl->gender (1);
366 last;
367 } elsif ($res =~ /^[mM]/) {
368 $pl->gender (0);
369 last;
370 }
371 Coro::Timer::sleep 0.05;
372 }
373
374 $ob->reply (undef, "Welcome to Deliantra!");
375
376 # XXX: Workaround for delayed client ext protocol handshake
377 $pl->esrv_new_player;
378
379 delete $pl->{deny_save};
380
381 last; 402 last;
382 } 403 }
383 404
384 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 405 # lock again, too layz to make this nicer
385 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR); 406 local $cf::LOGIN_LOCK{$user} = 1;
386 } 407 chargen $ns, $user, $pass;
408 login_done $ns->pl;
387 }); 409 });
388}); 410});
411
412cf::register_command password => sub {
413 my ($pl, $arg) = @_;
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
422 my (@args) = split /\s+/, $arg;
423 my ($player, $new_pw) = @args;
424
425 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
426 $pl->message (
427 "Usage: password <player> [<new password>]",
428 cf::NDI_UNIQUE | cf::NDI_REPLY);
429 return;
430 }
431
432 if ($new_pw eq '') {
433 $new_pw =
434 join '',
435 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
436 1..9;
437 }
438
439 cf::async {
440 my $plc = cf::player::find $player;
441 if ($plc) {
442 $plc->password (encode_password $new_pw);
443 $pl->message (
444 "Ok, changed password of '$player' to '$new_pw'!",
445 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
446 } else {
447 $pl->message (
448 "Fail! Couldn't set password for '$player', "
449 . "he doesn't seem to exist!",
450 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
451 }
452 };
453};
389 454
390cf::register_command quit => sub { 455cf::register_command quit => sub {
391 my ($ob, $arg) = @_; 456 my ($ob, $arg) = @_;
392 457
393 $ob->send_msg (undef, 458 $ob->send_msg (undef,
… …
404 $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 {
405 if ($_[0] !~ /^[yY]/) { 470 if ($_[0] !~ /^[yY]/) {
406 $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);
407 } else { 472 } else {
408 $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);
409 $pl->ns->flush;
410 cf::async { 474 cf::async {
411 ext::highscore::check $pl->ob;
412 $pl->quit_character; 475 $pl->quit_character;
413 }; 476 };
414 } 477 }
415 }); 478 });
416}; 479};
… …
424 487
425 my $pl = $ob->contr; 488 my $pl = $ob->contr;
426 489
427 # update respawn position 490 # update respawn position
428 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 491 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
429 cf::async { $pl->save };
430 492
493 cf::async {
431 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;
432 ext::highscore::check $ob; 495 ext::highscore::check $ob;
433 496
497 $pl->save;
498
434 $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);
435 500
501 my $ns = $pl->ns
502 or return;
503
436 $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 {
437 if ($_[0] !~ /^[yY]/) { 505 if ($_[0] !~ /^[yY]/) {
438 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 506 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
439 $pl->deactivate; 507 $pl->deactivate;
440 $pl->ns->destroy; 508 $pl->ns->destroy;
441 } else { 509 }
442 cf::async { $pl->save };
443 } 510 });
444 }); 511 };
445 }, 512 },
446); 513);
447 514
448cf::player->attach ( 515cf::player->attach (
449 on_login => sub { 516 on_login => sub {
… …
464 unless safe_spot $pl; 531 unless safe_spot $pl;
465 } 532 }
466 }, 533 },
467); 534);
468 535
469

Diff Legend

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