[ViewVC] Diff of: cvs/deliantra/server/ext/login.ext

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.120 by root, Thu Nov 15 06:00:16 2012 UTC vs.
Revision 1.128 by root, Sat Nov 17 12:02:43 2012 UTC

…		…
5	use Fcntl;	5	use Fcntl;
6	use Coro::AIO;	6	use Coro::AIO;
7	use Deliantra::Util ();	7	use Deliantra::Util ();
8		8
9	CONF MAX_DISCONNECT_TIME = 3600;	9	CONF MAX_DISCONNECT_TIME = 3600;
		10
		11	our $VALID_LOGIN = qr<^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z>;
10		12
11	sub query {	13	sub query {
12	my ($ns, $flags, $text) = @_;	14	my ($ns, $flags, $text) = @_;
13		15
14	$ns->query ($flags, $text, Coro::rouse_cb);	16	$ns->query ($flags, $text, Coro::rouse_cb);
…		…
58	my $y = $ob->y;	60	my $y = $ob->y;
59		61
60	# never happens normally, but helps when shell users make mistakes	62	# never happens normally, but helps when shell users make mistakes
61	$m->linkable	63	$m->linkable
62	or return 1;	64	or return 1;
63
64	# return 0;#d#
65	# warn join ":", $m->at ($x, $y);#d#
66	# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
67	# return 0;
68		65
69	scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)	66	scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70	}	67	}
71		68
72	sub enter_map {	69	sub enter_map {
…		…
127		124
128	$ob->goto ($map, $x, $y);	125	$ob->goto ($map, $x, $y);
129	}	126	}
130		127
131	sub encode_password($) {	128	sub encode_password($) {
132	"!" . unpack "H*", $_[0]	129	unpack "H*", Deliantra::Util::hash_pw $_[0]
133	}	130	}
134		131
135	sub compare_password($$) {	132	sub compare_password($$) {
136	my ($pass, $token) = @_;	133	my ($pass, $token) = @_;
137		134
…		…
153	my $temp = "$PLAYERDIR/~$Coro::current~deleting~";	150	my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
154	aio_rename "$PLAYERDIR/$user", $temp;	151	aio_rename "$PLAYERDIR/$user", $temp;
155	IO::AIO::aio_rmtree $temp;	152	IO::AIO::aio_rmtree $temp;
156	}	153	}
157		154
158	sub login_done {	155	sub login {
159	my ($pl) = @_;	156	my ($pl) = @_;
		157
		158	# handle character creation, if neccessary
		159	# the rest of this function is character creation
		160
		161	my $ns = $pl->ns;
		162	my $ob = $pl->ob;
		163
		164	$Coro::current->{desc} = "addme(" . $ob->name . ") login";
		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";
		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!");
160		254
161	if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {	255	if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
162	$pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);	256	$pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
163	}	257	}
164	}	258	}
165		259
166	sub chargen {	260	sub chargen {
167	my ($ns, $user, $pass) = @_;	261	my ($ns, $user, $hash) = @_;
168		262
169	# the rest of this function is character creation	263	# lock again, too lazy to make this nicer
170	$Coro::current->{desc} = "addme($user) chargen";	264	local $cf::LOGIN_LOCK{$user} = 1;
171		265
172	# just to make sure nothing is left over	266	# just to make sure nothing is left over
173	# normally, nothing is there.	267	# normally, nothing is there.
174	nuke_playerdir $user;	268	nuke_playerdir $user;
175		269
176	my $pl = cf::player::new $user;	270	my $pl = cf::player::new $user;
177	$pl->password (encode_password $pass);	271	$pl->password (unpack "H*", $hash);
178	$pl->connect ($ns);	272	$pl->connect ($ns);
179	my $ob = $pl->ob;
180		273
181	$ob->goto ($pl->maplevel, $ob->x, $ob->y);	274	$pl->{chargen} = "init";
182		275
183	while () {	276	login $pl;
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_animation (2);
206	$ob->add_statbonus;
207
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	# create the playerdir, if necessary, as chargen_race_done did it before
224	# presumably because of unique maps
225	aio_mkdir playerdir $pl, 0770;
226	$pl->chargen_race_done;
227
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
242	$ob->reply (undef, "Welcome to Deliantra!");
243
244	# XXX: Workaround for delayed client ext protocol handshake
245	$pl->esrv_new_player;
246
247	delete $pl->{deny_save};
248	}	277	}
249		278
250	cf::client->attach (on_addme => sub {	279	cf::client->attach (on_addme => sub {
251	my ($ns) = @_;	280	my ($ns) = @_;
252		281
253	$ns->pl and return $ns->destroy;	282	$ns->{addme}++ and return $ns->destroy;
254		283
255	$ns->async (sub {	284	$ns->async (sub {
256	$Coro::current->{desc} = "addme init";	285	$Coro::current->{desc} = "addme init";
257		286
258	my ($user, $pass);	287	my ($user, $pass);
…		…
275	$ns->send_drawinfo (	304	$ns->send_drawinfo (
276	"That username is currently used in another login session. "	305	"That username is currently used in another login session. "
277	. "Chose another, or wait till the other session has ended.",	306	. "Chose another, or wait till the other session has ended.",
278	cf::NDI_RED	307	cf::NDI_RED
279	);	308	);
280	} elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {	309	} elsif ($user =~ $VALID_LOGIN) {
281	last;	310	last;
282	} else {	311	} else {
283	$ns->send_drawinfo (	312	$ns->send_drawinfo (
284	"Your username contains illegal characters "	313	"Your username contains illegal characters "
285	. "(only a-z, A-Z and 0-9 are allowed), "	314	. "(only a-z, A-Z and 0-9 are allowed), "
…		…
335	my $token = $pl->password;	364	my $token = $pl->password;
336		365
337	if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {	366	if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
338	# player exists and passwords match - we can proceed	367	# player exists and passwords match - we can proceed
339		368
340	$pl->password (encode_password $pass); # make sure we store the new encoding #d#
341	# password matches, wonderful	369	# password matches, wonderful
342	my $pl = cf::player::find $user or next;	370	my $pl = cf::player::find $user or next;
343	$pl->connect ($ns);	371	$pl->connect ($ns);
344	enter_map $pl;	372	enter_map $pl;
345	login_done $pl;	373	login $pl;
346	return;	374	return;
347	} elsif (can_cleanup $pl, $mtime) {	375	} elsif (can_cleanup $pl, $mtime) {
348	Coro::Timer::sleep 1;	376	Coro::Timer::sleep 1;
349		377
350	$ns->send_drawinfo (	378	$ns->send_drawinfo (
…		…
401	}	429	}
402		430
403	last;	431	last;
404	}	432	}
405		433
406	# lock again, too layz to make this nicer	434	chargen $ns, $user, Deliantra::Util::hash_pw $pass;
407	local $cf::LOGIN_LOCK{$user} = 1;
408
409	chargen $ns, $user, $pass;
410	login_done $ns->pl;
411	});	435	});
412	});	436	});
		437
		438	cf::client->attach (
		439	on_version => sub {
		440	my ($ns, $arg) = @_;
		441
		442	# perl probably uses lrand48, which is not secure at all
		443	# maybe require linux and use /dev/urandom.
		444	$ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
		445	$ns->ext_msg (nonces => @{ $ns->{nonces} });
		446	},
		447	);
		448
		449	cf::register_async_exticmd create_login => sub {
		450	my ($ns, $reply, $user, $pass) = @_;
		451
		452	$ns->{addme}++ and return $ns->destroy;
		453
		454	$ns->async (sub {
		455	my $fail = sub {
		456	$reply->(0, $_[0]);
		457	$ns->flush; # does not ensure that the data reaches the client - TODO
		458	# need to do this in another thread, as this one gets canceled
		459	Coro::async_pool {
		460	Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
		461	$ns->destroy if $ns->valid;
		462	};
		463	Coro::schedule; # do the destroy, should not return
		464	};
		465
		466	$user =~ $VALID_LOGIN
		467	or return $fail (
		468	"Your username contains illegal characters (only a-z, A-Z and 0-9 are allowed), "
		469	. "or is not between 3 and 20 characters in length."
		470	);
		471
		472	cf::player::find $user
		473	and return $fail->("User '$user' already exists - choose another login name.");
		474
		475	$reply->(1, "Account Created");
		476
		477	chargen $ns, $user, $pass;
		478	});
		479	};
		480
		481	cf::register_async_exticmd login => sub {
		482	my ($ns, $reply, $user, $hash) = @_;
		483
		484	$ns->{addme}++ and return $ns->destroy;
		485
		486	$ns->async (sub {
		487	local $cf::LOGIN_LOCK{$user} = 1;
		488
		489	$Coro::current->{desc} = "login($user) check";
		490
		491	my $fail = sub {
		492	$reply->(0, $_[0]);
		493	$ns->flush; # does not ensure that the data reaches the client - TODO
		494	# need to do this in another thread, as this one gets canceled
		495	Coro::async_pool {
		496	Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
		497	$ns->destroy if $ns->valid;
		498	};
		499	Coro::schedule; # do the destroy, should not return
		500	};
		501
		502	# try to read the user file and check the password
		503	my $pl = cf::player::find $user
		504	or return $fail->("User '$user' does not exist - wrong spelling?");
		505
		506	aio_stat $pl->path
		507	and return $ns->destroy;
		508
		509	my $mtime = (stat _)[9];
		510	my $token = $pl->password;
		511
		512	$token = $token =~ /^!/
		513	? Deliantra::Util::hash_pw pack "H*", substr $token, 1
		514	: pack "H*", $token;
		515
		516	$token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
		517
		518	$token eq $hash
		519	or $cf::CFG{ext_login_nocheck}
		520	or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
		521
		522	# player exists and passwords match - we can proceed
		523
		524	$reply->(1, "Success");
		525
		526	$pl->connect ($ns);
		527	enter_map $pl;
		528	login $pl;
		529	});
		530	};
413		531
414	cf::register_command password => sub {	532	cf::register_command password => sub {
415	my ($pl, $arg) = @_;	533	my ($pl, $arg) = @_;
416		534
417	unless ($pl->flag (cf::FLAG_WIZ)) {	535	unless ($pl->flag (cf::FLAG_WIZ)) {
418	$pl->message (	536	$pl->message (
419	"The password can currently only changed by a DM.",	537	"The password can currently only changed by a DM.",
420	cf::NDI_UNIQUE \| cf::NDI_REPLY);	538	cf::NDI_UNIQUE \| cf::NDI_REPLY);
421	return;	539	return;
422	}	540	}
		541
		542	$pl->message (#d#
		543	"Passwords cannot currently be changed.",#d#
		544	cf::NDI_UNIQUE \| cf::NDI_REPLY);#d#
		545	return;#d#
423		546
424	my (@args) = split /\s+/, $arg;	547	my (@args) = split /\s+/, $arg;
425	my ($player, $new_pw) = @args;	548	my ($player, $new_pw) = @args;
426		549
427	if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {	550	if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {

Diff Legend

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

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.120 by root, Thu Nov 15 06:00:16 2012 UTC vs. Revision 1.128 by root, Sat Nov 17 12:02:43 2012 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.120 by root, Thu Nov 15 06:00:16 2012 UTC vs.
Revision 1.128 by root, Sat Nov 17 12:02:43 2012 UTC