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

Diff Legend

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