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

Diff Legend

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