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.137 by root, Mon Dec 19 21:21:10 2022 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);
14 Coro::rouse_wait 25 Coro::rouse_wait
15} 26}
16 27
17sub 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
18 my ($pl, $mtime) = @_; 33 my ($pl, $mtime) = @_;
19 34
20 my $age = time - $mtime; 35 my $age = time - $mtime;
21 my $level = $pl->ob->level; 36 my $level = $pl->ob->level;
22 37
23 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3 38 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3
24 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9 39 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9
25 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20 40 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20
26 || $age > 700 * 86400 # 2 years for everybody else 41 #|| $age > 700 * 86400 # 2 years for everybody else
27} 42}
28 43
29sub check_playing { 44# return a guard object for a lock on the given username, if available
45sub login_guard {
30 my ($ns, $user) = @_; 46 my ($user) = @_;
31 47
48 exists $LOGIN_LOCK{$user}
49 and return undef;
50
32 return unless cf::player::find_active $user; 51 cf::player::find_active $user
52 and return undef;
33 53
34 $ns->send_drawinfo ( 54 undef $LOGIN_LOCK{$user};
35 "That player is already logged in on this server. " 55 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} 56}
48 57
49sub safe_spot($) { 58sub safe_spot($) {
50 my ($pl) = @_; 59 my ($pl) = @_;
51 60
… …
57 my $y = $ob->y; 66 my $y = $ob->y;
58 67
59 # never happens normally, but helps when shell users make mistakes 68 # never happens normally, but helps when shell users make mistakes
60 $m->linkable 69 $m->linkable
61 or return 1; 70 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 71
68 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 72 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
69} 73}
70 74
71sub enter_map { 75sub enter_map {
… …
94 $ob->message ( 98 $ob->message (
95 "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. "
96 . "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. "
97 . "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... "
98 . "H<You disconnected too long without having used a savebed.>", 102 . "H<You disconnected too long without having used a savebed.>",
99 cf::NDI_RED 103 cf::NDI_RED | cf::NDI_REPLY
100 ); 104 );
101 # kill them. 105 # kill them.
102 # reminds me of the famous badness 10000 syndrome... 106 # reminds me of the famous badness 10000 syndrome...
103 $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
104 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;
… …
108 $ob->message ( 112 $ob->message (
109 "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. "
110 . "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. "
111 . "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... "
112 . "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.>",
113 cf::NDI_RED 117 cf::NDI_RED | cf::NDI_REPLY
114 ); 118 );
115 } 119 }
116 } else { 120 } else {
117 $ob->message ( 121 $ob->message (
118 "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, "
119 . "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, "
120 . "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. "
121 . "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.>",
122 cf::NDI_RED 126 cf::NDI_RED | cf::NDI_REPLY
123 ); 127 );
124 } 128 }
125 } 129 }
126 130
127 $ob->goto ($map, $x, $y); 131 $ob->goto ($map, $x, $y);
128} 132}
129 133
130sub encode_password($) { 134sub encode_password($) {
131 "!" . unpack "H*", $_[0] 135 unpack "H*", Deliantra::Util::hash_pw $_[0]
132} 136}
133 137
134sub compare_password($$) { 138sub compare_password($$) {
135 my ($pass, $token) = @_; 139 my ($pass, $token) = @_;
136 140
137 if ($token =~ /!!(.*)/) { 141 if ($token =~ /!!(.*)/) {
138 return +(substr $pass, 0, 8) eq pack "H*", $1; 142 return +(substr $pass, 0, 8) eq pack "H*", $1;
139 } elsif ($token =~ /!(.*)/) { 143 } elsif ($token =~ /!(.*)/) {
140 return $pass eq pack "H*", $1; 144 return $pass eq pack "H*", $1;
141 } else { 145 } else {
142 return $token eq crypt $pass, $token; 146 return $token eq encode_password $pass;
143 } 147 }
144} 148}
145 149
146# delete a player directory 150# delete a player directory
147sub nuke_playerdir { 151sub nuke_playerdir {
… …
152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 156 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
153 aio_rename "$PLAYERDIR/$user", $temp; 157 aio_rename "$PLAYERDIR/$user", $temp;
154 IO::AIO::aio_rmtree $temp; 158 IO::AIO::aio_rmtree $temp;
155} 159}
156 160
157sub login_done { 161sub login {
158 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!");
159 260
160 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 261 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
161 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR); 262 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
162 } 263 }
163} 264}
164 265
165sub chargen { 266sub chargen {
166 my ($ns, $user, $pass) = @_; 267 my ($ns, $user, $hash) = @_;
167
168 # the rest of this function is character creation
169 $Coro::current->{desc} = "addme($user) chargen";
170 268
171 # just to make sure nothing is left over 269 # just to make sure nothing is left over
172 # normally, nothing is there. 270 # normally, nothing is there.
173 nuke_playerdir $user; 271 nuke_playerdir $user;
174 272
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; 273 my $pl = cf::player::new $user;
187 $pl->password (encode_password $pass); 274 $pl->password (unpack "H*", $hash);
188 $pl->connect ($ns); 275 $pl->connect ($ns);
189 my $ob = $pl->ob;
190 276
191 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 277 $pl->{chargen} = "init";
192 278
193 while () { 279 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} 280}
259 281
260cf::client->attach (on_addme => sub { 282cf::client->attach (on_addme => sub {
261 my ($ns) = @_; 283 my ($ns) = @_;
262 284
263 $ns->pl and return $ns->destroy; 285 $ns->{addme}++ and return $ns->destroy;
264 286
265 $ns->async (sub { 287 $ns->async (sub {
266 $Coro::current->{desc} = "addme init"; 288 $Coro::current->{desc} = "addme init";
267 289
268 my ($user, $pass); 290 my ($user, $pass);
269 291
270 $ns->send_packet ("addme_success"); 292 $ns->send_packet ("addme_success");
271 293
272 for (;;) { 294 for (;;) {
273 $ns->send_drawinfo ( 295 delete $ns->{login_guard};
296
297 send_log $ns,
274 "Please enter your username now. If you are a new user, " 298 "Please enter your username now. If you are a new user, "
275 . "make one up that describes your character best. " 299 . "make one up that describes your character best. "
276 . "Only letters and digits are allowed, though.", 300 . "Only letters and digits are allowed, though.",
277 cf::NDI_BLUE 301 cf::NDI_BLUE | cf::NDI_REPLY
278 ); 302 ;
279 303
280 # read username 304 # read username
281 while () { 305 while () {
282 $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:";
283 307
284 if ($cf::LOGIN_LOCK{$user}) { 308 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; 309 last;
292 } else { 310 } else {
293 $ns->send_drawinfo ( 311 send_log $ns,
294 "Your username contains illegal characters " 312 "Your username contains illegal characters "
295 . "(only a-z, A-Z and 0-9 are allowed), " 313 . "(only a-z, A-Z and 0-9 are allowed), "
296 . "or is not between 3 and 20 characters in length.", 314 . "or is not between 3 and 20 characters in length.",
297 cf::NDI_RED 315 cf::NDI_RED | cf::NDI_REPLY
298 ); 316 ;
299 } 317 }
300 Coro::Timer::sleep 0.4; 318 Coro::Timer::sleep 0.4;
301 } 319 }
302 320
303 check_playing $ns, $user and next;
304
305 $Coro::current->{desc} = "addme($user) pass"; 321 $Coro::current->{desc} = "addme($user)";
306 322
307 $ns->send_drawinfo ( 323 send_log $ns,
308 "Welcome $user, please enter your password now. " 324 "Welcome $user, please enter your password now. "
309 . "New users should now choose a password. " 325 . "New users should now choose a password. "
310 . "Anything your client lets you enter is fine.", 326 . "Anything your client lets you enter is fine.",
311 cf::NDI_BLUE 327 cf::NDI_BLUE | cf::NDI_REPLY
312 ); 328 ;
313 329
314 # read password 330 # read password
315 while () { 331 while () {
316 $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:";
317 last if $pass =~ /.../; 333 last if $pass =~ /.../;
318 $ns->send_drawinfo ( 334 send_log $ns,
319 "Try to use at least three characters as your password please, " 335 "Try to use at least three characters as your password please, "
320 . "that cannot be too much to ask for :)", 336 . "that cannot be too much to ask for :)",
321 cf::NDI_RED 337 cf::NDI_RED | cf::NDI_REPLY
322 ); 338 ;
323 Coro::Timer::sleep 0.4; 339 Coro::Timer::sleep 0.4;
324 } 340 }
325 341
326 # lock this username for the remainder of this login session 342 $ns->{login_guard} = login_guard $user
327 if ($cf::LOGIN_LOCK{$user}) { 343 or do {
328 $ns->send_drawinfo ( 344 send_log $ns,
329 "That username is currently used in another login session. " 345 "That user is already logged in (or is logging in)."
330 . "Chose another, or wait till the other session has ended.", 346 . "Chose another, or wait till the other session has ended.",
331 cf::NDI_RED 347 cf::NDI_RED | cf::NDI_REPLY
348 ;
349 next;
332 ); 350 };
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 351
341 # try to read the user file and check the password 352 # try to read the user file and check the password
342 if (my $pl = cf::player::find $user) { 353 if (my $pl = cf::player::find $user) {
343 aio_stat $pl->path and next; 354 aio_stat $pl->path and next;
344 my $mtime = (stat _)[9]; 355 my $mtime = (stat _)[9];
345 my $token = $pl->password; 356 my $token = $pl->password;
346 357
347 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) { 358 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
348 # player exists and passwords match - we can proceed 359 # player exists and passwords match - we can proceed
349 360
350 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
351 # password matches, wonderful 361 # password matches, wonderful
352 my $pl = cf::player::find $user or next; 362 my $pl = cf::player::find $user or next;
353 $pl->connect ($ns); 363 $pl->connect ($ns);
354 enter_map $pl; 364 enter_map $pl;
355 login_done $pl; 365 login $pl;
356 return; 366 return;
357 } elsif (can_cleanup $pl, $mtime) { 367 } elsif (can_cleanup $pl, $mtime) {
358 Coro::Timer::sleep 1; 368 Coro::Timer::sleep 1;
359 369
360 $ns->send_drawinfo ( 370 send_log $ns,
361 "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, "
362 . "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 "
363 . "because it has not been in-use for some time.", 373 . "because it has not been in-use for some time.",
364 cf::NDI_RED 374 cf::NDI_RED | cf::NDI_REPLY
365 ); 375 ;
366 376
367 (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]/
368 or next; 378 or next;
369 379
370 # check if the file hasn't changed 380 # check if the file hasn't changed
… …
375 385
376 # fall through to creation 386 # fall through to creation
377 } else { 387 } else {
378 Coro::Timer::sleep 1; 388 Coro::Timer::sleep 1;
379 389
380 $ns->send_drawinfo ( 390 send_log $ns,
381 "Wrong username or password. Please try again " 391 "Wrong username or password. Please try again "
382 . "(check for Numlock and other semi-obvious error sources).", 392 . "(check for Numlock and other semi-obvious error sources).",
383 cf::NDI_RED 393 cf::NDI_RED | cf::NDI_REPLY
384 ); 394 ;
385 next; 395 next;
386 } 396 }
387 } else { 397 } else {
388 # unable to load the playerfile: 398 # unable to load the playerfile:
389 # 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
390 # something very similar. 400 # something very similar.
391 if (!aio_stat cf::player::playerdir $user) { 401 if (!aio_stat cf::player::playerdir $user) {
392 $ns->send_drawinfo ( 402 send_log $ns,
393 "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. "
394 . "If this is your account, ask a dungeon master for assistance. " 404 . "If this is your account, ask a dungeon master for assistance. "
395 . "Otherwise choose a different login name.", 405 . "Otherwise choose a different login name.",
396 cf::NDI_RED 406 cf::NDI_RED | cf::NDI_REPLY
397 ); 407 ;
398 next; 408 next;
399 } 409 }
400 } 410 }
401 411
412 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
413
414 if ($pass2 ne $pass) {
415 send_log $ns,
416 "The passwords do not match, please try again.",
417 cf::NDI_RED | cf::NDI_REPLY
418 ;
419 Coro::Timer::sleep 0.5;
420 next;
421 }
422
402 last; 423 last;
403 } 424 }
404 425
405 # lock again, too layz to make this nicer 426 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 }); 427 });
410}); 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};
411 528
412cf::register_command password => sub { 529cf::register_command password => sub {
413 my ($pl, $arg) = @_; 530 my ($pl, $arg) = @_;
414 531
415 unless ($pl->flag (cf::FLAG_WIZ)) { 532 unless ($pl->flag (cf::FLAG_WIZ)) {
416 $pl->message ( 533 $pl->message (
417 "The password can currently only changed by a DM.", 534 "The password can currently only changed by a DM.",
418 cf::NDI_UNIQUE | cf::NDI_REPLY); 535 cf::NDI_UNIQUE | cf::NDI_REPLY);
419 return; 536 return;
420 } 537 }
538
539 $pl->message (#d#
540 "Passwords cannot currently be changed.",#d#
541 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
542 return;#d#
421 543
422 my (@args) = split /\s+/, $arg; 544 my (@args) = split /\s+/, $arg;
423 my ($player, $new_pw) = @args; 545 my ($player, $new_pw) = @args;
424 546
425 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