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.119 by root, Thu Nov 15 05:54:02 2012 UTC vs.
Revision 1.125 by root, Sat Nov 17 10:40:22 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;
10
11our $VALID_LOGIN = qr<^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z>;
9 12
10sub query { 13sub query {
11 my ($ns, $flags, $text) = @_; 14 my ($ns, $flags, $text) = @_;
12 15
13 $ns->query ($flags, $text, Coro::rouse_cb); 16 $ns->query ($flags, $text, Coro::rouse_cb);
… …
57 my $y = $ob->y; 60 my $y = $ob->y;
58 61
59 # never happens normally, but helps when shell users make mistakes 62 # never happens normally, but helps when shell users make mistakes
60 $m->linkable 63 $m->linkable
61 or return 1; 64 or return 1;
62
63# return 0;#d#
64# warn join ":", $m->at ($x, $y);#d#
65# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
66# return 0;
67 65
68 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 66 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
69} 67}
70 68
71sub enter_map { 69sub enter_map {
… …
152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 150 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
153 aio_rename "$PLAYERDIR/$user", $temp; 151 aio_rename "$PLAYERDIR/$user", $temp;
154 IO::AIO::aio_rmtree $temp; 152 IO::AIO::aio_rmtree $temp;
155} 153}
156 154
157sub login_done { 155sub login {
158 my ($pl) = @_; 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 delete $pl->{deny_save}; # set by new
167
168 if ($pl->{chargen} eq "init") {
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 $pl->save;
173
174 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
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!");
159 255
160 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 256 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
161 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR); 257 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
162 } 258 }
163} 259}
164 260
165sub chargen { 261sub chargen {
166 my ($ns, $user, $pass) = @_; 262 my ($ns, $user, $hasah) = @_;
167 263
168 # the rest of this function is character creation 264 # lock again, too lazy to make this nicer
169 $Coro::current->{desc} = "addme($user) chargen"; 265 local $cf::LOGIN_LOCK{$user} = 1;
170 266
171 # just to make sure nothing is left over 267 # just to make sure nothing is left over
172 # normally, nothing is there. 268 # normally, nothing is there.
173 nuke_playerdir $user; 269 nuke_playerdir $user;
174 270
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; 271 my $pl = cf::player::new $user;
187 $pl->password (encode_password $pass); 272 $pl->password (encode_password $pass);
188 $pl->connect ($ns); 273 $pl->connect ($ns);
189 my $ob = $pl->ob;
190 274
191 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 275 $pl->{chargen} = "init";
192 276
193 while () { 277 login $pl;
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};
258} 278}
259 279
260cf::client->attach (on_addme => sub { 280cf::client->attach (on_addme => sub {
261 my ($ns) = @_; 281 my ($ns) = @_;
262 282
263 $ns->pl and return $ns->destroy; 283 $ns->{addme}++ and return $ns->destroy;
264 284
265 $ns->async (sub { 285 $ns->async (sub {
266 $Coro::current->{desc} = "addme init"; 286 $Coro::current->{desc} = "addme init";
267 287
268 my ($user, $pass); 288 my ($user, $pass);
… …
285 $ns->send_drawinfo ( 305 $ns->send_drawinfo (
286 "That username is currently used in another login session. " 306 "That username is currently used in another login session. "
287 . "Chose another, or wait till the other session has ended.", 307 . "Chose another, or wait till the other session has ended.",
288 cf::NDI_RED 308 cf::NDI_RED
289 ); 309 );
290 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) { 310 } elsif ($user =~ $VALID_LOGIN) {
291 last; 311 last;
292 } else { 312 } else {
293 $ns->send_drawinfo ( 313 $ns->send_drawinfo (
294 "Your username contains illegal characters " 314 "Your username contains illegal characters "
295 . "(only a-z, A-Z and 0-9 are allowed), " 315 . "(only a-z, A-Z and 0-9 are allowed), "
… …
345 my $token = $pl->password; 365 my $token = $pl->password;
346 366
347 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) { 367 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
348 # player exists and passwords match - we can proceed 368 # player exists and passwords match - we can proceed
349 369
350 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
351 # password matches, wonderful 370 # password matches, wonderful
352 my $pl = cf::player::find $user or next; 371 my $pl = cf::player::find $user or next;
353 $pl->connect ($ns); 372 $pl->connect ($ns);
354 enter_map $pl; 373 enter_map $pl;
355 login_done $pl; 374 login $pl;
356 return; 375 return;
357 } elsif (can_cleanup $pl, $mtime) { 376 } elsif (can_cleanup $pl, $mtime) {
358 Coro::Timer::sleep 1; 377 Coro::Timer::sleep 1;
359 378
360 $ns->send_drawinfo ( 379 $ns->send_drawinfo (
… …
397 ); 416 );
398 next; 417 next;
399 } 418 }
400 } 419 }
401 420
421 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
422
423 if ($pass2 ne $pass) {
424 $ns->send_drawinfo (
425 "The passwords do not match, please try again.",
426 cf::NDI_RED
427 );
428 Coro::Timer::sleep 0.5;
429 next;
430 }
431
402 last; 432 last;
403 } 433 }
404 434
405 # lock again, too layz to make this nicer 435 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
406 local $cf::LOGIN_LOCK{$user} = 1;
407 chargen $ns, $user, $pass;
408 login_done $ns->pl;
409 }); 436 });
410}); 437});
438
439cf::client->attach (
440 on_version => sub {
441 my ($ns, $arg) = @_;
442
443 # perl probably uses lrand48, which is not secure at all
444 # maybe require linux and use /dev/urandom.
445 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
446 $ns->ext_msg (nonces => @{ $ns->{nonces} });
447 },
448);
449
450cf::register_async_exticmd create_login => sub {
451 my ($ns, $reply, $user, $pass) = @_;
452
453 $ns->{addme}++ and return $ns->destroy;
454
455 $ns->async (sub {
456 my $fail = sub {
457 $reply->(0, $_[0]);
458 $ns->flush; # does not ensure that the data reaches the client - TODO
459 # need to do this in another thread, as this one gets canceled
460 Coro::async_pool {
461 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
462 $ns->destroy;
463 };
464 Coro::schedule; # do the destroy, should not return
465 };
466
467 $user =~ $VALID_LOGIN
468 or return $fail (
469 "Your username contains illegal characters (only a-z, A-Z and 0-9 are allowed), "
470 . "or is not between 3 and 20 characters in length."
471 );
472
473 cf::player::find $user
474 and return $fail->("User '$user' already exists - choose another login name.");
475
476 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
477 });
478};
479
480cf::register_async_exticmd login => sub {
481 my ($ns, $reply, $user, $hash) = @_;
482
483 $ns->{addme}++ and return $ns->destroy;
484
485 $ns->async (sub {
486 local $cf::LOGIN_LOCK{$user} = 1;
487
488 $Coro::current->{desc} = "login($user) check";
489
490 my $fail = sub {
491 $reply->(0, $_[0]);
492 $ns->flush; # does not ensure that the data reaches the client - TODO
493 # need to do this in another thread, as this one gets canceled
494 Coro::async_pool {
495 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
496 $ns->destroy;
497 };
498 Coro::schedule; # do the destroy, should not return
499 };
500
501 # try to read the user file and check the password
502 my $pl = cf::player::find $user
503 or return $fail->("User '$user' does not exist - wrong spelling?");
504
505 aio_stat $pl->path
506 and return $ns->destroy;
507
508 my $mtime = (stat _)[9];
509 my $token = $pl->password;
510
511 $token = $token =~ /^!/
512 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
513 : pack "H*", $token;
514
515 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
516
517 $token eq $hash
518 or $cf::CFG{ext_login_nocheck}
519 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
520
521 # player exists and passwords match - we can proceed
522
523 $reply->(1, "Success");
524
525 $pl->connect ($ns);
526 enter_map $pl;
527 login $pl;
528 });
529};
411 530
412cf::register_command password => sub { 531cf::register_command password => sub {
413 my ($pl, $arg) = @_; 532 my ($pl, $arg) = @_;
414 533
415 unless ($pl->flag (cf::FLAG_WIZ)) { 534 unless ($pl->flag (cf::FLAG_WIZ)) {
416 $pl->message ( 535 $pl->message (
417 "The password can currently only changed by a DM.", 536 "The password can currently only changed by a DM.",
418 cf::NDI_UNIQUE | cf::NDI_REPLY); 537 cf::NDI_UNIQUE | cf::NDI_REPLY);
419 return; 538 return;
420 } 539 }
540
541 $pl->message (#d#
542 "Passwords cannot currently be changed.",#d#
543 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
544 return;#d#
421 545
422 my (@args) = split /\s+/, $arg; 546 my (@args) = split /\s+/, $arg;
423 my ($player, $new_pw) = @args; 547 my ($player, $new_pw) = @args;
424 548
425 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 549 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {

Diff Legend

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