#include "cache.h"
#include "unicode.h"
#include "cookies.h"
+#include "base64.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
char *cookie;
/** @brief Connection rights */
rights_type rights;
+ /** @brief Next connection */
+ struct conn *next;
};
+/** @brief Linked list of connections */
+static struct conn *connections;
+
static int reader_callback(ev_source *ev,
ev_reader *reader,
void *ptr,
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.
}
c->w = 0;
ev_report(ev);
+ remove_connection(c);
return 0;
}
c->w = 0;
c->r = 0;
ev_report(ev);
+ remove_connection(c);
return 0;
}
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);
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 */
/* 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);
}
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;
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;
}
const char *v;
if(vec[1][0] != '_' && (v = trackdb_get(vec[0], vec[1])))
- sink_printf(ev_writer_sink(c->w), "252 %s\n", v);
+ sink_printf(ev_writer_sink(c->w), "252 %s\n", quoteutf8(v));
else
sink_writes(ev_writer_sink(c->w), "555 not found\n");
return 1;
return 1;
}
if((v = trackdb_get(track, "_length")))
- sink_printf(ev_writer_sink(c->w), "252 %s\n", v);
+ sink_printf(ev_writer_sink(c->w), "252 %s\n", quoteutf8(v));
else
sink_writes(ev_writer_sink(c->w), "550 not found\n");
return 1;
}
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))
c->w = 0;
}
c->r = 0;
+ remove_connection(c);
}
return 0;
}
* @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,
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);
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);
char **vec,
int attribute((unused)) nvec) {
sink_printf(ev_writer_sink(c->w), "252 %s\n",
- trackdb_getpart(vec[0], vec[1], vec[2]));
+ quoteutf8(trackdb_getpart(vec[0], vec[1], vec[2])));
return 1;
}
sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n");
return 1;
}
- sink_printf(ev_writer_sink(c->w), "252 %s\n", track);
+ sink_printf(ev_writer_sink(c->w), "252 %s\n", quoteutf8(track));
return 1;
}
const char *s = trackdb_get_global(vec[0]);
if(s)
- sink_printf(ev_writer_sink(c->w), "252 %s\n", s);
+ sink_printf(ev_writer_sink(c->w), "252 %s\n", quoteutf8(s));
else
sink_writes(ev_writer_sink(c->w), "555 not found\n");
return 1;
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]));
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;
}
static int c_adduser(struct conn *c,
char **vec,
- int attribute((unused)) nvec) {
- if(trackdb_adduser(vec[0], vec[1], default_rights(), 0))
+ int nvec) {
+ const char *rights;
+
+ 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
sink_writes(ev_writer_sink(c->w), "250 User created\n");
static int c_deluser(struct conn *c,
char **vec,
int attribute((unused)) nvec) {
- if(trackdb_deluser(vec[0]))
- sink_writes(ev_writer_sink(c->w), "550 Cannot deleted user\n");
- else
- sink_writes(ev_writer_sink(c->w), "250 User deleted\n");
+ struct conn *d;
+
+ if(trackdb_deluser(vec[0])) {
+ sink_writes(ev_writer_sink(c->w), "550 Cannot delete user\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;
+
/* 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[1], &r, 1))
+ for(d = connections; d; d = d->next)
+ if(!strcmp(d->who, vec[0]))
+ d->rights = r;
+ }
+ 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;
}
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;
}
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) {
+ char *buf, *cs;
+ size_t bufsize;
+ int offset;
+
+ /* The confirmation string is base64(username;nonce) */
+ bufsize = strlen(vec[0]) + CONFIRM_SIZE + 2;
+ buf = xmalloc_noptr(bufsize);
+ offset = byte_snprintf(buf, bufsize, "%s;", vec[0]);
+ 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
+ sink_printf(ev_writer_sink(c->w), "252 %s\n", quoteutf8(cs));
+ return 1;
+}
+
+static int c_confirm(struct conn *c,
+ char **vec,
+ int attribute((unused)) nvec) {
+ size_t nuser;
+ char *user, *sep;
+ rights_type rights;
+ const char *host;
+
+ /* 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], &rights))
+ sink_writes(ev_writer_sink(c->w), "550 Incorrect confirmation string\n");
+ 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 const struct command {
/** @brief Command name */
const char *name;
*/
rights_type rights;
} commands[] = {
- { "adduser", 2, 2, c_adduser, RIGHT_ADMIN|RIGHT__LOCAL },
+ { "adduser", 2, 3, c_adduser, RIGHT_ADMIN|RIGHT__LOCAL },
{ "allfiles", 0, 2, c_allfiles, RIGHT_READ },
+ { "confirm", 1, 1, c_confirm, 0 },
{ "cookie", 1, 1, c_cookie, 0 },
{ "deluser", 1, 1, c_deluser, RIGHT_ADMIN|RIGHT__LOCAL },
{ "dirs", 0, 2, c_dirs, RIGHT_READ },
{ "random-enabled", 0, 0, c_random_enabled, RIGHT_READ },
{ "recent", 0, 0, c_recent, RIGHT_READ },
{ "reconfigure", 0, 0, c_reconfigure, RIGHT_ADMIN },
+ { "register", 3, 3, c_register, RIGHT_REGISTER|RIGHT__LOCAL },
{ "remove", 1, 1, c_remove, RIGHT_REMOVE__MASK },
{ "rescan", 0, 0, c_rescan, RIGHT_RESCAN },
{ "resolve", 1, 1, c_resolve, RIGHT_READ },
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;
ev_writer_close(c->w);
c->w = 0;
}
+ remove_connection(c);
}
return 0;
}
c->l = l;
c->rights = 0;
gcry_randomize(c->nonce, sizeof c->nonce, GCRY_STRONG_RANDOM);
- sink_printf(ev_writer_sink(c->w), "231 %s %s\n",
+ sink_printf(ev_writer_sink(c->w), "231 %d %s %s\n",
+ 2,
config->authorization_algorithm,
hex(c->nonce, sizeof c->nonce));
return 0;
~mdw / disorder / blobdiff