/*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
-/** \file command.c does client authentication and executes server commands */
+/** \file command.c Client authentication and server commands. */
+#include <regex.h>
#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
#include <dirent.h>
#include <openssl/rc4.h>
+#include <osl.h>
#include "para.h"
#include "error.h"
+#include "crypt.h"
+#include "command.h"
#include "server.cmdline.h"
-#include "afs_common.h"
#include "string.h"
#include "afh.h"
#include "afs.h"
#include "server.h"
-#include "vss.h"
+#include "list.h"
#include "send.h"
+#include "vss.h"
#include "rc4.h"
#include "net.h"
#include "daemon.h"
#include "fd.h"
-#include "list.h"
+#include "ipc.h"
#include "user_list.h"
#include "server_command_list.h"
#include "afs_command_list.h"
+#include "sched.h"
+#include "signal.h"
-/** commands including options must be shorter than this */
+/** Commands including options must be shorter than this. */
#define MAX_COMMAND_LEN 32768
-static RC4_KEY rc4_recv_key;
-static RC4_KEY rc4_send_key;
-static unsigned char rc4_buf[2 * RC4_KEY_LEN];
-
-extern const char *status_item_list[NUM_STAT_ITEMS];
+extern int mmd_mutex;
extern struct misc_meta_data *mmd;
-extern struct audio_file_selector selectors[];
extern struct sender senders[];
+int send_afs_status(struct rc4_context *rc4c, int parser_friendly);
+
+const char *status_item_list[] = {STATUS_ITEM_ARRAY};
static void dummy(__a_unused int s)
-{}
+{
+}
static void mmd_dup(struct misc_meta_data *new_mmd)
{
- mmd_lock();
+ mutex_lock(mmd_mutex);
*new_mmd = *mmd;
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
}
/*
- * compute human readable string containing
- * vss status for given integer value
+ * Compute human readable string containing vss status for given integer value.
+ *
+ * We don't want to use vss_playing() and friends here because we take a
+ * snapshot of the mmd struct and use the copy for computing the state of the
+ * vss. If the real data were used, we would take the mmd lock for a rather
+ * long time or risk to get an inconsistent view.
*/
static char *vss_status_tohuman(unsigned int flags)
{
if (flags & VSS_PLAYING)
return para_strdup("playing");
- else if (flags & VSS_NEXT)
+ if (flags & VSS_NEXT)
return para_strdup("stopped");
- else
- return para_strdup("paused");
+ return para_strdup("paused");
}
/*
return msg;
}
-/*
- * compute status bar string. Never returns NULL
- */
-static char *get_sb_string(struct misc_meta_data *nmmd)
-{
- char *base, *ret;
- long long unsigned secs = 0, rsecs = 0, percent = 0;
-
- base = para_basename(nmmd->filename);
- if (!base)
- return para_strdup("");
- if (!base[0])
- return base;
- if (nmmd->afi.chunks_total) {
- secs = (long long) nmmd->afi.seconds_total * nmmd->chunks_sent
- / nmmd->afi.chunks_total;
- rsecs = (long long) nmmd->afi.seconds_total *
- (nmmd->afi.chunks_total - nmmd->chunks_sent)
- / nmmd->afi.chunks_total;
- percent = 100 * ((nmmd->chunks_sent + 5) / 10)
- / ((nmmd->afi.chunks_total + 5) / 10);
- }
- ret = make_message("%llu:%02llu [%llu:%02llu] (%llu%%) %s",
- secs / 60, secs % 60,
- rsecs / 60, rsecs % 60,
- percent,
- base
- );
- free(base);
- return ret;
-}
-
-static char *get_status(struct misc_meta_data *nmmd)
+static char *get_status(struct misc_meta_data *nmmd, int parser_friendly)
{
- char *bar, *ret, mtime[30] = "";
+ char mtime[30] = "";
char *status, *flags; /* vss status info */
char *ut = uptime_str();
long offset = (nmmd->offset + 500) / 1000;
- struct timeval now;
+ struct timeval current_time;
struct tm mtime_tm;
+ struct para_buffer b = {.flags = parser_friendly? PBF_SIZE_PREFIX : 0};
- if (nmmd->audio_format >= 0) {
- localtime_r(&nmmd->mtime, &mtime_tm);
- strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
- }
/* report real status */
status = vss_status_tohuman(nmmd->vss_status_flags);
flags = vss_get_status_flags(nmmd->vss_status_flags);
- bar = para_basename(nmmd->filename);
- gettimeofday(&now, NULL);
- ret = make_message(
- "%s:%zu\n" "%s:%s\n" "%s:%lu\n" "%s:%u\n"
- "%s:%s\n" "%s:%s\n" "%s:%s\n" "%s:%s\n"
- "%s:%li\n" "%s:%s\n" "%s" "%s"
- "%s:%s\n" "%s:%lu.%lu\n" "%s:%lu.%lu\n",
- status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
- status_item_list[SI_MTIME], mtime,
- status_item_list[SI_LENGTH], nmmd->afi.seconds_total,
- status_item_list[SI_NUM_PLAYED], nmmd->num_played,
-
- status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
- status_item_list[SI_STATUS], status,
- status_item_list[SI_STATUS_FLAGS], flags,
- status_item_list[SI_SELECTOR], selectors[nmmd->selector_num].name,
-
- status_item_list[SI_OFFSET], offset,
- status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),
- nmmd->selector_info,
- nmmd->afi.info_string,
-
- status_item_list[SI_UPTIME], ut,
- status_item_list[SI_STREAM_START],
- (long unsigned)nmmd->stream_start.tv_sec,
- (long unsigned)nmmd->stream_start.tv_usec,
- status_item_list[SI_CURRENT_TIME],
- (long unsigned)now.tv_sec,
- (long unsigned)now.tv_usec
-
- );
- free(bar);
+ if (nmmd->size) { /* parent currently has an audio file open */
+ localtime_r(&nmmd->mtime, &mtime_tm);
+ strftime(mtime, 29, "%b %d %Y", &mtime_tm);
+ }
+ gettimeofday(¤t_time, NULL);
+ WRITE_STATUS_ITEM(&b, SI_FILE_SIZE, "%zu\n", nmmd->size / 1024);
+ WRITE_STATUS_ITEM(&b, SI_MTIME, "%s\n", mtime);
+ WRITE_STATUS_ITEM(&b, SI_STATUS, "%s\n", status);
+ WRITE_STATUS_ITEM(&b, SI_STATUS_FLAGS, "%s\n", flags);
+ WRITE_STATUS_ITEM(&b, SI_OFFSET, "%li\n", offset);
+ WRITE_STATUS_ITEM(&b, SI_AFS_MODE, "%s\n", mmd->afs_mode_string);
+ WRITE_STATUS_ITEM(&b, SI_STREAM_START, "%lu.%lu\n",
+ (long unsigned)nmmd->stream_start.tv_sec,
+ (long unsigned)nmmd->stream_start.tv_usec);
+ WRITE_STATUS_ITEM(&b, SI_CURRENT_TIME, "%lu.%lu\n",
+ (long unsigned)current_time.tv_sec,
+ (long unsigned)current_time.tv_usec);
free(flags);
free(status);
free(ut);
- return ret;
+ return b.buf;
}
static int check_sender_args(int argc, char * const * argv, struct sender_command_data *scd)
if (!subcmds[i])
return -E_COMMAND_SYNTAX;
scd->cmd_num = i;
- mmd_lock();
- if (!senders[scd->sender_num].client_cmds[scd->cmd_num]) {
- mmd_unlock();
+ if (!senders[scd->sender_num].client_cmds[scd->cmd_num])
return -E_SENDER_CMD;
- }
- mmd_unlock();
switch (scd->cmd_num) {
case SENDER_ON:
case SENDER_OFF:
break;
case SENDER_DENY:
case SENDER_ALLOW:
- if (argc != 4 && argc != 5)
- return -E_COMMAND_SYNTAX;
- if (!inet_pton(AF_INET, argv[3], &scd->addr))
+ if (argc != 4 || parse_cidr(argv[3], scd->host,
+ sizeof(scd->host), &scd->netmask) == NULL)
return -E_COMMAND_SYNTAX;
- scd->netmask = 32;
- if (argc == 5) {
- scd->netmask = atoi(argv[4]);
- if (scd->netmask < 0 || scd->netmask > 32)
- return -E_COMMAND_SYNTAX;
- }
break;
case SENDER_ADD:
case SENDER_DELETE:
- if (argc != 4 && argc != 5)
- return -E_COMMAND_SYNTAX;
- if (!inet_pton(AF_INET, argv[3], &scd->addr))
+ if (argc != 4)
return -E_COMMAND_SYNTAX;
- scd->port = -1;
- if (argc == 5) {
- scd->port = atoi(argv[4]);
- if (scd->port < 0 || scd->port > 65535)
- return -E_COMMAND_SYNTAX;
- }
- break;
+ return parse_fec_url(argv[3], scd);
default:
return -E_COMMAND_SYNTAX;
}
return 1;
}
-int com_sender(int fd, int argc, char * const * argv)
+int com_sender(struct rc4_context *rc4c, int argc, char * const * argv)
{
int i, ret;
+ char *msg = NULL;
struct sender_command_data scd;
if (argc < 2) {
- char *msg = NULL;
for (i = 0; senders[i].name; i++) {
char *tmp = make_message("%s%s\n",
msg? msg : "", senders[i].name);
free(msg);
msg = tmp;
}
- ret = send_buffer(fd, msg);
+ ret = rc4_send_buffer(rc4c, msg);
free(msg);
return ret;
}
ret = check_sender_args(argc, argv, &scd);
if (ret < 0) {
- char *msg;
if (scd.sender_num < 0)
return ret;
msg = senders[scd.sender_num].help();
- send_buffer(fd, msg);
+ ret = rc4_send_buffer(rc4c, msg);
free(msg);
- return 1;
+ return ret;
}
+
+ switch (scd.cmd_num) {
+ case SENDER_ADD:
+ case SENDER_DELETE:
+ assert(senders[scd.sender_num].resolve_target);
+ ret = senders[scd.sender_num].resolve_target(argv[3], &scd);
+ if (ret < 0)
+ return ret;
+ }
+
for (i = 0; i < 10; i++) {
- mmd_lock();
+ mutex_lock(mmd_mutex);
if (mmd->sender_cmd_data.cmd_num >= 0) {
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
usleep(100 * 1000);
continue;
}
- mmd->sender_cmd_data = scd;
- mmd_unlock();
+ memcpy(&mmd->sender_cmd_data, &scd, sizeof(scd));
+ mutex_unlock(mmd_mutex);
break;
}
return (i < 10)? 1 : -E_LOCK;
}
/* server info */
-int com_si(int fd, int argc, __a_unused char * const * argv)
+int com_si(struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
{
int i, ret;
char *ut;
- char *selector_string = NULL, *sender_info = NULL, *sender_list = NULL;
+ char *sender_info = NULL;
if (argc != 1)
return -E_COMMAND_SYNTAX;
- mmd_lock();
- for (i = 0; selectors[i].name; i++) {
- selector_string = para_strcat(selector_string, selectors[i].name);
- selector_string = para_strcat(selector_string, " ");
- }
+ mutex_lock(mmd_mutex);
for (i = 0; senders[i].name; i++) {
char *info = senders[i].info();
sender_info = para_strcat(sender_info, info);
free(info);
- sender_list = para_strcat(sender_list, senders[i].name);
- sender_list = para_strcat(sender_list, " ");
}
ut = uptime_str();
- ret = send_va_buffer(fd, "up: %s\nplayed: %u\n"
- "pid: %d\n"
+ ret = rc4_send_va_buffer(rc4c, "up: %s\nplayed: %u\n"
+ "server_pid: %d\n"
+ "afs_pid: %d\n"
"connections (active/accepted/total): %u/%u/%u\n"
- "current loglevel: %i\n"
- "supported audio file selectors: %s\n"
+ "current loglevel: %s\n"
"supported audio formats: %s\n"
- "supported senders: %s\n"
"%s",
ut, mmd->num_played,
- getppid(),
+ (int)getppid(),
+ (int)mmd->afs_pid,
mmd->active_connections,
mmd->num_commands,
mmd->num_connects,
conf.loglevel_arg,
- selector_string,
supported_audio_formats(),
- sender_list,
sender_info
);
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
free(ut);
- free(selector_string);
- free(sender_list);
free(sender_info);
return ret;
}
/* version */
-int com_version(int fd, int argc, __a_unused char * const * argv)
+int com_version(struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
- return send_buffer(fd, VERSION_TEXT("server")
+ return rc4_send_buffer(rc4c, VERSION_TEXT("server")
"built: " BUILD_DATE "\n"
- SYSTEM ", " CC_VERSION "\n"
+ UNAME_RS ", " CC_VERSION "\n"
);
}
-/* sc */
-int com_sc(int fd, int argc, char * const * argv)
-{
- char *name = NULL;
- int ret, old = 0, count = -1; /* print af change forever */
-
- if (argc > 1)
- count = atoi(argv[1]);
-repeat:
- mmd_lock();
- if (old != mmd->num_played) {
- old = mmd->num_played;
- name = para_strdup(mmd->filename);
- }
- mmd_unlock();
- if (name) {
- ret = send_va_buffer(fd, "%s\n", name);
- free(name);
- name = NULL;
- if (ret < 0)
- return ret;
- if (argc > 1 && !--count)
- return 1;
- }
- usleep(500000);
- goto repeat;
-}
+#define EMPTY_STATUS_ITEMS \
+ ITEM(PATH) \
+ ITEM(DIRECTORY) \
+ ITEM(BASENAME) \
+ ITEM(SCORE) \
+ ITEM(ATTRIBUTES_BITMAP) \
+ ITEM(ATTRIBUTES_TXT) \
+ ITEM(HASH) \
+ ITEM(IMAGE_ID) \
+ ITEM(IMAGE_NAME) \
+ ITEM(LYRICS_ID) \
+ ITEM(LYRICS_NAME) \
+ ITEM(BITRATE) \
+ ITEM(FORMAT) \
+ ITEM(FREQUENCY) \
+ ITEM(CHANNELS) \
+ ITEM(DURATION) \
+ ITEM(SECONDS_TOTAL) \
+ ITEM(NUM_PLAYED) \
+ ITEM(LAST_PLAYED) \
+ ITEM(TECHINFO) \
+ ITEM(ARTIST) \
+ ITEM(TITLE) \
+ ITEM(YEAR) \
+ ITEM(ALBUM) \
+ ITEM(COMMENT) \
+ ITEM(AMPLIFICATION)
-/* sb */
-int com_sb(int fd, int argc, char * const * argv)
-{
- char *sb;
- int ret, nr = -1; /* status bar will be printed that many
- * times. Negative value means: print
- * forever
- */
- if (argc > 1)
- nr = atoi(argv[1]);
- while (nr) {
- mmd_lock();
- sb = get_sb_string(mmd);
- mmd_unlock();
- ret = send_va_buffer(fd, "%s\n", sb);
- free(sb);
- if (ret < 0)
- return ret;
- if (nr == 1)
- return 1;
- usleep(500000);
- if (nr > 0)
- nr--;
- }
- return 1;
+/**
+ * Write a list of audio-file related status items with empty values.
+ *
+ * This is used by vss when currently no audio file is open.
+ */
+static char *empty_status_items(int parser_friendly)
+{
+ if (parser_friendly)
+ return make_message(
+ #define ITEM(x) "0004 %02x:\n"
+ EMPTY_STATUS_ITEMS
+ #undef ITEM
+ #define ITEM(x) , SI_ ## x
+ EMPTY_STATUS_ITEMS
+ #undef ITEM
+ );
+ return make_message(
+ #define ITEM(x) "%s:\n"
+ EMPTY_STATUS_ITEMS
+ #undef ITEM
+ #define ITEM(x) ,status_item_list[SI_ ## x]
+ EMPTY_STATUS_ITEMS
+ #undef ITEM
+ );
}
+#undef EMPTY_STATUS_ITEMS
/* stat */
-int com_stat(int fd, int argc, char * const * argv)
+int com_stat(struct rc4_context *rc4c, int argc, char * const * argv)
{
- int ret, num = 0;/* status will be printed that many
- * times. num <= 0 means: print forever
- */
+ int i, ret;
struct misc_meta_data tmp, *nmmd = &tmp;
char *s;
+ int32_t num = 0;
+ int parser_friendly = 0;
- signal(SIGUSR1, dummy);
+ para_sigaction(SIGUSR1, dummy);
- if (argc > 1)
- num = atoi(argv[1]);
+ for (i = 1; i < argc; i++) {
+ const char *arg = argv[i];
+ if (arg[0] != '-')
+ break;
+ if (!strcmp(arg, "--")) {
+ i++;
+ break;
+ }
+ if (!strncmp(arg, "-n=", 3)) {
+ ret = para_atoi32(arg + 3, &num);
+ if (ret < 0)
+ return ret;
+ continue;
+ }
+ if (!strcmp(arg, "-p")) {
+ parser_friendly = 1;
+ continue;
+ }
+ return -E_COMMAND_SYNTAX;
+ }
+ if (i != argc)
+ return -E_COMMAND_SYNTAX;
for (;;) {
-
mmd_dup(nmmd);
- s = get_status(nmmd);
- ret = send_buffer(fd, s);
+ s = get_status(nmmd, parser_friendly);
+ ret = rc4_send_buffer(rc4c, s);
free(s);
if (ret < 0)
goto out;
+ if (nmmd->vss_status_flags & VSS_NEXT) {
+ static char *esi;
+ if (!esi)
+ esi = empty_status_items(parser_friendly);
+ ret = rc4_send_buffer(rc4c, esi);
+ if (ret < 0)
+ goto out;
+ } else
+ send_afs_status(rc4c, parser_friendly);
ret = 1;
- if (num == 1)
+ if (num > 0 && !--num)
goto out;
sleep(50);
if (getppid() == 1)
return ret;
}
-static int send_list_of_commands(int fd, struct server_command *cmd,
+static int send_list_of_commands(struct rc4_context *rc4c, struct server_command *cmd,
const char *handler)
{
int ret, i;
for (i = 1; cmd->name; cmd++, i++) {
char *perms = cmd_perms_itohuman(cmd->perms);
- ret = send_va_buffer(fd, "%s\t%s\t%s\t%s\n", cmd->name,
+ ret = rc4_send_va_buffer(rc4c, "%s\t%s\t%s\t%s\n", cmd->name,
handler,
perms,
cmd->description);
return 1;
}
-/* always returns string that must be freed by the caller in handler */
+/* returns string that must be freed by the caller */
static struct server_command *get_cmd_ptr(const char *name, char **handler)
{
struct server_command *cmd;
for (cmd = server_cmds; cmd->name; cmd++)
if (!strcmp(cmd->name, name)) {
if (handler)
- *handler = para_strdup("para_server"); /* server commands */
+ *handler = para_strdup("server"); /* server commands */
return cmd;
}
- /* not found, look for commands supported by the current selector */
- mmd_lock();
- if (handler)
- *handler = make_message("the %s selector",
- selectors[mmd->selector_num].name);
- cmd = selectors[mmd->selector_num].cmd_list;
- mmd_unlock();
- for (; cmd->name; cmd++)
- if (!strcmp(cmd->name, name))
- return cmd;
/* not found, look for commands supported by afs */
for (cmd = afs_cmds; cmd->name; cmd++)
- if (!strcmp(cmd->name, name))
+ if (!strcmp(cmd->name, name)) {
+ if (handler)
+ *handler = para_strdup("afs");
return cmd;
+ }
return NULL;
}
/* help */
-int com_help(int fd, int argc, char * const * argv)
+int com_help(struct rc4_context *rc4c, int argc, char * const * argv)
{
struct server_command *cmd;
char *perms, *handler;
if (argc < 2) {
/* no argument given, print list of commands */
- if ((ret = send_list_of_commands(fd, server_cmds, "server")) < 0)
- return ret;
- mmd_lock();
- handler = para_strdup(selectors[mmd->selector_num].name);
- cmd = selectors[mmd->selector_num].cmd_list;
- mmd_unlock();
- ret = send_list_of_commands(fd, cmd, handler);
- free(handler);
- if (ret < 0)
+ if ((ret = send_list_of_commands(rc4c, server_cmds, "server")) < 0)
return ret;
- cmd = afs_cmds;
- return send_list_of_commands(fd, cmd, "afs");
+ return send_list_of_commands(rc4c, afs_cmds, "afs");
}
/* argument given for help */
cmd = get_cmd_ptr(argv[1], &handler);
return -E_BAD_CMD;
}
perms = cmd_perms_itohuman(cmd->perms);
- ret = send_va_buffer(fd,
+ ret = rc4_send_va_buffer(rc4c,
"%s - %s\n\n"
"handler: %s\n"
"permissions: %s\n"
}
/* hup */
-int com_hup(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_hup(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
}
/* term */
-int com_term(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_term(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
return 1;
}
-int com_play(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_play(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
- mmd_lock();
+ mutex_lock(mmd_mutex);
mmd->new_vss_status_flags |= VSS_PLAYING;
mmd->new_vss_status_flags &= ~VSS_NOMORE;
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
return 1;
}
/* stop */
-int com_stop(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_stop(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
- mmd_lock();
+ mutex_lock(mmd_mutex);
mmd->new_vss_status_flags &= ~VSS_PLAYING;
mmd->new_vss_status_flags &= ~VSS_REPOS;
mmd->new_vss_status_flags |= VSS_NEXT;
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
return 1;
}
/* pause */
-int com_pause(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_pause(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
- mmd_lock();
- if (!vss_paused())
- mmd->events++;
- mmd->new_vss_status_flags &= ~VSS_PLAYING;
- mmd->new_vss_status_flags &= ~VSS_NEXT;
- mmd_unlock();
- return 1;
-}
-
-int com_chs(int fd, int argc, char * const * argv)
-{
- int i, ret;
-
- if (argc == 1) {
- char *selector;
- mmd_lock();
- selector = para_strdup(selectors[mmd->selector_num].name);
- mmd_unlock();
- ret = send_va_buffer(fd, "%s\n", selector);
- free(selector);
- return ret;
- }
- for (i = 0; selectors[i].name; i++) {
- if (strcmp(selectors[i].name, argv[1]))
- continue;
- mmd_lock();
- mmd->selector_change = i;
+ mutex_lock(mmd_mutex);
+ if (!vss_paused() && !vss_stopped()) {
mmd->events++;
- mmd_unlock();
- return 1;
+ mmd->new_vss_status_flags &= ~VSS_PLAYING;
+ mmd->new_vss_status_flags &= ~VSS_NEXT;
}
- return -E_BAD_SELECTOR;
+ mutex_unlock(mmd_mutex);
+ return 1;
}
/* next */
-int com_next(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_next(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
- mmd_lock();
+ mutex_lock(mmd_mutex);
mmd->events++;
mmd->new_vss_status_flags |= VSS_NEXT;
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
return 1;
}
/* nomore */
-int com_nomore(__a_unused int fd, int argc, __a_unused char * const * argv)
+int com_nomore(__a_unused struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
{
if (argc != 1)
return -E_COMMAND_SYNTAX;
- mmd_lock();
+ mutex_lock(mmd_mutex);
if (vss_playing() || vss_paused())
mmd->new_vss_status_flags |= VSS_NOMORE;
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
return 1;
}
/* ff */
-int com_ff(__a_unused int fd, int argc, char * const * argv)
+int com_ff(__a_unused struct rc4_context *rc4c, int argc, char * const * argv)
{
long promille;
int ret, backwards = 0;
return -E_COMMAND_SYNTAX;
if (ret > 1 && c == '-')
backwards = 1; /* jmp backwards */
- mmd_lock();
+ mutex_lock(mmd_mutex);
ret = -E_NO_AUDIO_FILE;
- if (!mmd->afi.chunks_total || !mmd->afi.seconds_total)
+ if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
goto out;
- promille = (1000 * mmd->current_chunk) / mmd->afi.chunks_total;
+ promille = (1000 * mmd->current_chunk) / mmd->afd.afhi.chunks_total;
if (backwards)
- promille -= 1000 * i / mmd->afi.seconds_total;
+ promille -= 1000 * i / mmd->afd.afhi.seconds_total;
else
- promille += 1000 * i / mmd->afi.seconds_total;
+ promille += 1000 * i / mmd->afd.afhi.seconds_total;
if (promille < 0)
promille = 0;
if (promille > 1000) {
mmd->new_vss_status_flags |= VSS_NEXT;
goto out;
}
- mmd->repos_request = (mmd->afi.chunks_total * promille) / 1000;
+ mmd->repos_request = (mmd->afd.afhi.chunks_total * promille) / 1000;
mmd->new_vss_status_flags |= VSS_REPOS;
mmd->new_vss_status_flags &= ~VSS_NEXT;
mmd->events++;
ret = 1;
out:
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
return ret;
}
/* jmp */
-int com_jmp(__a_unused int fd, int argc, char * const * argv)
+int com_jmp(__a_unused struct rc4_context *rc4c, int argc, char * const * argv)
{
long unsigned int i;
int ret;
return -E_COMMAND_SYNTAX;
if (sscanf(argv[1], "%lu", &i) <= 0)
return -E_COMMAND_SYNTAX;
- mmd_lock();
+ mutex_lock(mmd_mutex);
ret = -E_NO_AUDIO_FILE;
- if (!mmd->afi.chunks_total)
+ if (!mmd->afd.afhi.chunks_total)
goto out;
if (i > 100)
i = 100;
PARA_INFO_LOG("jumping to %lu%%\n", i);
- mmd->repos_request = (mmd->afi.chunks_total * i + 50)/ 100;
+ mmd->repos_request = (mmd->afd.afhi.chunks_total * i + 50)/ 100;
PARA_INFO_LOG("sent: %lu, offset before jmp: %lu\n",
mmd->chunks_sent, mmd->offset);
mmd->new_vss_status_flags |= VSS_REPOS;
ret = 1;
mmd->events++;
out:
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
return ret;
}
*/
static int check_perms(unsigned int perms, struct server_command *cmd_ptr)
{
- PARA_DEBUG_LOG("%s", "checking permissions\n");
+ PARA_DEBUG_LOG("checking permissions\n");
return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0;
}
return get_cmd_ptr(buf, NULL);
}
-static long int para_rand(long unsigned max)
-{
- return (long int) ((max + 0.0) * (random() / (RAND_MAX + 1.0)));
-}
-
-static void init_rc4_keys(void)
-{
- int i;
-
- for (i = 0; i < 2 * RC4_KEY_LEN; i++)
- rc4_buf[i] = para_rand(256);
- PARA_DEBUG_LOG("rc4 keys initialized (%u:%u)\n",
- (unsigned char) rc4_buf[0],
- (unsigned char) rc4_buf[RC4_KEY_LEN]);
- RC4_set_key(&rc4_recv_key, RC4_KEY_LEN, rc4_buf);
- RC4_set_key(&rc4_send_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
-}
-
-static void rc4_recv(unsigned long len, const unsigned char *indata,
- unsigned char *outdata, __a_unused void *private_data)
-{
- RC4(&rc4_recv_key, len, indata, outdata);
-}
-
-static void rc4_send(unsigned long len, const unsigned char *indata,
- unsigned char *outdata, __a_unused void *private_data)
-{
- RC4(&rc4_send_key, len, indata, outdata);
-}
-
-static int read_command(int fd, char **result)
+static int read_command(struct rc4_context *rc4c, char **result)
{
int ret;
char buf[4096];
size_t numbytes;
char *p;
- ret = recv_buffer(fd, buf, sizeof(buf));
+ ret = rc4_recv_buffer(rc4c, buf, sizeof(buf));
if (ret < 0)
goto out;
if (!ret)
}
+static void reset_signals(void)
+{
+ para_sigaction(SIGCHLD, SIG_IGN);
+ para_sigaction(SIGINT, SIG_DFL);
+ para_sigaction(SIGTERM, SIG_DFL);
+ para_sigaction(SIGHUP, SIG_DFL);
+}
+
/**
- * perform user authentication and execute a command
- *
- * \param fd the file descriptor to send output to
- * \param addr socket address info of peer
+ * Perform user authentication and execute a command.
*
- * \return EXIT_SUCCESS or EXIT_FAILURE
+ * \param fd The file descriptor to send output to.
+ * \param peername Identifies the connecting peer.
*
* Whenever para_server accepts an incoming tcp connection on
* the port it listens on, it forks and the resulting child
* encrypted with its RSA public key. From this point on,
* all transfers are crypted with this session key.
*
- * Next it is checked if the peer supplied a valid server
- * command or a command for the audio file selector currently
- * in use. If yes, and if the user has sufficient
- * permissions to execute that command, the function calls
- * the corresponding command handler which does argument
- * checking and further processing.
+ * Next it is checked if the peer supplied a valid server command or a command
+ * for the audio file selector. If yes, and if the user has sufficient
+ * permissions to execute that command, the function calls the corresponding
+ * command handler which does argument checking and further processing.
*
* In order to cope with a DOS attacks, a timeout is set up
* which terminates the function if the connection was not
*
* \sa alarm(2), rc4(3), crypt.c, crypt.h
*/
-int handle_connect(int fd, struct sockaddr_in *addr)
+__noreturn void handle_connect(int fd, const char *peername)
{
- int ret, argc, use_rc4 = 0;
+ int ret, argc;
char buf[4096];
- unsigned char crypt_buf[MAXLINE];
+ unsigned char rand_buf[CHALLENGE_SIZE + 2 * RC4_KEY_LEN];
+ unsigned char challenge_sha1[HASH_SIZE];
struct user *u;
struct server_command *cmd = NULL;
- long unsigned challenge_nr, chall_response;
char **argv = NULL;
char *p, *command = NULL;
size_t numbytes;
+ struct rc4_context rc4c = {.fd = fd};
- signal(SIGCHLD, SIG_IGN);
- signal(SIGINT, SIG_DFL);
- signal(SIGTERM, SIG_DFL);
- signal(SIGHUP, SIG_DFL);
- signal(SIGUSR1, SIG_IGN);
-
- challenge_nr = random();
+ reset_signals();
+ /* we need a blocking fd here as recv() might return EAGAIN otherwise. */
+ ret = mark_fd_blocking(fd);
+ if (ret < 0)
+ goto err_out;
/* send Welcome message */
ret = send_va_buffer(fd, "This is para_server, version "
PACKAGE_VERSION ".\n" );
ret = recv_buffer(fd, buf, sizeof(buf));
if (ret < 0)
goto err_out;
- if (ret <= 6) {
- ret = -E_AUTH;
+ if (ret < 10) {
+ ret = -E_AUTH_REQUEST;
goto err_out;
}
numbytes = ret;
- ret = -E_AUTH;
- if (strncmp(buf, "auth ", 5))
+ ret = -E_AUTH_REQUEST;
+ if (strncmp(buf, AUTH_REQUEST_MSG, strlen(AUTH_REQUEST_MSG)))
goto err_out;
-
- if (numbytes < 9 || strncmp(buf, "auth rc4 ", 9))
- p = buf + 5; /* client version < 0.2.6 */
- else {
- p = buf + 9; /* client version >= 0.2.6 */
- use_rc4 = 1;
- }
- PARA_DEBUG_LOG("received %s request for user %s\n",
- use_rc4? "rc4" : "auth", p);
+ p = buf + strlen(AUTH_REQUEST_MSG);
+ PARA_DEBUG_LOG("received auth request for user %s\n", p);
ret = -E_BAD_USER;
u = lookup_user(p);
- if (!u)
- goto err_out;
- ret = para_encrypt_challenge(u->rsa, challenge_nr, crypt_buf);
- if (ret <= 0)
- goto err_out;
- numbytes = ret;
- PARA_DEBUG_LOG("sending %zu byte challenge\n", numbytes);
- /* We can't use send_buffer here since buf may contain null bytes */
- ret = send_bin_buffer(fd,(char *) crypt_buf, numbytes);
+ if (u) {
+ get_random_bytes_or_die(rand_buf, sizeof(rand_buf));
+ ret = para_encrypt_buffer(u->rsa, rand_buf, sizeof(rand_buf),
+ (unsigned char *)buf);
+ if (ret < 0)
+ goto err_out;
+ numbytes = ret;
+ } else {
+ /*
+ * We don't want to reveal our user names, so we send a
+ * challenge to the client even if the user does not exist, and
+ * fail the authentication later.
+ */
+ numbytes = 256;
+ get_random_bytes_or_die((unsigned char *)buf, numbytes);
+ }
+ PARA_DEBUG_LOG("sending %u byte challenge + rc4 keys (%zu bytes)\n",
+ CHALLENGE_SIZE, numbytes);
+ ret = send_bin_buffer(fd, buf, numbytes);
if (ret < 0)
- goto err_out;
- /* recv decrypted number */
- ret = recv_buffer(fd, buf, sizeof(buf));
+ goto net_err;
+ /* recv challenge response */
+ ret = recv_bin_buffer(fd, buf, HASH_SIZE);
if (ret < 0)
- goto err_out;
+ goto net_err;
numbytes = ret;
- ret = -E_AUTH;
- if (!numbytes)
- goto err_out;
- if (sscanf(buf, CHALLENGE_RESPONSE_MSG "%lu", &chall_response) < 1
- || chall_response != challenge_nr)
- goto err_out;
- /* auth successful, send 'Proceed' message */
- PARA_INFO_LOG("good auth for %s (%lu)\n", u->name, challenge_nr);
- sprintf(buf, "%s", PROCEED_MSG);
- if (use_rc4) {
- init_rc4_keys();
- ret = para_encrypt_buffer(u->rsa, rc4_buf, 2 * RC4_KEY_LEN,
- (unsigned char *)buf + PROCEED_MSG_LEN + 1);
- if (ret <= 0)
- goto err_out;
- numbytes = ret + strlen(PROCEED_MSG) + 1;
- } else
- numbytes = strlen(buf);
- ret = send_bin_buffer(fd, buf, numbytes);
+ PARA_DEBUG_LOG("received %d bytes challenge response\n", ret);
+ ret = -E_BAD_USER;
+ if (!u)
+ goto net_err;
+ /*
+ * The correct response is the sha1 of the first CHALLENGE_SIZE bytes
+ * of the random data.
+ */
+ ret = -E_BAD_AUTH;
+ if (numbytes != HASH_SIZE)
+ goto net_err;
+ sha1_hash((char *)rand_buf, CHALLENGE_SIZE, challenge_sha1);
+ if (memcmp(challenge_sha1, buf, HASH_SIZE))
+ goto net_err;
+ /* auth successful */
+ alarm(0);
+ PARA_INFO_LOG("good auth for %s\n", u->name);
+ /* init rc4 keys with the second part of the random buffer */
+ RC4_set_key(&rc4c.recv_key, RC4_KEY_LEN, rand_buf + CHALLENGE_SIZE);
+ RC4_set_key(&rc4c.send_key, RC4_KEY_LEN, rand_buf + CHALLENGE_SIZE
+ + RC4_KEY_LEN);
+ ret = rc4_send_buffer(&rc4c, PROCEED_MSG);
if (ret < 0)
+ goto net_err;
+ ret = read_command(&rc4c, &command);
+ if (ret == -E_COMMAND_SYNTAX)
goto err_out;
- if (use_rc4)
- enable_crypt(fd, rc4_recv, rc4_send, NULL);
- ret = read_command(fd, &command);
if (ret < 0)
- goto err_out;
+ goto net_err;
ret = -E_BAD_CMD;
cmd = parse_cmd(command);
if (!cmd)
if (ret < 0)
goto err_out;
/* valid command and sufficient perms */
- alarm(0);
- argc = split_args(command, &argv, "\n");
- mmd_lock();
- mmd->num_commands++;
- mmd_unlock();
+ ret = create_argv(command, "\n", &argv);
+ if (ret < 0)
+ goto err_out;
+ argc = ret;
PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
- inet_ntoa(addr->sin_addr));
- ret = cmd->handler(fd, argc, argv);
- if (ret >= 0) {
- ret = EXIT_SUCCESS;
+ peername);
+ ret = cmd->handler(&rc4c, argc, argv);
+ free_argv(argv);
+ mutex_lock(mmd_mutex);
+ mmd->num_commands++;
+ mutex_unlock(mmd_mutex);
+ if (ret >= 0)
goto out;
- }
err_out:
- PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret));
- if (ret != -E_SEND && ret != -E_RECV)
- send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
- ret = EXIT_FAILURE;
+ rc4_send_va_buffer(&rc4c, "%s\n", para_strerror(-ret));
+net_err:
+ PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
out:
free(command);
- free(argv);
- mmd_lock();
+ mutex_lock(mmd_mutex);
if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0)
mmd->events++;
mmd->active_connections--;
- mmd_unlock();
- return ret;
+ mutex_unlock(mmd_mutex);
+ exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);
}