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.110 by root, Sat May 8 10:49:44 2010 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
8our $MAX_DISCONNECT_TIME = $cf::CFG{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
… …
59 my $m = $ob->map 60 my $m = $ob->map
60 or return; 61 or return;
61 my $x = $ob->x; 62 my $x = $ob->x;
62 my $y = $ob->y; 63 my $y = $ob->y;
63 64
64# return 0;#d# 65 # never happens normally, but helps when shell users make mistakes
65# warn join ":", $m->at ($x, $y);#d# 66 $m->linkable
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 67 or return 1;
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# crypt $_[0], 132 unpack "H*", Deliantra::Util::hash_pw $_[0]
133# join '',
134# ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
135 "!" . unpack "H*", $_[0]
136} 133}
137 134
138sub compare_password($$) { 135sub compare_password($$) {
139 my ($pass, $token) = @_; 136 my ($pass, $token) = @_;
140 137
141 if ($token =~ /\!(.*)/) { 138 if ($token =~ /!!(.*)/) {
139 return +(substr $pass, 0, 8) eq pack "H*", $1;
140 } elsif ($token =~ /!(.*)/) {
142 return $pass eq pack "H*", $1; 141 return $pass eq pack "H*", $1;
143 } else { 142 } else {
144 return $token eq crypt $pass, $token; 143 return $token eq crypt $pass, $token;
145 } 144 }
146} 145}
147 146
148# delete a player directory, be non-blocking AND synchronous... 147# delete a player directory
149# (that's hard, so we crap out and fork).
150sub nuke_playerdir { 148sub nuke_playerdir {
151 my ($user) = @_; 149 my ($user) = @_;
152 150
151 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
152
153 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 153 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
154
155 cf::fork_call {
156 rename "$PLAYERDIR/$user", $temp; 154 aio_rename "$PLAYERDIR/$user", $temp;
157 system "rm", "-rf", $temp; 155 IO::AIO::aio_rmtree $temp;
156}
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";
158 }; 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;
159} 275}
160 276
161cf::client->attach (on_addme => sub { 277cf::client->attach (on_addme => sub {
162 my ($ns) = @_; 278 my ($ns) = @_;
163 279
164 $ns->pl and return $ns->destroy; 280 $ns->{addme}++ and return $ns->destroy;
165 281
166 $ns->async (sub { 282 $ns->async (sub {
167 $Coro::current->{desc} = "addme init"; 283 $Coro::current->{desc} = "addme init";
168 284
169 my ($user, $pass); 285 my ($user, $pass);
170 286
171 $ns->send_packet ("addme_success"); 287 $ns->send_packet ("addme_success");
172 288
173 for (;;) { 289 for (;;) {
290 delete $ns->{login_guard};
291
174 $ns->send_drawinfo ( 292 $ns->send_drawinfo (
175 "Please enter your username now. If you are a new user, " 293 "Please enter your username now. If you are a new user, "
176 . "make one up that describes your character best. " 294 . "make one up that describes your character best. "
177 . "Only letters and digits are allowed, though.", 295 . "Only letters and digits are allowed, though.",
178 cf::NDI_BLUE 296 cf::NDI_BLUE
… …
180 298
181 # read username 299 # read username
182 while () { 300 while () {
183 $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:";
184 302
185 if ($cf::LOGIN_LOCK{$user}) { 303 if ($user =~ $VALID_LOGIN) {
186 $ns->send_drawinfo (
187 "That username is currently used in another login session. "
188 . "Chose another, or wait till the other session has ended.",
189 cf::NDI_RED
190 );
191 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
192 last; 304 last;
193 } else { 305 } else {
194 $ns->send_drawinfo ( 306 $ns->send_drawinfo (
195 "Your username contains illegal characters " 307 "Your username contains illegal characters "
196 . "(only a-z, A-Z and 0-9 are allowed), " 308 . "(only a-z, A-Z and 0-9 are allowed), "
… …
199 ); 311 );
200 } 312 }
201 Coro::Timer::sleep 0.4; 313 Coro::Timer::sleep 0.4;
202 } 314 }
203 315
204 check_playing $ns, $user and next;
205
206 $Coro::current->{desc} = "addme($user) pass"; 316 $Coro::current->{desc} = "addme($user)";
207 317
208 $ns->send_drawinfo ( 318 $ns->send_drawinfo (
209 "Welcome $user, please enter your password now. " 319 "Welcome $user, please enter your password now. "
210 . "New users should now choose a password. " 320 . "New users should now choose a password. "
211 . "Anything your client lets you enter is fine.", 321 . "Anything your client lets you enter is fine.",
… …
222 cf::NDI_RED 332 cf::NDI_RED
223 ); 333 );
224 Coro::Timer::sleep 0.4; 334 Coro::Timer::sleep 0.4;
225 } 335 }
226 336
227 # lock this username for the remainder of this login session 337 $ns->{login_guard} = login_guard $user
228 if ($cf::LOGIN_LOCK{$user}) { 338 or do {
229 $ns->send_drawinfo ( 339 $ns->send_drawinfo (
230 "That username is currently used in another login session. " 340 "That user is already logged in (or is logging in)."
231 . "Chose another, or wait till the other session has ended.", 341 . "Chose another, or wait till the other session has ended.",
232 cf::NDI_RED 342 cf::NDI_RED
343 );
344 next;
233 ); 345 };
234 next;
235 }
236 local $cf::LOGIN_LOCK{$user} = 1;
237
238 check_playing $ns, $user and next;
239
240 $Coro::current->{desc} = "addme($user) check";
241 346
242 # try to read the user file and check the password 347 # try to read the user file and check the password
243 if (my $pl = cf::player::find $user) { 348 if (my $pl = cf::player::find $user) {
244 aio_stat $pl->path and next; 349 aio_stat $pl->path and next;
245 my $mtime = (stat _)[9]; 350 my $mtime = (stat _)[9];
246 my $token = $pl->password; 351 my $token = $pl->password;
247 352
248 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) { 353 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
249 $pl->password (encode_password $pass); # make sure we store the new encoding #d# 354 # player exists and passwords match - we can proceed
250 nuke_str $pass; 355
251 # password matches, wonderful 356 # password matches, wonderful
252 my $pl = cf::player::find $user or next; 357 my $pl = cf::player::find $user or next;
253 $pl->connect ($ns); 358 $pl->connect ($ns);
254 enter_map $pl; 359 enter_map $pl;
360 login $pl;
255 last; 361 return;
256 } elsif (can_cleanup $pl, $mtime) { 362 } elsif (can_cleanup $pl, $mtime) {
257 Coro::Timer::sleep 1; 363 Coro::Timer::sleep 1;
258 364
259 $ns->send_drawinfo ( 365 $ns->send_drawinfo (
260 "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, "
261 . "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 "
262 . "because it has not been in-use for some time.", 368 . "because it has not been in-use for some time.",
263 cf::NDI_RED 369 cf::NDI_RED
264 ); 370 );
265 371
266 #TODO: nuke_str
267 (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]/
268 or next; 373 or next;
269 374
270 # check if the file hasn't changed 375 # check if the file hasn't changed
271 aio_stat cf::player::path $user and next; 376 aio_stat cf::player::path $user and next;
… …
273 378
274 $pl->quit_character; 379 $pl->quit_character;
275 380
276 # fall through to creation 381 # fall through to creation
277 } else { 382 } else {
278 nuke_str $pass;
279
280 Coro::Timer::sleep 1; 383 Coro::Timer::sleep 1;
281 384
282 $ns->send_drawinfo ( 385 $ns->send_drawinfo (
283 "Wrong username or password. Please try again " 386 "Wrong username or password. Please try again "
284 . "(check for Numlock and other semi-obvious error sources).", 387 . "(check for Numlock and other semi-obvious error sources).",
… …
286 ); 389 );
287 next; 390 next;
288 } 391 }
289 } else { 392 } else {
290 # unable to load the playerfile: 393 # unable to load the playerfile:
291 # check wether the player dir exists, which means the file is corrupted or 394 # check whether the player dir exists, which means the file is corrupted or
292 # something very similar. 395 # something very similar.
293 if (!aio_stat cf::player::playerdir $user) { 396 if (!aio_stat cf::player::playerdir $user) {
294 $ns->send_drawinfo ( 397 $ns->send_drawinfo (
295 "Unable to retrieve this player. It might be a locked or broken account. " 398 "Unable to retrieve this player. It might be a locked or broken account. "
296 . "If this is your account, ask a dungeon master for assistance. " 399 . "If this is your account, ask a dungeon master for assistance. "
… …
299 ); 402 );
300 next; 403 next;
301 } 404 }
302 } 405 }
303 406
304 # the rest of this function is character creation
305 $Coro::current->{desc} = "addme($user) chargen";
306
307 # just to make sure nothing is left over
308 nuke_playerdir $user;
309
310 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.";
311 408
312 if ($pass2 ne $pass) { 409 if ($pass2 ne $pass) {
313 nuke_str $pass;
314 nuke_str $pass2;
315 $ns->send_drawinfo ( 410 $ns->send_drawinfo (
316 "The passwords do not match, please try again.", 411 "The passwords do not match, please try again.",
317 cf::NDI_RED 412 cf::NDI_RED
318 ); 413 );
319 Coro::Timer::sleep 0.5; 414 Coro::Timer::sleep 0.5;
320 next; 415 next;
321 } 416 }
322 417
323 nuke_str $pass2;
324
325 my $pl = cf::player::new $user;
326 $pl->password (encode_password $pass);
327 nuke_str $pass;
328 $pl->connect ($ns);
329 my $ob = $pl->ob;
330
331 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
332
333 while () {
334 $ob->update_stats;
335 $pl->save_stats;
336
337 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
338 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
339
340 if ($res =~ /^[Nn]/) {
341 last;
342 } elsif ($res > 0 && $res <= 7) {
343 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
344
345 if ($swap > 0 && $swap <= 7) {
346 $ob->swap_stats ($res - 1, $swap - 1);
347 }
348 } else {
349 $ob->roll_stats;
350 }
351
352 Coro::Timer::sleep 0.05;
353 }
354
355 $ob->set_animation (2);
356 $ob->add_statbonus;
357
358 while () {
359 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
360 my $msg = $ob->msg;
361 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
362 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
363
364 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
365 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
366
367 last if $res =~ /[dD]/;
368
369 $pl->chargen_race_next;
370 Coro::Timer::sleep 0.05;
371 }
372
373 # create the playerdir, if necessary, as chargen_race_done did it before
374 # presumably because of unique maps
375 aio_mkdir playerdir $pl, 0770;
376 $pl->chargen_race_done;
377
378 while () {
379 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
380 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
381
382 if ($res =~ /^[fF]/) {
383 $pl->gender (1);
384 last;
385 } elsif ($res =~ /^[mM]/) {
386 $pl->gender (0);
387 last;
388 }
389 Coro::Timer::sleep 0.05;
390 }
391
392 $ob->reply (undef, "Welcome to Deliantra!");
393
394 # XXX: Workaround for delayed client ext protocol handshake
395 $pl->esrv_new_player;
396
397 delete $pl->{deny_save};
398
399 last; 418 last;
400 } 419 }
401 420
402 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 421 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
403 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
404 }
405 }); 422 });
406}); 423});
407 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};
523
408cf::register_command password => sub { 524cf::register_command password => sub {
409 my ($pl, $arg) = @_; 525 my ($pl, $arg) = @_;
410 526
527 unless ($pl->flag (cf::FLAG_WIZ)) {
528 $pl->message (
529 "The password can currently only changed by a DM.",
530 cf::NDI_UNIQUE | cf::NDI_REPLY);
531 return;
532 }
533
534 $pl->message (#d#
535 "Passwords cannot currently be changed.",#d#
536 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
537 return;#d#
538
411 my (@args) = split /\s+/, $arg; 539 my (@args) = split /\s+/, $arg;
412
413 my ($new_pw, $player);
414
415 if ($pl->flag (cf::FLAG_WIZ)) {
416 ($player, $new_pw) = @args; 540 my ($player, $new_pw) = @args;
417 } else {
418 $new_pw = $args[0];
419 }
420 541
421 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 542 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
422 $pl->message ( 543 $pl->message (
423 "Usage: password <player> [<new password>]", 544 "Usage: password <player> [<new password>]",
424 cf::NDI_UNIQUE | cf::NDI_REPLY); 545 cf::NDI_UNIQUE | cf::NDI_REPLY);
425 return; 546 return;
426 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
427 $pl->message (
428 "Usage: password <new password>",
429 cf::NDI_UNIQUE | cf::NDI_REPLY);
430 return;
431 } 547 }
432 548
433 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
434 unless ($new_pw ne '') { 549 if ($new_pw eq '') {
435 $new_pw = 550 $new_pw =
436 join '', 551 join '',
437 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] } 552 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
438 1..9; 553 1..9;
439 } 554 }
440 555
441 cf::async { 556 cf::async {
442 my $plc = cf::player::find $player; 557 my $plc = cf::player::find $player;
443 if ($plc) { 558 if ($plc) {
444 $plc->password (encode_password $new_pw); 559 $plc->password (encode_password $new_pw);
445 $pl->message (
446 "Ok, changed password of '$player' to '$new_pw'!",
447 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
448 } else {
449 $pl->message (
450 "Fail! Couldn't set password for '$player', "
451 . "he doesn't seem to exist!",
452 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
453 }
454 };
455 } else {
456 my $change = delete $pl->{password_change};
457
458 if ($change && (time - $change->[0]) < 60) {
459 $pl->message ( 560 $pl->message (
460 "Ok, changed your password!", 561 "Ok, changed password of '$player' to '$new_pw'!",
461 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 562 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462 $pl->contr->password (encode_password $new_pw);
463
464 } else { 563 } else {
465 $pl->message ( 564 $pl->message (
466 "Ok, please confirm your new password by sending " 565 "Fail! Couldn't set password for '$player', "
467 . "the command again within one minute!", 566 . "he doesn't seem to exist!",
468 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 567 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
469 $pl->{password_change} = [time, $new_pw];
470 } 568 }
471 } 569 };
472}; 570};
473 571
474cf::register_command quit => sub { 572cf::register_command quit => sub {
475 my ($ob, $arg) = @_; 573 my ($ob, $arg) = @_;
476 574
… …
488 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 586 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
489 if ($_[0] !~ /^[yY]/) { 587 if ($_[0] !~ /^[yY]/) {
490 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 588 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
491 } else { 589 } else {
492 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 590 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
493 $pl->ns->flush;
494 cf::async { 591 cf::async {
495 ext::highscore::check $pl->ob;
496 $pl->quit_character; 592 $pl->quit_character;
497 }; 593 };
498 } 594 }
499 }); 595 });
500}; 596};
… …
508 604
509 my $pl = $ob->contr; 605 my $pl = $ob->contr;
510 606
511 # update respawn position 607 # update respawn position
512 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 608 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
513 cf::async { $pl->save };
514 609
610 cf::async {
515 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 611 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
516 ext::highscore::check $ob; 612 ext::highscore::check $ob;
517 613
614 $pl->save;
615
518 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY); 616 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
519 617
618 my $ns = $pl->ns
619 or return;
620
520 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 621 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
521 if ($_[0] !~ /^[yY]/) { 622 if ($_[0] !~ /^[yY]/) {
522 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 623 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
523 $pl->deactivate; 624 $pl->deactivate;
524 $pl->ns->destroy; 625 $pl->ns->destroy;
525 } else { 626 }
526 cf::async { $pl->save };
527 } 627 });
528 }); 628 };
529 }, 629 },
530); 630);
531 631
532cf::player->attach ( 632cf::player->attach (
533 on_login => sub { 633 on_login => sub {

Diff Legend

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