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.118 by root, Thu Nov 8 00:16:07 2012 UTC vs.
Revision 1.130 by root, Sun Nov 18 10:00:55 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
8CONF 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 13
15sub query { 14sub query {
16 my ($ns, $flags, $text) = @_; 15 my ($ns, $flags, $text) = @_;
17 16
18 $ns->query ($flags, $text, Coro::rouse_cb); 17 $ns->query ($flags, $text, Coro::rouse_cb);
… …
29 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9 28 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9
30 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20 29 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20
31 || $age > 700 * 86400 # 2 years for everybody else 30 || $age > 700 * 86400 # 2 years for everybody else
32} 31}
33 32
34sub check_playing { 33# return a guard object for a lock on the given username, if available
34sub login_guard {
35 my ($ns, $user) = @_; 35 my ($user) = @_;
36 36
37 exists $LOGIN_LOCK{$user}
38 and return undef;
39
37 return unless cf::player::find_active $user; 40 cf::player::find_active $user
41 and return undef;
38 42
39 $ns->send_drawinfo ( 43 undef $LOGIN_LOCK{$user};
40 "That player is already logged in on this server. " 44 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} 45}
53 46
54sub safe_spot($) { 47sub safe_spot($) {
55 my ($pl) = @_; 48 my ($pl) = @_;
56 49
… …
62 my $y = $ob->y; 55 my $y = $ob->y;
63 56
64 # never happens normally, but helps when shell users make mistakes 57 # never happens normally, but helps when shell users make mistakes
65 $m->linkable 58 $m->linkable
66 or return 1; 59 or return 1;
67
68# return 0;#d#
69# warn join ":", $m->at ($x, $y);#d#
70# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
71# return 0;
72 60
73 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 61 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
74} 62}
75 63
76sub enter_map { 64sub enter_map {
… …
99 $ob->message ( 87 $ob->message (
100 "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. "
101 . "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. "
102 . "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... "
103 . "H<You disconnected too long without having used a savebed.>", 91 . "H<You disconnected too long without having used a savebed.>",
104 cf::NDI_RED 92 cf::NDI_RED | cf::NDI_REPLY
105 ); 93 );
106 # kill them. 94 # kill them.
107 # reminds me of the famous badness 10000 syndrome... 95 # reminds me of the famous badness 10000 syndrome...
108 $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
109 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;
… …
113 $ob->message ( 101 $ob->message (
114 "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. "
115 . "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. "
116 . "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... "
117 . "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.>",
118 cf::NDI_RED 106 cf::NDI_RED | cf::NDI_REPLY
119 ); 107 );
120 } 108 }
121 } else { 109 } else {
122 $ob->message ( 110 $ob->message (
123 "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, "
124 . "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, "
125 . "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. "
126 . "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.>",
127 cf::NDI_RED 115 cf::NDI_RED | cf::NDI_REPLY
128 ); 116 );
129 } 117 }
130 } 118 }
131 119
132 $ob->goto ($map, $x, $y); 120 $ob->goto ($map, $x, $y);
133} 121}
134 122
135sub encode_password($) { 123sub encode_password($) {
136# crypt $_[0], 124 unpack "H*", Deliantra::Util::hash_pw $_[0]
137# join '',
138# ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
139 "!" . unpack "H*", $_[0]
140} 125}
141 126
142sub compare_password($$) { 127sub compare_password($$) {
143 my ($pass, $token) = @_; 128 my ($pass, $token) = @_;
144 129
… …
160 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 145 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
161 aio_rename "$PLAYERDIR/$user", $temp; 146 aio_rename "$PLAYERDIR/$user", $temp;
162 IO::AIO::aio_rmtree $temp; 147 IO::AIO::aio_rmtree $temp;
163} 148}
164 149
150sub login {
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!");
247
248 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
249 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
250 }
251}
252
253sub chargen {
254 my ($ns, $user, $hash) = @_;
255
256 # just to make sure nothing is left over
257 # normally, nothing is there.
258 nuke_playerdir $user;
259
260 my $pl = cf::player::new $user;
261 $pl->password (unpack "H*", $hash);
262 $pl->connect ($ns);
263
264 $pl->{chargen} = "init";
265
266 login $pl;
267}
268
165cf::client->attach (on_addme => sub { 269cf::client->attach (on_addme => sub {
166 my ($ns) = @_; 270 my ($ns) = @_;
167 271
168 $ns->pl and return $ns->destroy; 272 $ns->{addme}++ and return $ns->destroy;
169 273
170 $ns->async (sub { 274 $ns->async (sub {
171 $Coro::current->{desc} = "addme init"; 275 $Coro::current->{desc} = "addme init";
172 276
173 my ($user, $pass); 277 my ($user, $pass);
174 278
175 $ns->send_packet ("addme_success"); 279 $ns->send_packet ("addme_success");
176 280
177 for (;;) { 281 for (;;) {
178 $ns->send_drawinfo ( 282 delete $ns->{login_guard};
283
284 $ns->send_msg (log =>
179 "Please enter your username now. If you are a new user, " 285 "Please enter your username now. If you are a new user, "
180 . "make one up that describes your character best. " 286 . "make one up that describes your character best. "
181 . "Only letters and digits are allowed, though.", 287 . "Only letters and digits are allowed, though.",
182 cf::NDI_BLUE 288 cf::NDI_BLUE | cf::NDI_REPLY
183 ); 289 );
184 290
185 # read username 291 # read username
186 while () { 292 while () {
187 $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:";
188 294
189 if ($cf::LOGIN_LOCK{$user}) { 295 if ($user =~ $VALID_LOGIN) {
190 $ns->send_drawinfo (
191 "That username is currently used in another login session. "
192 . "Chose another, or wait till the other session has ended.",
193 cf::NDI_RED
194 );
195 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
196 last; 296 last;
197 } else { 297 } else {
198 $ns->send_drawinfo ( 298 $ns->send_msg (log =>
199 "Your username contains illegal characters " 299 "Your username contains illegal characters "
200 . "(only a-z, A-Z and 0-9 are allowed), " 300 . "(only a-z, A-Z and 0-9 are allowed), "
201 . "or is not between 3 and 20 characters in length.", 301 . "or is not between 3 and 20 characters in length.",
202 cf::NDI_RED 302 cf::NDI_RED | cf::NDI_REPLY
203 ); 303 );
204 } 304 }
205 Coro::Timer::sleep 0.4; 305 Coro::Timer::sleep 0.4;
206 } 306 }
207 307
208 check_playing $ns, $user and next;
209
210 $Coro::current->{desc} = "addme($user) pass"; 308 $Coro::current->{desc} = "addme($user)";
211 309
212 $ns->send_drawinfo ( 310 $ns->send_msg (log =>
213 "Welcome $user, please enter your password now. " 311 "Welcome $user, please enter your password now. "
214 . "New users should now choose a password. " 312 . "New users should now choose a password. "
215 . "Anything your client lets you enter is fine.", 313 . "Anything your client lets you enter is fine.",
216 cf::NDI_BLUE 314 cf::NDI_BLUE | cf::NDI_REPLY
217 ); 315 );
218 316
219 # read password 317 # read password
220 while () { 318 while () {
221 $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:";
222 last if $pass =~ /.../; 320 last if $pass =~ /.../;
223 $ns->send_drawinfo ( 321 $ns->send_msg (log =>
224 "Try to use at least three characters as your password please, " 322 "Try to use at least three characters as your password please, "
225 . "that cannot be too much to ask for :)", 323 . "that cannot be too much to ask for :)",
226 cf::NDI_RED 324 cf::NDI_RED | cf::NDI_REPLY
227 ); 325 );
228 Coro::Timer::sleep 0.4; 326 Coro::Timer::sleep 0.4;
229 } 327 }
230 328
231 # lock this username for the remainder of this login session 329 $ns->{login_guard} = login_guard $user
232 if ($cf::LOGIN_LOCK{$user}) { 330 or do {
233 $ns->send_drawinfo ( 331 $ns->send_msg (log =>
234 "That username is currently used in another login session. " 332 "That user is already logged in (or is logging in)."
235 . "Chose another, or wait till the other session has ended.", 333 . "Chose another, or wait till the other session has ended.",
236 cf::NDI_RED 334 cf::NDI_RED | cf::NDI_REPLY
335 );
336 next;
237 ); 337 };
238 next;
239 }
240 local $cf::LOGIN_LOCK{$user} = 1;
241
242 check_playing $ns, $user and next;
243
244 $Coro::current->{desc} = "addme($user) check";
245 338
246 # try to read the user file and check the password 339 # try to read the user file and check the password
247 if (my $pl = cf::player::find $user) { 340 if (my $pl = cf::player::find $user) {
248 aio_stat $pl->path and next; 341 aio_stat $pl->path and next;
249 my $mtime = (stat _)[9]; 342 my $mtime = (stat _)[9];
250 my $token = $pl->password; 343 my $token = $pl->password;
251 344
252 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) { 345 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
253 $pl->password (encode_password $pass); # make sure we store the new encoding #d# 346 # player exists and passwords match - we can proceed
254 nuke_str $pass; 347
255 # password matches, wonderful 348 # password matches, wonderful
256 my $pl = cf::player::find $user or next; 349 my $pl = cf::player::find $user or next;
257 $pl->connect ($ns); 350 $pl->connect ($ns);
258 enter_map $pl; 351 enter_map $pl;
352 login $pl;
259 last; 353 return;
260 } elsif (can_cleanup $pl, $mtime) { 354 } elsif (can_cleanup $pl, $mtime) {
261 Coro::Timer::sleep 1; 355 Coro::Timer::sleep 1;
262 356
263 $ns->send_drawinfo ( 357 $ns->send_msg (log =>
264 "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, "
265 . "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 "
266 . "because it has not been in-use for some time.", 360 . "because it has not been in-use for some time.",
267 cf::NDI_RED 361 cf::NDI_RED | cf::NDI_REPLY
268 ); 362 );
269 363
270 #TODO: nuke_str
271 (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]/
272 or next; 365 or next;
273 366
274 # check if the file hasn't changed 367 # check if the file hasn't changed
275 aio_stat cf::player::path $user and next; 368 aio_stat cf::player::path $user and next;
… …
277 370
278 $pl->quit_character; 371 $pl->quit_character;
279 372
280 # fall through to creation 373 # fall through to creation
281 } else { 374 } else {
282 nuke_str $pass;
283
284 Coro::Timer::sleep 1; 375 Coro::Timer::sleep 1;
285 376
286 $ns->send_drawinfo ( 377 $ns->send_msg (log =>
287 "Wrong username or password. Please try again " 378 "Wrong username or password. Please try again "
288 . "(check for Numlock and other semi-obvious error sources).", 379 . "(check for Numlock and other semi-obvious error sources).",
289 cf::NDI_RED 380 cf::NDI_RED | cf::NDI_REPLY
290 ); 381 );
291 next; 382 next;
292 } 383 }
293 } else { 384 } else {
294 # unable to load the playerfile: 385 # unable to load the playerfile:
295 # 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
296 # something very similar. 387 # something very similar.
297 if (!aio_stat cf::player::playerdir $user) { 388 if (!aio_stat cf::player::playerdir $user) {
298 $ns->send_drawinfo ( 389 $ns->send_msg ( log =>
299 "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. "
300 . "If this is your account, ask a dungeon master for assistance. " 391 . "If this is your account, ask a dungeon master for assistance. "
301 . "Otherwise choose a different login name.", 392 . "Otherwise choose a different login name.",
302 cf::NDI_RED 393 cf::NDI_RED | cf::NDI_REPLY
303 ); 394 );
304 next; 395 next;
305 } 396 }
306 } 397 }
307 398
308 # the rest of this function is character creation
309 $Coro::current->{desc} = "addme($user) chargen";
310
311 # just to make sure nothing is left over
312 # normally, nothing is there.
313 nuke_playerdir $user;
314
315 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.";
316 400
317 if ($pass2 ne $pass) { 401 if ($pass2 ne $pass) {
318 nuke_str $pass; 402 $ns->send_msg (log =>
319 nuke_str $pass2;
320 $ns->send_drawinfo (
321 "The passwords do not match, please try again.", 403 "The passwords do not match, please try again.",
322 cf::NDI_RED 404 cf::NDI_RED | cf::NDI_REPLY
323 ); 405 );
324 Coro::Timer::sleep 0.5; 406 Coro::Timer::sleep 0.5;
325 next; 407 next;
326 } 408 }
327 409
328 nuke_str $pass2;
329
330 my $pl = cf::player::new $user;
331 $pl->password (encode_password $pass);
332 nuke_str $pass;
333 $pl->connect ($ns);
334 my $ob = $pl->ob;
335
336 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
337
338 while () {
339 $ob->update_stats;
340 $pl->save_stats;
341
342 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
343 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
344
345 if ($res =~ /^[Nn]/) {
346 last;
347 } elsif ($res > 0 && $res <= 7) {
348 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
349
350 if ($swap > 0 && $swap <= 7) {
351 $ob->swap_stats ($res - 1, $swap - 1);
352 }
353 } else {
354 $ob->roll_stats;
355 }
356
357 Coro::Timer::sleep 0.05;
358 }
359
360 $ob->set_animation (2);
361 $ob->add_statbonus;
362
363 while () {
364 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
365 my $msg = $ob->msg;
366 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
367 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
368
369 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
370 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
371
372 last if $res =~ /[dD]/;
373
374 $pl->chargen_race_next;
375 Coro::Timer::sleep 0.05;
376 }
377
378 # create the playerdir, if necessary, as chargen_race_done did it before
379 # presumably because of unique maps
380 aio_mkdir playerdir $pl, 0770;
381 $pl->chargen_race_done;
382
383 while () {
384 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
385 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
386
387 if ($res =~ /^[fF]/) {
388 $pl->gender (1);
389 last;
390 } elsif ($res =~ /^[mM]/) {
391 $pl->gender (0);
392 last;
393 }
394 Coro::Timer::sleep 0.05;
395 }
396
397 $ob->reply (undef, "Welcome to Deliantra!");
398
399 # XXX: Workaround for delayed client ext protocol handshake
400 $pl->esrv_new_player;
401
402 delete $pl->{deny_save};
403
404 last; 410 last;
405 } 411 }
406 412
407 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 413 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
408 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
409 }
410 }); 414 });
411}); 415});
416
417cf::client->attach (
418 on_version => sub {
419 my ($ns, $arg) = @_;
420
421 # perl probably uses lrand48, which is not secure at all
422 # maybe require linux and use /dev/urandom.
423 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
424 $ns->ext_msg (nonces => @{ $ns->{nonces} });
425 },
426);
427
428cf::register_async_exticmd create_login => sub {
429 my ($ns, $reply, $user, $pass) = @_;
430
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 });
461};
462
463cf::register_async_exticmd login => sub {
464 my ($ns, $reply, $user, $hash) = @_;
465
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 });
514};
412 515
413cf::register_command password => sub { 516cf::register_command password => sub {
414 my ($pl, $arg) = @_; 517 my ($pl, $arg) = @_;
415 518
416 unless ($pl->flag (cf::FLAG_WIZ)) { 519 unless ($pl->flag (cf::FLAG_WIZ)) {
417 $pl->message ( 520 $pl->message (
418 "The password can currently only changed by a DM.", 521 "The password can currently only changed by a DM.",
419 cf::NDI_UNIQUE | cf::NDI_REPLY); 522 cf::NDI_UNIQUE | cf::NDI_REPLY);
420 return; 523 return;
421 } 524 }
525
526 $pl->message (#d#
527 "Passwords cannot currently be changed.",#d#
528 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
529 return;#d#
422 530
423 my (@args) = split /\s+/, $arg; 531 my (@args) = split /\s+/, $arg;
424 my ($player, $new_pw) = @args; 532 my ($player, $new_pw) = @args;
425 533
426 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