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

Diff Legend

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