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.129 by root, Sun Nov 18 09:53:46 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>;
12our %LOGIN_LOCK;
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);
20}
10 21
11sub query { 22sub query {
12 my ($ns, $flags, $text) = @_; 23 my ($ns, $flags, $text) = @_;
13 24
14 $ns->query ($flags, $text, Coro::rouse_cb); 25 $ns->query ($flags, $text, Coro::rouse_cb);
… …
25 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9 36 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9
26 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20 37 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20
27 || $age > 700 * 86400 # 2 years for everybody else 38 || $age > 700 * 86400 # 2 years for everybody else
28} 39}
29 40
30sub check_playing { 41# return a guard object for a lock on the given username, if available
42sub login_guard {
31 my ($ns, $user) = @_; 43 my ($user) = @_;
32 44
45 exists $LOGIN_LOCK{$user}
46 and return undef;
47
33 return unless cf::player::find_active $user; 48 cf::player::find_active $user
49 and return undef;
34 50
35 $ns->send_drawinfo ( 51 undef $LOGIN_LOCK{$user};
36 "That player is already logged in on this server. " 52 Guard::guard { delete $LOGIN_LOCK{$user} }
37 . "If you want to create a new player, choose another name. "
38 . "If you have already a registered, make sure nobody "
39 . "else is using your account at this time. If you lost your connection "
40 . "then the server will likely timeout within a minute. If you still "
41 . "cannot log-in after a minute, you are still logged in. Make sure "
42 . "you do not have another client running. If you use windows, reboot, "
43 . "this will fix anything.",
44 cf::NDI_RED
45 );
46
47 1
48} 53}
49 54
50sub safe_spot($) { 55sub safe_spot($) {
51 my ($pl) = @_; 56 my ($pl) = @_;
52 57
… …
58 my $y = $ob->y; 63 my $y = $ob->y;
59 64
60 # never happens normally, but helps when shell users make mistakes 65 # never happens normally, but helps when shell users make mistakes
61 $m->linkable 66 $m->linkable
62 or return 1; 67 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 68
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70} 70}
71 71
72sub enter_map { 72sub enter_map {
… …
127 127
128 $ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
129} 129}
130 130
131sub encode_password($) { 131sub encode_password($) {
132 "!" . unpack "H*", $_[0] 132 unpack "H*", Deliantra::Util::hash_pw $_[0]
133} 133}
134 134
135sub compare_password($$) { 135sub compare_password($$) {
136 my ($pass, $token) = @_; 136 my ($pass, $token) = @_;
137 137
… …
153 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 153 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
154 aio_rename "$PLAYERDIR/$user", $temp; 154 aio_rename "$PLAYERDIR/$user", $temp;
155 IO::AIO::aio_rmtree $temp; 155 IO::AIO::aio_rmtree $temp;
156} 156}
157 157
158sub login_done { 158sub login {
159 my ($pl) = @_; 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!");
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, $hash) = @_;
168
169 # the rest of this function is character creation
170 $Coro::current->{desc} = "addme($user) chargen";
171 263
172 # just to make sure nothing is left over 264 # just to make sure nothing is left over
173 # normally, nothing is there. 265 # normally, nothing is there.
174 nuke_playerdir $user; 266 nuke_playerdir $user;
175 267
176 my $pl = cf::player::new $user; 268 my $pl = cf::player::new $user;
177 $pl->password (encode_password $pass); 269 $pl->password (unpack "H*", $hash);
178 $pl->connect ($ns); 270 $pl->connect ($ns);
179 my $ob = $pl->ob;
180 271
181 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 272 $pl->{chargen} = "init";
182 273
183 while () { 274 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} 275}
249 276
250cf::client->attach (on_addme => sub { 277cf::client->attach (on_addme => sub {
251 my ($ns) = @_; 278 my ($ns) = @_;
252 279
253 $ns->pl and return $ns->destroy; 280 $ns->{addme}++ and return $ns->destroy;
254 281
255 $ns->async (sub { 282 $ns->async (sub {
256 $Coro::current->{desc} = "addme init"; 283 $Coro::current->{desc} = "addme init";
257 284
258 my ($user, $pass); 285 my ($user, $pass);
259 286
260 $ns->send_packet ("addme_success"); 287 $ns->send_packet ("addme_success");
261 288
262 for (;;) { 289 for (;;) {
290 delete $ns->{login_guard};
291
263 $ns->send_drawinfo ( 292 $ns->send_drawinfo (
264 "Please enter your username now. If you are a new user, " 293 "Please enter your username now. If you are a new user, "
265 . "make one up that describes your character best. " 294 . "make one up that describes your character best. "
266 . "Only letters and digits are allowed, though.", 295 . "Only letters and digits are allowed, though.",
267 cf::NDI_BLUE 296 cf::NDI_BLUE
… …
269 298
270 # read username 299 # read username
271 while () { 300 while () {
272 $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:";
273 302
274 if ($cf::LOGIN_LOCK{$user}) { 303 if ($user =~ $VALID_LOGIN) {
275 $ns->send_drawinfo (
276 "That username is currently used in another login session. "
277 . "Chose another, or wait till the other session has ended.",
278 cf::NDI_RED
279 );
280 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
281 last; 304 last;
282 } else { 305 } else {
283 $ns->send_drawinfo ( 306 $ns->send_drawinfo (
284 "Your username contains illegal characters " 307 "Your username contains illegal characters "
285 . "(only a-z, A-Z and 0-9 are allowed), " 308 . "(only a-z, A-Z and 0-9 are allowed), "
… …
288 ); 311 );
289 } 312 }
290 Coro::Timer::sleep 0.4; 313 Coro::Timer::sleep 0.4;
291 } 314 }
292 315
293 check_playing $ns, $user and next;
294
295 $Coro::current->{desc} = "addme($user) pass"; 316 $Coro::current->{desc} = "addme($user)";
296 317
297 $ns->send_drawinfo ( 318 $ns->send_drawinfo (
298 "Welcome $user, please enter your password now. " 319 "Welcome $user, please enter your password now. "
299 . "New users should now choose a password. " 320 . "New users should now choose a password. "
300 . "Anything your client lets you enter is fine.", 321 . "Anything your client lets you enter is fine.",
… …
311 cf::NDI_RED 332 cf::NDI_RED
312 ); 333 );
313 Coro::Timer::sleep 0.4; 334 Coro::Timer::sleep 0.4;
314 } 335 }
315 336
316 # lock this username for the remainder of this login session 337 $ns->{login_guard} = login_guard $user
317 if ($cf::LOGIN_LOCK{$user}) { 338 or do {
318 $ns->send_drawinfo ( 339 $ns->send_drawinfo (
319 "That username is currently used in another login session. " 340 "That user is already logged in (or is logging in)."
320 . "Chose another, or wait till the other session has ended.", 341 . "Chose another, or wait till the other session has ended.",
321 cf::NDI_RED 342 cf::NDI_RED
343 );
344 next;
322 ); 345 };
323 next;
324 }
325 local $cf::LOGIN_LOCK{$user} = 1;
326
327 check_playing $ns, $user and next;
328
329 $Coro::current->{desc} = "addme($user) check";
330 346
331 # try to read the user file and check the password 347 # try to read the user file and check the password
332 if (my $pl = cf::player::find $user) { 348 if (my $pl = cf::player::find $user) {
333 aio_stat $pl->path and next; 349 aio_stat $pl->path and next;
334 my $mtime = (stat _)[9]; 350 my $mtime = (stat _)[9];
335 my $token = $pl->password; 351 my $token = $pl->password;
336 352
337 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) { 353 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
338 # player exists and passwords match - we can proceed 354 # player exists and passwords match - we can proceed
339 355
340 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
341 # password matches, wonderful 356 # password matches, wonderful
342 my $pl = cf::player::find $user or next; 357 my $pl = cf::player::find $user or next;
343 $pl->connect ($ns); 358 $pl->connect ($ns);
344 enter_map $pl; 359 enter_map $pl;
345 login_done $pl; 360 login $pl;
346 return; 361 return;
347 } elsif (can_cleanup $pl, $mtime) { 362 } elsif (can_cleanup $pl, $mtime) {
348 Coro::Timer::sleep 1; 363 Coro::Timer::sleep 1;
349 364
350 $ns->send_drawinfo ( 365 $ns->send_drawinfo (
… …
401 } 416 }
402 417
403 last; 418 last;
404 } 419 }
405 420
406 # lock again, too layz to make this nicer 421 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 }); 422 });
412}); 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};
413 523
414cf::register_command password => sub { 524cf::register_command password => sub {
415 my ($pl, $arg) = @_; 525 my ($pl, $arg) = @_;
416 526
417 unless ($pl->flag (cf::FLAG_WIZ)) { 527 unless ($pl->flag (cf::FLAG_WIZ)) {
418 $pl->message ( 528 $pl->message (
419 "The password can currently only changed by a DM.", 529 "The password can currently only changed by a DM.",
420 cf::NDI_UNIQUE | cf::NDI_REPLY); 530 cf::NDI_UNIQUE | cf::NDI_REPLY);
421 return; 531 return;
422 } 532 }
533
534 $pl->message (#d#
535 "Passwords cannot currently be changed.",#d#
536 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
537 return;#d#
423 538
424 my (@args) = split /\s+/, $arg; 539 my (@args) = split /\s+/, $arg;
425 my ($player, $new_pw) = @args; 540 my ($player, $new_pw) = @args;
426 541
427 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