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

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.119 by root, Thu Nov 15 05:54:02 2012 UTC vs.
Revision 1.124 by root, Sat Nov 17 06:41:16 2012 UTC

 # login handling
 use Fcntl;
 use Coro::AIO;
+use Deliantra::Util ();
 CONF MAX_DISCONNECT_TIME = 3600;
 sub query {
    my ($ns, $flags, $text) = @_;
    my $y = $ob->y;
    # never happens normally, but helps when shell users make mistakes
    $m->linkable
       or return 1;
-#   return 0;#d#
-#   warn join ":", $m->at ($x, $y);#d#
-#   warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
-#   return 0;
    scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
 }
 sub enter_map {
    # just to make sure nothing is left over
    # normally, nothing is there.
    nuke_playerdir $user;
-   my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
-   if ($pass2 ne $pass) {
-      $ns->send_drawinfo (
-         "The passwords do not match, please try again.",
-         cf::NDI_RED
-      );
-      Coro::Timer::sleep 0.5;
-      next;
-   }
    my $pl = cf::player::new $user;
    $pl->password (encode_password $pass);
    $pl->connect ($ns);
    my $ob = $pl->ob;
 }
 cf::client->attach (on_addme => sub {
    my ($ns) = @_;
-   $ns->pl and return $ns->destroy;
+   $ns->{addme}++ and return $ns->destroy;
    $ns->async (sub {
       $Coro::current->{desc} = "addme init";
       my ($user, $pass);
             my $token = $pl->password;
             if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
                # player exists and passwords match - we can proceed
-               $pl->password (encode_password $pass); # make sure we store the new encoding #d#
                # password matches, wonderful
                my $pl = cf::player::find $user or next;
                $pl->connect ($ns);
                enter_map $pl;
                login_done $pl;
                );
                next;
             }
          }
+         my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
+         if ($pass2 ne $pass) {
+            $ns->send_drawinfo (
+               "The passwords do not match, please try again.",
+               cf::NDI_RED
+            );
+            Coro::Timer::sleep 0.5;
+            next;
+         }
          last;
       }
       # lock again, too layz to make this nicer
       local $cf::LOGIN_LOCK{$user} = 1;
       chargen $ns, $user, $pass;
       login_done $ns->pl;
    });
 });
+cf::client->attach (
+   on_version => sub {
+      my ($ns, $arg) = @_;
+      $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63  } 1..2];
+      $ns->ext_msg (nonces => @{ $ns->{nonces} });
+   },
+);
+#cf::register_async_exticmd create_login => sub {
+#   my ($ns, $reply, $user, $pass) = @_;
+#
+#  $ns->{addme}++ and return $ns->destroy;
+#};
+cf::register_async_exticmd login => sub {
+   my ($ns, $reply, $user, $hash) = @_;
+   $ns->{addme}++ and return $ns->destroy;
+   $ns->async (sub {
+      local $cf::LOGIN_LOCK{$user} = 1;
+      $Coro::current->{desc} = "login($user) check";
+      my $fail = sub {
+         $reply->(0, $_[0]);
+         $ns->flush; # does not ensure that the data reaches the client - TODO
+         # need to do this in another thread, as this one gets canceled
+         Coro::async_pool {
+            Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
+            $ns->destroy;
+         };
+         Coro::schedule; # do the destroy, should not return
+      };
+      # try to read the user file and check the password
+      my $pl = cf::player::find $user
+         or return $fail->("User '$user' does not exist - wrong spelling?");
+      aio_stat $pl->path
+         and return $ns->destroy;
+      my $mtime = (stat _)[9];
+      my $token = $pl->password;
+      $token = $token =~ /^!/
+               ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
+               : pack "H*", $token;
+      $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
+      $token eq $hash
+         or $cf::CFG{ext_login_nocheck}
+         or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
+      # player exists and passwords match - we can proceed
+      $pl->connect ($ns);
+      enter_map $pl;
+      login_done $pl;
+      $reply->(1, "Success");
+   });
+};
 cf::register_command password => sub {
    my ($pl, $arg) = @_;
    unless ($pl->flag (cf::FLAG_WIZ)) {
       $pl->message (
          "The password can currently only changed by a DM.",
          cf::NDI_UNIQUE | cf::NDI_REPLY);
       return;
    }
+   $pl->message (#d#
+      "Passwords cannot currently be changed.",#d#
+      cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
+   return;#d#
    my (@args) = split /\s+/, $arg;
    my ($player, $new_pw) = @args;
    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.119 by root, Thu Nov 15 05:54:02 2012 UTC vs. Revision 1.124 by root, Sat Nov 17 06:41:16 2012 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.119 by root, Thu Nov 15 05:54:02 2012 UTC vs.
Revision 1.124 by root, Sat Nov 17 06:41:16 2012 UTC