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