]> git.pond.sub.org Git - empserver/blobdiff - src/lib/player/login.c
Update known contributors comments
[empserver] / src / lib / player / login.c
index 3f7aa9bc9d1c35f90d861095fa330417c9ea0fa0..28b5311c09839bbdcdbe82097cdfa196c03bb59d 100644 (file)
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  login.c: Allow the player to login
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2004-2008
+ *     Ron Koenderink, 2005-2009
  */
 
-#include <string.h>
-#include "prototypes.h"
-#include "misc.h"
-#include "proto.h"
-#include "player.h"
+#include <config.h>
+
 #include "com.h"
-#include "empthread.h"
 #include "empio.h"
-#include "nsc.h"
+#include "empthread.h"
+#include "file.h"
+#include "match.h"
+#include "misc.h"
 #include "nat.h"
+#include "nsc.h"
 #include "optlist.h"
-#include "file.h"
-#include "subs.h"
-#include "common.h"
-#include "gen.h"
-
-#ifdef aix
-#include <unistd.h>
-#endif /* aix */
-#if !defined(_WIN32)
-#include <netinet/in.h>
-#endif
-#include <errno.h>
+#include "player.h"
+#include "proto.h"
+#include "prototypes.h"
 
-extern struct cmndstr login_coms[];
+static int client_cmd(void);
+static int coun_cmd(void);
+static int kill_cmd(void);
+static int options_cmd(void);
+static int pass_cmd(void);
+static int play_cmd(void);
+static int quit_cmd(void);
+static int sanc_cmd(void);
+static int user_cmd(void);
 
+static struct cmndstr login_coms[] = {
+    {"client client-id...", 0, client_cmd, 0, 0},
+    {"coun country", 0, coun_cmd, 0, 0},
+    {"kill", 0, kill_cmd, 0, 0},
+    {"options option=value...", 0, options_cmd, 0, 0},
+    {"pass password", 0, pass_cmd, 0, 0},
+    {"play [user [country [password]]]", 0, play_cmd, 0, 0},
+    {"quit", 0, quit_cmd, 0, 0},
+    {"sanc", 0, sanc_cmd, 0, 0},
+    {"user name", 0, user_cmd, 0, 0},
+    {0, 0, 0, 0, 0}
+};
 
 /*ARGSUSED*/
 void
 player_login(void *ud)
 {
-    s_char buf[128];
-    s_char space[128];
+    char buf[128];
+    char space[128];
     int ac;
     int cmd;
+    int res;
 
     player->proc = empth_self();
 
     pr_id(player, C_INIT, "Empire server ready\n");
 
-    while (!io_eof(player->iop) && !io_error(player->iop)) {
+    while (player->state != PS_SHUTDOWN) {
        io_output(player->iop, IO_WAIT);
        if (io_gets(player->iop, buf, sizeof(buf)) < 0) {
-           io_input(player->iop, IO_WAIT);
+           res = io_input(player->iop, IO_WAIT);
+           if (res <= 0) {
+               if (res == 0 && !io_eof(player->iop))
+                   pr_id(player, C_DATA, "idle connection terminated\n");
+               break;
+           }
            continue;
        }
-       ac = parse(buf, player->argp, NULL, space, NULL);
-       cmd = comtch(player->argp[0], login_coms, 0, 0);
+       ac = parse(buf, space, player->argp, NULL, NULL, NULL);
+       cmd = comtch(player->argp[0], login_coms, 0);
        if (cmd < 0) {
            pr_id(player, C_BADCMD, "Command %s not found\n", player->argp[0]);
            continue;
@@ -95,12 +114,10 @@ player_login(void *ud)
        default:
            break;
        }
-       if (player->state >= PS_SHUTDOWN)
-           break;
     }
     player->state = PS_SHUTDOWN;
     if (!io_eof(player->iop)) {
-       (void)pr_player(player, C_EXIT, "so long...\n");
+       pr_id(player, C_EXIT, "so long...\n");
        io_noblocking(player->iop, 0);
        while (io_output(player->iop, IO_WAIT) > 0) ;
     }
@@ -112,17 +129,23 @@ player_login(void *ud)
 static int
 client_cmd(void)
 {
-    int i;
+    int i, sz;
+    char *p, *end;
 
     if (!player->argp[1])
        return RET_SYN;
 
+    p = player->client;
+    end = player->client + sizeof(player->client) - 1;
     for (i = 1; player->argp[i]; ++i) {
        if (i > 1)
-           strncat(player->client, " ", sizeof(player->client) - 1);
-       strncat(player->client, player->argp[i], sizeof(player->client) - 1);
+           *p++ = ' ';
+       sz = strlen(player->argp[i]);
+       sz = MIN(sz, end - p);
+       memcpy(p, player->argp[i], sz);
+       p += sz;
     }
-    player->client[sizeof(player->client) - 1] = '\0';
+    *p = 0;
     pr_id(player, C_CMDOK, "talking to %s\n", player->client);
     return RET_OK;
 }
@@ -151,8 +174,8 @@ sanc_cmd(void)
     }
 
     snxtitem_all(&ni, EF_NATION);
-    while (nxtitem(&ni, (s_char *)&nat)) {
-       if (nat.nat_stat != (STAT_INUSE | STAT_SANCT))
+    while (nxtitem(&ni, &nat)) {
+       if (nat.nat_stat != STAT_SANCT)
            continue;
        if (first) {
            pr_id(player, C_DATA,
@@ -177,10 +200,10 @@ coun_cmd(void)
        return RET_SYN;
     if (natbyname(player->argp[1], &cnum) < 0) {
        pr_id(player, C_CMDERR, "country %s does not exist\n", player->argp[1]);
-       return 0;
+       return RET_FAIL;
     }
     player->cnum = cnum;
-    player->validated = 0;
+    player->authenticated = 0;
     pr_id(player, C_CMDOK, "country name %s\n", player->argp[1]);
     return 0;
 }
@@ -190,7 +213,7 @@ pass_cmd(void)
 {
     if (!player->argp[1])
        return RET_SYN;
-    if (player->cnum == 255) {
+    if (player->cnum == NATID_BAD) {
        pr_id(player, C_CMDERR, "need country first\n");
        return RET_FAIL;
     }
@@ -200,12 +223,89 @@ pass_cmd(void)
                 praddr(player), player->cnum, player->argp[1]);
        return RET_FAIL;
     }
-    player->validated++;
+    player->authenticated = 1;
     pr_id(player, C_CMDOK, "password ok\n");
     logerror("%s using country #%d", praddr(player), player->cnum);
     return RET_OK;
 }
 
+static int
+options_cmd(void)
+{
+    /*
+     * The option mechanism allows arbitrary string values, but so far
+     * all options are flags in struct player.  Should be easy to
+     * generalize if needed.
+     */
+    struct logoptstr {
+       char *name;
+       int val;
+    };
+    static struct logoptstr login_opts[] = {
+       { "utf-8", PF_UTF8 },
+       { NULL, 0 }
+    };
+    char **ap;
+    char *p;
+    int opt;
+    unsigned i;
+
+    if (!player->argp[1]) {
+       for (i = 0; login_opts[i].name; ++i)
+           pr_id(player, C_DATA, "%s=%d\n",
+                 login_opts[i].name,
+                 (player->flags & login_opts[i].val) != 0);
+       pr_id(player, C_CMDOK, "\n");
+       return RET_OK;
+    }
+
+    for (ap = player->argp+1; *ap; ++ap) {
+       p = strchr(*ap, '=');
+       if (p)
+           *p++ = 0;
+       opt = stmtch(*ap, login_opts,
+                    offsetof(struct logoptstr, name),
+                    sizeof(struct logoptstr));
+       if (opt < 0) {
+           pr_id(player, C_BADCMD, "Option %s not found\n", *ap);
+           return RET_FAIL;
+       }
+       if (!p || atoi(p))
+           player->flags |= login_opts[opt].val;
+       else
+           player->flags &= ~login_opts[opt].val;
+    }
+
+    pr_id(player, C_CMDOK, "Accepted\n");
+
+    return RET_OK;
+}
+
+static int
+may_play(void)
+{
+    struct natstr *np;
+
+    if (player->cnum == NATID_BAD || !player->authenticated) {
+       pr_id(player, C_CMDERR, "need country and password\n");
+       return 0;
+    }
+    /* TODO strstr() cheesy, compare IP against IP/BITS ... */
+    np = getnatp(player->cnum);
+    if (np->nat_stat == STAT_GOD && *privip
+       && !strstr(privip, player->hostaddr)) {
+       logerror("Deity login from untrusted host attempted by %s",
+                praddr(player));
+       logerror("To allow this, add %s to econfig key privip",
+                player->hostaddr);
+       pr_id(player, C_EXIT,
+             "Deity login not allowed from this IP!"
+             "  See log for help on how to allow it.\n");
+       return 0;
+    }
+    return 1;
+}
+
 static int
 play_cmd(void)
 {
@@ -213,17 +313,18 @@ play_cmd(void)
     natid cnum;
     struct natstr *natp;
     char **ap;
+    char buf[128];
 
     ap = player->argp;
     if (*++ap) {
        strncpy(player->userid, *ap, sizeof(player->userid) - 1);
        player->userid[sizeof(player->userid) - 1] = '\0';
-       player->validated = 0;
+       player->authenticated = 0;
     }
     if (*++ap) {
        if (natbyname(*ap, &cnum) < 0) {
            pr_id(player, C_CMDERR, "country %s does not exist\n", *ap);
-           return 0;
+           return RET_FAIL;
        }
     }
     if (*++ap) {
@@ -234,28 +335,26 @@ play_cmd(void)
            return RET_FAIL;
        }
        player->cnum = cnum;
-       player->validated++;
+       player->authenticated = 1;
     }
-    if (player->cnum == 255 || !player->validated) {
-       pr_id(player, C_CMDERR, "need country and password\n");
+    if (!may_play())
        return RET_FAIL;
-    }
-    if ((other = player_find_other(player, (natid)player->cnum)) != 0) {
+    other = getplayer((natid)player->cnum);
+    if (other) {
        natp = getnatp(player->cnum);
-       if (natp->nat_stat != VIS) {
+       if (natp->nat_stat != STAT_VIS) {
            pr_id(player, C_EXIT, "country in use by %s\n", praddr(other));
        } else {
            pr_id(player, C_EXIT, "country in use\n");
        }
        return RET_FAIL;
     }
-    if (match_user(banfil, player)) {
-       logerror("Attempted login by BANNED host %s", praddr(player));
-       pr("Your login has been banned from this game\n");
-       io_shutdown(player->iop, IO_READ);
-       return RET_FAIL;
-    }
+    snprintf(buf, sizeof(buf), "Play#%d", player->cnum);
+    empth_set_name(empth_self(), buf);
+    logerror("%s logged in as country #%d", praddr(player), player->cnum);
+    pr_id(player, C_INIT, "%d\n", CLIENTPROTO);
     player_main(player);
+    logerror("%s logged out, country #%d", praddr(player), player->cnum);
     player->state = PS_SHUTDOWN;
     return RET_OK;
 }
@@ -265,42 +364,19 @@ kill_cmd(void)
 {
     struct player *other;
 
-    if (player->cnum == 255 || !player->validated) {
-       pr_id(player, C_CMDERR, "need country and password\n");
+    if (!may_play())
        return RET_FAIL;
-    }
-    /* XXX find cnum other than us */
-    if ((other = player_find_other(player, player->cnum)) == 0) {
+    other = getplayer(player->cnum);
+    if (!other) {
        pr_id(player, C_EXIT, "country not in use\n");
        return RET_FAIL;
     }
+    logerror("%s killed country #%d", praddr(player), player->cnum);
     io_shutdown(other->iop, IO_READ | IO_WRITE);
     pr_id(player, C_EXIT, "closed socket of offending job\n");
     return RET_OK;
 }
 
-static int
-list_cmd(void)
-{
-    struct player *lp;
-    int first = 1;
-
-    if (player->cnum != 0 || !player->validated) {
-       pr_id(player, C_CMDERR, "Permission denied\n");
-       return 0;
-    }
-    for (lp = player_next(0); lp != 0; lp = player_next(lp)) {
-       if (first) {
-           pr_id(player, C_DATA, "user@host\tcountry\tpid\n");
-           first = 0;
-       }
-       pr_id(player, C_DATA, "%s\t%d\n", praddr(lp), lp->cnum);
-    }
-    if (first == 0)
-       pr_id(player, C_DATA, "\n");
-    return 0;
-}
-
 static int
 quit_cmd(void)
 {
@@ -308,16 +384,3 @@ quit_cmd(void)
     io_shutdown(player->iop, IO_READ);
     return RET_OK;
 }
-
-struct cmndstr login_coms[] = {
-    {"list", 0, list_cmd, 0, 0},
-    {"client clientname [version info]", 0, client_cmd, 0, 0},
-    {"user username", 0, user_cmd, 0, 0},
-    {"sanc", 0, sanc_cmd, 0, 0},
-    {"coun countryname", 0, coun_cmd, 0, 0},
-    {"pass password", 0, pass_cmd, 0, 0},
-    {"play [user country pass]", 0, play_cmd, 0, 0},
-    {"quit ", 0, quit_cmd, 0, 0},
-    {"kill {self}", 0, kill_cmd, 0, 0},
-    {0, 0, 0, 0, 0}
-};