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

Diff Legend

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