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

Diff Legend

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