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.123 by root, Fri Nov 16 12:02:46 2012 UTC vs.
Revision 1.134 by root, Tue Feb 20 14:28:27 2018 UTC

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

Diff Legend

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