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

Diff Legend

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