X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/ba39faf632da43d64106536f256153c2092346e4..d42e98caaaf4f07c8d1252236f03eb68b8be4619:/server/server.c diff --git a/server/server.c b/server/server.c index 22cf454..18f6851 100644 --- a/server/server.c +++ b/server/server.c @@ -1,77 +1,31 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * - * This program is free software; you can redistribute it and/or modify + * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * along with this program. If not, see . */ -#include -#include "types.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "event.h" -#include "server.h" -#include "syscalls.h" -#include "queue.h" -#include "server-queue.h" -#include "play.h" -#include "log.h" -#include "mem.h" -#include "state.h" -#include "charset.h" -#include "split.h" -#include "configuration.h" -#include "hex.h" -#include "rights.h" -#include "trackdb.h" -#include "table.h" -#include "kvp.h" -#include "mixer.h" -#include "sink.h" -#include "authhash.h" -#include "plugin.h" -#include "printf.h" -#include "trackname.h" -#include "eventlog.h" -#include "defs.h" -#include "cache.h" -#include "unicode.h" -#include "cookies.h" -#include "mime.h" +#include "disorder-server.h" #ifndef NONCE_SIZE # define NONCE_SIZE 16 #endif +#ifndef CONFIRM_SIZE +# define CONFIRM_SIZE 10 +#endif + int volume_left, volume_right; /* last known volume */ /** @brief Accept all well-formed login attempts @@ -114,8 +68,15 @@ struct conn { char *cookie; /** @brief Connection rights */ rights_type rights; + /** @brief Next connection */ + struct conn *next; + /** @brief True if pending rescan had 'wait' set */ + int rescan_wait; }; +/** @brief Linked list of connections */ +static struct conn *connections; + static int reader_callback(ev_source *ev, ev_reader *reader, void *ptr, @@ -125,6 +86,16 @@ static int reader_callback(ev_source *ev, static const char *noyes[] = { "no", "yes" }; +/** @brief Remove a connection from the connection list */ +static void remove_connection(struct conn *c) { + struct conn **cc; + + for(cc = &connections; *cc && *cc != c; cc = &(*cc)->next) + ; + if(*cc) + *cc = c->next; +} + /** @brief Called when a connection's writer fails or is shut down * * If the connection still has a raeder that is cancelled. @@ -150,6 +121,7 @@ static int writer_error(ev_source attribute((unused)) *ev, } c->w = 0; ev_report(ev); + remove_connection(c); return 0; } @@ -169,6 +141,7 @@ static int reader_error(ev_source attribute((unused)) *ev, c->w = 0; c->r = 0; ev_report(ev); + remove_connection(c); return 0; } @@ -215,7 +188,7 @@ static int c_play(struct conn *c, char **vec, sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n"); return 1; } - q = queue_add(track, c->who, WHERE_BEFORE_RANDOM); + q = queue_add(track, c->who, WHERE_BEFORE_RANDOM, origin_picked); queue_write(); /* If we added the first track, and something is playing, then prepare the * new track. If nothing is playing then we don't bother as it wouldn't gain @@ -233,30 +206,22 @@ static int c_play(struct conn *c, char **vec, static int c_remove(struct conn *c, char **vec, int attribute((unused)) nvec) { struct queue_entry *q; - rights_type r; if(!(q = queue_find(vec[0]))) { sink_writes(ev_writer_sink(c->w), "550 no such track on the queue\n"); return 1; } - if(q->submitter) - if(!strcmp(q->submitter, c->who)) - r = RIGHT_REMOVE_MINE; - else - r = RIGHT_REMOVE_ANY; - else - r = RIGHT_REMOVE_RANDOM; - if(!(c->rights & r)) { + if(!right_removable(c->rights, c->who, q)) { + error(0, "%s attempted remove but lacks required rights", c->who); sink_writes(ev_writer_sink(c->w), - "550 Not authorized to remove that track\n"); + "510 Not authorized to remove that track\n"); return 1; } queue_remove(q, c->who); /* De-prepare the track. */ abandon(c->ev, q); - /* If we removed a random track then add another one. */ - if(q->state == playing_random) - add_random_track(); + /* See about adding a new random track */ + add_random_track(c->ev); /* Prepare whatever the next head track is. */ if(qhead.next != &qhead) prepare(c->ev, qhead.next); @@ -268,8 +233,6 @@ static int c_remove(struct conn *c, char **vec, static int c_scratch(struct conn *c, char **vec, int nvec) { - rights_type r; - if(!playing) { sink_writes(ev_writer_sink(c->w), "250 nothing is playing\n"); return 1; /* completed */ @@ -277,16 +240,10 @@ static int c_scratch(struct conn *c, /* TODO there is a bug here: if we specify an ID but it's not the currently * playing track then you will get 550 if you weren't authorized to scratch * the currently playing track. */ - if(playing->submitter) - if(!strcmp(playing->submitter, c->who)) - r = RIGHT_SCRATCH_MINE; - else - r = RIGHT_SCRATCH_ANY; - else - r = RIGHT_SCRATCH_RANDOM; - if(!(c->rights & r)) { + if(!right_scratchable(c->rights, c->who, playing)) { + error(0, "%s attempted scratch but lacks required rights", c->who); sink_writes(ev_writer_sink(c->w), - "550 Not authorized to scratch that track\n"); + "510 Not authorized to scratch that track\n"); return 1; } scratch(c->who, nvec == 1 ? vec[0] : 0); @@ -346,13 +303,107 @@ static int c_reconfigure(struct conn *c, return 1; /* completed */ } +static void finished_rescan(void *ru) { + struct conn *const c = ru; + + sink_writes(ev_writer_sink(c->w), "250 rescan completed\n"); + /* Turn this connection back on */ + ev_reader_enable(c->r); +} + +static void start_fresh_rescan(void *ru) { + struct conn *const c = ru; + + if(trackdb_rescan_underway()) { + /* Some other waiter beat us to it. However in this case we're happy to + * piggyback; the requirement is that a new rescan be started, not that it + * was _our_ rescan. */ + if(c->rescan_wait) { + /* We block until the rescan completes */ + trackdb_add_rescanned(finished_rescan, c); + } else { + /* We report that the new rescan has started */ + sink_writes(ev_writer_sink(c->w), "250 rescan initiated\n"); + /* Turn this connection back on */ + ev_reader_enable(c->r); + } + } else { + /* We are the first connection to get a callback so we must start a + * rescan. */ + if(c->rescan_wait) { + /* We want to block until the new rescan completes */ + trackdb_rescan(c->ev, 1/*check*/, finished_rescan, c); + } else { + /* We can report back immediately */ + trackdb_rescan(c->ev, 1/*check*/, 0, 0); + sink_writes(ev_writer_sink(c->w), "250 rescan initiated\n"); + /* Turn this connection back on */ + ev_reader_enable(c->r); + } + } +} + static int c_rescan(struct conn *c, - char attribute((unused)) **vec, - int attribute((unused)) nvec) { - info("S%x rescan by %s", c->tag, c->who); - trackdb_rescan(c->ev); - sink_writes(ev_writer_sink(c->w), "250 initiated rescan\n"); - return 1; /* completed */ + char **vec, + int nvec) { + int flag_wait = 0, flag_fresh = 0, n; + + /* Parse flags */ + for(n = 0; n < nvec; ++n) { + if(!strcmp(vec[n], "wait")) + flag_wait = 1; /* wait for rescan to complete */ +#if 0 + /* Currently disabled because untested (and hard to test). */ + else if(!strcmp(vec[n], "fresh")) + flag_fresh = 1; /* don't piggyback underway rescan */ +#endif + else { + sink_writes(ev_writer_sink(c->w), "550 unknown flag\n"); + return 1; /* completed */ + } + } + /* Report what was requested */ + info("S%x rescan by %s (%s %s)", c->tag, c->who, + flag_wait ? "wait" : "", + flag_fresh ? "fresh" : ""); + if(trackdb_rescan_underway()) { + if(flag_fresh) { + /* We want a fresh rescan but there is already one underway. Arrange a + * callback when it completes and then set off a new one. */ + c->rescan_wait = flag_wait; + trackdb_add_rescanned(start_fresh_rescan, c); + if(flag_wait) + return 0; + else { + sink_writes(ev_writer_sink(c->w), "250 rescan queued\n"); + return 1; + } + } else { + /* There's a rescan underway, and it's acceptable to piggyback on it */ + if(flag_wait) { + /* We want to block until completion. */ + trackdb_add_rescanned(finished_rescan, c); + return 0; + } else { + /* We don't want to block. So we just report that things are in + * hand. */ + sink_writes(ev_writer_sink(c->w), "250 rescan already underway\n"); + return 1; + } + } + } else { + /* No rescan is underway. fresh is therefore irrelevant. */ + if(flag_wait) { + /* We want to block until completion */ + trackdb_rescan(c->ev, 1/*check*/, finished_rescan, c); + return 0; + } else { + /* We don't want to block. */ + trackdb_rescan(c->ev, 1/*check*/, 0, 0); + sink_writes(ev_writer_sink(c->w), "250 rescan initiated\n"); + return 1; /* completed */ + } + } } static int c_version(struct conn *c, @@ -434,7 +485,7 @@ static int c_user(struct conn *c, } password = kvp_get(k, "password"); if(!password) password = ""; - if(parse_rights(kvp_get(k, "rights"), &rights)) { + if(parse_rights(kvp_get(k, "rights"), &rights, 1)) { error(0, "error parsing rights for %s", vec[0]); sink_writes(ev_writer_sink(c->w), "530 authentication failed\n"); return 1; @@ -446,10 +497,10 @@ static int c_user(struct conn *c, c->who = vec[0]; c->rights = rights; /* currently we only bother logging remote connections */ - if(strcmp(host, "local")) { + if(strcmp(host, "local")) info("S%x %s connected from %s", c->tag, vec[0], host); + else c->rights |= RIGHT__LOCAL; - } sink_writes(ev_writer_sink(c->w), "230 OK\n"); return 1; } @@ -605,9 +656,13 @@ static int c_allfiles(struct conn *c, static int c_get(struct conn *c, char **vec, int attribute((unused)) nvec) { - const char *v; + const char *v, *track; - if(vec[1][0] != '_' && (v = trackdb_get(vec[0], vec[1]))) + if(!(track = trackdb_resolve(vec[0]))) { + sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n"); + return 1; + } + if(vec[1][0] != '_' && (v = trackdb_get(track, vec[1]))) sink_printf(ev_writer_sink(c->w), "252 %s\n", quoteutf8(v)); else sink_writes(ev_writer_sink(c->w), "555 not found\n"); @@ -633,7 +688,13 @@ static int c_length(struct conn *c, static int c_set(struct conn *c, char **vec, int attribute((unused)) nvec) { - if(vec[1][0] != '_' && !trackdb_set(vec[0], vec[1], vec[2])) + const char *track; + + if(!(track = trackdb_resolve(vec[0]))) { + sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n"); + return 1; + } + if(vec[1][0] != '_' && !trackdb_set(track, vec[1], vec[2])) sink_writes(ev_writer_sink(c->w), "250 OK\n"); else sink_writes(ev_writer_sink(c->w), "550 not found\n"); @@ -644,8 +705,13 @@ static int c_prefs(struct conn *c, char **vec, int attribute((unused)) nvec) { struct kvp *k; + const char *track; - k = trackdb_get_all(vec[0]); + if(!(track = trackdb_resolve(vec[0]))) { + sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n"); + return 1; + } + k = trackdb_get_all(track); sink_writes(ev_writer_sink(c->w), "253 prefs follow\n"); for(; k; k = k->next) if(k->name[0] != '_') /* omit internal values */ @@ -658,6 +724,7 @@ static int c_prefs(struct conn *c, static int c_exists(struct conn *c, char **vec, int attribute((unused)) nvec) { + /* trackdb_exists() does its own alias checking */ sink_printf(ev_writer_sink(c->w), "252 %s\n", noyes[trackdb_exists(vec[0])]); return 1; } @@ -754,10 +821,11 @@ static int c_volume(struct conn *c, } rights = set ? RIGHT_VOLUME : RIGHT_READ; if(!(c->rights & rights)) { - sink_writes(ev_writer_sink(c->w), "530 Prohibited\n"); + error(0, "%s attempted to set volume but lacks required rights", c->who); + sink_writes(ev_writer_sink(c->w), "510 Prohibited\n"); return 1; } - if(mixer_control(&l, &r, set)) + if(mixer_control(-1/*as configured*/, &l, &r, set)) sink_writes(ev_writer_sink(c->w), "550 error accessing mixer\n"); else { sink_printf(ev_writer_sink(c->w), "252 %d %d\n", l, r); @@ -795,6 +863,7 @@ static int logging_reader_callback(ev_source attribute((unused)) *ev, c->w = 0; } c->r = 0; + remove_connection(c); } return 0; } @@ -805,8 +874,19 @@ static void logclient(const char *msg, void *user) { if(!c->w || !c->r) { /* This connection has gone up in smoke for some reason */ eventlog_remove(c->lo); + c->lo = 0; return; } + /* user_* messages are restricted */ + if(!strncmp(msg, "user_", 5)) { + /* They are only sent to admin users */ + if(!(c->rights & RIGHT_ADMIN)) + return; + /* They are not sent over TCP connections unless remote user-management is + * enabled */ + if(!config->remote_userman && !(c->rights & RIGHT__LOCAL)) + return; + } sink_printf(ev_writer_sink(c->w), "%"PRIxMAX" %s\n", (uintmax_t)time(0), msg); } @@ -849,20 +929,13 @@ static int c_log(struct conn *c, * @return 0 if move is prohibited, non-0 if it is allowed */ static int has_move_rights(struct conn *c, struct queue_entry **qs, int nqs) { - rights_type r = 0; - for(; nqs > 0; ++qs, --nqs) { struct queue_entry *const q = *qs; - if(q->submitter) - if(!strcmp(q->submitter, c->who)) - r |= RIGHT_MOVE_MINE; - else - r |= RIGHT_MOVE_ANY; - else - r |= RIGHT_MOVE_RANDOM; + if(!right_movable(c->rights, c->who, q)) + return 0; } - return (c->rights & r) == r; + return 1; } static int c_move(struct conn *c, @@ -876,8 +949,9 @@ static int c_move(struct conn *c, return 1; } if(!has_move_rights(c, &q, 1)) { + error(0, "%s attempted move but lacks required rights", c->who); sink_writes(ev_writer_sink(c->w), - "550 Not authorized to move that track\n"); + "510 Not authorized to move that track\n"); return 1; } n = queue_move(q, atoi(vec[1]), c->who); @@ -910,8 +984,9 @@ static int c_moveafter(struct conn *c, return 1; } if(!has_move_rights(c, qs, nvec)) { + error(0, "%s attempted moveafter but lacks required rights", c->who); sink_writes(ev_writer_sink(c->w), - "550 Not authorized to move those tracks\n"); + "510 Not authorized to move those tracks\n"); return 1; } queue_moveafter(q, nvec, qs, c->who); @@ -925,8 +1000,14 @@ static int c_moveafter(struct conn *c, static int c_part(struct conn *c, char **vec, int attribute((unused)) nvec) { + const char *track; + + if(!(track = trackdb_resolve(vec[0]))) { + sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n"); + return 1; + } sink_printf(ev_writer_sink(c->w), "252 %s\n", - quoteutf8(trackdb_getpart(vec[0], vec[1], vec[2]))); + quoteutf8(trackdb_getpart(track, vec[1], vec[2]))); return 1; } @@ -992,9 +1073,18 @@ static int c_nop(struct conn *c, static int c_new(struct conn *c, char **vec, int nvec) { - char **tracks = trackdb_new(0, nvec > 0 ? atoi(vec[0]) : INT_MAX); + int max, n; + char **tracks; + if(nvec > 0) + max = atoi(vec[0]); + else + max = INT_MAX; + if(max <= 0 || max > config->new_max) + max = config->new_max; + tracks = trackdb_new(0, max); sink_printf(ev_writer_sink(c->w), "253 New track list follows\n"); + n = 0; while(*tracks) { sink_printf(ev_writer_sink(c->w), "%s%s\n", **tracks == '.' ? "." : "", *tracks); @@ -1008,7 +1098,7 @@ static int c_new(struct conn *c, static int c_rtp_address(struct conn *c, char attribute((unused)) **vec, int attribute((unused)) nvec) { - if(config->speaker_backend == BACKEND_NETWORK) { + if(config->api == BACKEND_NETWORK) { sink_printf(ev_writer_sink(c->w), "252 %s %s\n", quoteutf8(config->broadcast.s[0]), quoteutf8(config->broadcast.s[1])); @@ -1041,14 +1131,15 @@ static int c_cookie(struct conn *c, return 1; } /* Log in */ - c->who = vec[0]; + c->who = user; c->cookie = vec[0]; c->rights = rights; - if(strcmp(host, "local")) { + if(strcmp(host, "local")) info("S%x %s connected with cookie from %s", c->tag, user, host); + else c->rights |= RIGHT__LOCAL; - } - sink_writes(ev_writer_sink(c->w), "230 OK\n"); + /* Response contains username so client knows who they are acting as */ + sink_printf(ev_writer_sink(c->w), "232 %s\n", quoteutf8(user)); return 1; } @@ -1077,8 +1168,23 @@ static int c_revoke(struct conn *c, static int c_adduser(struct conn *c, char **vec, - int attribute((unused)) nvec) { - if(trackdb_adduser(vec[0], vec[1], config->default_rights, + int nvec) { + const char *rights; + + if(!config->remote_userman && !(c->rights & RIGHT__LOCAL)) { + error(0, "S%x: remote adduser", c->tag); + sink_writes(ev_writer_sink(c->w), "550 Remote user management is disabled\n"); + return 1; + } + if(nvec > 2) { + rights = vec[2]; + if(parse_rights(vec[2], 0, 1)) { + sink_writes(ev_writer_sink(c->w), "550 Invalid rights list\n"); + return -1; + } + } else + rights = config->default_rights; + if(trackdb_adduser(vec[0], vec[1], rights, 0/*email*/, 0/*confirmation*/)) sink_writes(ev_writer_sink(c->w), "550 Cannot create user\n"); else @@ -1089,28 +1195,75 @@ static int c_adduser(struct conn *c, static int c_deluser(struct conn *c, char **vec, int attribute((unused)) nvec) { - if(trackdb_deluser(vec[0])) + struct conn *d; + + if(!config->remote_userman && !(c->rights & RIGHT__LOCAL)) { + error(0, "S%x: remote deluser", c->tag); + sink_writes(ev_writer_sink(c->w), "550 Remote user management is disabled\n"); + return 1; + } + if(trackdb_deluser(vec[0])) { sink_writes(ev_writer_sink(c->w), "550 Cannot delete user\n"); - else - sink_writes(ev_writer_sink(c->w), "250 User deleted\n"); + return 1; + } + /* Zap connections belonging to deleted user */ + for(d = connections; d; d = d->next) + if(!strcmp(d->who, vec[0])) + d->rights = 0; + sink_writes(ev_writer_sink(c->w), "250 User deleted\n"); return 1; } static int c_edituser(struct conn *c, char **vec, int attribute((unused)) nvec) { + struct conn *d; + + if(!config->remote_userman && !(c->rights & RIGHT__LOCAL)) { + error(0, "S%x: remote edituser", c->tag); + sink_writes(ev_writer_sink(c->w), "550 Remote user management is disabled\n"); + return 1; + } /* RIGHT_ADMIN can do anything; otherwise you can only set your own email * address and password. */ if((c->rights & RIGHT_ADMIN) || (!strcmp(c->who, vec[0]) && (!strcmp(vec[1], "email") || !strcmp(vec[1], "password")))) { - if(trackdb_edituserinfo(vec[0], vec[1], vec[2])) + if(trackdb_edituserinfo(vec[0], vec[1], vec[2])) { sink_writes(ev_writer_sink(c->w), "550 Failed to change setting\n"); - else - sink_writes(ev_writer_sink(c->w), "250 OK\n"); - } else - sink_writes(ev_writer_sink(c->w), "550 Restricted to administrators\n"); + return 1; + } + if(!strcmp(vec[1], "password")) { + /* Zap all connections for this user after a password change */ + for(d = connections; d; d = d->next) + if(!strcmp(d->who, vec[0])) + d->rights = 0; + } else if(!strcmp(vec[1], "rights")) { + /* Update rights for this user */ + rights_type r; + + if(!parse_rights(vec[2], &r, 1)) { + const char *new_rights = rights_string(r); + for(d = connections; d; d = d->next) { + if(!strcmp(d->who, vec[0])) { + /* Update rights */ + d->rights = r; + /* Notify any log connections */ + if(d->lo) + sink_printf(ev_writer_sink(d->w), + "%"PRIxMAX" rights_changed %s\n", + (uintmax_t)time(0), + quoteutf8(new_rights)); + } + } + } + } + sink_writes(ev_writer_sink(c->w), "250 OK\n"); + } else { + error(0, "%s attempted edituser but lacks required rights", c->who); + sink_writes(ev_writer_sink(c->w), "510 Restricted to administrators\n"); + } return 1; } @@ -1120,8 +1273,17 @@ static int c_userinfo(struct conn *c, struct kvp *k; const char *value; + /* We allow remote querying of rights so that clients can figure out what + * they're allowed to do */ + if(!config->remote_userman + && !(c->rights & RIGHT__LOCAL) + && strcmp(vec[1], "rights")) { + error(0, "S%x: remote userinfo %s %s", c->tag, vec[0], vec[1]); + sink_writes(ev_writer_sink(c->w), "550 Remote user management is disabled\n"); + return 1; + } /* RIGHT_ADMIN allows anything; otherwise you can only get your own email - * address and righst list. */ + * address and rights list. */ if((c->rights & RIGHT_ADMIN) || (!strcmp(c->who, vec[0]) && (!strcmp(vec[1], "email") @@ -1133,8 +1295,10 @@ static int c_userinfo(struct conn *c, sink_writes(ev_writer_sink(c->w), "555 Not set\n"); else sink_writes(ev_writer_sink(c->w), "550 No such user\n"); - } else - sink_writes(ev_writer_sink(c->w), "550 Restricted to administrators\n"); + } else { + error(0, "%s attempted userinfo but lacks required rights", c->who); + sink_writes(ev_writer_sink(c->w), "510 Restricted to administrators\n"); + } return 1; } @@ -1154,6 +1318,16 @@ static int c_users(struct conn *c, return 1; /* completed */ } +/** @brief Base64 mapping table for confirmation strings + * + * This is used with generic_to_base64() and generic_base64(). We cannot use + * the MIME table as that contains '+' and '=' which get quoted when + * URL-encoding. (The CGI still does the URL encoding but it is desirable to + * avoid it being necessary.) + */ +static const char confirm_base64_table[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789/.*"; + static int c_register(struct conn *c, char **vec, int attribute((unused)) nvec) { @@ -1162,11 +1336,12 @@ static int c_register(struct conn *c, int offset; /* The confirmation string is base64(username;nonce) */ - bufsize = strlen(vec[0]) + NONCE_SIZE + 2; + bufsize = strlen(vec[0]) + CONFIRM_SIZE + 2; buf = xmalloc_noptr(bufsize); offset = byte_snprintf(buf, bufsize, "%s;", vec[0]); - gcry_randomize(buf + offset, NONCE_SIZE, GCRY_STRONG_RANDOM); - cs = mime_to_base64((uint8_t *)buf, offset + NONCE_SIZE); + gcry_randomize(buf + offset, CONFIRM_SIZE, GCRY_STRONG_RANDOM); + cs = generic_to_base64((uint8_t *)buf, offset + CONFIRM_SIZE, + confirm_base64_table); if(trackdb_adduser(vec[0], vec[1], config->default_rights, vec[2], cs)) sink_writes(ev_writer_sink(c->w), "550 Cannot create user\n"); else @@ -1179,20 +1354,250 @@ static int c_confirm(struct conn *c, int attribute((unused)) nvec) { size_t nuser; char *user, *sep; + rights_type rights; + const char *host; - if(!(user = mime_base64(vec[0], &nuser)) + /* Get some kind of peer identifcation */ + if(!(host = connection_host(c))) { + sink_writes(ev_writer_sink(c->w), "530 Authentication failure\n"); + return 1; + } + if(!(user = generic_base64(vec[0], &nuser, confirm_base64_table)) || !(sep = memchr(user, ';', nuser))) { sink_writes(ev_writer_sink(c->w), "550 Malformed confirmation string\n"); return 1; } *sep = 0; - if(trackdb_confirm(user, vec[0])) + if(trackdb_confirm(user, vec[0], &rights)) sink_writes(ev_writer_sink(c->w), "550 Incorrect confirmation string\n"); - else + else { + c->who = user; + c->cookie = 0; + c->rights = rights; + if(strcmp(host, "local")) + info("S%x %s confirmed from %s", c->tag, user, host); + else + c->rights |= RIGHT__LOCAL; + /* Response contains username so client knows who they are acting as */ + sink_printf(ev_writer_sink(c->w), "232 %s\n", quoteutf8(user)); + } + return 1; +} + +static int sent_reminder(ev_source attribute((unused)) *ev, + pid_t attribute((unused)) pid, + int status, + const struct rusage attribute((unused)) *rusage, + void *u) { + struct conn *const c = u; + + /* Tell the client what went down */ + if(!status) { sink_writes(ev_writer_sink(c->w), "250 OK\n"); + } else { + error(0, "reminder subprocess %s", wstat(status)); + sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); + } + /* Re-enable this connection */ + ev_reader_enable(c->r); + return 0; +} + +static int c_reminder(struct conn *c, + char **vec, + int attribute((unused)) nvec) { + struct kvp *k; + const char *password, *email, *text, *encoding, *charset, *content_type; + const time_t *last; + time_t now; + pid_t pid; + + static hash *last_reminder; + + if(!config->mail_sender) { + error(0, "cannot send password reminders because mail_sender not set"); + sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); + return 1; + } + if(!(k = trackdb_getuserinfo(vec[0]))) { + error(0, "reminder for user '%s' who does not exist", vec[0]); + sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); + return 1; + } + if(!(email = kvp_get(k, "email")) + || !email_valid(email)) { + error(0, "user '%s' has no valid email address", vec[0]); + sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); + return 1; + } + if(!(password = kvp_get(k, "password")) + || !*password) { + error(0, "user '%s' has no password", vec[0]); + sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); + return 1; + } + /* Rate-limit reminders. This hash is bounded in size by the number of + * users. If this is actually a problem for anyone then we can periodically + * clean it. */ + if(!last_reminder) + last_reminder = hash_new(sizeof (time_t)); + last = hash_find(last_reminder, vec[0]); + time(&now); + if(last && now < *last + config->reminder_interval) { + error(0, "sent a password reminder to '%s' too recently", vec[0]); + sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); + return 1; + } + /* Send the reminder */ + /* TODO this should be templatized and to some extent merged with + * the code in act_register() */ + byte_xasprintf((char **)&text, +"Someone requested that you be sent a reminder of your DisOrder password.\n" +"Your password is:\n" +"\n" +" %s\n", password); + if(!(text = mime_encode_text(text, &charset, &encoding))) + fatal(0, "cannot encode email"); + byte_xasprintf((char **)&content_type, "text/plain;charset=%s", + quote822(charset, 0)); + pid = sendmail_subprocess("", config->mail_sender, email, + "DisOrder password reminder", + encoding, content_type, text); + if(pid < 0) { + sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n"); + return 1; + } + hash_add(last_reminder, vec[0], &now, HASH_INSERT_OR_REPLACE); + info("sending a passsword reminder to user '%s'", vec[0]); + /* We can only continue when the subprocess finishes */ + ev_child(c->ev, pid, 0, sent_reminder, c); + return 0; +} + +static int c_schedule_list(struct conn *c, + char attribute((unused)) **vec, + int attribute((unused)) nvec) { + char **ids = schedule_list(0); + sink_writes(ev_writer_sink(c->w), "253 ID list follows\n"); + while(*ids) + sink_printf(ev_writer_sink(c->w), "%s\n", *ids++); + sink_writes(ev_writer_sink(c->w), ".\n"); + return 1; /* completed */ +} + +static int c_schedule_get(struct conn *c, + char **vec, + int attribute((unused)) nvec) { + struct kvp *actiondata = schedule_get(vec[0]), *k; + + if(!actiondata) { + sink_writes(ev_writer_sink(c->w), "555 No such event\n"); + return 1; /* completed */ + } + /* Scheduled events are public information. Anyone with RIGHT_READ can see + * them. */ + sink_writes(ev_writer_sink(c->w), "253 Event information follows\n"); + for(k = actiondata; k; k = k->next) + sink_printf(ev_writer_sink(c->w), " %s %s\n", + quoteutf8(k->name), quoteutf8(k->value)); + sink_writes(ev_writer_sink(c->w), ".\n"); + return 1; /* completed */ +} + +static int c_schedule_del(struct conn *c, + char **vec, + int attribute((unused)) nvec) { + struct kvp *actiondata = schedule_get(vec[0]); + + if(!actiondata) { + sink_writes(ev_writer_sink(c->w), "555 No such event\n"); + return 1; /* completed */ + } + /* If you have admin rights you can delete anything. If you don't then you + * can only delete your own scheduled events. */ + if(!(c->rights & RIGHT_ADMIN)) { + const char *who = kvp_get(actiondata, "who"); + + if(!who || !c->who || strcmp(who, c->who)) { + sink_writes(ev_writer_sink(c->w), "551 Not authorized\n"); + return 1; /* completed */ + } + } + if(schedule_del(vec[0])) + sink_writes(ev_writer_sink(c->w), "550 Could not delete scheduled event\n"); + else + sink_writes(ev_writer_sink(c->w), "250 Deleted\n"); + return 1; /* completed */ +} + +static int c_schedule_add(struct conn *c, + char **vec, + int nvec) { + struct kvp *actiondata = 0; + const char *id; + + /* Standard fields */ + kvp_set(&actiondata, "who", c->who); + kvp_set(&actiondata, "when", vec[0]); + kvp_set(&actiondata, "priority", vec[1]); + kvp_set(&actiondata, "action", vec[2]); + /* Action-dependent fields */ + if(!strcmp(vec[2], "play")) { + if(nvec != 4) { + sink_writes(ev_writer_sink(c->w), "550 Wrong number of arguments\n"); + return 1; + } + if(!trackdb_exists(vec[3])) { + sink_writes(ev_writer_sink(c->w), "550 Track is not in database\n"); + return 1; + } + kvp_set(&actiondata, "track", vec[3]); + } else if(!strcmp(vec[2], "set-global")) { + if(nvec < 4 || nvec > 5) { + sink_writes(ev_writer_sink(c->w), "550 Wrong number of arguments\n"); + return 1; + } + kvp_set(&actiondata, "key", vec[3]); + if(nvec > 4) + kvp_set(&actiondata, "value", vec[4]); + } else { + sink_writes(ev_writer_sink(c->w), "550 Unknown action\n"); + return 1; + } + /* schedule_add() checks user rights */ + id = schedule_add(c->ev, actiondata); + if(!id) + sink_writes(ev_writer_sink(c->w), "550 Cannot add scheduled event\n"); + else + sink_printf(ev_writer_sink(c->w), "252 %s\n", id); return 1; } - + +static int c_adopt(struct conn *c, + char **vec, + int attribute((unused)) nvec) { + struct queue_entry *q; + + if(!c->who) { + sink_writes(ev_writer_sink(c->w), "550 no identity\n"); + return 1; + } + if(!(q = queue_find(vec[0]))) { + sink_writes(ev_writer_sink(c->w), "550 no such track on the queue\n"); + return 1; + } + if(q->origin != origin_random) { + sink_writes(ev_writer_sink(c->w), "550 not a random track\n"); + return 1; + } + q->origin = origin_adopted; + q->submitter = xstrdup(c->who); + eventlog("adopted", q->id, q->submitter, (char *)0); + queue_write(); + sink_writes(ev_writer_sink(c->w), "250 OK\n"); + return 1; +} + static const struct command { /** @brief Command name */ const char *name; @@ -1213,7 +1618,8 @@ static const struct command { */ rights_type rights; } commands[] = { - { "adduser", 2, 2, c_adduser, RIGHT_ADMIN|RIGHT__LOCAL }, + { "adduser", 2, 3, c_adduser, RIGHT_ADMIN|RIGHT__LOCAL }, + { "adopt", 1, 1, c_adopt, RIGHT_PLAY }, { "allfiles", 0, 2, c_allfiles, RIGHT_READ }, { "confirm", 1, 1, c_confirm, 0 }, { "cookie", 1, 1, c_cookie, 0 }, @@ -1246,12 +1652,17 @@ static const struct command { { "recent", 0, 0, c_recent, RIGHT_READ }, { "reconfigure", 0, 0, c_reconfigure, RIGHT_ADMIN }, { "register", 3, 3, c_register, RIGHT_REGISTER|RIGHT__LOCAL }, + { "reminder", 1, 1, c_reminder, RIGHT__LOCAL }, { "remove", 1, 1, c_remove, RIGHT_REMOVE__MASK }, - { "rescan", 0, 0, c_rescan, RIGHT_RESCAN }, + { "rescan", 0, INT_MAX, c_rescan, RIGHT_RESCAN }, { "resolve", 1, 1, c_resolve, RIGHT_READ }, { "resume", 0, 0, c_resume, RIGHT_PAUSE }, { "revoke", 0, 0, c_revoke, RIGHT_READ }, { "rtp-address", 0, 0, c_rtp_address, 0 }, + { "schedule-add", 3, INT_MAX, c_schedule_add, RIGHT_READ }, + { "schedule-del", 1, 1, c_schedule_del, RIGHT_READ }, + { "schedule-get", 1, 1, c_schedule_get, RIGHT_READ }, + { "schedule-list", 0, 0, c_schedule_list, RIGHT_READ }, { "scratch", 0, 1, c_scratch, RIGHT_SCRATCH__MASK }, { "search", 1, 1, c_search, RIGHT_READ }, { "set", 3, 3, c_set, RIGHT_PREFS, }, @@ -1293,12 +1704,14 @@ static int command(struct conn *c, char *line) { sink_writes(ev_writer_sink(c->w), "500 do what?\n"); return 1; } - if((n = TABLE_FIND(commands, struct command, name, vec[0])) < 0) + if((n = TABLE_FIND(commands, name, vec[0])) < 0) sink_writes(ev_writer_sink(c->w), "500 unknown command\n"); else { if(commands[n].rights && !(c->rights & commands[n].rights)) { - sink_writes(ev_writer_sink(c->w), "530 Prohibited\n"); + error(0, "%s attempted %s but lacks required rights", c->who ? c->who : "NULL", + commands[n].name); + sink_writes(ev_writer_sink(c->w), "510 Prohibited\n"); return 1; } ++vec; @@ -1367,6 +1780,7 @@ static int reader_callback(ev_source attribute((unused)) *ev, ev_writer_close(c->w); c->w = 0; } + remove_connection(c); } return 0; } @@ -1383,6 +1797,7 @@ static int listen_callback(ev_source *ev, D(("server listen_callback fd %d (%s)", fd, l->name)); nonblock(fd); cloexec(fd); + c->next = connections; c->tag = tags++; c->ev = ev; c->w = ev_writer_new(ev, fd, writer_error, c, @@ -1394,6 +1809,7 @@ static int listen_callback(ev_source *ev, c->reader = reader_callback; c->l = l; c->rights = 0; + connections = c; gcry_randomize(c->nonce, sizeof c->nonce, GCRY_STRONG_RANDOM); sink_printf(ev_writer_sink(c->w), "231 %d %s %s\n", 2,