]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/servercommand.cpp
Add server-side enforcement of the 'fast' privilege; also fix client checking 'fly...
[dragonfireclient.git] / src / servercommand.cpp
index e2e84bacb000945e4bf2ac08a392217cc8045fea..f6088925ea851d4067c7feac43b0b84c15b1cdd6 100644 (file)
@@ -20,6 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "utility.h"
 #include "settings.h"
 #include "main.h" // For g_settings
+#include "content_sao.h"
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 
@@ -37,98 +38,6 @@ void cmd_me(std::wostringstream &os,
        ctx->flags |= SEND_TO_OTHERS | SEND_NO_PREFIX;
 }
 
-void cmd_privs(std::wostringstream &os,
-       ServerCommandContext *ctx)
-{
-       if(ctx->parms.size() == 1)
-       {
-               // Show our own real privs, without any adjustments
-               // made for admin status
-               os<<L"-!- " + narrow_to_wide(privsToString(
-                               ctx->server->getPlayerAuthPrivs(ctx->player->getName())));
-               return;
-       }
-
-       if((ctx->privs & PRIV_PRIVS) == 0)
-       {
-               os<<L"-!- You don't have permission to do that";
-               return;
-       }
-               
-       Player *tp = ctx->env->getPlayer(wide_to_narrow(ctx->parms[1]).c_str());
-       if(tp == NULL)
-       {
-               os<<L"-!- No such player";
-               return;
-       }
-       
-       os<<L"-!- " + narrow_to_wide(privsToString(ctx->server->getPlayerAuthPrivs(tp->getName())));
-}
-
-void cmd_grantrevoke(std::wostringstream &os,
-       ServerCommandContext *ctx)
-{
-       if(ctx->parms.size() != 3)
-       {
-               os<<L"-!- Missing parameter";
-               return;
-       }
-
-       if((ctx->privs & PRIV_PRIVS) == 0)
-       {
-               os<<L"-!- You don't have permission to do that";
-               return;
-       }
-
-       u64 newprivs = stringToPrivs(wide_to_narrow(ctx->parms[2]));
-       if(newprivs == PRIV_INVALID)
-       {
-               os<<L"-!- Invalid privileges specified";
-               return;
-       }
-
-       Player *tp = ctx->env->getPlayer(wide_to_narrow(ctx->parms[1]).c_str());
-       if(tp == NULL)
-       {
-               os<<L"-!- No such player";
-               return;
-       }
-       
-       std::string playername = wide_to_narrow(ctx->parms[1]);
-       u64 privs = ctx->server->getPlayerAuthPrivs(playername);
-
-       if(ctx->parms[0] == L"grant"){
-               privs |= newprivs;
-               actionstream<<ctx->player->getName()<<" grants "
-                               <<wide_to_narrow(ctx->parms[2])<<" to "
-                               <<playername<<std::endl;
-
-               std::wstring msg;
-               msg += narrow_to_wide(ctx->player->getName());
-               msg += L" granted you the privilege \"";
-               msg += ctx->parms[2];
-               msg += L"\"";
-               ctx->server->notifyPlayer(playername.c_str(), msg);
-       } else {
-               privs &= ~newprivs;
-               actionstream<<ctx->player->getName()<<" revokes "
-                               <<wide_to_narrow(ctx->parms[2])<<" from "
-                               <<playername<<std::endl;
-
-               std::wstring msg;
-               msg += narrow_to_wide(ctx->player->getName());
-               msg += L" revoked from you the privilege \"";
-               msg += ctx->parms[2];
-               msg += L"\"";
-               ctx->server->notifyPlayer(playername.c_str(), msg);
-       }
-       
-       ctx->server->setPlayerAuthPrivs(playername, privs);
-       
-       os<<L"-!- Privileges change to ";
-       os<<narrow_to_wide(privsToString(privs));
-}
-
 void cmd_time(std::wostringstream &os,
        ServerCommandContext *ctx)
 {
@@ -137,8 +46,8 @@ void cmd_time(std::wostringstream &os,
                os<<L"-!- Missing parameter";
                return;
        }
-
-       if((ctx->privs & PRIV_SETTIME) ==0)
+       
+       if(!ctx->server->checkPriv(ctx->player->getName(), "settime"))
        {
                os<<L"-!- You don't have permission to do that";
                return;
@@ -155,7 +64,7 @@ void cmd_time(std::wostringstream &os,
 void cmd_shutdown(std::wostringstream &os,
        ServerCommandContext *ctx)
 {
-       if((ctx->privs & PRIV_SERVER) ==0)
+       if(!ctx->server->checkPriv(ctx->player->getName(), "server"))
        {
                os<<L"-!- You don't have permission to do that";
                return;
@@ -173,7 +82,7 @@ void cmd_shutdown(std::wostringstream &os,
 void cmd_setting(std::wostringstream &os,
        ServerCommandContext *ctx)
 {
-       if((ctx->privs & PRIV_SERVER) ==0)
+       if(!ctx->server->checkPriv(ctx->player->getName(), "server"))
        {
                os<<L"-!- You don't have permission to do that";
                return;
@@ -194,47 +103,9 @@ void cmd_setting(std::wostringstream &os,
        os<< L"-!- Setting changed and configuration saved.";
 }
 
-void cmd_teleport(std::wostringstream &os,
-       ServerCommandContext *ctx)
-{
-       if((ctx->privs & PRIV_TELEPORT) ==0)
-       {
-               os<<L"-!- You don't have permission to do that";
-               return;
-       }
-
-       if(ctx->parms.size() != 2)
-       {
-               os<<L"-!- Missing parameter";
-               return;
-       }
-
-       std::vector<std::wstring> coords = str_split(ctx->parms[1], L',');
-       if(coords.size() != 3)
-       {
-               os<<L"-!- You can only specify coordinates currently";
-               return;
-       }
-
-       v3f dest(stoi(coords[0])*10, stoi(coords[1])*10, stoi(coords[2])*10);
-
-       actionstream<<ctx->player->getName()<<" teleports from "
-                       <<PP(ctx->player->getPosition()/BS)<<" to "
-                       <<PP(dest/BS)<<std::endl;
-
-       //ctx->player->setPosition(dest);
-
-       // Use the ServerActiveObject interface of ServerRemotePlayer
-       ServerRemotePlayer *srp = static_cast<ServerRemotePlayer*>(ctx->player);
-       srp->setPos(dest);
-       ctx->server->SendMovePlayer(ctx->player);
-
-       os<< L"-!- Teleported.";
-}
-
 void cmd_banunban(std::wostringstream &os, ServerCommandContext *ctx)
 {
-       if((ctx->privs & PRIV_BAN) == 0)
+       if(!ctx->server->checkPriv(ctx->player->getName(), "ban"))
        {
                os<<L"-!- You don't have permission to do that";
                return;
@@ -281,62 +152,10 @@ void cmd_banunban(std::wostringstream &os, ServerCommandContext *ctx)
        }
 }
 
-void cmd_setclearpassword(std::wostringstream &os,
-       ServerCommandContext *ctx)
-{
-       if((ctx->privs & PRIV_PASSWORD) == 0)
-       {
-               os<<L"-!- You don't have permission to do that";
-               return;
-       }
-
-       std::string playername;
-       std::wstring password;
-
-       if(ctx->parms[0] == L"setpassword")
-       {
-               if(ctx->parms.size() != 3)
-               {
-                       os<<L"-!- Missing parameter";
-                       return;
-               }
-
-               playername = wide_to_narrow(ctx->parms[1]);
-               password = ctx->parms[2];
-
-               actionstream<<ctx->player->getName()<<" sets password of "
-                       <<playername<<std::endl;
-       }
-       else
-       {
-               // clearpassword
-
-               if(ctx->parms.size() != 2)
-               {
-                       os<<L"-!- Missing parameter";
-                       return;
-               }
-
-               playername = wide_to_narrow(ctx->parms[1]);
-               password = L"";
-
-               actionstream<<ctx->player->getName()<<" clears password of"
-                       <<playername<<std::endl;
-       }
-
-       ctx->server->setPlayerPassword(playername, password);
-
-       std::wostringstream msg;
-       msg<<ctx->player->getName()<<L" changed your password";
-       ctx->server->notifyPlayer(playername.c_str(), msg.str());
-
-       os<<L"-!- Password change for "<<narrow_to_wide(playername)<<" successful";
-}
-
 void cmd_clearobjects(std::wostringstream &os,
        ServerCommandContext *ctx)
 {
-       if((ctx->privs & PRIV_SERVER) ==0)
+       if(!ctx->server->checkPriv(ctx->player->getName(), "server"))
        {
                os<<L"-!- You don't have permission to do that";
                return;
@@ -369,43 +188,16 @@ std::wstring processServerCommand(ServerCommandContext *ctx)
        std::wostringstream os(std::ios_base::binary);
        ctx->flags = SEND_TO_SENDER;    // Default, unless we change it.
 
-       u64 privs = ctx->privs;
-
-       if(ctx->parms.size() == 0 || ctx->parms[0] == L"help")
-       {
-               os<<L"-!- Available commands: ";
-               os<<L"me status privs";
-               if(privs & PRIV_SERVER)
-                       os<<L" shutdown setting clearobjects";
-               if(privs & PRIV_SETTIME)
-                       os<<L" time";
-               if(privs & PRIV_TELEPORT)
-                       os<<L" teleport";
-               if(privs & PRIV_PRIVS)
-                       os<<L" grant revoke";
-               if(privs & PRIV_BAN)
-                       os<<L" ban unban";
-               if(privs & PRIV_PASSWORD)
-                       os<<L" setpassword clearpassword";
-       }
-       else if(ctx->parms[0] == L"status")
+       if(ctx->parms[0] == L"status")
                cmd_status(os, ctx);
-       else if(ctx->parms[0] == L"privs")
-               cmd_privs(os, ctx);
-       else if(ctx->parms[0] == L"grant" || ctx->parms[0] == L"revoke")
-               cmd_grantrevoke(os, ctx);
        else if(ctx->parms[0] == L"time")
                cmd_time(os, ctx);
        else if(ctx->parms[0] == L"shutdown")
                cmd_shutdown(os, ctx);
        else if(ctx->parms[0] == L"setting")
                cmd_setting(os, ctx);
-       else if(ctx->parms[0] == L"teleport")
-               cmd_teleport(os, ctx);
        else if(ctx->parms[0] == L"ban" || ctx->parms[0] == L"unban")
                cmd_banunban(os, ctx);
-       else if(ctx->parms[0] == L"setpassword" || ctx->parms[0] == L"clearpassword")
-               cmd_setclearpassword(os, ctx);
        else if(ctx->parms[0] == L"me")
                cmd_me(os, ctx);
        else if(ctx->parms[0] == L"clearobjects")