--- deliantra/server/ext/login.ext	2007/12/26 21:38:02	1.75
+++ deliantra/server/ext/login.ext	2012/11/15 07:08:15	1.122
@@ -1,25 +1,18 @@
-#! perl # mandatory
+#! perl # mandatory depends=highscore
 
 # login handling
 
 use Fcntl;
 use Coro::AIO;
+use Deliantra::Util ();
 
-our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
-
-# paranoia function to overwrite a string-in-place
-sub nuke_str {
-   substr $_[0], 0, (length $_[0]), "x" x length $_[0]
-}
+CONF MAX_DISCONNECT_TIME = 3600;
 
 sub query {
    my ($ns, $flags, $text) = @_;
 
-   my $current = $Coro::current;
-   $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
-   Coro::schedule while ref $current;
-
-   $current
+   $ns->query ($flags, $text, Coro::rouse_cb);
+   Coro::rouse_wait
 }
 
 sub can_cleanup {
@@ -54,6 +47,23 @@
    1
 }
 
+sub safe_spot($) {
+   my ($pl) = @_;
+   
+   my $ob = $pl->ob;
+
+   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;
+
+   scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
+}
+
 sub enter_map {
    my ($pl) = @_;
 
@@ -66,114 +76,175 @@
 
    $ob->enter_link;
 
-   if (my $time = delete $pl->{unclean_save}) {
-      if (my $m = cf::map::find $map) {
-         if ($time < $m->{instantiate_time}) {
-            # the map was reset in the meantime
-            my $age = $cf::RUNTIME - $time;
+   my $m = cf::map::find $map;
+   my $time = delete $pl->{unclean_save};
 
-            warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
+   if ($time && $m) {
+      if ($time < $m->{instantiate_time}) {
+         # the map was reset in the meantime
+         my $age = $cf::RUNTIME - $time;
 
-            # for now, just go back to savebed
-            ($map, $x, $y) = $pl->savebed;
+         cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
 
-            if ($age >= $MAX_DISCONNECT_TIME) {
-               $ob->message (
-                  "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
-                . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
-                . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
-                . "H<You disconnected too long without having used a savebed.>",
-                  cf::NDI_RED
-               );
-               # kill them.
-               # reminds me of the famous badness 10000 syndrome...
-               $ob->stats->hp (-10000); #] if they survive this they deserved to live
-               $pl->killer ("a cave-in");
-            } else {
-               $ob->message (
-                  "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
-                . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
-                . "Better use a savebed next time, much worse things could have happened... "
-                . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
-                  cf::NDI_RED
-               );
-            }
+         if ($age >= $MAX_DISCONNECT_TIME) {
+            $ob->message (
+               "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
+             . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
+             . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
+             . "H<You disconnected too long without having used a savebed.>",
+               cf::NDI_RED
+            );
+            # kill them.
+            # reminds me of the famous badness 10000 syndrome...
+            $ob->stats->hp (-10000); #] if they survive this they deserved to live
+            my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
          } else {
+            ($map, $x, $y) = $pl->savebed;
+
             $ob->message (
-               "You didn't use a bed to reality to leave this realm. This is very dangerous, "
-             . "as lots of things could happen when you leave by other means, such as cave-ins, "
-             . "or monsters suddenly snapping your body. Better use a savebed next time. "
-             . "H<Always apply a bed of reality to disconnect from the server.>",
+               "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
+             . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
+             . "Better use a savebed next time, much worse things could have happened... "
+             . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
                cf::NDI_RED
             );
          }
+      } else {
+         $ob->message (
+            "You didn't use a bed to reality to leave this realm. This is very dangerous, "
+          . "as lots of things could happen when you leave by other means, such as cave-ins, "
+          . "or monsters suddenly snapping your body. Better use a savebed next time. "
+          . "H<Always apply a bed of reality to disconnect from the server.>",
+            cf::NDI_RED
+         );
       }
    }
 
    $ob->goto ($map, $x, $y);
 }
 
-# delete a player directory, be non-blocking AND synchronous...
-# (thats hard, so we crap out and fork).
+sub encode_password($) {
+   "!" . unpack "H*", $_[0]
+}
+
+sub compare_password($$) {
+   my ($pass, $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
 sub nuke_playerdir {
    my ($user) = @_;
 
+   my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
+
    my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
+   aio_rename "$PLAYERDIR/$user", $temp;
+   IO::AIO::aio_rmtree $temp;
+}
 
-   cf::fork_call {
-      rename "$PLAYERDIR/$user", $temp;
-      system "rm", "-rf", $temp;
-   };
+sub login_done {
+   my ($pl) = @_;
+
+   if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
+      $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
+   }
 }
 
-cf::client->attach (on_addme => sub {
-   my ($ns) = @_;
+sub chargen {
+   my ($ns, $user, $pass) = @_;
+
+   # 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 $pl = cf::player::new $user;
+   $pl->password (encode_password $pass);
+   $pl->connect ($ns);
+   my $ob = $pl->ob;
+
+   $ob->goto ($pl->maplevel, $ob->x, $ob->y);
+
+   while () {
+      $ob->update_stats;
+      $pl->save_stats;
+
+      my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
+                   "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
+
+      if ($res =~ /^[Nn]/) {
+         last;
+      } elsif ($res > 0 && $res <= 7) {
+         my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
 
-   if (!$ns->facecache)
-     {
-       $ns->send_drawinfo (<<EOF, cf::NDI_RED);
-
-
-***
-*** WARNING:
-*** Your client does not support face/image caching,
-*** or it has been disabled. Face caching is mandatory
-*** so please enable it or use a newer client.
-***
-*** Look at your client preferences:
-***
-*** CFPlus: all known versions automatically enable the facecache.
-*** cfclient: use the -cache commandline option.
-*** cfclient: map will not redraw automatically (bug).
-*** gcfclient: use -cache commandline option, or enable
-*** gcfclient: Client => Configure => Map & Image => Cache Images.
-*** jcrossclient: your client is broken, use CFPlus or gcfclient.
-***
-***
-EOF
-      if ($ns->version =~ /jcrossclient/) {
-         # let them, for now
+         if ($swap > 0 && $swap <= 7) {
+            $ob->swap_stats ($res - 1, $swap - 1);
+         }
       } else {
-        $ns->flush;
-        return $ns->destroy;
+         $ob->roll_stats;
       }
 
-      # $ns->facecache = true;
+      Coro::Timer::sleep 0.05;
    }
 
-   if ($ns->mapmode < cf::Map1aCmd) {
-      $ns->send_drawinfo (<<EOF, cf::NDI_RED);
+   $ob->set_animation (2);
+   $ob->add_statbonus;
+
+   while () {
+      $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
+      my $msg = $ob->msg;
+      $msg =~ s/(?<=\S)\n(?=\S)/ /g;
+      $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
 
+      my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
+                   "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
 
-***
-*** WARNING:
-*** Your client is too old. Please upgrade to a newer version.
-EOF
+      last if $res =~ /[dD]/;
 
-      $ns->flush;
-      return $ns->destroy;
+      $pl->chargen_race_next;
+      Coro::Timer::sleep 0.05;
    }
 
+   # create the playerdir, if necessary, as chargen_race_done did it before
+   # presumably because of unique maps
+   aio_mkdir playerdir $pl, 0770;
+   $pl->chargen_race_done;
+
+   while () {
+      my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
+                   "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
+
+      if ($res =~ /^[fF]/) {
+         $pl->gender (1);
+         last;
+      } elsif ($res =~ /^[mM]/) {
+         $pl->gender (0);
+         last;
+      }
+      Coro::Timer::sleep 0.05;
+   }
+
+   $ob->reply (undef, "Welcome to Deliantra!");
+
+   # XXX: Workaround for delayed client ext protocol handshake
+   $pl->esrv_new_player;
+
+   delete $pl->{deny_save};
+}
+
+cf::client->attach (on_addme => sub {
+   my ($ns) = @_;
+
    $ns->pl and return $ns->destroy;
 
    $ns->async (sub {
@@ -193,7 +264,7 @@
 
          # read username
          while () {
-            $user = query $ns, 0, "What is your name?\n:";
+            $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
 
             if ($cf::LOGIN_LOCK{$user}) {
                $ns->send_drawinfo (
@@ -201,13 +272,13 @@
                 . "Chose another, or wait till the other session has ended.",
                   cf::NDI_RED
                );
-            } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) {
+            } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
                last;
             } else {
                $ns->send_drawinfo (
                   "Your username contains illegal characters "
                 . "(only a-z, A-Z and 0-9 are allowed), "
-                . "or is not between 3 and 18 characters in length.",
+                . "or is not between 3 and 20 characters in length.",
                   cf::NDI_RED
                );
             }
@@ -256,15 +327,17 @@
          if (my $pl = cf::player::find $user) {
             aio_stat $pl->path and next;
             my $mtime = (stat _)[9];
-            my $hash = $pl->password;
+            my $token = $pl->password;
+
+            if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
+               # player exists and passwords match - we can proceed
 
-            if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
-               nuke_str $pass;
                # password matches, wonderful
                my $pl = cf::player::find $user or next;
                $pl->connect ($ns);
                enter_map $pl;
-               last;
+               login_done $pl;
+               return;
             } elsif (can_cleanup $pl, $mtime) {
                Coro::Timer::sleep 1;
 
@@ -275,7 +348,6 @@
                   cf::NDI_RED
                );
 
-               #TODO: nuke_str
                (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
                   or next;
 
@@ -287,8 +359,6 @@
 
                # fall through to creation
             } else {
-               nuke_str $pass;
-
                Coro::Timer::sleep 1;
 
                $ns->send_drawinfo (
@@ -300,7 +370,7 @@
             }
          } 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 (
@@ -313,17 +383,9 @@
             }
          }
 
-         # the rest of this function is character creation
-         $Coro::current->{desc} = "addme($user) chargen";
-
-         # just to make sure nothing is left over
-         nuke_playerdir $user;
-
          my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
 
          if ($pass2 ne $pass) {
-            nuke_str $pass;
-            nuke_str $pass2;
             $ns->send_drawinfo (
                "The passwords do not match, please try again.",
                cf::NDI_RED
@@ -332,88 +394,87 @@
             next;
          }
 
-         nuke_str $pass2;
-
-         my $pl = cf::player::new $user;
-         $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
-         nuke_str $pass;
-         $pl->connect ($ns);
-         my $ob = $pl->ob;
-
-         $ob->goto ($pl->maplevel, $ob->x, $ob->y);
-
-         while () {
-            $ob->update_stats;
-            $pl->save_stats;
-
-            my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
-                         "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
+         last;
+      }
 
-            if ($res =~ /^[Nn]/) {
-               last;
-            } elsif ($res > 0 && $res <= 7) {
-               my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
+      # lock again, too layz to make this nicer
+      local $cf::LOGIN_LOCK{$user} = 1;
 
-               if ($swap > 0 && $swap <= 7) {
-                  $ob->swap_stats ($res - 1, $swap - 1);
-               }
-            } else {
-               $ob->roll_stats;
-            }
+      chargen $ns, $user, $pass;
+      login_done $ns->pl;
+   });
+});
 
-            Coro::Timer::sleep 0.2;
-         }
+cf::client->attach (
+   on_version => sub {
+      my ($ns, $arg) = @_;
 
-         $ob->set_animation (2);
-         $ob->add_statbonus;
+      $ns->ext_msg (nonces => map { join "", map { chr rand 256 } 0..63  } 1..2);
+   },
+);
 
-         while () {
-            $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
-            my $msg = $ob->msg;
-            $msg =~ s/(?<=\S)\n(?=\S)/ /g;
-            $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
+#cf::register_async_exticmd create_login => sub {
+#   my ($ns, $reply, $user, $pass) = @_;
+#
+#   $ns->pl and return $ns->destroy;
+#};
 
-            my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
-                         "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
+cf::register_async_exticmd login => sub {
+   my ($ns, $reply, $user, $hash) = @_;
 
-            last if $res =~ /[dD]/;
+   $ns->pl and return $ns->destroy;
+};
 
-            $pl->chargen_race_next;
-            Coro::Timer::sleep 0.2;
-         }
+cf::register_command password => sub {
+   my ($pl, $arg) = @_;
 
-         $pl->chargen_race_done;
+   unless ($pl->flag (cf::FLAG_WIZ)) {
+      $pl->message (
+         "The password can currently only changed by a DM.",
+         cf::NDI_UNIQUE | cf::NDI_REPLY);
+      return;
+   }
 
-         while () {
-            my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
-                         "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
+   my (@args) = split /\s+/, $arg;
+   my ($player, $new_pw) = @args;
 
-            if ($res =~ /^[fF]/) {
-               $pl->gender (1);
-               last;
-            } elsif ($res =~ /^[mM]/) {
-               $pl->gender (0);
-               last;
-            }
-            Coro::Timer::sleep 0.2;
-         }
-
-         $ob->reply (undef, "Welcome to Deliantra!");
+   if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
+      $pl->message (
+         "Usage: password <player> [<new password>]",
+         cf::NDI_UNIQUE | cf::NDI_REPLY);
+      return;
+   }
 
-         delete $pl->{deny_save};
+   if ($new_pw eq '') {
+      $new_pw =
+         join '',
+            map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
+               1..9;
+   }
 
-         last;
+   cf::async {
+      my $plc = cf::player::find $player;
+      if ($plc) {
+         $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);
       }
-   });
-});
+   };
+};
 
 cf::register_command quit => sub {
    my ($ob, $arg) = @_;
 
-   $ob->reply (undef,
-               "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
-               . "If you are sure you want to do this, then use the quit_character command instead of quit.",
-               cf::NDI_UNIQUE | cf::NDI_RED);
+   $ob->send_msg (undef,
+                  "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
+                  . "If you are sure you want to do this, then use the quit_character command instead of quit.",
+                  cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
 };
 
 cf::register_command quit_character => sub {
@@ -423,15 +484,12 @@
 
    $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->reply (undef,
-                     "Ok, not not quitting then.",
-                     cf::NDI_UNIQUE | cf::NDI_RED);
+         $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
       } else {
-         $ob->reply (undef,
-                     "Ok, quitting, hope to see you again.",
-                     cf::NDI_UNIQUE | cf::NDI_RED);
-         $pl->ns->flush;
-         cf::async { $pl->quit_character };
+         $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
+         cf::async {
+            $pl->quit_character;
+         };
       }
    });
 };
@@ -447,22 +505,26 @@
 
       # update respawn position
       $pl->savebed ($bed->map->path, $bed->x, $bed->y);
-      cf::async { $pl->save };
 
-      $pl->killer ("left");
-      $ob->check_score;
-
-      $ob->reply (undef, "In the future, you will wake up here when you die.");
-
-      $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
-         if ($_[0] !~ /^[yY]/) {
-            $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
-            $pl->deactivate;
-            $pl->ns->destroy;
-         } else {
-            cf::async { $pl->save };
-         }
-      });
+      cf::async {
+         my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
+         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);
+
+         my $ns = $pl->ns
+            or return;
+
+         $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
+            if ($_[0] !~ /^[yY]/) {
+               $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
+               $pl->deactivate;
+               $pl->ns->destroy;
+            }
+         });
+      };
    },
 );
 
@@ -481,67 +543,9 @@
          $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
       } else {
          $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
-         $pl->{unclean_save} = $cf::RUNTIME;
+         $pl->{unclean_save} = $cf::RUNTIME
+            unless safe_spot $pl;
       }
    },
 );
 
-#############################################################################
-
-our $SCHEDULE_INTERVAL  = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
-our $SAVE_TIMEOUT       = $cf::CFG{player_save_interval}     || 20; # save players every n seconds
-
-our $SCHEDULER = cf::async_ext {
-   $Coro::current->{desc} = "player scheduler";
-
-   while () {
-      Coro::EV::timer_once $SCHEDULE_INTERVAL;
-
-      # this weird form of iteration over values is used because
-      # the hash changes underneath us frequently, and for
-      # keeps a direct reference to the value without (in 5.8 perls)
-      # keeping a reference, so this is prone to crashes or worse.
-      my @players = keys %cf::PLAYER;
-      for (@players) {
-         my $pl = $cf::PLAYER{$_}
-            or next;
-         $pl->valid or next;
-
-         eval {
-            if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
-               $pl->save;
-
-               unless ($pl->active || $pl->ns) {
-                  # check refcounts, this is tricky and needs to be adjusted to fit server internals
-                  my $ob = $pl->ob;
-
-                  my $pl_ref = $pl->refcnt_cnt;
-                  my $ob_ref = $ob->refcnt_cnt;
-
-                  ## pl_ref == $pl + ob->contr   + %cf::PLAYER
-                  ## ob_ref == $ob + pl->observe + simply being an object
-                  if ($pl_ref == 3 && $ob_ref == 3) {
-                     warn "player-scheduler destroy ", $ob->name;#d#
-
-                     # remove from sight and get fresh "copies"
-                     $pl = delete $cf::PLAYER{$ob->name};
-                     $ob = $pl->ob;
-
-                     $pl->destroy; # destroys $ob
-                  } else {
-                     my $a_ = $pl->refcnt;#d#
-                     my $b_ = $ob->refcnt;#d#
-
-                     warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
-                  }
-               }
-            }
-         };
-         warn $@ if $@;
-         Coro::cede;
-      };
-   }
-};
-
-$SCHEDULER->prio (1);
-