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.109 by root, Tue May 4 21:45:42 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
… …
59 my $m = $ob->map 59 my $m = $ob->map
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# return 0;#d# 64 # never happens normally, but helps when shell users make mistakes
65# warn join ":", $m->at ($x, $y);#d# 65 $m->linkable
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 66 or return 1;
67# return 0;
68 67
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 68 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70} 69}
71 70
72sub enter_map { 71sub enter_map {
… …
95 $ob->message ( 94 $ob->message (
96 "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. "
97 . "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. "
98 . "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... "
99 . "H<You disconnected too long without having used a savebed.>", 98 . "H<You disconnected too long without having used a savebed.>",
100 cf::NDI_RED 99 cf::NDI_RED | cf::NDI_REPLY
101 ); 100 );
102 # kill them. 101 # kill them.
103 # reminds me of the famous badness 10000 syndrome... 102 # reminds me of the famous badness 10000 syndrome...
104 $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
105 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;
… …
109 $ob->message ( 108 $ob->message (
110 "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. "
111 . "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. "
112 . "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... "
113 . "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.>",
114 cf::NDI_RED 113 cf::NDI_RED | cf::NDI_REPLY
115 ); 114 );
116 } 115 }
117 } else { 116 } else {
118 $ob->message ( 117 $ob->message (
119 "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, "
120 . "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, "
121 . "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. "
122 . "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.>",
123 cf::NDI_RED 122 cf::NDI_RED | cf::NDI_REPLY
124 ); 123 );
125 } 124 }
126 } 125 }
127 126
128 $ob->goto ($map, $x, $y); 127 $ob->goto ($map, $x, $y);
129} 128}
130 129
131sub encode_password { 130sub encode_password($) {
132 crypt $_[0], 131 unpack "H*", Deliantra::Util::hash_pw $_[0]
133 join '',
134 ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
135} 132}
136 133
137# delete a player directory, be non-blocking AND synchronous... 134sub compare_password($$) {
138# (that's hard, so we crap out and fork). 135 my ($pass, $token) = @_;
136
137 if ($token =~ /!!(.*)/) {
138 return +(substr $pass, 0, 8) eq pack "H*", $1;
139 } elsif ($token =~ /!(.*)/) {
140 return $pass eq pack "H*", $1;
141 } else {
142 return $token eq crypt $pass, $token;
143 }
144}
145
146# delete a player directory
139sub nuke_playerdir { 147sub nuke_playerdir {
140 my ($user) = @_; 148 my ($user) = @_;
141 149
150 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
151
142 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
143
144 cf::fork_call {
145 rename "$PLAYERDIR/$user", $temp; 153 aio_rename "$PLAYERDIR/$user", $temp;
146 system "rm", "-rf", $temp; 154 IO::AIO::aio_rmtree $temp;
155}
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";
147 }; 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;
148} 276}
149 277
150cf::client->attach (on_addme => sub { 278cf::client->attach (on_addme => sub {
151 my ($ns) = @_; 279 my ($ns) = @_;
152 280
153 $ns->pl and return $ns->destroy; 281 $ns->{addme}++ and return $ns->destroy;
154 282
155 $ns->async (sub { 283 $ns->async (sub {
156 $Coro::current->{desc} = "addme init"; 284 $Coro::current->{desc} = "addme init";
157 285
158 my ($user, $pass); 286 my ($user, $pass);
159 287
160 $ns->send_packet ("addme_success"); 288 $ns->send_packet ("addme_success");
161 289
162 for (;;) { 290 for (;;) {
163 $ns->send_drawinfo ( 291 delete $ns->{login_guard};
292
293 send_log $ns,
164 "Please enter your username now. If you are a new user, " 294 "Please enter your username now. If you are a new user, "
165 . "make one up that describes your character best. " 295 . "make one up that describes your character best. "
166 . "Only letters and digits are allowed, though.", 296 . "Only letters and digits are allowed, though.",
167 cf::NDI_BLUE 297 cf::NDI_BLUE | cf::NDI_REPLY
168 ); 298 ;
169 299
170 # read username 300 # read username
171 while () { 301 while () {
172 $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:";
173 303
174 if ($cf::LOGIN_LOCK{$user}) { 304 if ($user =~ $VALID_LOGIN) {
175 $ns->send_drawinfo (
176 "That username is currently used in another login session. "
177 . "Chose another, or wait till the other session has ended.",
178 cf::NDI_RED
179 );
180 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
181 last; 305 last;
182 } else { 306 } else {
183 $ns->send_drawinfo ( 307 send_log $ns,
184 "Your username contains illegal characters " 308 "Your username contains illegal characters "
185 . "(only a-z, A-Z and 0-9 are allowed), " 309 . "(only a-z, A-Z and 0-9 are allowed), "
186 . "or is not between 3 and 20 characters in length.", 310 . "or is not between 3 and 20 characters in length.",
187 cf::NDI_RED 311 cf::NDI_RED | cf::NDI_REPLY
188 ); 312 ;
189 } 313 }
190 Coro::Timer::sleep 0.4; 314 Coro::Timer::sleep 0.4;
191 } 315 }
192 316
193 check_playing $ns, $user and next;
194
195 $Coro::current->{desc} = "addme($user) pass"; 317 $Coro::current->{desc} = "addme($user)";
196 318
197 $ns->send_drawinfo ( 319 send_log $ns,
198 "Welcome $user, please enter your password now. " 320 "Welcome $user, please enter your password now. "
199 . "New users should now choose a password. " 321 . "New users should now choose a password. "
200 . "Anything your client lets you enter is fine.", 322 . "Anything your client lets you enter is fine.",
201 cf::NDI_BLUE 323 cf::NDI_BLUE | cf::NDI_REPLY
202 ); 324 ;
203 325
204 # read password 326 # read password
205 while () { 327 while () {
206 $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:";
207 last if $pass =~ /.../; 329 last if $pass =~ /.../;
208 $ns->send_drawinfo ( 330 send_log $ns,
209 "Try to use at least three characters as your password please, " 331 "Try to use at least three characters as your password please, "
210 . "that cannot be too much to ask for :)", 332 . "that cannot be too much to ask for :)",
211 cf::NDI_RED 333 cf::NDI_RED | cf::NDI_REPLY
212 ); 334 ;
213 Coro::Timer::sleep 0.4; 335 Coro::Timer::sleep 0.4;
214 } 336 }
215 337
216 # lock this username for the remainder of this login session 338 $ns->{login_guard} = login_guard $user
217 if ($cf::LOGIN_LOCK{$user}) { 339 or do {
218 $ns->send_drawinfo ( 340 send_log $ns,
219 "That username is currently used in another login session. " 341 "That user is already logged in (or is logging in)."
220 . "Chose another, or wait till the other session has ended.", 342 . "Chose another, or wait till the other session has ended.",
221 cf::NDI_RED 343 cf::NDI_RED | cf::NDI_REPLY
344 ;
345 next;
222 ); 346 };
223 next;
224 }
225 local $cf::LOGIN_LOCK{$user} = 1;
226
227 check_playing $ns, $user and next;
228
229 $Coro::current->{desc} = "addme($user) check";
230 347
231 # try to read the user file and check the password 348 # try to read the user file and check the password
232 if (my $pl = cf::player::find $user) { 349 if (my $pl = cf::player::find $user) {
233 aio_stat $pl->path and next; 350 aio_stat $pl->path and next;
234 my $mtime = (stat _)[9]; 351 my $mtime = (stat _)[9];
235 my $hash = $pl->password; 352 my $token = $pl->password;
236 353
237 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 354 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
238 nuke_str $pass; 355 # player exists and passwords match - we can proceed
356
239 # password matches, wonderful 357 # password matches, wonderful
240 my $pl = cf::player::find $user or next; 358 my $pl = cf::player::find $user or next;
241 $pl->connect ($ns); 359 $pl->connect ($ns);
242 enter_map $pl; 360 enter_map $pl;
361 login $pl;
243 last; 362 return;
244 } elsif (can_cleanup $pl, $mtime) { 363 } elsif (can_cleanup $pl, $mtime) {
245 Coro::Timer::sleep 1; 364 Coro::Timer::sleep 1;
246 365
247 $ns->send_drawinfo ( 366 send_log $ns,
248 "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, "
249 . "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 "
250 . "because it has not been in-use for some time.", 369 . "because it has not been in-use for some time.",
251 cf::NDI_RED 370 cf::NDI_RED | cf::NDI_REPLY
252 ); 371 ;
253 372
254 #TODO: nuke_str
255 (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]/
256 or next; 374 or next;
257 375
258 # check if the file hasn't changed 376 # check if the file hasn't changed
259 aio_stat cf::player::path $user and next; 377 aio_stat cf::player::path $user and next;
… …
261 379
262 $pl->quit_character; 380 $pl->quit_character;
263 381
264 # fall through to creation 382 # fall through to creation
265 } else { 383 } else {
266 nuke_str $pass;
267
268 Coro::Timer::sleep 1; 384 Coro::Timer::sleep 1;
269 385
270 $ns->send_drawinfo ( 386 send_log $ns,
271 "Wrong username or password. Please try again " 387 "Wrong username or password. Please try again "
272 . "(check for Numlock and other semi-obvious error sources).", 388 . "(check for Numlock and other semi-obvious error sources).",
273 cf::NDI_RED 389 cf::NDI_RED | cf::NDI_REPLY
274 ); 390 ;
275 next; 391 next;
276 } 392 }
277 } else { 393 } else {
278 # unable to load the playerfile: 394 # unable to load the playerfile:
279 # 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
280 # something very similar. 396 # something very similar.
281 if (!aio_stat cf::player::playerdir $user) { 397 if (!aio_stat cf::player::playerdir $user) {
282 $ns->send_drawinfo ( 398 send_log $ns,
283 "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. "
284 . "If this is your account, ask a dungeon master for assistance. " 400 . "If this is your account, ask a dungeon master for assistance. "
285 . "Otherwise choose a different login name.", 401 . "Otherwise choose a different login name.",
286 cf::NDI_RED 402 cf::NDI_RED | cf::NDI_REPLY
287 ); 403 ;
288 next; 404 next;
289 } 405 }
290 } 406 }
291 407
292 # the rest of this function is character creation
293 $Coro::current->{desc} = "addme($user) chargen";
294
295 # just to make sure nothing is left over
296 nuke_playerdir $user;
297
298 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.";
299 409
300 if ($pass2 ne $pass) { 410 if ($pass2 ne $pass) {
301 nuke_str $pass; 411 send_log $ns,
302 nuke_str $pass2;
303 $ns->send_drawinfo (
304 "The passwords do not match, please try again.", 412 "The passwords do not match, please try again.",
305 cf::NDI_RED 413 cf::NDI_RED | cf::NDI_REPLY
306 ); 414 ;
307 Coro::Timer::sleep 0.5; 415 Coro::Timer::sleep 0.5;
308 next; 416 next;
309 } 417 }
310 418
311 nuke_str $pass2;
312
313 my $pl = cf::player::new $user;
314 $pl->password (encode_password $pass);
315 nuke_str $pass;
316 $pl->connect ($ns);
317 my $ob = $pl->ob;
318
319 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
320
321 while () {
322 $ob->update_stats;
323 $pl->save_stats;
324
325 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
326 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
327
328 if ($res =~ /^[Nn]/) {
329 last;
330 } elsif ($res > 0 && $res <= 7) {
331 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
332
333 if ($swap > 0 && $swap <= 7) {
334 $ob->swap_stats ($res - 1, $swap - 1);
335 }
336 } else {
337 $ob->roll_stats;
338 }
339
340 Coro::Timer::sleep 0.05;
341 }
342
343 $ob->set_animation (2);
344 $ob->add_statbonus;
345
346 while () {
347 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
348 my $msg = $ob->msg;
349 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
350 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
351
352 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
353 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
354
355 last if $res =~ /[dD]/;
356
357 $pl->chargen_race_next;
358 Coro::Timer::sleep 0.05;
359 }
360
361 # create the playerdir, if necessary, as chargen_race_done did it before
362 # presumably because of unique maps
363 aio_mkdir playerdir $pl, 0770;
364 $pl->chargen_race_done;
365
366 while () {
367 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
368 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
369
370 if ($res =~ /^[fF]/) {
371 $pl->gender (1);
372 last;
373 } elsif ($res =~ /^[mM]/) {
374 $pl->gender (0);
375 last;
376 }
377 Coro::Timer::sleep 0.05;
378 }
379
380 $ob->reply (undef, "Welcome to Deliantra!");
381
382 # XXX: Workaround for delayed client ext protocol handshake
383 $pl->esrv_new_player;
384
385 delete $pl->{deny_save};
386
387 last; 419 last;
388 } 420 }
389 421
390 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) { 422 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
391 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
392 }
393 }); 423 });
394}); 424});
395 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};
524
396cf::register_command password => sub { 525cf::register_command password => sub {
397 my ($pl, $arg) = @_; 526 my ($pl, $arg) = @_;
398 527
528 unless ($pl->flag (cf::FLAG_WIZ)) {
529 $pl->message (
530 "The password can currently only changed by a DM.",
531 cf::NDI_UNIQUE | cf::NDI_REPLY);
532 return;
533 }
534
535 $pl->message (#d#
536 "Passwords cannot currently be changed.",#d#
537 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
538 return;#d#
539
399 my (@args) = split /\s+/, $arg; 540 my (@args) = split /\s+/, $arg;
400
401 my ($new_pw, $player);
402
403 if ($pl->flag (cf::FLAG_WIZ)) {
404 ($player, $new_pw) = @args; 541 my ($player, $new_pw) = @args;
405 } else {
406 $new_pw = $args[0];
407 }
408 542
409 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') { 543 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
410 $pl->message ( 544 $pl->message (
411 "Usage: password <player> [<new password>]", 545 "Usage: password <player> [<new password>]",
412 cf::NDI_UNIQUE | cf::NDI_REPLY); 546 cf::NDI_UNIQUE | cf::NDI_REPLY);
413 return; 547 return;
414 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
415 $pl->message (
416 "Usage: password <new password>",
417 cf::NDI_UNIQUE | cf::NDI_REPLY);
418 return;
419 } 548 }
420 549
421 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
422 unless ($new_pw ne '') { 550 if ($new_pw eq '') {
423 $new_pw = 551 $new_pw =
424 join '', 552 join '',
425 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] } 553 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
426 1..9; 554 1..9;
427 } 555 }
428 556
429 cf::async { 557 cf::async {
430 my $plc = cf::player::find $player; 558 my $plc = cf::player::find $player;
431 if ($plc) { 559 if ($plc) {
432 $plc->password (encode_password $new_pw); 560 $plc->password (encode_password $new_pw);
433 $pl->message (
434 "Ok, changed password of '$player' to '$new_pw'!",
435 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
436 } else {
437 $pl->message (
438 "Fail! Couldn't set password for '$player', "
439 . "he doesn't seem to exist!",
440 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
441 }
442 };
443 } else {
444 my $change = delete $pl->{password_change};
445
446 if ($change && (time - $change->[0]) < 60) {
447 $pl->message ( 561 $pl->message (
448 "Ok, changed your password!", 562 "Ok, changed password of '$player' to '$new_pw'!",
449 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 563 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
450 $pl->contr->password (encode_password $new_pw);
451
452 } else { 564 } else {
453 $pl->message ( 565 $pl->message (
454 "Ok, please confirm your new password by sending " 566 "Fail! Couldn't set password for '$player', "
455 . "the command again within one minute!", 567 . "he doesn't seem to exist!",
456 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 568 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
457 $pl->{password_change} = [time, $new_pw];
458 } 569 }
459 } 570 };
460}; 571};
461 572
462cf::register_command quit => sub { 573cf::register_command quit => sub {
463 my ($ob, $arg) = @_; 574 my ($ob, $arg) = @_;
464 575
… …
476 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 587 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
477 if ($_[0] !~ /^[yY]/) { 588 if ($_[0] !~ /^[yY]/) {
478 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 589 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
479 } else { 590 } else {
480 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 591 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
481 $pl->ns->flush;
482 cf::async { 592 cf::async {
483 ext::highscore::check $pl->ob;
484 $pl->quit_character; 593 $pl->quit_character;
485 }; 594 };
486 } 595 }
487 }); 596 });
488}; 597};
… …
496 605
497 my $pl = $ob->contr; 606 my $pl = $ob->contr;
498 607
499 # update respawn position 608 # update respawn position
500 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 609 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
501 cf::async { $pl->save };
502 610
611 cf::async {
503 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 612 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
504 ext::highscore::check $ob; 613 ext::highscore::check $ob;
505 614
615 $pl->save;
616
506 $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);
507 618
619 my $ns = $pl->ns
620 or return;
621
508 $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 {
509 if ($_[0] !~ /^[yY]/) { 623 if ($_[0] !~ /^[yY]/) {
510 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 624 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
511 $pl->deactivate; 625 $pl->deactivate;
512 $pl->ns->destroy; 626 $pl->ns->destroy;
513 } else { 627 }
514 cf::async { $pl->save };
515 } 628 });
516 }); 629 };
517 }, 630 },
518); 631);
519 632
520cf::player->attach ( 633cf::player->attach (
521 on_login => sub { 634 on_login => sub {

Diff Legend

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