#define _GNU_SOURCE
#include <unistd.h>
#include <stdlib.h>
-#include <malloc.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/ip6.h>
#include <arpa/inet.h>
+#include <sys/un.h>
#include <errno.h>
#include <string.h>
#include <stdarg.h>
struct uiuser *users = NULL;
struct uidata *actives = NULL;
-struct socket *uisocket = NULL;
+struct socket *tcpsocket = NULL;
+struct socket *unixsocket = NULL;
+static time_t starttime;
static wchar_t *quoteword(wchar_t *word)
{
if(!memcmp(&((struct sockaddr_in6 *)sk->remote)->sin6_addr, &mv4lo, sizeof(in6addr_loopback)))
valid = 1;
break;
+ case AF_UNIX:
+ valid = 1;
+ break;
default:
valid = 0;
break;
prev = NULL;
for(mech = mechs; mech != NULL; mech = mech->next)
{
- if(mech->enabled)
+ if(mech->enabled && authavailable(mech, sk))
{
if(prev != NULL)
sq(sk, 1, L"200", prev->name, NULL);
return;
}
free(buf);
- switch(authenticate(data->auth, NULL))
+ switch(authenticate(data->auth, sk, NULL))
{
case AUTH_SUCCESS:
data->userinfo = finduser(data->username);
sq(sk, 0, L"507", L"Data not expected", NULL);
return;
}
- switch(authenticate(data->auth, buf))
+ switch(authenticate(data->auth, sk, buf))
{
case AUTH_SUCCESS:
data->userinfo = finduser(data->username);
args = NULL;
for(i = 3; i < argc - 1; i += 2)
newwcspair(argv[i], argv[i + 1], &args);
- fn = fnetinitconnect(argv[1], buf, args);
+ fn = fnetinitconnect(argv[1], data->userinfo->name, buf, args);
err = errno;
free(buf);
if(fn == NULL)
sq(sk, 0, L"510", L"No such node", NULL);
return;
}
+ if(wpfind(fn->args, L"locked") && !((data->userinfo->perms & PERM_ADMIN) || !wcscmp(data->userinfo->name, fn->owner)))
+ {
+ sq(sk, 0, L"502", L"This node is locked and you are neither administrator nor its owner", NULL);
+ return;
+ }
killfnetnode(fn);
unlinkfnetnode(fn);
}
} else {
for(peer = fn->peers; peer != NULL; peer = peer->next)
{
- sq(sk, 2 | ((peer->next != NULL)?1:0), L"200", peer->id, peer->nick, NULL);
+ sq(sk, 2 | ((peer->next != NULL)?1:0), L"200", L"%%ls", peer->id, L"%%ls", peer->nick, NULL);
for(i = 0; i < peer->dinum; i++)
{
if(peer->peerdi[i].datum->datatype == FNPD_INT)
sq(sk, 2, peer->peerdi[i].datum->id, buf, NULL);
}
if((peer->peerdi[i].datum->datatype == FNPD_STR) && (peer->peerdi[i].data.str != NULL))
- sq(sk, 2, peer->peerdi[i].datum->id, peer->peerdi[i].data.str, NULL);
+ sq(sk, 2, peer->peerdi[i].datum->id, L"%%ls", peer->peerdi[i].data.str, NULL);
}
sq(sk, 0, NULL);
}
sq(sk, 0, L"505", L"System error - Could not fork session", "Internal error", NULL);
return;
}
- if((filtercmd = findfile(icswcstombs(confgetstr("ui", "filtercmd"), NULL, NULL), "dcdl-filtercmd", pwent->pw_dir, 0)) == NULL)
+ filtercmd = findfile(icswcstombs(confgetstr("ui", "filtercmd"), NULL, NULL), NULL, 0);
+ if(filtercmd == NULL)
+ filtercmd = findfile("dc-filtercmd", pwent->pw_dir, 0);
+ if(filtercmd == NULL)
{
flog(LOG_WARNING, "could not find filtercmd executable for user %s", pwent->pw_name);
sq(sk, 0, L"505", L"System error - Could not fork session", L"Could not find filtercmd executable", NULL);
havepriv(PERM_TRANS);
buf1 = swprintf2(L"%lli", bytesdownload);
buf2 = swprintf2(L"%lli", bytesupload);
- sq(sk, 0, L"200", L"%%ls", buf1, L"%%ls", buf2, NULL);
+ sq(sk, 0, L"200", L"down", L"%%ls", buf1, L"up", L"%%ls", buf2, NULL);
free(buf1);
free(buf2);
}
sq(sk, 0, L"200", L"Message sent", NULL);
}
+static void cmd_uptime(struct socket *sk, struct uidata *data, int argc, wchar_t **argv)
+{
+ sq(sk, 0, L"200", L"%%i", time(NULL) - starttime, NULL);
+}
+
#undef haveargs
#undef havepriv
{L"transstatus", cmd_transstatus},
{L"register", cmd_register},
{L"sendmsg", cmd_sendmsg},
+ {L"uptime", cmd_uptime},
{NULL, NULL}
};
}
}
-static int portupdate(struct configvar *var, void *uudata)
+static struct sockaddr_un *makeunixname(void)
+{
+ static struct sockaddr_un buf;
+ char *val;
+ struct passwd *pwd;
+ uid_t uid;
+
+ memset(&buf, 0, sizeof(buf));
+ buf.sun_family = PF_UNIX;
+ if((val = icswcstombs(confgetstr("ui", "unixsock"), NULL, NULL)) == NULL) {
+ flog(LOG_WARNING, "could not map Unix socket name into local charset: %s", strerror(errno));
+ return(NULL);
+ }
+ if(!strcmp(val, "none"))
+ return(NULL);
+ if(!strcmp(val, "default"))
+ {
+ if((uid = getuid()) == 0)
+ {
+ strcpy(buf.sun_path, "/var/run/doldacond.sock");
+ return(&buf);
+ } else {
+ if((pwd = getpwuid(uid)) == NULL)
+ {
+ flog(LOG_ERR, "could not get passwd entry for current user: %s", strerror(errno));
+ return(NULL);
+ }
+ strcpy(buf.sun_path, "/tmp/doldacond-");
+ strcat(buf.sun_path, pwd->pw_name);
+ return(&buf);
+ }
+ }
+ if(strchr(val, '/'))
+ {
+ strcpy(buf.sun_path, val);
+ return(&buf);
+ }
+ flog(LOG_WARNING, "invalid Unix socket name: %s", val);
+ return(NULL);
+}
+
+static int tcpportupdate(struct configvar *var, void *uudata)
+{
+ struct socket *newsock;
+
+ newsock = NULL;
+ if((var->val.num != -1) && ((newsock = netcstcplisten(var->val.num, 1, uiaccept, NULL)) == NULL))
+ {
+ flog(LOG_WARNING, "could not create new TCP UI socket, reverting to old: %s", strerror(errno));
+ return(0);
+ }
+ if(tcpsocket != NULL)
+ {
+ putsock(tcpsocket);
+ tcpsocket = NULL;
+ }
+ tcpsocket = newsock;
+ return(0);
+}
+
+static int unixsockupdate(struct configvar *var, void *uudata)
{
struct socket *newsock;
+ struct sockaddr_un *un;
- if((uisocket = netcstcplisten(var->val.num, 1, uiaccept, NULL)) == NULL)
+ newsock = NULL;
+ if(((un = makeunixname()) != NULL) && ((newsock = netcslistenlocal(SOCK_STREAM, (struct sockaddr *)un, sizeof(*un), uiaccept, NULL)) == NULL))
{
- flog(LOG_WARNING, "could not create new UI socket, reverting to old: %s", strerror(errno));
+ flog(LOG_WARNING, "could not create new Unix UI socket, reverting to old: %s", strerror(errno));
return(0);
}
- if(uisocket != NULL)
- putsock(uisocket);
- uisocket = newsock;
+ if(unixsocket != NULL)
+ {
+ putsock(unixsocket);
+ unixsocket = NULL;
+ }
+ unixsocket = newsock;
return(0);
}
static int init(int hup)
{
struct uiuser *user, *next;
+ struct sockaddr_un *un;
if(hup)
{
}
if(!hup)
{
- if(uisocket != NULL)
- putsock(uisocket);
- if((uisocket = netcstcplisten(confgetint("ui", "port"), 1, uiaccept, NULL)) == NULL)
+ starttime = time(NULL);
+ if((confgetint("ui", "port") != -1) && ((tcpsocket = netcstcplisten(confgetint("ui", "port"), 1, uiaccept, NULL)) == NULL))
+ {
+ flog(LOG_CRIT, "could not create TCP UI socket: %s", strerror(errno));
+ return(1);
+ }
+ CBREG(confgetvar("ui", "port"), conf_update, tcpportupdate, NULL, NULL);
+ if(((un = makeunixname()) != NULL) && ((unixsocket = netcslistenlocal(SOCK_STREAM, (struct sockaddr *)un, sizeof(*un), uiaccept, NULL)) == NULL))
{
- flog(LOG_CRIT, "could not create UI socket: %s", strerror(errno));
+ flog(LOG_CRIT, "could not create Unix UI socket: %s", strerror(errno));
return(1);
}
- CBREG(confgetvar("ui", "port"), conf_update, portupdate, NULL, NULL);
+ CBREG(confgetvar("ui", "unixsock"), conf_update, unixsockupdate, NULL, NULL);
GCBREG(newfncb, newfnetnode, NULL);
GCBREG(newtransfercb, newtransfernotify, NULL);
}
{
while(users != NULL)
freeuser(users);
+ if(tcpsocket != NULL)
+ putsock(tcpsocket);
+ if(unixsocket != NULL)
+ putsock(unixsocket);
}
static struct configvar myvars[] =
{
+ /** If true, UI connections will only be accepted from localhost
+ * addresses (127.0.0.1, ::1 or ::ffff:127.0.0.1). Unless you are
+ * completely sure that you know what you are doing, never turn
+ * this off when auth.authless is on. */
{CONF_VAR_BOOL, "onlylocal", {.num = 1}},
+ /** The TCP port number on which to accept UI client connections,
+ * or -1 to not listen on TCP. */
{CONF_VAR_INT, "port", {.num = 1500}},
+ /**
+ * Controls the the name to use for the Unix socket on which to
+ * accept UI client connections. If the name contains a slash, it
+ * is treated as a file name to bind on. If the name is "default",
+ * the file name will be "/var/run/doldacond.sock" if doldacond
+ * runs with UID == 0, or "/tmp/doldacond-NAME" otherwise, where
+ * NAME is the user name of the UID which doldacond runs as. If
+ * the name is "none", no Unix socket will be used. Otherwise, an
+ * error is signaled.
+ */
+ {CONF_VAR_STRING, "unixsock", {.str = L"default"}},
+ /** The TOS value to use for UI connections (see the TOS VALUES
+ * section). */
{CONF_VAR_INT, "uitos", {.num = SOCK_TOS_MINDELAY}},
+ /** The name of the filtercmd script (see the FILES section for
+ * lookup information). */
{CONF_VAR_STRING, "filtercmd", {.str = L"dc-filtercmd"}},
{CONF_VAR_END}
};
Dolda2000 GitWeb / doldaconnect.git / blobdiff