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.129 by root, Sun Nov 18 09:53:46 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 { 12our %LOGIN_LOCK;
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 13
14# HACK: remove when done
15sub cf::client::send_drawinfo {
16 my ($self, $text, $flags) = @_;
17
18 utf8::encode $text;
19 $self->send_packet (sprintf "msg %d log %s", $flags || cf::NDI_BLACK, $text);
13} 20}
14 21
15sub query { 22sub query {
16 my ($ns, $flags, $text) = @_; 23 my ($ns, $flags, $text) = @_;
17 24
… …
29 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9 36 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9
30 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20 37 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20
31 || $age > 700 * 86400 # 2 years for everybody else 38 || $age > 700 * 86400 # 2 years for everybody else
32} 39}
33 40
34sub check_playing { 41# return a guard object for a lock on the given username, if available
42sub login_guard {
35 my ($ns, $user) = @_; 43 my ($user) = @_;
36 44
45 exists $LOGIN_LOCK{$user}
46 and return undef;
47
37 return unless cf::player::find_active $user; 48 cf::player::find_active $user
49 and return undef;
38 50
39 $ns->send_drawinfo ( 51 undef $LOGIN_LOCK{$user};
40 "That player is already logged in on this server. " 52 Guard::guard { delete $LOGIN_LOCK{$user} }
41 . "If you want to create a new player, choose another name. "
42 . "If you have already a registered, make sure nobody "
43 . "else is using your account at this time. If you lost your connection "
44 . "then the server will likely timeout within a minute. If you still "
45 . "cannot log-in after a minute, you are still logged in. Make sure "
46 . "you do not have another client running. If you use windows, reboot, "
47 . "this will fix anything.",
48 cf::NDI_RED
49 );
50
51 1
52} 53}
53 54
54sub safe_spot($) { 55sub safe_spot($) {
55 my ($pl) = @_; 56 my ($pl) = @_;
56 57
… …
62 my $y = $ob->y; 63 my $y = $ob->y;
63 64
64 # never happens normally, but helps when shell users make mistakes 65 # never happens normally, but helps when shell users make mistakes
65 $m->linkable 66 $m->linkable
66 or return 1; 67 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 68
73 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
74} 70}
75 71
76sub enter_map { 72sub enter_map {
… …
131 127
132 $ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
133} 129}
134 130
135sub encode_password($) { 131sub encode_password($) {
136# crypt $_[0], 132 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} 133}
141 134
142sub compare_password($$) { 135sub compare_password($$) {
143 my ($pass, $token) = @_; 136 my ($pass, $token) = @_;
144 137
… …
160 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 153 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
161 aio_rename "$PLAYERDIR/$user", $temp; 154 aio_rename "$PLAYERDIR/$user", $temp;
162 IO::AIO::aio_rmtree $temp; 155 IO::AIO::aio_rmtree $temp;
163} 156}
164 157
158sub login {
159 my ($pl) = @_;
160
161 # handle character creation, if neccessary
162 # the rest of this function is character creation
163
164 my $ns = $pl->ns;
165 my $ob = $pl->ob;
166
167 if ($pl->{chargen} eq "init") {
168 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
169
170 # create the playerdir, if necessary, as chargen_race_done did it before
171 # presumably because of unique maps
172 aio_mkdir playerdir $pl, 0770;
173 delete $pl->{deny_save}; # set by new
174 $pl->save;
175
176 $pl->{chargen} = "stats";
177 }
178
179 if ($pl->{chargen} eq "stats") {
180 while () {
181 $ob->update_stats;
182 $pl->save_stats;
183
184 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
185 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
186
187 if ($res =~ /^[Nn]/) {
188 last;
189 } elsif ($res > 0 && $res <= 7) {
190 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
191
192 if ($swap > 0 && $swap <= 7) {
193 $ob->swap_stats ($res - 1, $swap - 1);
194 }
195 } else {
196 $ob->roll_stats;
197 }
198
199 Coro::Timer::sleep 0.05;
200 }
201
202 $ob->set_animation (2);
203 $ob->add_statbonus;
204
205 $pl->{chargen} = "race";
206 }
207
208 if ($pl->{chargen} eq "race") {
209 while () {
210 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
211 my $msg = $ob->msg;
212 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
213 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
214
215 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
216 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
217
218 last if $res =~ /[dD]/;
219
220 $pl->chargen_race_next;
221 Coro::Timer::sleep 0.05;
222 }
223
224 $pl->chargen_race_done;
225 $pl->{chargen} = "gender";
226 }
227
228 if ($pl->{chargen} eq "race") {
229 while () {
230 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
231 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
232
233 if ($res =~ /^[fF]/) {
234 $pl->gender (1);
235 last;
236 } elsif ($res =~ /^[mM]/) {
237 $pl->gender (0);
238 last;
239 }
240 Coro::Timer::sleep 0.05;
241 }
242 $pl->{chargen} = "done";
243 }
244
245 $ns->state (cf::ST_PLAYING);
246
247 if ($pl->{chargen} eq "done") {
248 # XXX: Workaround for delayed client ext protocol handshake
249 $pl->esrv_new_player;
250
251 $pl->{chargen} = "done";
252 }
253
254 $ob->reply (undef, "Welcome to Deliantra!");
255
256 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
257 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
258 }
259}
260
261sub chargen {
262 my ($ns, $user, $hash) = @_;
263
264 # just to make sure nothing is left over
265 # normally, nothing is there.
266 nuke_playerdir $user;
267
268 my $pl = cf::player::new $user;
269 $pl->password (unpack "H*", $hash);
270 $pl->connect ($ns);
271
272 $pl->{chargen} = "init";
273
274 login $pl;
275}
276
165cf::client->attach (on_addme => sub { 277cf::client->attach (on_addme => sub {
166 my ($ns) = @_; 278 my ($ns) = @_;
167 279
168 $ns->pl and return $ns->destroy; 280 $ns->{addme}++ and return $ns->destroy;
169 281
170 $ns->async (sub { 282 $ns->async (sub {
171 $Coro::current->{desc} = "addme init"; 283 $Coro::current->{desc} = "addme init";
172 284
173 my ($user, $pass); 285 my ($user, $pass);
174 286
175 $ns->send_packet ("addme_success"); 287 $ns->send_packet ("addme_success");
176 288
177 for (;;) { 289 for (;;) {
290 delete $ns->{login_guard};
291
178 $ns->send_drawinfo ( 292 $ns->send_drawinfo (
179 "Please enter your username now. If you are a new user, " 293 "Please enter your username now. If you are a new user, "
180 . "make one up that describes your character best. " 294 . "make one up that describes your character best. "
181 . "Only letters and digits are allowed, though.", 295 . "Only letters and digits are allowed, though.",
182 cf::NDI_BLUE 296 cf::NDI_BLUE
… …
184 298
185 # read username 299 # read username
186 while () { 300 while () {
187 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:"; 301 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
188 302
189 if ($cf::LOGIN_LOCK{$user}) { 303 if ($user =~ $VALID_LOGIN) {
190 $ns->send_drawinfo (
191 "That username is currently used in another login session. "
192 . "Chose another, or wait till the other session has ended.",
193 cf::NDI_RED
194 );
195 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
196 last; 304 last;
197 } else { 305 } else {
198 $ns->send_drawinfo ( 306 $ns->send_drawinfo (
199 "Your username contains illegal characters " 307 "Your username contains illegal characters "
200 . "(only a-z, A-Z and 0-9 are allowed), " 308 . "(only a-z, A-Z and 0-9 are allowed), "
… …
203 ); 311 );
204 } 312 }
205 Coro::Timer::sleep 0.4; 313 Coro::Timer::sleep 0.4;
206 } 314 }
207 315
208 check_playing $ns, $user and next;
209
210 $Coro::current->{desc} = "addme($user) pass"; 316 $Coro::current->{desc} = "addme($user)";
211 317
212 $ns->send_drawinfo ( 318 $ns->send_drawinfo (
213 "Welcome $user, please enter your password now. " 319 "Welcome $user, please enter your password now. "
214 . "New users should now choose a password. " 320 . "New users should now choose a password. "
215 . "Anything your client lets you enter is fine.", 321 . "Anything your client lets you enter is fine.",
… …
226 cf::NDI_RED 332 cf::NDI_RED
227 ); 333 );
228 Coro::Timer::sleep 0.4; 334 Coro::Timer::sleep 0.4;
229 } 335 }
230 336
231 # lock this username for the remainder of this login session 337 $ns->{login_guard} = login_guard $user
232 if ($cf::LOGIN_LOCK{$user}) { 338 or do {
233 $ns->send_drawinfo ( 339 $ns->send_drawinfo (
234 "That username is currently used in another login session. " 340 "That user is already logged in (or is logging in)."
235 . "Chose another, or wait till the other session has ended.", 341 . "Chose another, or wait till the other session has ended.",
236 cf::NDI_RED 342 cf::NDI_RED
343 );
344 next;
237 ); 345 };
238 next;
239 }
240 local $cf::LOGIN_LOCK{$user} = 1;
241
242 check_playing $ns, $user and next;
243
244 $Coro::current->{desc} = "addme($user) check";
245 346
246 # try to read the user file and check the password 347 # try to read the user file and check the password
247 if (my $pl = cf::player::find $user) { 348 if (my $pl = cf::player::find $user) {
248 aio_stat $pl->path and next; 349 aio_stat $pl->path and next;
249 my $mtime = (stat _)[9]; 350 my $mtime = (stat _)[9];
250 my $token = $pl->password; 351 my $token = $pl->password;
251 352
252 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) { 353 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# 354 # player exists and passwords match - we can proceed
254 nuke_str $pass; 355
255 # password matches, wonderful 356 # password matches, wonderful
256 my $pl = cf::player::find $user or next; 357 my $pl = cf::player::find $user or next;
257 $pl->connect ($ns); 358 $pl->connect ($ns);
258 enter_map $pl; 359 enter_map $pl;
360 login $pl;
259 last; 361 return;
260 } elsif (can_cleanup $pl, $mtime) { 362 } elsif (can_cleanup $pl, $mtime) {
261 Coro::Timer::sleep 1; 363 Coro::Timer::sleep 1;
262 364
263 $ns->send_drawinfo ( 365 $ns->send_drawinfo (
264 "Player exists, but password does not match. If this is your account, " 366 "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 " 367 . "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.", 368 . "because it has not been in-use for some time.",
267 cf::NDI_RED 369 cf::NDI_RED
268 ); 370 );
269 371
270 #TODO: nuke_str
271 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/ 372 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
272 or next; 373 or next;
273 374
274 # check if the file hasn't changed 375 # check if the file hasn't changed
275 aio_stat cf::player::path $user and next; 376 aio_stat cf::player::path $user and next;
… …
277 378
278 $pl->quit_character; 379 $pl->quit_character;
279 380
280 # fall through to creation 381 # fall through to creation
281 } else { 382 } else {
282 nuke_str $pass;
283
284 Coro::Timer::sleep 1; 383 Coro::Timer::sleep 1;
285 384
286 $ns->send_drawinfo ( 385 $ns->send_drawinfo (
287 "Wrong username or password. Please try again " 386 "Wrong username or password. Please try again "
288 . "(check for Numlock and other semi-obvious error sources).", 387 . "(check for Numlock and other semi-obvious error sources).",
… …
303 ); 402 );
304 next; 403 next;
305 } 404 }
306 } 405 }
307 406
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."; 407 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
316 408
317 if ($pass2 ne $pass) { 409 if ($pass2 ne $pass) {
318 nuke_str $pass;
319 nuke_str $pass2;
320 $ns->send_drawinfo ( 410 $ns->send_drawinfo (
321 "The passwords do not match, please try again.", 411 "The passwords do not match, please try again.",
322 cf::NDI_RED 412 cf::NDI_RED
323 ); 413 );
324 Coro::Timer::sleep 0.5; 414 Coro::Timer::sleep 0.5;
325 next; 415 next;
326 } 416 }
327 417
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; 418 last;
405 } 419 }
406 420
407 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 421 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
408 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
409 }
410 }); 422 });
411}); 423});
424
425cf::client->attach (
426 on_version => sub {
427 my ($ns, $arg) = @_;
428
429 # perl probably uses lrand48, which is not secure at all
430 # maybe require linux and use /dev/urandom.
431 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
432 $ns->ext_msg (nonces => @{ $ns->{nonces} });
433 },
434);
435
436cf::register_async_exticmd create_login => sub {
437 my ($ns, $reply, $user, $pass) = @_;
438
439 $ns->{addme}++ and return $ns->destroy;
440
441 $ns->async (sub {
442 my $fail = sub {
443 $reply->(0, $_[0]);
444 $ns->flush; # does not ensure that the data reaches the client - TODO
445 # need to do this in another thread, as this one gets canceled
446 Coro::async_pool {
447 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
448 $ns->destroy if $ns->valid;
449 };
450 Coro::schedule; # do the destroy, should not return
451 };
452
453 $user =~ $VALID_LOGIN
454 or return $fail (
455 "Your username contains illegal characters (only a-z, A-Z and 0-9 are allowed), "
456 . "or is not between 3 and 20 characters in length."
457 );
458
459 $ns->{login_guard} = login_guard $user
460 or return $fail->("User name '$user' is in use - try another login name.");
461
462 cf::player::find $user
463 and return $fail->("User name '$user' is already registered - choose another login name.");
464
465 $reply->(1, "Account Created");
466
467 chargen $ns, $user, $pass;
468 });
469};
470
471cf::register_async_exticmd login => sub {
472 my ($ns, $reply, $user, $hash) = @_;
473
474 $ns->{addme}++ and return $ns->destroy;
475
476 $ns->async (sub {
477 $Coro::current->{desc} = "login($user)";
478
479 my $fail = sub {
480 $reply->(0, $_[0]);
481 $ns->flush; # does not ensure that the data reaches the client - TODO
482 # need to do this in another thread, as this one gets canceled
483 Coro::async_pool {
484 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
485 $ns->destroy if $ns->valid;
486 };
487 Coro::schedule; # do the destroy, should not return
488 };
489
490 $ns->{login_guard} = login_guard $user
491 or return $fail->("User '$user' is currently playing or logging in in another session. If that is your "
492 . "user name, make sure you are not running two clients. When in doubt, reboot.");
493
494 # try to read the user file and check the password
495 my $pl = cf::player::find $user
496 or return $fail->("User '$user' does not exist - wrong spelling?");
497
498 aio_stat $pl->path
499 and return $ns->destroy;
500
501 my $mtime = (stat _)[9];
502 my $token = $pl->password;
503
504 $token = $token =~ /^!/
505 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
506 : pack "H*", $token;
507
508 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
509
510 $token eq $hash
511 or $cf::CFG{ext_login_nocheck}
512 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
513
514 # player exists and passwords match - we can proceed
515
516 $reply->(1, "Success");
517
518 $pl->connect ($ns);
519 enter_map $pl;
520 login $pl;
521 });
522};
412 523
413cf::register_command password => sub { 524cf::register_command password => sub {
414 my ($pl, $arg) = @_; 525 my ($pl, $arg) = @_;
415 526
416 unless ($pl->flag (cf::FLAG_WIZ)) { 527 unless ($pl->flag (cf::FLAG_WIZ)) {
417 $pl->message ( 528 $pl->message (
418 "The password can currently only changed by a DM.", 529 "The password can currently only changed by a DM.",
419 cf::NDI_UNIQUE | cf::NDI_REPLY); 530 cf::NDI_UNIQUE | cf::NDI_REPLY);
420 return; 531 return;
421 } 532 }
533
534 $pl->message (#d#
535 "Passwords cannot currently be changed.",#d#
536 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
537 return;#d#
422 538
423 my (@args) = split /\s+/, $arg; 539 my (@args) = split /\s+/, $arg;
424 my ($player, $new_pw) = @args; 540 my ($player, $new_pw) = @args;
425 541
426 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 542 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {

Diff Legend

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