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.118 by root, Thu Nov 8 00:16:07 2012 UTC vs.
Revision 1.128 by root, Sat Nov 17 12:02:43 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
8CONF 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);
… …
62 my $y = $ob->y; 60 my $y = $ob->y;
63 61
64 # never happens normally, but helps when shell users make mistakes 62 # never happens normally, but helps when shell users make mistakes
65 $m->linkable 63 $m->linkable
66 or return 1; 64 or return 1;
67
68# return 0;#d#
69# warn join ":", $m->at ($x, $y);#d#
70# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
71# return 0;
72 65
73 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 66 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
74} 67}
75 68
76sub enter_map { 69sub enter_map {
… …
131 124
132 $ob->goto ($map, $x, $y); 125 $ob->goto ($map, $x, $y);
133} 126}
134 127
135sub encode_password($) { 128sub encode_password($) {
136# crypt $_[0], 129 unpack "H*", Deliantra::Util::hash_pw $_[0]
137# join '',
138# ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
139 "!" . unpack "H*", $_[0]
140} 130}
141 131
142sub compare_password($$) { 132sub compare_password($$) {
143 my ($pass, $token) = @_; 133 my ($pass, $token) = @_;
144 134
… …
160 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 150 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
161 aio_rename "$PLAYERDIR/$user", $temp; 151 aio_rename "$PLAYERDIR/$user", $temp;
162 IO::AIO::aio_rmtree $temp; 152 IO::AIO::aio_rmtree $temp;
163} 153}
164 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
165cf::client->attach (on_addme => sub { 279cf::client->attach (on_addme => sub {
166 my ($ns) = @_; 280 my ($ns) = @_;
167 281
168 $ns->pl and return $ns->destroy; 282 $ns->{addme}++ and return $ns->destroy;
169 283
170 $ns->async (sub { 284 $ns->async (sub {
171 $Coro::current->{desc} = "addme init"; 285 $Coro::current->{desc} = "addme init";
172 286
173 my ($user, $pass); 287 my ($user, $pass);
… …
190 $ns->send_drawinfo ( 304 $ns->send_drawinfo (
191 "That username is currently used in another login session. " 305 "That username is currently used in another login session. "
192 . "Chose another, or wait till the other session has ended.", 306 . "Chose another, or wait till the other session has ended.",
193 cf::NDI_RED 307 cf::NDI_RED
194 ); 308 );
195 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) { 309 } elsif ($user =~ $VALID_LOGIN) {
196 last; 310 last;
197 } else { 311 } else {
198 $ns->send_drawinfo ( 312 $ns->send_drawinfo (
199 "Your username contains illegal characters " 313 "Your username contains illegal characters "
200 . "(only a-z, A-Z and 0-9 are allowed), " 314 . "(only a-z, A-Z and 0-9 are allowed), "
… …
248 aio_stat $pl->path and next; 362 aio_stat $pl->path and next;
249 my $mtime = (stat _)[9]; 363 my $mtime = (stat _)[9];
250 my $token = $pl->password; 364 my $token = $pl->password;
251 365
252 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) { 366 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
253 $pl->password (encode_password $pass); # make sure we store the new encoding #d# 367 # player exists and passwords match - we can proceed
254 nuke_str $pass; 368
255 # password matches, wonderful 369 # password matches, wonderful
256 my $pl = cf::player::find $user or next; 370 my $pl = cf::player::find $user or next;
257 $pl->connect ($ns); 371 $pl->connect ($ns);
258 enter_map $pl; 372 enter_map $pl;
373 login $pl;
259 last; 374 return;
260 } elsif (can_cleanup $pl, $mtime) { 375 } elsif (can_cleanup $pl, $mtime) {
261 Coro::Timer::sleep 1; 376 Coro::Timer::sleep 1;
262 377
263 $ns->send_drawinfo ( 378 $ns->send_drawinfo (
264 "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, "
265 . "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 "
266 . "because it has not been in-use for some time.", 381 . "because it has not been in-use for some time.",
267 cf::NDI_RED 382 cf::NDI_RED
268 ); 383 );
269 384
270 #TODO: nuke_str
271 (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]/
272 or next; 386 or next;
273 387
274 # check if the file hasn't changed 388 # check if the file hasn't changed
275 aio_stat cf::player::path $user and next; 389 aio_stat cf::player::path $user and next;
… …
277 391
278 $pl->quit_character; 392 $pl->quit_character;
279 393
280 # fall through to creation 394 # fall through to creation
281 } else { 395 } else {
282 nuke_str $pass;
283
284 Coro::Timer::sleep 1; 396 Coro::Timer::sleep 1;
285 397
286 $ns->send_drawinfo ( 398 $ns->send_drawinfo (
287 "Wrong username or password. Please try again " 399 "Wrong username or password. Please try again "
288 . "(check for Numlock and other semi-obvious error sources).", 400 . "(check for Numlock and other semi-obvious error sources).",
… …
303 ); 415 );
304 next; 416 next;
305 } 417 }
306 } 418 }
307 419
308 # the rest of this function is character creation
309 $Coro::current->{desc} = "addme($user) chargen";
310
311 # just to make sure nothing is left over
312 # normally, nothing is there.
313 nuke_playerdir $user;
314
315 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.";
316 421
317 if ($pass2 ne $pass) { 422 if ($pass2 ne $pass) {
318 nuke_str $pass;
319 nuke_str $pass2;
320 $ns->send_drawinfo ( 423 $ns->send_drawinfo (
321 "The passwords do not match, please try again.", 424 "The passwords do not match, please try again.",
322 cf::NDI_RED 425 cf::NDI_RED
323 ); 426 );
324 Coro::Timer::sleep 0.5; 427 Coro::Timer::sleep 0.5;
325 next; 428 next;
326 } 429 }
327 430
328 nuke_str $pass2;
329
330 my $pl = cf::player::new $user;
331 $pl->password (encode_password $pass);
332 nuke_str $pass;
333 $pl->connect ($ns);
334 my $ob = $pl->ob;
335
336 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
337
338 while () {
339 $ob->update_stats;
340 $pl->save_stats;
341
342 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
343 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
344
345 if ($res =~ /^[Nn]/) {
346 last;
347 } elsif ($res > 0 && $res <= 7) {
348 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
349
350 if ($swap > 0 && $swap <= 7) {
351 $ob->swap_stats ($res - 1, $swap - 1);
352 }
353 } else {
354 $ob->roll_stats;
355 }
356
357 Coro::Timer::sleep 0.05;
358 }
359
360 $ob->set_animation (2);
361 $ob->add_statbonus;
362
363 while () {
364 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
365 my $msg = $ob->msg;
366 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
367 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
368
369 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
370 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
371
372 last if $res =~ /[dD]/;
373
374 $pl->chargen_race_next;
375 Coro::Timer::sleep 0.05;
376 }
377
378 # create the playerdir, if necessary, as chargen_race_done did it before
379 # presumably because of unique maps
380 aio_mkdir playerdir $pl, 0770;
381 $pl->chargen_race_done;
382
383 while () {
384 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
385 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
386
387 if ($res =~ /^[fF]/) {
388 $pl->gender (1);
389 last;
390 } elsif ($res =~ /^[mM]/) {
391 $pl->gender (0);
392 last;
393 }
394 Coro::Timer::sleep 0.05;
395 }
396
397 $ob->reply (undef, "Welcome to Deliantra!");
398
399 # XXX: Workaround for delayed client ext protocol handshake
400 $pl->esrv_new_player;
401
402 delete $pl->{deny_save};
403
404 last; 431 last;
405 } 432 }
406 433
407 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 434 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
408 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
409 }
410 }); 435 });
411}); 436});
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 $reply->(1, "Account Created");
476
477 chargen $ns, $user, $pass;
478 });
479};
480
481cf::register_async_exticmd login => sub {
482 my ($ns, $reply, $user, $hash) = @_;
483
484 $ns->{addme}++ and return $ns->destroy;
485
486 $ns->async (sub {
487 local $cf::LOGIN_LOCK{$user} = 1;
488
489 $Coro::current->{desc} = "login($user) check";
490
491 my $fail = sub {
492 $reply->(0, $_[0]);
493 $ns->flush; # does not ensure that the data reaches the client - TODO
494 # need to do this in another thread, as this one gets canceled
495 Coro::async_pool {
496 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
497 $ns->destroy if $ns->valid;
498 };
499 Coro::schedule; # do the destroy, should not return
500 };
501
502 # try to read the user file and check the password
503 my $pl = cf::player::find $user
504 or return $fail->("User '$user' does not exist - wrong spelling?");
505
506 aio_stat $pl->path
507 and return $ns->destroy;
508
509 my $mtime = (stat _)[9];
510 my $token = $pl->password;
511
512 $token = $token =~ /^!/
513 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
514 : pack "H*", $token;
515
516 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
517
518 $token eq $hash
519 or $cf::CFG{ext_login_nocheck}
520 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
521
522 # player exists and passwords match - we can proceed
523
524 $reply->(1, "Success");
525
526 $pl->connect ($ns);
527 enter_map $pl;
528 login $pl;
529 });
530};
412 531
413cf::register_command password => sub { 532cf::register_command password => sub {
414 my ($pl, $arg) = @_; 533 my ($pl, $arg) = @_;
415 534
416 unless ($pl->flag (cf::FLAG_WIZ)) { 535 unless ($pl->flag (cf::FLAG_WIZ)) {
417 $pl->message ( 536 $pl->message (
418 "The password can currently only changed by a DM.", 537 "The password can currently only changed by a DM.",
419 cf::NDI_UNIQUE | cf::NDI_REPLY); 538 cf::NDI_UNIQUE | cf::NDI_REPLY);
420 return; 539 return;
421 } 540 }
541
542 $pl->message (#d#
543 "Passwords cannot currently be changed.",#d#
544 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
545 return;#d#
422 546
423 my (@args) = split /\s+/, $arg; 547 my (@args) = split /\s+/, $arg;
424 my ($player, $new_pw) = @args; 548 my ($player, $new_pw) = @args;
425 549
426 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 550 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {

Diff Legend

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