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.121 by root, Thu Nov 15 07:08:08 2012 UTC vs.
Revision 1.130 by root, Sun Nov 18 10:00:55 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;
10 13
11sub query { 14sub query {
12 my ($ns, $flags, $text) = @_; 15 my ($ns, $flags, $text) = @_;
13 16
14 $ns->query ($flags, $text, Coro::rouse_cb); 17 $ns->query ($flags, $text, Coro::rouse_cb);
… …
25 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9 28 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9
26 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20 29 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20
27 || $age > 700 * 86400 # 2 years for everybody else 30 || $age > 700 * 86400 # 2 years for everybody else
28} 31}
29 32
30sub check_playing { 33# return a guard object for a lock on the given username, if available
34sub login_guard {
31 my ($ns, $user) = @_; 35 my ($user) = @_;
32 36
37 exists $LOGIN_LOCK{$user}
38 and return undef;
39
33 return unless cf::player::find_active $user; 40 cf::player::find_active $user
41 and return undef;
34 42
35 $ns->send_drawinfo ( 43 undef $LOGIN_LOCK{$user};
36 "That player is already logged in on this server. " 44 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} 45}
49 46
50sub safe_spot($) { 47sub safe_spot($) {
51 my ($pl) = @_; 48 my ($pl) = @_;
52 49
… …
90 $ob->message ( 87 $ob->message (
91 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 88 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
92 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " 89 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
93 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... " 90 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
94 . "H<You disconnected too long without having used a savebed.>", 91 . "H<You disconnected too long without having used a savebed.>",
95 cf::NDI_RED 92 cf::NDI_RED | cf::NDI_REPLY
96 ); 93 );
97 # kill them. 94 # kill them.
98 # reminds me of the famous badness 10000 syndrome... 95 # reminds me of the famous badness 10000 syndrome...
99 $ob->stats->hp (-10000); #] if they survive this they deserved to live 96 $ob->stats->hp (-10000); #] if they survive this they deserved to live
100 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy; 97 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
… …
104 $ob->message ( 101 $ob->message (
105 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 102 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
106 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 103 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
107 . "Better use a savebed next time, much worse things could have happened... " 104 . "Better use a savebed next time, much worse things could have happened... "
108 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>", 105 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
109 cf::NDI_RED 106 cf::NDI_RED | cf::NDI_REPLY
110 ); 107 );
111 } 108 }
112 } else { 109 } else {
113 $ob->message ( 110 $ob->message (
114 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 111 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
115 . "as lots of things could happen when you leave by other means, such as cave-ins, " 112 . "as lots of things could happen when you leave by other means, such as cave-ins, "
116 . "or monsters suddenly snapping your body. Better use a savebed next time. " 113 . "or monsters suddenly snapping your body. Better use a savebed next time. "
117 . "H<Always apply a bed of reality to disconnect from the server.>", 114 . "H<Always apply a bed of reality to disconnect from the server.>",
118 cf::NDI_RED 115 cf::NDI_RED | cf::NDI_REPLY
119 ); 116 );
120 } 117 }
121 } 118 }
122 119
123 $ob->goto ($map, $x, $y); 120 $ob->goto ($map, $x, $y);
124} 121}
125 122
126sub encode_password($) { 123sub encode_password($) {
127 "!" . unpack "H*", $_[0] 124 unpack "H*", Deliantra::Util::hash_pw $_[0]
128} 125}
129 126
130sub compare_password($$) { 127sub compare_password($$) {
131 my ($pass, $token) = @_; 128 my ($pass, $token) = @_;
132 129
… …
148 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 145 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
149 aio_rename "$PLAYERDIR/$user", $temp; 146 aio_rename "$PLAYERDIR/$user", $temp;
150 IO::AIO::aio_rmtree $temp; 147 IO::AIO::aio_rmtree $temp;
151} 148}
152 149
153sub login_done { 150sub login {
154 my ($pl) = @_; 151 my ($pl) = @_;
152
153 # handle character creation, if neccessary
154 # the rest of this function is character creation
155
156 my $ns = $pl->ns;
157 my $ob = $pl->ob;
158
159 if ($pl->{chargen} eq "init") {
160 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
161
162 # create the playerdir, if necessary, as chargen_race_done did it before
163 # presumably because of unique maps
164 aio_mkdir playerdir $pl, 0770;
165 delete $pl->{deny_save}; # set by new
166 $pl->save;
167
168 $pl->{chargen} = "stats";
169 }
170
171 if ($pl->{chargen} eq "stats") {
172 while () {
173 $ob->update_stats;
174 $pl->save_stats;
175
176 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
177 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
178
179 if ($res =~ /^[Nn]/) {
180 last;
181 } elsif ($res > 0 && $res <= 7) {
182 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
183
184 if ($swap > 0 && $swap <= 7) {
185 $ob->swap_stats ($res - 1, $swap - 1);
186 }
187 } else {
188 $ob->roll_stats;
189 }
190
191 Coro::Timer::sleep 0.05;
192 }
193
194 $ob->set_animation (2);
195 $ob->add_statbonus;
196
197 $pl->{chargen} = "race";
198 }
199
200 if ($pl->{chargen} eq "race") {
201 while () {
202 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
203 my $msg = $ob->msg;
204 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
205 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
206
207 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
208 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
209
210 last if $res =~ /[dD]/;
211
212 $pl->chargen_race_next;
213 Coro::Timer::sleep 0.05;
214 }
215
216 $pl->chargen_race_done;
217 $pl->{chargen} = "gender";
218 }
219
220 if ($pl->{chargen} eq "race") {
221 while () {
222 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
223 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
224
225 if ($res =~ /^[fF]/) {
226 $pl->gender (1);
227 last;
228 } elsif ($res =~ /^[mM]/) {
229 $pl->gender (0);
230 last;
231 }
232 Coro::Timer::sleep 0.05;
233 }
234 $pl->{chargen} = "done";
235 }
236
237 $ns->state (cf::ST_PLAYING);
238
239 if ($pl->{chargen} eq "done") {
240 # XXX: Workaround for delayed client ext protocol handshake
241 $pl->esrv_new_player;
242
243 $pl->{chargen} = "done";
244 }
245
246 $ob->reply (undef, "Welcome to Deliantra!");
155 247
156 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 248 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
157 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR); 249 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
158 } 250 }
159} 251}
160 252
161sub chargen { 253sub chargen {
162 my ($ns, $user, $pass) = @_; 254 my ($ns, $user, $hash) = @_;
163
164 # the rest of this function is character creation
165 $Coro::current->{desc} = "addme($user) chargen";
166 255
167 # just to make sure nothing is left over 256 # just to make sure nothing is left over
168 # normally, nothing is there. 257 # normally, nothing is there.
169 nuke_playerdir $user; 258 nuke_playerdir $user;
170 259
171 my $pl = cf::player::new $user; 260 my $pl = cf::player::new $user;
172 $pl->password (encode_password $pass); 261 $pl->password (unpack "H*", $hash);
173 $pl->connect ($ns); 262 $pl->connect ($ns);
174 my $ob = $pl->ob;
175 263
176 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 264 $pl->{chargen} = "init";
177 265
178 while () { 266 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} 267}
244 268
245cf::client->attach (on_addme => sub { 269cf::client->attach (on_addme => sub {
246 my ($ns) = @_; 270 my ($ns) = @_;
247 271
248 $ns->pl and return $ns->destroy; 272 $ns->{addme}++ and return $ns->destroy;
249 273
250 $ns->async (sub { 274 $ns->async (sub {
251 $Coro::current->{desc} = "addme init"; 275 $Coro::current->{desc} = "addme init";
252 276
253 my ($user, $pass); 277 my ($user, $pass);
254 278
255 $ns->send_packet ("addme_success"); 279 $ns->send_packet ("addme_success");
256 280
257 for (;;) { 281 for (;;) {
258 $ns->send_drawinfo ( 282 delete $ns->{login_guard};
283
284 $ns->send_msg (log =>
259 "Please enter your username now. If you are a new user, " 285 "Please enter your username now. If you are a new user, "
260 . "make one up that describes your character best. " 286 . "make one up that describes your character best. "
261 . "Only letters and digits are allowed, though.", 287 . "Only letters and digits are allowed, though.",
262 cf::NDI_BLUE 288 cf::NDI_BLUE | cf::NDI_REPLY
263 ); 289 );
264 290
265 # read username 291 # read username
266 while () { 292 while () {
267 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:"; 293 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
268 294
269 if ($cf::LOGIN_LOCK{$user}) { 295 if ($user =~ $VALID_LOGIN) {
270 $ns->send_drawinfo (
271 "That username is currently used in another login session. "
272 . "Chose another, or wait till the other session has ended.",
273 cf::NDI_RED
274 );
275 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
276 last; 296 last;
277 } else { 297 } else {
278 $ns->send_drawinfo ( 298 $ns->send_msg (log =>
279 "Your username contains illegal characters " 299 "Your username contains illegal characters "
280 . "(only a-z, A-Z and 0-9 are allowed), " 300 . "(only a-z, A-Z and 0-9 are allowed), "
281 . "or is not between 3 and 20 characters in length.", 301 . "or is not between 3 and 20 characters in length.",
282 cf::NDI_RED 302 cf::NDI_RED | cf::NDI_REPLY
283 ); 303 );
284 } 304 }
285 Coro::Timer::sleep 0.4; 305 Coro::Timer::sleep 0.4;
286 } 306 }
287 307
288 check_playing $ns, $user and next;
289
290 $Coro::current->{desc} = "addme($user) pass"; 308 $Coro::current->{desc} = "addme($user)";
291 309
292 $ns->send_drawinfo ( 310 $ns->send_msg (log =>
293 "Welcome $user, please enter your password now. " 311 "Welcome $user, please enter your password now. "
294 . "New users should now choose a password. " 312 . "New users should now choose a password. "
295 . "Anything your client lets you enter is fine.", 313 . "Anything your client lets you enter is fine.",
296 cf::NDI_BLUE 314 cf::NDI_BLUE | cf::NDI_REPLY
297 ); 315 );
298 316
299 # read password 317 # read password
300 while () { 318 while () {
301 $pass = query $ns, cf::CS_QUERY_HIDEINPUT, "What is your password?\n:"; 319 $pass = query $ns, cf::CS_QUERY_HIDEINPUT, "What is your password?\n:";
302 last if $pass =~ /.../; 320 last if $pass =~ /.../;
303 $ns->send_drawinfo ( 321 $ns->send_msg (log =>
304 "Try to use at least three characters as your password please, " 322 "Try to use at least three characters as your password please, "
305 . "that cannot be too much to ask for :)", 323 . "that cannot be too much to ask for :)",
306 cf::NDI_RED 324 cf::NDI_RED | cf::NDI_REPLY
307 ); 325 );
308 Coro::Timer::sleep 0.4; 326 Coro::Timer::sleep 0.4;
309 } 327 }
310 328
311 # lock this username for the remainder of this login session 329 $ns->{login_guard} = login_guard $user
312 if ($cf::LOGIN_LOCK{$user}) { 330 or do {
313 $ns->send_drawinfo ( 331 $ns->send_msg (log =>
314 "That username is currently used in another login session. " 332 "That user is already logged in (or is logging in)."
315 . "Chose another, or wait till the other session has ended.", 333 . "Chose another, or wait till the other session has ended.",
316 cf::NDI_RED 334 cf::NDI_RED | cf::NDI_REPLY
335 );
336 next;
317 ); 337 };
318 next;
319 }
320 local $cf::LOGIN_LOCK{$user} = 1;
321
322 check_playing $ns, $user and next;
323
324 $Coro::current->{desc} = "addme($user) check";
325 338
326 # try to read the user file and check the password 339 # try to read the user file and check the password
327 if (my $pl = cf::player::find $user) { 340 if (my $pl = cf::player::find $user) {
328 aio_stat $pl->path and next; 341 aio_stat $pl->path and next;
329 my $mtime = (stat _)[9]; 342 my $mtime = (stat _)[9];
… …
334 347
335 # password matches, wonderful 348 # password matches, wonderful
336 my $pl = cf::player::find $user or next; 349 my $pl = cf::player::find $user or next;
337 $pl->connect ($ns); 350 $pl->connect ($ns);
338 enter_map $pl; 351 enter_map $pl;
339 login_done $pl; 352 login $pl;
340 return; 353 return;
341 } elsif (can_cleanup $pl, $mtime) { 354 } elsif (can_cleanup $pl, $mtime) {
342 Coro::Timer::sleep 1; 355 Coro::Timer::sleep 1;
343 356
344 $ns->send_drawinfo ( 357 $ns->send_msg (log =>
345 "Player exists, but password does not match. If this is your account, " 358 "Player exists, but password does not match. If this is your account, "
346 . "please try again. If not, you can now decide to take over this account " 359 . "please try again. If not, you can now decide to take over this account "
347 . "because it has not been in-use for some time.", 360 . "because it has not been in-use for some time.",
348 cf::NDI_RED 361 cf::NDI_RED | cf::NDI_REPLY
349 ); 362 );
350 363
351 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/ 364 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
352 or next; 365 or next;
353 366
… …
359 372
360 # fall through to creation 373 # fall through to creation
361 } else { 374 } else {
362 Coro::Timer::sleep 1; 375 Coro::Timer::sleep 1;
363 376
364 $ns->send_drawinfo ( 377 $ns->send_msg (log =>
365 "Wrong username or password. Please try again " 378 "Wrong username or password. Please try again "
366 . "(check for Numlock and other semi-obvious error sources).", 379 . "(check for Numlock and other semi-obvious error sources).",
367 cf::NDI_RED 380 cf::NDI_RED | cf::NDI_REPLY
368 ); 381 );
369 next; 382 next;
370 } 383 }
371 } else { 384 } else {
372 # unable to load the playerfile: 385 # unable to load the playerfile:
373 # check whether the player dir exists, which means the file is corrupted or 386 # check whether the player dir exists, which means the file is corrupted or
374 # something very similar. 387 # something very similar.
375 if (!aio_stat cf::player::playerdir $user) { 388 if (!aio_stat cf::player::playerdir $user) {
376 $ns->send_drawinfo ( 389 $ns->send_msg ( log =>
377 "Unable to retrieve this player. It might be a locked or broken account. " 390 "Unable to retrieve this player. It might be a locked or broken account. "
378 . "If this is your account, ask a dungeon master for assistance. " 391 . "If this is your account, ask a dungeon master for assistance. "
379 . "Otherwise choose a different login name.", 392 . "Otherwise choose a different login name.",
380 cf::NDI_RED 393 cf::NDI_RED | cf::NDI_REPLY
381 ); 394 );
382 next; 395 next;
383 } 396 }
384 } 397 }
385 398
386 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 399 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
387 400
388 if ($pass2 ne $pass) { 401 if ($pass2 ne $pass) {
389 $ns->send_drawinfo ( 402 $ns->send_msg (log =>
390 "The passwords do not match, please try again.", 403 "The passwords do not match, please try again.",
391 cf::NDI_RED 404 cf::NDI_RED | cf::NDI_REPLY
392 ); 405 );
393 Coro::Timer::sleep 0.5; 406 Coro::Timer::sleep 0.5;
394 next; 407 next;
395 } 408 }
396 409
397 last; 410 last;
398 } 411 }
399 412
400 # lock again, too layz to make this nicer 413 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 }); 414 });
406}); 415});
407 416
408cf::client->attach ( 417cf::client->attach (
409 on_version => sub { 418 on_version => sub {
410 my ($ns, $arg) = @_; 419 my ($ns, $arg) = @_;
411 420
421 # perl probably uses lrand48, which is not secure at all
422 # maybe require linux and use /dev/urandom.
412 $ns->ext_msg (nonces => map { join "", map { chr rand 256 } 0..63 } 1..2); 423 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
413 424 $ns->ext_msg (nonces => @{ $ns->{nonces} });
414 fatal ($ns,"oops");#d#
415 }, 425 },
416); 426);
417 427
418#cf::register_async_exticmd create_login => sub { 428cf::register_async_exticmd create_login => sub {
419# my ($ns, $reply, $user, $pass) = @_; 429 my ($ns, $reply, $user, $pass) = @_;
420# 430
421# $ns->pl and return $ns->destroy; 431 $ns->{addme}++ and return $ns->destroy;
432
433 $ns->async (sub {
434 my $fail = sub {
435 $reply->(0, $_[0]);
436 $ns->flush; # does not ensure that the data reaches the client - TODO
437 # need to do this in another thread, as this one gets canceled
438 Coro::async_pool {
439 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
440 $ns->destroy if $ns->valid;
441 };
442 Coro::schedule; # do the destroy, should not return
443 };
444
445 $user =~ $VALID_LOGIN
446 or return $fail (
447 "Your username contains illegal characters (only a-z, A-Z and 0-9 are allowed), "
448 . "or is not between 3 and 20 characters in length."
449 );
450
451 $ns->{login_guard} = login_guard $user
452 or return $fail->("User name '$user' is in use - try another login name.");
453
454 cf::player::find $user
455 and return $fail->("User name '$user' is already registered - choose another login name.");
456
457 $reply->(1, "Account Created");
458
459 chargen $ns, $user, $pass;
460 });
422#}; 461};
423 462
424cf::register_async_exticmd login => sub { 463cf::register_async_exticmd login => sub {
425 my ($ns, $reply, $user, $hash) = @_; 464 my ($ns, $reply, $user, $hash) = @_;
426 465
427 $ns->pl and return $ns->destroy; 466 $ns->{addme}++ and return $ns->destroy;
467
468 $ns->async (sub {
469 $Coro::current->{desc} = "login($user)";
470
471 my $fail = sub {
472 $reply->(0, $_[0]);
473 $ns->flush; # does not ensure that the data reaches the client - TODO
474 # need to do this in another thread, as this one gets canceled
475 Coro::async_pool {
476 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
477 $ns->destroy if $ns->valid;
478 };
479 Coro::schedule; # do the destroy, should not return
480 };
481
482 $ns->{login_guard} = login_guard $user
483 or return $fail->("User '$user' is currently playing or logging in in another session. If that is your "
484 . "user name, make sure you are not running two clients. When in doubt, reboot.");
485
486 # try to read the user file and check the password
487 my $pl = cf::player::find $user
488 or return $fail->("User '$user' does not exist - wrong spelling?");
489
490 aio_stat $pl->path
491 and return $ns->destroy;
492
493 my $mtime = (stat _)[9];
494 my $token = $pl->password;
495
496 $token = $token =~ /^!/
497 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
498 : pack "H*", $token;
499
500 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
501
502 $token eq $hash
503 or $cf::CFG{ext_login_nocheck}
504 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
505
506 # player exists and passwords match - we can proceed
507
508 $reply->(1, "Success");
509
510 $pl->connect ($ns);
511 enter_map $pl;
512 login $pl;
513 });
428}; 514};
429 515
430cf::register_command password => sub { 516cf::register_command password => sub {
431 my ($pl, $arg) = @_; 517 my ($pl, $arg) = @_;
432 518
… …
434 $pl->message ( 520 $pl->message (
435 "The password can currently only changed by a DM.", 521 "The password can currently only changed by a DM.",
436 cf::NDI_UNIQUE | cf::NDI_REPLY); 522 cf::NDI_UNIQUE | cf::NDI_REPLY);
437 return; 523 return;
438 } 524 }
525
526 $pl->message (#d#
527 "Passwords cannot currently be changed.",#d#
528 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
529 return;#d#
439 530
440 my (@args) = split /\s+/, $arg; 531 my (@args) = split /\s+/, $arg;
441 my ($player, $new_pw) = @args; 532 my ($player, $new_pw) = @args;
442 533
443 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 534 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {

Diff Legend

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