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

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.110 by root, Sat May 8 10:49:44 2010 UTC vs.
Revision 1.118 by root, Thu Nov 8 00:16:07 2012 UTC

 # login handling
 use Fcntl;
 use Coro::AIO;
-our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
+CONF MAX_DISCONNECT_TIME = 3600;
 # paranoia function to overwrite a string-in-place
 sub nuke_str {
    substr $_[0], 0, (length $_[0]), "x" x length $_[0]
 }
    my $m = $ob->map
       or return;
    my $x = $ob->x;
    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;
 }
 sub compare_password($$) {
    my ($pass, $token) = @_;
-   if ($token =~ /\!(.*)/) {
+   if ($token =~ /!!(.*)/) {
+      return +(substr $pass, 0, 8) eq pack "H*", $1;
+   } elsif ($token =~ /!(.*)/) {
       return $pass eq pack "H*", $1;
    } else {
       return $token eq crypt $pass, $token;
    }
 }
-# delete a player directory, be non-blocking AND synchronous...
+# delete a player directory
-# (that's hard, so we crap out and fork).
 sub nuke_playerdir {
    my ($user) = @_;
+   my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
    my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
-   cf::fork_call {
-      rename "$PLAYERDIR/$user", $temp;
+   aio_rename "$PLAYERDIR/$user", $temp;
-      system "rm", "-rf", $temp;
+   IO::AIO::aio_rmtree $temp;
-   };
 }
 cf::client->attach (on_addme => sub {
    my ($ns) = @_;
                );
                next;
             }
          } else {
             # unable to load the playerfile:
-            # check wether the player dir exists, which means the file is corrupted or
+            # check whether the player dir exists, which means the file is corrupted or
             # something very similar.
             if (!aio_stat cf::player::playerdir $user) {
                $ns->send_drawinfo (
                   "Unable to retrieve this player. It might be a locked or broken account. "
                 . "If this is your account, ask a dungeon master for assistance. "
          # the rest of this function is character creation
          $Coro::current->{desc} = "addme($user) chargen";
          # 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) {
 });
 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;
+   }
    my (@args) = split /\s+/, $arg;
-   my ($new_pw, $player);
-   if ($pl->flag (cf::FLAG_WIZ)) {
-      ($player, $new_pw) = @args;
+   my ($player, $new_pw) = @args;
-   } else {
-      $new_pw = $args[0];
-   }
    if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
       $pl->message (
          "Usage: password <player> [<new password>]",
          cf::NDI_UNIQUE | cf::NDI_REPLY);
       return;
-   } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
-      $pl->message (
-         "Usage: password <new password>",
-         cf::NDI_UNIQUE | cf::NDI_REPLY);
-      return;
    }
-   if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
-      unless ($new_pw ne '') {
+   if ($new_pw eq '') {
-         $new_pw =
+      $new_pw =
-            join '',
+         join '',
-               map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
+            map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
-                  1..9;
+               1..9;
-      }
+   }
-      cf::async {
+   cf::async {
-         my $plc = cf::player::find $player;
+      my $plc = cf::player::find $player;
-         if ($plc) {
+      if ($plc) {
-            $plc->password (encode_password $new_pw);
+         $plc->password (encode_password $new_pw);
-            $pl->message (
-               "Ok, changed password of '$player' to '$new_pw'!",
-               cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
-         } else {
-            $pl->message (
-               "Fail! Couldn't set password for '$player', "
-               . "he doesn't seem to exist!",
-               cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
-         }
-      };
-   } else {
-      my $change = delete $pl->{password_change};
-      if ($change && (time - $change->[0]) < 60) {
          $pl->message (
-            "Ok, changed your password!",
+            "Ok, changed password of '$player' to '$new_pw'!",
             cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
-         $pl->contr->password (encode_password $new_pw);
       } else {
          $pl->message (
-            "Ok, please confirm your new password by sending "
+            "Fail! Couldn't set password for '$player', "
-            . "the command again within one minute!",
+            . "he doesn't seem to exist!",
             cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
-         $pl->{password_change} = [time, $new_pw];
       }
-   }
+   };
 };
 cf::register_command quit => sub {
    my ($ob, $arg) = @_;
    $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
       if ($_[0] !~ /^[yY]/) {
          $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
       } else {
          $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
-         $pl->ns->flush;
          cf::async {
-            ext::highscore::check $pl->ob;
             $pl->quit_character;
          };
       }
    });
 };
       my $pl = $ob->contr;
       # update respawn position
       $pl->savebed ($bed->map->path, $bed->x, $bed->y);
-      cf::async { $pl->save };
+      cf::async {
-      my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
+         my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
-      ext::highscore::check $ob;
+         ext::highscore::check $ob;
+         $pl->save;
-      $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
+         $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
+         my $ns = $pl->ns
+            or return;
-      $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
+         $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
-         if ($_[0] !~ /^[yY]/) {
+            if ($_[0] !~ /^[yY]/) {
-            $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
+               $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
-            $pl->deactivate;
+               $pl->deactivate;
-            $pl->ns->destroy;
+               $pl->ns->destroy;
-         } else {
+            }
-            cf::async { $pl->save };
-         }
+         });
-      });
+      };
    },
 );
 cf::player->attach (
    on_login  => sub {

Diff Legend

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

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.110 by root, Sat May 8 10:49:44 2010 UTC vs. Revision 1.118 by root, Thu Nov 8 00:16:07 2012 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.110 by root, Sat May 8 10:49:44 2010 UTC vs.
Revision 1.118 by root, Thu Nov 8 00:16:07 2012 UTC