X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fui.c;h=a2ec7201b5256af82a04eabae20926ed5b3168b5;hb=5f151349b57b751c581446d7b2b512904578fc1d;hp=62daf218c0803c58014819875dcc46b446540adb;hpb=504ba854ababeea74e726976825959f068c1b48b;p=doldaconnect.git diff --git a/daemon/ui.c b/daemon/ui.c index 62daf21..a2ec720 100644 --- a/daemon/ui.c +++ b/daemon/ui.c @@ -128,11 +128,14 @@ struct uidata int tract:1; int trprog:1; int srch:1; + int msg:1; } b; int w; } notify; wchar_t *username; struct uiuser *userinfo; + int id; + wchar_t *regname; uid_t uid; struct notif *fnotif, *lnotif; char *fcmdbuf; @@ -144,7 +147,7 @@ struct uidata size_t inbufsize, indata; /* Wordset storage */ wchar_t **argv; - int argc, args; + size_t argc, args; /* WCS conversation stuff */ wchar_t *cb; /* Conversation buffer */ size_t cbsize, cbdata; @@ -159,6 +162,8 @@ struct uidata static int srcheta(struct search *srch, void *uudata); static int srchcommit(struct search *srch, void *uudata); static int srchres(struct search *srch, struct srchres *sr, void *uudata); +static struct notif *newnotif(struct uidata *data, int code, ...); +static void notifappend(struct notif *notif, ...); struct uiuser *users = NULL; struct uidata *actives = NULL; @@ -437,19 +442,20 @@ static void cmd_login(struct socket *sk, struct uidata *data, int argc, wchar_t if(data->uid == -1) { sq(sk, 0, L"506", L"Authentication error", NULL); - flog(LOG_INFO, "user %ls authenticated successfully, but no account existed", data->username); + flog(LOG_INFO, "user %ls authenticated successfully from %s, but no account existed", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); } else if((data->userinfo == NULL) || (data->userinfo->perms & PERM_DISALLOW)) { sq(sk, 0, L"506", L"Authentication error", NULL); - flog(LOG_INFO, "user %ls authenticated successfully, but was not authorized", data->username); + flog(LOG_INFO, "user %ls authenticated successfully from %s, but was not authorized", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); } else { sq(sk, 0, L"200", L"Welcome", NULL); - flog(LOG_INFO, "%ls (UID %i) logged in", data->username, data->uid); + flog(LOG_INFO, "%ls (UID %i) logged in from %s", data->username, data->uid, formataddress(sk->remote, sk->remotelen)); } break; case AUTH_DENIED: sq(sk, 0, L"506", L"Authentication error", L"%%ls", (data->auth->text == NULL)?L"":(data->auth->text), NULL); + flog(LOG_INFO, "authentication failed for %ls from %s", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); break; case AUTH_PASS: @@ -510,19 +516,20 @@ static void cmd_pass(struct socket *sk, struct uidata *data, int argc, wchar_t * if(data->uid == -1) { sq(sk, 0, L"506", L"Authentication error", NULL); - flog(LOG_INFO, "user %ls authenticated successfully, but no account existed", data->username); + flog(LOG_INFO, "user %ls authenticated successfully from %s, but no account existed", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); } else if((data->userinfo == NULL) || (data->userinfo->perms & PERM_DISALLOW)) { sq(sk, 0, L"506", L"Authentication error", NULL); - flog(LOG_INFO, "user %ls authenticated successfully, but was not authorized", data->username); + flog(LOG_INFO, "user %ls authenticated successfully from %s, but was not authorized", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); } else { sq(sk, 0, L"200", L"Welcome", NULL); - flog(LOG_INFO, "%ls (UID %i) logged in", data->username, data->uid); + flog(LOG_INFO, "%ls (UID %i) logged in from %s", data->username, data->uid, formataddress(sk->remote, sk->remotelen)); } break; case AUTH_DENIED: sq(sk, 0, L"506", L"Authentication error", L"%%ls", (data->auth->text == NULL)?L"":(data->auth->text), NULL); + flog(LOG_INFO, "authentication failed for %ls from %s", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); break; case AUTH_PASS: @@ -569,6 +576,11 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc haveargs(3); havepriv(PERM_FNETCTL); + for(i = 0, fn = fnetnodes; fn != NULL; i++, fn = fn->next); + if((confgetint("fnet", "maxnodes") > 0) && (i >= confgetint("fnet", "maxnodes"))) { + sq(sk, 0, L"515", L"Too many fnetnodes connected already", NULL); + return; + } if((buf = icwcstombs(argv[2], NULL)) == NULL) { sq(sk, 0, L"504", L"Could not convert data to locale charset", NULL); @@ -590,8 +602,8 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc } linkfnetnode(fn); fnetsetname(fn, argv[2]); + sq(sk, 0, L"200", L"%%i", fn->id, L"Connection under way", NULL); putfnetnode(fn); - sq(sk, 0, L"200", L"Connection under way", NULL); } static void cmd_lsnodes(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) @@ -605,7 +617,7 @@ static void cmd_lsnodes(struct socket *sk, struct uidata *data, int argc, wchar_ } for(fn = fnetnodes; fn != NULL; fn = fn->next) { - sq(sk, (fn->next != NULL)?1:0, L"200", L"%%i", fn->id, fn->fnet->name, (fn->name == NULL)?L"":fn->name, L"%%i", fn->numpeers, L"%%i", fn->state, NULL); + sq(sk, (fn->next != NULL)?1:0, L"200", L"%%i", fn->id, fn->fnet->name, (fn->name == NULL)?L"":fn->name, L"%%i", fn->numpeers, L"%%i", fn->state, L"%%ls", fn->pubid, NULL); } } @@ -850,6 +862,8 @@ static void cmd_notify(struct socket *sk, struct uidata *data, int argc, wchar_t data->notify.b.trprog = val; } else if(!wcscasecmp(argv[i], L"srch:act")) { data->notify.b.srch = val; + } else if(!wcscasecmp(argv[i], L"msg")) { + data->notify.b.msg = val; } } sq(sk, 0, L"200", L"Notification alteration succeeded", NULL); @@ -1117,7 +1131,7 @@ static void cmd_filtercmd(struct socket *sk, struct uidata *data, int argc, wcha 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)) == NULL) + if((filtercmd = findfile(icswcstombs(confgetstr("ui", "filtercmd"), NULL, NULL), "dcdl-filtercmd", pwent->pw_dir, 0)) == 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); @@ -1223,6 +1237,73 @@ static void cmd_transstatus(struct socket *sk, struct uidata *data, int argc, wc free(buf2); } +static void cmd_register(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) +{ + struct uidata *d2; + + haveargs(2); + if(data->userinfo == NULL) { + sq(sk, 0, L"502", L"Must be logged in", NULL); + return; + } + if(argv[1][0] == L'#') { + sq(sk, 0, L"509", L"Name must not begin with a hash sign", NULL); + return; + } + for(d2 = actives; d2 != NULL; d2 = d2->next) { + if((d2 != data) && d2->regname && !wcscmp(d2->regname, argv[1])) { + sq(sk, 0, L"516", L"Name already in use", NULL); + return; + } + } + if(data->regname != NULL) + free(data->regname); + data->regname = swcsdup(argv[1]); + sq(sk, 0, L"200", L"Registered", NULL); +} + +static void cmd_sendmsg(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) +{ + int i, rcptid; + struct uidata *rcpt; + wchar_t *myname; + struct notif *notif; + + haveargs(2); + if(data->userinfo == NULL) { + sq(sk, 0, L"502", L"Must be logged in", NULL); + return; + } + if(argv[1][0] == L'#') { + rcptid = wcstol(argv[1] + 1, NULL, 0); + for(rcpt = actives; rcpt != NULL; rcpt = rcpt->next) { + if(rcpt->id == rcptid) + break; + } + } else { + for(rcpt = actives; rcpt != NULL; rcpt = rcpt->next) { + if(rcpt->regname && !wcscmp(rcpt->regname, argv[1])) + break; + } + } + if(rcpt == NULL) { + sq(sk, 0, L"517", L"No such recipient", NULL); + return; + } + if(!rcpt->notify.b.msg) { + sq(sk, 0, L"518", L"Recipient not listening for messages", NULL); + return; + } + if(data->regname != NULL) + myname = swcsdup(data->regname); + else + myname = swprintf2(L"#%i", data->id); + notif = newnotif(rcpt, 640, NOTIF_STR, myname, NOTIF_END); + for(i = 2; i < argc; i++) + notifappend(notif, NOTIF_STR, argv[i], NOTIF_END); + sq(sk, 0, L"200", L"Message sent", NULL); +} + #undef haveargs #undef havepriv @@ -1259,6 +1340,8 @@ static struct command commands[] = {L"lstrarg", cmd_lstrarg}, {L"hashstatus", cmd_hashstatus}, {L"transstatus", cmd_transstatus}, + {L"register", cmd_register}, + {L"sendmsg", cmd_sendmsg}, {NULL, NULL} }; @@ -1434,6 +1517,8 @@ static void freeuidata(struct uidata *data) } if(data->auth != NULL) authputhandle(data->auth); + if(data->regname != NULL) + free(data->regname); if(data->username != NULL) { if(data->userinfo != NULL) @@ -1471,9 +1556,11 @@ static void queuecmd(struct uidata *data, struct command *cmd, int argc, wchar_t static struct uidata *newuidata(struct socket *sk) { struct uidata *data; + static int curid = 0; data = smalloc(sizeof(*data)); memset(data, 0, sizeof(*data)); + data->id = curid++; data->sk = sk; getsock(sk); data->inbuf = smalloc(1024); @@ -1922,7 +2009,7 @@ static int transferdestroyed(struct transfer *transfer, void *uudata) for(data = actives; data != NULL; data = data->next) { if(haspriv(data, PERM_TRANS) && data->notify.b.tract && ((transfer->owner == 0) || (transfer->owner == data->uid))) - newnotif(data, 617, NOTIF_ID, transfer->id, NOTIF_END); + newnotif(data, 617, NOTIF_ID, transfer->id, NOTIF_STR, (transfer->exitstatus == NULL)?L"":(transfer->exitstatus), NOTIF_END); } return(0); } @@ -2036,41 +2123,11 @@ static void preinit(int hup) } } -#ifdef HAVE_IPV6 -static struct sockaddr *getnameforport(int port, socklen_t *len) -{ - static struct sockaddr_in6 addr; - - memset(&addr, 0, sizeof(addr)); - addr.sin6_family = AF_INET6; - addr.sin6_port = htons(port); - addr.sin6_addr = in6addr_any; - if(len != NULL) - *len = sizeof(addr); - return((struct sockaddr *)&addr); -} -#else -static struct sockaddr *getnameforport(int port, socklen_t *len) -{ - static struct sockaddr_in addr; - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - if(len != NULL) - *len = sizeof(addr); - return((struct sockaddr *)&addr); -} -#endif - static int portupdate(struct configvar *var, void *uudata) { - struct sockaddr *addr; - socklen_t addrlen; struct socket *newsock; - addr = getnameforport(var->val.num, &addrlen); - if((uisocket = netcslistenlocal(SOCK_STREAM, addr, addrlen, uiaccept, NULL)) == NULL) + if((uisocket = netcstcplisten(var->val.num, 1, uiaccept, NULL)) == NULL) { flog(LOG_WARNING, "could not create new UI socket, reverting to old: %s", strerror(errno)); return(0); @@ -2083,8 +2140,6 @@ static int portupdate(struct configvar *var, void *uudata) static int init(int hup) { - struct sockaddr *addr; - socklen_t addrlen; struct uiuser *user, *next; if(hup) @@ -2100,8 +2155,7 @@ static int init(int hup) { if(uisocket != NULL) putsock(uisocket); - addr = getnameforport(confgetint("ui", "port"), &addrlen); - if((uisocket = netcslistenlocal(SOCK_STREAM, addr, addrlen, uiaccept, NULL)) == NULL) + if((uisocket = netcstcplisten(confgetint("ui", "port"), 1, uiaccept, NULL)) == NULL) { flog(LOG_CRIT, "could not create UI socket: %s", strerror(errno)); return(1);