X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/b12be54a68a7738d948d866eb7b9231f8e55a12e..0f55e9050dd26ab8804934a188f1ee8ab8b55ffe:/server/server.c diff --git a/server/server.c b/server/server.c index cd97435..a69c451 100644 --- a/server/server.c +++ b/server/server.c @@ -51,6 +51,7 @@ #include "split.h" #include "configuration.h" #include "hex.h" +#include "rights.h" #include "trackdb.h" #include "table.h" #include "kvp.h" @@ -65,6 +66,7 @@ #include "cache.h" #include "unicode.h" #include "cookies.h" +#include "mime.h" #ifndef NONCE_SIZE # define NONCE_SIZE 16 @@ -110,6 +112,8 @@ struct conn { const struct listener *l; /** @brief Login cookie or NULL */ char *cookie; + /** @brief Connection rights */ + rights_type rights; }; static int reader_callback(ev_source *ev, @@ -168,16 +172,6 @@ static int reader_error(ev_source attribute((unused)) *ev, return 0; } -/** @brief Return true if we are talking to a trusted user */ -static int trusted(struct conn *c) { - int n; - - for(n = 0; (n < config->trust.n - && strcmp(config->trust.s[n], c->who)); ++n) - ; - return n < config->trust.n; -} - static int c_disable(struct conn *c, char **vec, int nvec) { if(nvec == 0) disable_playing(c->who); @@ -239,22 +233,28 @@ 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(config->restrictions & RESTRICT_REMOVE) { - /* can only remove tracks that you submitted */ - if(!q->submitter || strcmp(q->submitter, c->who)) { - sink_writes(ev_writer_sink(c->w), "550 you didn't submit that track!\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)) { + sink_writes(ev_writer_sink(c->w), + "550 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 the random track then add another one. */ + /* If we removed a random track then add another one. */ if(q->state == playing_random) add_random_track(); /* Prepare whatever the next head track is. */ @@ -268,16 +268,26 @@ 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 */ } - if(config->restrictions & RESTRICT_SCRATCH) { - /* can only scratch tracks you submitted and randomly selected ones */ - if(playing->submitter && strcmp(playing->submitter, c->who)) { - sink_writes(ev_writer_sink(c->w), "550 you didn't submit that track!\n"); - return 1; - } + /* 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)) { + sink_writes(ev_writer_sink(c->w), + "550 Not authorized to scratch that track\n"); + return 1; } scratch(c->who, nvec == 1 ? vec[0] : 0); /* If you scratch an unpaused track then it is automatically unpaused */ @@ -365,14 +375,6 @@ static int c_playing(struct conn *c, return 1; /* completed */ } -static int c_become(struct conn *c, - char **vec, - int attribute((unused)) nvec) { - c->who = vec[0]; - sink_writes(ev_writer_sink(c->w), "230 OK\n"); - return 1; -} - static const char *connection_host(struct conn *c) { union { struct sockaddr sa; @@ -403,8 +405,9 @@ static const char *connection_host(struct conn *c) { static int c_user(struct conn *c, char **vec, int attribute((unused)) nvec) { - int n; - const char *res, *host; + struct kvp *k; + const char *res, *host, *password; + rights_type rights; if(c->who) { sink_writes(ev_writer_sink(c->w), "530 already authenticated\n"); @@ -416,22 +419,37 @@ static int c_user(struct conn *c, return 1; } /* find the user */ - for(n = 0; n < config->allow.n - && strcmp(config->allow.s[n].s[0], vec[0]); ++n) - ; - /* if it's a real user check whether the response is right */ - if(n >= config->allow.n) { - info("S%x unknown user '%s' from %s", c->tag, vec[0], host); + k = trackdb_getuserinfo(vec[0]); + /* reject nonexistent users */ + if(!k) { + error(0, "S%x unknown user '%s' from %s", c->tag, vec[0], host); + sink_writes(ev_writer_sink(c->w), "530 authentication failed\n"); + return 1; + } + /* reject unconfirmed users */ + if(kvp_get(k, "confirmation")) { + error(0, "S%x unconfirmed user '%s' from %s", c->tag, vec[0], host); + sink_writes(ev_writer_sink(c->w), "530 authentication failed\n"); + return 1; + } + password = kvp_get(k, "password"); + if(!password) password = ""; + 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; } - res = authhash(c->nonce, sizeof c->nonce, config->allow.s[n].s[1], + /* check whether the response is right */ + res = authhash(c->nonce, sizeof c->nonce, password, config->authorization_algorithm); if(wideopen || (res && !strcmp(res, vec[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); + c->rights |= RIGHT__LOCAL; + } sink_writes(ev_writer_sink(c->w), "230 OK\n"); return 1; } @@ -590,7 +608,7 @@ static int c_get(struct conn *c, 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; @@ -606,7 +624,7 @@ static int c_length(struct conn *c, 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; @@ -716,6 +734,7 @@ static int c_volume(struct conn *c, int nvec) { int l, r, set; char lb[32], rb[32]; + rights_type rights; switch(nvec) { case 0: @@ -733,6 +752,11 @@ static int c_volume(struct conn *c, default: abort(); } + rights = set ? RIGHT_VOLUME : RIGHT_READ; + if(!(c->rights & rights)) { + sink_writes(ev_writer_sink(c->w), "530 Prohibited\n"); + return 1; + } if(mixer_control(&l, &r, set)) sink_writes(ev_writer_sink(c->w), "550 error accessing mixer\n"); else { @@ -818,23 +842,44 @@ static int c_log(struct conn *c, return 0; } +/** @brief Test whether a move is allowed + * @param c Connection + * @param qs List of IDs on queue + * @param nqs Number of IDs + * @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; + } + return (c->rights & r) == r; +} + static int c_move(struct conn *c, char **vec, int attribute((unused)) nvec) { struct queue_entry *q; int n; - if(config->restrictions & RESTRICT_MOVE) { - if(!trusted(c)) { - sink_writes(ev_writer_sink(c->w), - "550 only trusted users can move tracks\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(!has_move_rights(c, &q, 1)) { + sink_writes(ev_writer_sink(c->w), + "550 Not authorized to move that track\n"); + return 1; + } n = queue_move(q, atoi(vec[1]), c->who); sink_printf(ev_writer_sink(c->w), "252 %d\n", n); /* If we've moved to the head of the queue then prepare the track. */ @@ -849,13 +894,6 @@ static int c_moveafter(struct conn *c, struct queue_entry *q, **qs; int n; - if(config->restrictions & RESTRICT_MOVE) { - if(!trusted(c)) { - sink_writes(ev_writer_sink(c->w), - "550 only trusted users can move tracks\n"); - return 1; - } - } if(vec[0][0]) { if(!(q = queue_find(vec[0]))) { sink_writes(ev_writer_sink(c->w), "550 no such track on the queue\n"); @@ -871,6 +909,11 @@ static int c_moveafter(struct conn *c, sink_writes(ev_writer_sink(c->w), "550 no such track on the queue\n"); return 1; } + if(!has_move_rights(c, qs, nvec)) { + sink_writes(ev_writer_sink(c->w), + "550 Not authorized to move those tracks\n"); + return 1; + } queue_moveafter(q, nvec, qs, c->who); sink_printf(ev_writer_sink(c->w), "250 Moved tracks\n"); /* If we've moved to the head of the queue then prepare the track. */ @@ -883,7 +926,7 @@ static int c_part(struct conn *c, 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; } @@ -896,7 +939,7 @@ static int c_resolve(struct conn *c, 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; } @@ -913,7 +956,6 @@ static int c_tags(struct conn *c, } sink_writes(ev_writer_sink(c->w), ".\n"); return 1; /* completed */ - } static int c_set_global(struct conn *c, @@ -934,7 +976,7 @@ static int c_get_global(struct conn *c, 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; @@ -980,6 +1022,7 @@ static int c_cookie(struct conn *c, int attribute((unused)) nvec) { const char *host; char *user; + rights_type rights; /* Can't log in twice on the same connection */ if(c->who) { @@ -992,16 +1035,19 @@ static int c_cookie(struct conn *c, return 1; } /* Check the cookie */ - user = verify_cookie(vec[0]); + user = verify_cookie(vec[0], &rights); if(!user) { sink_writes(ev_writer_sink(c->w), "530 authentication failure\n"); return 1; } /* Log in */ - c->who = user; + c->who = vec[0]; c->cookie = vec[0]; - if(strcmp(host, "local")) + c->rights = rights; + if(strcmp(host, "local")) { info("S%x %s connected with cookie from %s", c->tag, user, host); + c->rights |= RIGHT__LOCAL; + } sink_writes(ev_writer_sink(c->w), "230 OK\n"); return 1; } @@ -1012,7 +1058,7 @@ static int c_make_cookie(struct conn *c, const char *cookie = make_cookie(c->who); if(cookie) - sink_printf(ev_writer_sink(c->w), "252 %s\n", cookie); + sink_printf(ev_writer_sink(c->w), "252 %s\n", quoteutf8(cookie)); else sink_writes(ev_writer_sink(c->w), "550 Cannot create cookie\n"); return 1; @@ -1029,62 +1075,207 @@ static int c_revoke(struct conn *c, return 1; } -#define C_AUTH 0001 /* must be authenticated */ -#define C_TRUSTED 0002 /* must be trusted user */ +static int c_adduser(struct conn *c, + char **vec, + 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"); + return 1; +} + +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 delete user\n"); + else + 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) { + /* 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])) + 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; +} + +static int c_userinfo(struct conn *c, + char attribute((unused)) **vec, + int attribute((unused)) nvec) { + struct kvp *k; + const char *value; + + /* RIGHT_ADMIN allows anything; otherwise you can only get your own email + * address and righst list. */ + if((c->rights & RIGHT_ADMIN) + || (!strcmp(c->who, vec[0]) + && (!strcmp(vec[1], "email") + || !strcmp(vec[1], "rights")))) { + if((k = trackdb_getuserinfo(vec[0]))) + if((value = kvp_get(k, vec[1]))) + sink_printf(ev_writer_sink(c->w), "252 %s\n", quoteutf8(value)); + else + 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"); + return 1; +} +static int c_users(struct conn *c, + char attribute((unused)) **vec, + int attribute((unused)) nvec) { + /* TODO de-dupe with c_tags */ + char **users = trackdb_listusers(); + + sink_writes(ev_writer_sink(c->w), "253 User list follows\n"); + while(*users) { + sink_printf(ev_writer_sink(c->w), "%s%s\n", + **users == '.' ? "." : "", *users); + ++users; + } + sink_writes(ev_writer_sink(c->w), ".\n"); + return 1; /* completed */ +} + +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]) + NONCE_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); + 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; + + if(!(user = mime_base64(vec[0], &nuser)) + || !(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])) + sink_writes(ev_writer_sink(c->w), "550 Incorrect confirmation string\n"); + else + sink_writes(ev_writer_sink(c->w), "250 OK\n"); + return 1; +} + static const struct command { + /** @brief Command name */ const char *name; - int minargs, maxargs; + + /** @brief Minimum number of arguments */ + int minargs; + + /** @brief Maximum number of arguments */ + int maxargs; + + /** @brief Function to process command */ int (*fn)(struct conn *, char **, int); - unsigned flags; + + /** @brief Rights required to execute command + * + * 0 means that the command can be issued without logging in. If multiple + * bits are listed here any of those rights will do. + */ + rights_type rights; } commands[] = { - { "allfiles", 0, 2, c_allfiles, C_AUTH }, - { "become", 1, 1, c_become, C_AUTH|C_TRUSTED }, + { "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 }, - { "dirs", 0, 2, c_dirs, C_AUTH }, - { "disable", 0, 1, c_disable, C_AUTH }, - { "enable", 0, 0, c_enable, C_AUTH }, - { "enabled", 0, 0, c_enabled, C_AUTH }, - { "exists", 1, 1, c_exists, C_AUTH }, - { "files", 0, 2, c_files, C_AUTH }, - { "get", 2, 2, c_get, C_AUTH }, - { "get-global", 1, 1, c_get_global, C_AUTH }, - { "length", 1, 1, c_length, C_AUTH }, - { "log", 0, 0, c_log, C_AUTH }, - { "make-cookie", 0, 0, c_make_cookie, C_AUTH }, - { "move", 2, 2, c_move, C_AUTH }, - { "moveafter", 1, INT_MAX, c_moveafter, C_AUTH }, - { "new", 0, 1, c_new, C_AUTH }, - { "nop", 0, 0, c_nop, C_AUTH }, - { "part", 3, 3, c_part, C_AUTH }, - { "pause", 0, 0, c_pause, C_AUTH }, - { "play", 1, 1, c_play, C_AUTH }, - { "playing", 0, 0, c_playing, C_AUTH }, - { "prefs", 1, 1, c_prefs, C_AUTH }, - { "queue", 0, 0, c_queue, C_AUTH }, - { "random-disable", 0, 0, c_random_disable, C_AUTH }, - { "random-enable", 0, 0, c_random_enable, C_AUTH }, - { "random-enabled", 0, 0, c_random_enabled, C_AUTH }, - { "recent", 0, 0, c_recent, C_AUTH }, - { "reconfigure", 0, 0, c_reconfigure, C_AUTH|C_TRUSTED }, - { "remove", 1, 1, c_remove, C_AUTH }, - { "rescan", 0, 0, c_rescan, C_AUTH|C_TRUSTED }, - { "resolve", 1, 1, c_resolve, C_AUTH }, - { "resume", 0, 0, c_resume, C_AUTH }, - { "revoke", 0, 0, c_revoke, C_AUTH }, - { "rtp-address", 0, 0, c_rtp_address, C_AUTH }, - { "scratch", 0, 1, c_scratch, C_AUTH }, - { "search", 1, 1, c_search, C_AUTH }, - { "set", 3, 3, c_set, C_AUTH, }, - { "set-global", 2, 2, c_set_global, C_AUTH }, - { "shutdown", 0, 0, c_shutdown, C_AUTH|C_TRUSTED }, - { "stats", 0, 0, c_stats, C_AUTH }, - { "tags", 0, 0, c_tags, C_AUTH }, - { "unset", 2, 2, c_set, C_AUTH }, - { "unset-global", 1, 1, c_set_global, C_AUTH }, + { "deluser", 1, 1, c_deluser, RIGHT_ADMIN|RIGHT__LOCAL }, + { "dirs", 0, 2, c_dirs, RIGHT_READ }, + { "disable", 0, 1, c_disable, RIGHT_GLOBAL_PREFS }, + { "edituser", 3, 3, c_edituser, RIGHT_ADMIN|RIGHT_USERINFO }, + { "enable", 0, 0, c_enable, RIGHT_GLOBAL_PREFS }, + { "enabled", 0, 0, c_enabled, RIGHT_READ }, + { "exists", 1, 1, c_exists, RIGHT_READ }, + { "files", 0, 2, c_files, RIGHT_READ }, + { "get", 2, 2, c_get, RIGHT_READ }, + { "get-global", 1, 1, c_get_global, RIGHT_READ }, + { "length", 1, 1, c_length, RIGHT_READ }, + { "log", 0, 0, c_log, RIGHT_READ }, + { "make-cookie", 0, 0, c_make_cookie, RIGHT_READ }, + { "move", 2, 2, c_move, RIGHT_MOVE__MASK }, + { "moveafter", 1, INT_MAX, c_moveafter, RIGHT_MOVE__MASK }, + { "new", 0, 1, c_new, RIGHT_READ }, + { "nop", 0, 0, c_nop, 0 }, + { "part", 3, 3, c_part, RIGHT_READ }, + { "pause", 0, 0, c_pause, RIGHT_PAUSE }, + { "play", 1, 1, c_play, RIGHT_PLAY }, + { "playing", 0, 0, c_playing, RIGHT_READ }, + { "prefs", 1, 1, c_prefs, RIGHT_READ }, + { "queue", 0, 0, c_queue, RIGHT_READ }, + { "random-disable", 0, 0, c_random_disable, RIGHT_GLOBAL_PREFS }, + { "random-enable", 0, 0, c_random_enable, RIGHT_GLOBAL_PREFS }, + { "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 }, + { "resume", 0, 0, c_resume, RIGHT_PAUSE }, + { "revoke", 0, 0, c_revoke, RIGHT_READ }, + { "rtp-address", 0, 0, c_rtp_address, 0 }, + { "scratch", 0, 1, c_scratch, RIGHT_SCRATCH__MASK }, + { "search", 1, 1, c_search, RIGHT_READ }, + { "set", 3, 3, c_set, RIGHT_PREFS, }, + { "set-global", 2, 2, c_set_global, RIGHT_GLOBAL_PREFS }, + { "shutdown", 0, 0, c_shutdown, RIGHT_ADMIN }, + { "stats", 0, 0, c_stats, RIGHT_READ }, + { "tags", 0, 0, c_tags, RIGHT_READ }, + { "unset", 2, 2, c_set, RIGHT_PREFS }, + { "unset-global", 1, 1, c_set_global, RIGHT_GLOBAL_PREFS }, { "user", 2, 2, c_user, 0 }, - { "version", 0, 0, c_version, C_AUTH }, - { "volume", 0, 2, c_volume, C_AUTH } + { "userinfo", 2, 2, c_userinfo, RIGHT_READ }, + { "users", 0, 0, c_users, RIGHT_READ }, + { "version", 0, 0, c_version, RIGHT_READ }, + { "volume", 0, 2, c_volume, RIGHT_READ|RIGHT_VOLUME } }; static void command_error(const char *msg, void *u) { @@ -1115,12 +1306,9 @@ static int command(struct conn *c, char *line) { if((n = TABLE_FIND(commands, struct command, name, vec[0])) < 0) sink_writes(ev_writer_sink(c->w), "500 unknown command\n"); else { - if((commands[n].flags & C_AUTH) && !c->who) { - sink_writes(ev_writer_sink(c->w), "530 not authenticated\n"); - return 1; - } - if((commands[n].flags & C_TRUSTED) && !trusted(c)) { - sink_writes(ev_writer_sink(c->w), "530 insufficient privilege\n"); + if(commands[n].rights + && !(c->rights & commands[n].rights)) { + sink_writes(ev_writer_sink(c->w), "530 Prohibited\n"); return 1; } ++vec; @@ -1215,16 +1403,12 @@ static int listen_callback(ev_source *ev, c->fd = fd; c->reader = reader_callback; c->l = l; + c->rights = 0; gcry_randomize(c->nonce, sizeof c->nonce, GCRY_STRONG_RANDOM); - if(!strcmp(config->authorization_algorithm, "sha1") - || !strcmp(config->authorization_algorithm, "SHA1")) { - sink_printf(ev_writer_sink(c->w), "231 %s\n", - hex(c->nonce, sizeof c->nonce)); - } else { - sink_printf(ev_writer_sink(c->w), "231 %s %s\n", - config->authorization_algorithm, - hex(c->nonce, sizeof c->nonce)); - } + sink_printf(ev_writer_sink(c->w), "231 %d %s %s\n", + 2, + config->authorization_algorithm, + hex(c->nonce, sizeof c->nonce)); return 0; }