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.124 by root, Sat Nov 17 06:41: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);
… …
148 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 150 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
149 aio_rename "$PLAYERDIR/$user", $temp; 151 aio_rename "$PLAYERDIR/$user", $temp;
150 IO::AIO::aio_rmtree $temp; 152 IO::AIO::aio_rmtree $temp;
151} 153}
152 154
153sub login_done { 155sub login {
154 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!");
155 255
156 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 256 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
157 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR); 257 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
158 } 258 }
159} 259}
160 260
161sub chargen { 261sub chargen {
162 my ($ns, $user, $pass) = @_; 262 my ($ns, $user, $hasah) = @_;
163 263
164 # the rest of this function is character creation 264 # lock again, too lazy to make this nicer
165 $Coro::current->{desc} = "addme($user) chargen"; 265 local $cf::LOGIN_LOCK{$user} = 1;
166 266
167 # just to make sure nothing is left over 267 # just to make sure nothing is left over
168 # normally, nothing is there. 268 # normally, nothing is there.
169 nuke_playerdir $user; 269 nuke_playerdir $user;
170 270
171 my $pl = cf::player::new $user; 271 my $pl = cf::player::new $user;
172 $pl->password (encode_password $pass); 272 $pl->password (encode_password $pass);
173 $pl->connect ($ns); 273 $pl->connect ($ns);
174 my $ob = $pl->ob;
175 274
176 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 275 $pl->{chargen} = "init";
177 276
178 while () { 277 login $pl;
179 $ob->update_stats;
180 $pl->save_stats;
181
182 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
183 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
184
185 if ($res =~ /^[Nn]/) {
186 last;
187 } elsif ($res > 0 && $res <= 7) {
188 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
189
190 if ($swap > 0 && $swap <= 7) {
191 $ob->swap_stats ($res - 1, $swap - 1);
192 }
193 } else {
194 $ob->roll_stats;
195 }
196
197 Coro::Timer::sleep 0.05;
198 }
199
200 $ob->set_animation (2);
201 $ob->add_statbonus;
202
203 while () {
204 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
205 my $msg = $ob->msg;
206 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
207 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
208
209 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
210 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
211
212 last if $res =~ /[dD]/;
213
214 $pl->chargen_race_next;
215 Coro::Timer::sleep 0.05;
216 }
217
218 # create the playerdir, if necessary, as chargen_race_done did it before
219 # presumably because of unique maps
220 aio_mkdir playerdir $pl, 0770;
221 $pl->chargen_race_done;
222
223 while () {
224 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
225 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
226
227 if ($res =~ /^[fF]/) {
228 $pl->gender (1);
229 last;
230 } elsif ($res =~ /^[mM]/) {
231 $pl->gender (0);
232 last;
233 }
234 Coro::Timer::sleep 0.05;
235 }
236
237 $ob->reply (undef, "Welcome to Deliantra!");
238
239 # XXX: Workaround for delayed client ext protocol handshake
240 $pl->esrv_new_player;
241
242 delete $pl->{deny_save};
243} 278}
244 279
245cf::client->attach (on_addme => sub { 280cf::client->attach (on_addme => sub {
246 my ($ns) = @_; 281 my ($ns) = @_;
247 282
… …
270 $ns->send_drawinfo ( 305 $ns->send_drawinfo (
271 "That username is currently used in another login session. " 306 "That username is currently used in another login session. "
272 . "Chose another, or wait till the other session has ended.", 307 . "Chose another, or wait till the other session has ended.",
273 cf::NDI_RED 308 cf::NDI_RED
274 ); 309 );
275 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) { 310 } elsif ($user =~ $VALID_LOGIN) {
276 last; 311 last;
277 } else { 312 } else {
278 $ns->send_drawinfo ( 313 $ns->send_drawinfo (
279 "Your username contains illegal characters " 314 "Your username contains illegal characters "
280 . "(only a-z, A-Z and 0-9 are allowed), " 315 . "(only a-z, A-Z and 0-9 are allowed), "
… …
334 369
335 # password matches, wonderful 370 # password matches, wonderful
336 my $pl = cf::player::find $user or next; 371 my $pl = cf::player::find $user or next;
337 $pl->connect ($ns); 372 $pl->connect ($ns);
338 enter_map $pl; 373 enter_map $pl;
339 login_done $pl; 374 login $pl;
340 return; 375 return;
341 } elsif (can_cleanup $pl, $mtime) { 376 } elsif (can_cleanup $pl, $mtime) {
342 Coro::Timer::sleep 1; 377 Coro::Timer::sleep 1;
343 378
344 $ns->send_drawinfo ( 379 $ns->send_drawinfo (
… …
395 } 430 }
396 431
397 last; 432 last;
398 } 433 }
399 434
400 # lock again, too layz to make this nicer 435 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
401 local $cf::LOGIN_LOCK{$user} = 1;
402
403 chargen $ns, $user, $pass;
404 login_done $ns->pl;
405 }); 436 });
406}); 437});
407 438
408cf::client->attach ( 439cf::client->attach (
409 on_version => sub { 440 on_version => sub {
410 my ($ns, $arg) = @_; 441 my ($ns, $arg) = @_;
411 442
443 # perl probably uses lrand48, which is not secure at all
444 # maybe require linux and use /dev/urandom.
412 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2]; 445 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
413 $ns->ext_msg (nonces => @{ $ns->{nonces} }); 446 $ns->ext_msg (nonces => @{ $ns->{nonces} });
414 }, 447 },
415); 448);
416 449
417#cf::register_async_exticmd create_login => sub { 450cf::register_async_exticmd create_login => sub {
418# my ($ns, $reply, $user, $pass) = @_; 451 my ($ns, $reply, $user, $pass) = @_;
419#
420# $ns->{addme}++ and return $ns->destroy;
421#};
422
423cf::register_async_exticmd login => sub {
424 my ($ns, $reply, $user, $hash) = @_;
425 452
426 $ns->{addme}++ and return $ns->destroy; 453 $ns->{addme}++ and return $ns->destroy;
427 454
428 $ns->async (sub { 455 $ns->async (sub {
429 local $cf::LOGIN_LOCK{$user} = 1;
430
431 $Coro::current->{desc} = "login($user) check";
432
433 my $fail = sub { 456 my $fail = sub {
434 $reply->(0, $_[0]); 457 $reply->(0, $_[0]);
435 $ns->flush; # does not ensure that the data reaches the client - TODO 458 $ns->flush; # does not ensure that the data reaches the client - TODO
436 # need to do this in another thread, as this one gets canceled 459 # need to do this in another thread, as this one gets canceled
437 Coro::async_pool { 460 Coro::async_pool {
… …
439 $ns->destroy; 462 $ns->destroy;
440 }; 463 };
441 Coro::schedule; # do the destroy, should not return 464 Coro::schedule; # do the destroy, should not return
442 }; 465 };
443 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
444 # try to read the user file and check the password 501 # try to read the user file and check the password
445 my $pl = cf::player::find $user 502 my $pl = cf::player::find $user
446 or return $fail->("User '$user' does not exist - wrong spelling?"); 503 or return $fail->("User '$user' does not exist - wrong spelling?");
447 504
448 aio_stat $pl->path 505 aio_stat $pl->path
… …
461 or $cf::CFG{ext_login_nocheck} 518 or $cf::CFG{ext_login_nocheck}
462 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc."); 519 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
463 520
464 # player exists and passwords match - we can proceed 521 # player exists and passwords match - we can proceed
465 522
523 $reply->(1, "Success");
524
466 $pl->connect ($ns); 525 $pl->connect ($ns);
467 enter_map $pl; 526 enter_map $pl;
468 login_done $pl; 527 login $pl;
469
470 $reply->(1, "Success");
471 }); 528 });
472}; 529};
473 530
474cf::register_command password => sub { 531cf::register_command password => sub {
475 my ($pl, $arg) = @_; 532 my ($pl, $arg) = @_;

Diff Legend

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