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

Diff Legend

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