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.120 by root, Thu Nov 15 06:00:16 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
… …
58 my $y = $ob->y; 64 my $y = $ob->y;
59 65
60 # never happens normally, but helps when shell users make mistakes 66 # never happens normally, but helps when shell users make mistakes
61 $m->linkable 67 $m->linkable
62 or return 1; 68 or return 1;
63
64# return 0;#d#
65# warn join ":", $m->at ($x, $y);#d#
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
67# return 0;
68 69
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 70 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70} 71}
71 72
72sub enter_map { 73sub enter_map {
… …
95 $ob->message ( 96 $ob->message (
96 "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. "
97 . "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. "
98 . "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... "
99 . "H<You disconnected too long without having used a savebed.>", 100 . "H<You disconnected too long without having used a savebed.>",
100 cf::NDI_RED 101 cf::NDI_RED | cf::NDI_REPLY
101 ); 102 );
102 # kill them. 103 # kill them.
103 # reminds me of the famous badness 10000 syndrome... 104 # reminds me of the famous badness 10000 syndrome...
104 $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
105 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;
… …
109 $ob->message ( 110 $ob->message (
110 "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. "
111 . "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. "
112 . "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... "
113 . "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.>",
114 cf::NDI_RED 115 cf::NDI_RED | cf::NDI_REPLY
115 ); 116 );
116 } 117 }
117 } else { 118 } else {
118 $ob->message ( 119 $ob->message (
119 "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, "
120 . "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, "
121 . "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. "
122 . "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.>",
123 cf::NDI_RED 124 cf::NDI_RED | cf::NDI_REPLY
124 ); 125 );
125 } 126 }
126 } 127 }
127 128
128 $ob->goto ($map, $x, $y); 129 $ob->goto ($map, $x, $y);
129} 130}
130 131
131sub encode_password($) { 132sub encode_password($) {
132 "!" . unpack "H*", $_[0] 133 unpack "H*", Deliantra::Util::hash_pw $_[0]
133} 134}
134 135
135sub compare_password($$) { 136sub compare_password($$) {
136 my ($pass, $token) = @_; 137 my ($pass, $token) = @_;
137 138
138 if ($token =~ /!!(.*)/) { 139 if ($token =~ /!!(.*)/) {
139 return +(substr $pass, 0, 8) eq pack "H*", $1; 140 return +(substr $pass, 0, 8) eq pack "H*", $1;
140 } elsif ($token =~ /!(.*)/) { 141 } elsif ($token =~ /!(.*)/) {
141 return $pass eq pack "H*", $1; 142 return $pass eq pack "H*", $1;
142 } else { 143 } else {
143 return $token eq crypt $pass, $token; 144 return $token eq encode_password $pass;
144 } 145 }
145} 146}
146 147
147# delete a player directory 148# delete a player directory
148sub nuke_playerdir { 149sub nuke_playerdir {
… …
153 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 154 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
154 aio_rename "$PLAYERDIR/$user", $temp; 155 aio_rename "$PLAYERDIR/$user", $temp;
155 IO::AIO::aio_rmtree $temp; 156 IO::AIO::aio_rmtree $temp;
156} 157}
157 158
158sub login_done { 159sub login {
159 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!");
160 258
161 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 259 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
162 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR); 260 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
163 } 261 }
164} 262}
165 263
166sub chargen { 264sub chargen {
167 my ($ns, $user, $pass) = @_; 265 my ($ns, $user, $hash) = @_;
168
169 # the rest of this function is character creation
170 $Coro::current->{desc} = "addme($user) chargen";
171 266
172 # just to make sure nothing is left over 267 # just to make sure nothing is left over
173 # normally, nothing is there. 268 # normally, nothing is there.
174 nuke_playerdir $user; 269 nuke_playerdir $user;
175 270
176 my $pl = cf::player::new $user; 271 my $pl = cf::player::new $user;
177 $pl->password (encode_password $pass); 272 $pl->password (unpack "H*", $hash);
178 $pl->connect ($ns); 273 $pl->connect ($ns);
179 my $ob = $pl->ob;
180 274
181 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 275 $pl->{chargen} = "init";
182 276
183 while () { 277 login $pl;
184 $ob->update_stats;
185 $pl->save_stats;
186
187 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
188 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
189
190 if ($res =~ /^[Nn]/) {
191 last;
192 } elsif ($res > 0 && $res <= 7) {
193 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
194
195 if ($swap > 0 && $swap <= 7) {
196 $ob->swap_stats ($res - 1, $swap - 1);
197 }
198 } else {
199 $ob->roll_stats;
200 }
201
202 Coro::Timer::sleep 0.05;
203 }
204
205 $ob->set_animation (2);
206 $ob->add_statbonus;
207
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 # create the playerdir, if necessary, as chargen_race_done did it before
224 # presumably because of unique maps
225 aio_mkdir playerdir $pl, 0770;
226 $pl->chargen_race_done;
227
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
242 $ob->reply (undef, "Welcome to Deliantra!");
243
244 # XXX: Workaround for delayed client ext protocol handshake
245 $pl->esrv_new_player;
246
247 delete $pl->{deny_save};
248} 278}
249 279
250cf::client->attach (on_addme => sub { 280cf::client->attach (on_addme => sub {
251 my ($ns) = @_; 281 my ($ns) = @_;
252 282
253 $ns->pl and return $ns->destroy; 283 $ns->{addme}++ and return $ns->destroy;
254 284
255 $ns->async (sub { 285 $ns->async (sub {
256 $Coro::current->{desc} = "addme init"; 286 $Coro::current->{desc} = "addme init";
257 287
258 my ($user, $pass); 288 my ($user, $pass);
259 289
260 $ns->send_packet ("addme_success"); 290 $ns->send_packet ("addme_success");
261 291
262 for (;;) { 292 for (;;) {
263 $ns->send_drawinfo ( 293 delete $ns->{login_guard};
294
295 send_log $ns,
264 "Please enter your username now. If you are a new user, " 296 "Please enter your username now. If you are a new user, "
265 . "make one up that describes your character best. " 297 . "make one up that describes your character best. "
266 . "Only letters and digits are allowed, though.", 298 . "Only letters and digits are allowed, though.",
267 cf::NDI_BLUE 299 cf::NDI_BLUE | cf::NDI_REPLY
268 ); 300 ;
269 301
270 # read username 302 # read username
271 while () { 303 while () {
272 $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:";
273 305
274 if ($cf::LOGIN_LOCK{$user}) { 306 if ($user =~ $VALID_LOGIN) {
275 $ns->send_drawinfo (
276 "That username is currently used in another login session. "
277 . "Chose another, or wait till the other session has ended.",
278 cf::NDI_RED
279 );
280 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
281 last; 307 last;
282 } else { 308 } else {
283 $ns->send_drawinfo ( 309 send_log $ns,
284 "Your username contains illegal characters " 310 "Your username contains illegal characters "
285 . "(only a-z, A-Z and 0-9 are allowed), " 311 . "(only a-z, A-Z and 0-9 are allowed), "
286 . "or is not between 3 and 20 characters in length.", 312 . "or is not between 3 and 20 characters in length.",
287 cf::NDI_RED 313 cf::NDI_RED | cf::NDI_REPLY
288 ); 314 ;
289 } 315 }
290 Coro::Timer::sleep 0.4; 316 Coro::Timer::sleep 0.4;
291 } 317 }
292 318
293 check_playing $ns, $user and next;
294
295 $Coro::current->{desc} = "addme($user) pass"; 319 $Coro::current->{desc} = "addme($user)";
296 320
297 $ns->send_drawinfo ( 321 send_log $ns,
298 "Welcome $user, please enter your password now. " 322 "Welcome $user, please enter your password now. "
299 . "New users should now choose a password. " 323 . "New users should now choose a password. "
300 . "Anything your client lets you enter is fine.", 324 . "Anything your client lets you enter is fine.",
301 cf::NDI_BLUE 325 cf::NDI_BLUE | cf::NDI_REPLY
302 ); 326 ;
303 327
304 # read password 328 # read password
305 while () { 329 while () {
306 $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:";
307 last if $pass =~ /.../; 331 last if $pass =~ /.../;
308 $ns->send_drawinfo ( 332 send_log $ns,
309 "Try to use at least three characters as your password please, " 333 "Try to use at least three characters as your password please, "
310 . "that cannot be too much to ask for :)", 334 . "that cannot be too much to ask for :)",
311 cf::NDI_RED 335 cf::NDI_RED | cf::NDI_REPLY
312 ); 336 ;
313 Coro::Timer::sleep 0.4; 337 Coro::Timer::sleep 0.4;
314 } 338 }
315 339
316 # lock this username for the remainder of this login session 340 $ns->{login_guard} = login_guard $user
317 if ($cf::LOGIN_LOCK{$user}) { 341 or do {
318 $ns->send_drawinfo ( 342 send_log $ns,
319 "That username is currently used in another login session. " 343 "That user is already logged in (or is logging in)."
320 . "Chose another, or wait till the other session has ended.", 344 . "Chose another, or wait till the other session has ended.",
321 cf::NDI_RED 345 cf::NDI_RED | cf::NDI_REPLY
346 ;
347 next;
322 ); 348 };
323 next;
324 }
325 local $cf::LOGIN_LOCK{$user} = 1;
326
327 check_playing $ns, $user and next;
328
329 $Coro::current->{desc} = "addme($user) check";
330 349
331 # try to read the user file and check the password 350 # try to read the user file and check the password
332 if (my $pl = cf::player::find $user) { 351 if (my $pl = cf::player::find $user) {
333 aio_stat $pl->path and next; 352 aio_stat $pl->path and next;
334 my $mtime = (stat _)[9]; 353 my $mtime = (stat _)[9];
335 my $token = $pl->password; 354 my $token = $pl->password;
336 355
337 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) { 356 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
338 # player exists and passwords match - we can proceed 357 # player exists and passwords match - we can proceed
339 358
340 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
341 # password matches, wonderful 359 # password matches, wonderful
342 my $pl = cf::player::find $user or next; 360 my $pl = cf::player::find $user or next;
343 $pl->connect ($ns); 361 $pl->connect ($ns);
344 enter_map $pl; 362 enter_map $pl;
345 login_done $pl; 363 login $pl;
346 return; 364 return;
347 } elsif (can_cleanup $pl, $mtime) { 365 } elsif (can_cleanup $pl, $mtime) {
348 Coro::Timer::sleep 1; 366 Coro::Timer::sleep 1;
349 367
350 $ns->send_drawinfo ( 368 send_log $ns,
351 "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, "
352 . "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 "
353 . "because it has not been in-use for some time.", 371 . "because it has not been in-use for some time.",
354 cf::NDI_RED 372 cf::NDI_RED | cf::NDI_REPLY
355 ); 373 ;
356 374
357 (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]/
358 or next; 376 or next;
359 377
360 # check if the file hasn't changed 378 # check if the file hasn't changed
… …
365 383
366 # fall through to creation 384 # fall through to creation
367 } else { 385 } else {
368 Coro::Timer::sleep 1; 386 Coro::Timer::sleep 1;
369 387
370 $ns->send_drawinfo ( 388 send_log $ns,
371 "Wrong username or password. Please try again " 389 "Wrong username or password. Please try again "
372 . "(check for Numlock and other semi-obvious error sources).", 390 . "(check for Numlock and other semi-obvious error sources).",
373 cf::NDI_RED 391 cf::NDI_RED | cf::NDI_REPLY
374 ); 392 ;
375 next; 393 next;
376 } 394 }
377 } else { 395 } else {
378 # unable to load the playerfile: 396 # unable to load the playerfile:
379 # 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
380 # something very similar. 398 # something very similar.
381 if (!aio_stat cf::player::playerdir $user) { 399 if (!aio_stat cf::player::playerdir $user) {
382 $ns->send_drawinfo ( 400 send_log $ns,
383 "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. "
384 . "If this is your account, ask a dungeon master for assistance. " 402 . "If this is your account, ask a dungeon master for assistance. "
385 . "Otherwise choose a different login name.", 403 . "Otherwise choose a different login name.",
386 cf::NDI_RED 404 cf::NDI_RED | cf::NDI_REPLY
387 ); 405 ;
388 next; 406 next;
389 } 407 }
390 } 408 }
391 409
392 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.";
393 411
394 if ($pass2 ne $pass) { 412 if ($pass2 ne $pass) {
395 $ns->send_drawinfo ( 413 send_log $ns,
396 "The passwords do not match, please try again.", 414 "The passwords do not match, please try again.",
397 cf::NDI_RED 415 cf::NDI_RED | cf::NDI_REPLY
398 ); 416 ;
399 Coro::Timer::sleep 0.5; 417 Coro::Timer::sleep 0.5;
400 next; 418 next;
401 } 419 }
402 420
403 last; 421 last;
404 } 422 }
405 423
406 # lock again, too layz to make this nicer 424 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
407 local $cf::LOGIN_LOCK{$user} = 1;
408
409 chargen $ns, $user, $pass;
410 login_done $ns->pl;
411 }); 425 });
412}); 426});
427
428cf::client->attach (
429 on_version => sub {
430 my ($ns, $arg) = @_;
431
432 # perl probably uses lrand48, which is not secure at all
433 # maybe require linux and use /dev/urandom.
434 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
435 $ns->ext_msg (nonces => @{ $ns->{nonces} });
436 },
437);
438
439cf::register_async_exticmd create_login => sub {
440 my ($ns, $reply, $user, $pass) = @_;
441
442 $ns->{addme}++ and return $ns->destroy;
443
444 $ns->async (sub {
445 my $fail = sub {
446 $reply->(0, $_[0]);
447 $ns->flush; # does not ensure that the data reaches the client - TODO
448 # need to do this in another thread, as this one gets canceled
449 Coro::async_pool {
450 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
451 $ns->destroy if $ns->valid;
452 };
453 Coro::schedule; # do the destroy, should not return
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.");
496
497 # try to read the user file and check the password
498 my $pl = cf::player::find $user
499 or return $fail->("User '$user' does not exist - wrong spelling?");
500
501 aio_stat $pl->path
502 and return $ns->destroy;
503
504 my $mtime = (stat _)[9];
505 my $token = $pl->password;
506
507 $token = $token =~ /^!/
508 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
509 : pack "H*", $token;
510
511 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
512
513 $token eq $hash
514 or $cf::CFG{ext_login_nocheck}
515 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
516
517 # player exists and passwords match - we can proceed
518
519 $reply->(1, "Success");
520
521 $pl->connect ($ns);
522 enter_map $pl;
523 login $pl;
524 });
525};
413 526
414cf::register_command password => sub { 527cf::register_command password => sub {
415 my ($pl, $arg) = @_; 528 my ($pl, $arg) = @_;
416 529
417 unless ($pl->flag (cf::FLAG_WIZ)) { 530 unless ($pl->flag (cf::FLAG_WIZ)) {
418 $pl->message ( 531 $pl->message (
419 "The password can currently only changed by a DM.", 532 "The password can currently only changed by a DM.",
420 cf::NDI_UNIQUE | cf::NDI_REPLY); 533 cf::NDI_UNIQUE | cf::NDI_REPLY);
421 return; 534 return;
422 } 535 }
536
537 $pl->message (#d#
538 "Passwords cannot currently be changed.",#d#
539 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
540 return;#d#
423 541
424 my (@args) = split /\s+/, $arg; 542 my (@args) = split /\s+/, $arg;
425 my ($player, $new_pw) = @args; 543 my ($player, $new_pw) = @args;
426 544
427 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