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.120 by root, Thu Nov 15 06:00:16 2012 UTC vs.
Revision 1.125 by root, Sat Nov 17 10:40:22 2012 UTC

5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use Deliantra::Util (); 7use Deliantra::Util ();
8 8
9CONF 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>;
10 12
11sub query { 13sub query {
12 my ($ns, $flags, $text) = @_; 14 my ($ns, $flags, $text) = @_;
13 15
14 $ns->query ($flags, $text, Coro::rouse_cb); 16 $ns->query ($flags, $text, Coro::rouse_cb);
58 my $y = $ob->y; 60 my $y = $ob->y;
59 61
60 # never happens normally, but helps when shell users make mistakes 62 # never happens normally, but helps when shell users make mistakes
61 $m->linkable 63 $m->linkable
62 or return 1; 64 or return 1;
63
64# return 0;#d#
65# warn join ":", $m->at ($x, $y);#d#
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
67# return 0;
68 65
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 66 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70} 67}
71 68
72sub enter_map { 69sub enter_map {
153 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 150 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
154 aio_rename "$PLAYERDIR/$user", $temp; 151 aio_rename "$PLAYERDIR/$user", $temp;
155 IO::AIO::aio_rmtree $temp; 152 IO::AIO::aio_rmtree $temp;
156} 153}
157 154
158sub login_done { 155sub login {
159 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!");
160 255
161 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 256 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
162 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR); 257 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
163 } 258 }
164} 259}
165 260
166sub chargen { 261sub chargen {
167 my ($ns, $user, $pass) = @_; 262 my ($ns, $user, $hasah) = @_;
168 263
169 # the rest of this function is character creation 264 # lock again, too lazy to make this nicer
170 $Coro::current->{desc} = "addme($user) chargen"; 265 local $cf::LOGIN_LOCK{$user} = 1;
171 266
172 # just to make sure nothing is left over 267 # just to make sure nothing is left over
173 # normally, nothing is there. 268 # normally, nothing is there.
174 nuke_playerdir $user; 269 nuke_playerdir $user;
175 270
176 my $pl = cf::player::new $user; 271 my $pl = cf::player::new $user;
177 $pl->password (encode_password $pass); 272 $pl->password (encode_password $pass);
178 $pl->connect ($ns); 273 $pl->connect ($ns);
179 my $ob = $pl->ob;
180 274
181 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 275 $pl->{chargen} = "init";
182 276
183 while () { 277 login $pl;
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};
248} 278}
249 279
250cf::client->attach (on_addme => sub { 280cf::client->attach (on_addme => sub {
251 my ($ns) = @_; 281 my ($ns) = @_;
252 282
253 $ns->pl and return $ns->destroy; 283 $ns->{addme}++ and return $ns->destroy;
254 284
255 $ns->async (sub { 285 $ns->async (sub {
256 $Coro::current->{desc} = "addme init"; 286 $Coro::current->{desc} = "addme init";
257 287
258 my ($user, $pass); 288 my ($user, $pass);
275 $ns->send_drawinfo ( 305 $ns->send_drawinfo (
276 "That username is currently used in another login session. " 306 "That username is currently used in another login session. "
277 . "Chose another, or wait till the other session has ended.", 307 . "Chose another, or wait till the other session has ended.",
278 cf::NDI_RED 308 cf::NDI_RED
279 ); 309 );
280 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) { 310 } elsif ($user =~ $VALID_LOGIN) {
281 last; 311 last;
282 } else { 312 } else {
283 $ns->send_drawinfo ( 313 $ns->send_drawinfo (
284 "Your username contains illegal characters " 314 "Your username contains illegal characters "
285 . "(only a-z, A-Z and 0-9 are allowed), " 315 . "(only a-z, A-Z and 0-9 are allowed), "
335 my $token = $pl->password; 365 my $token = $pl->password;
336 366
337 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) { 367 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
338 # player exists and passwords match - we can proceed 368 # player exists and passwords match - we can proceed
339 369
340 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
341 # password matches, wonderful 370 # password matches, wonderful
342 my $pl = cf::player::find $user or next; 371 my $pl = cf::player::find $user or next;
343 $pl->connect ($ns); 372 $pl->connect ($ns);
344 enter_map $pl; 373 enter_map $pl;
345 login_done $pl; 374 login $pl;
346 return; 375 return;
347 } elsif (can_cleanup $pl, $mtime) { 376 } elsif (can_cleanup $pl, $mtime) {
348 Coro::Timer::sleep 1; 377 Coro::Timer::sleep 1;
349 378
350 $ns->send_drawinfo ( 379 $ns->send_drawinfo (
401 } 430 }
402 431
403 last; 432 last;
404 } 433 }
405 434
406 # lock again, too layz to make this nicer 435 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
407 local $cf::LOGIN_LOCK{$user} = 1;
408
409 chargen $ns, $user, $pass;
410 login_done $ns->pl;
411 }); 436 });
412}); 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};
413 530
414cf::register_command password => sub { 531cf::register_command password => sub {
415 my ($pl, $arg) = @_; 532 my ($pl, $arg) = @_;
416 533
417 unless ($pl->flag (cf::FLAG_WIZ)) { 534 unless ($pl->flag (cf::FLAG_WIZ)) {
418 $pl->message ( 535 $pl->message (
419 "The password can currently only changed by a DM.", 536 "The password can currently only changed by a DM.",
420 cf::NDI_UNIQUE | cf::NDI_REPLY); 537 cf::NDI_UNIQUE | cf::NDI_REPLY);
421 return; 538 return;
422 } 539 }
540
541 $pl->message (#d#
542 "Passwords cannot currently be changed.",#d#
543 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
544 return;#d#
423 545
424 my (@args) = split /\s+/, $arg; 546 my (@args) = split /\s+/, $arg;
425 my ($player, $new_pw) = @args; 547 my ($player, $new_pw) = @args;
426 548
427 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