#include <string.h>
#include <getopt.h>
#include <limits.h>
+#include <unistd.h>
+
+#include <uuid/uuid.h>
#include "verbose.h"
#include "afb-config.h"
#error "you should define BINDING_INSTALL_DIR"
#endif
-#define AFB_VERSION "0.5"
+#define AFB_VERSION "0.6"
// default
#define DEFLT_CNTX_TIMEOUT 3600 // default Client Connection
// Define command line option
-#define SET_VERBOSE 'v'
#define SET_BACKGROUND 2
#define SET_FORGROUND 3
-#define SET_QUIET 'q'
#define SET_TCP_PORT 5
#define SET_ROOT_DIR 6
#define SET_CACHE_TIMEOUT 10
#define SET_SESSION_DIR 11
-#define SET_AUTH_TOKEN 12
#define SET_LDPATH 13
#define SET_APITIMEOUT 14
#define SET_CNTXTIMEOUT 15
-#define DISPLAY_VERSION 'V'
-#define DISPLAY_HELP 'h'
#define SET_MODE 18
-#define SET_READYFD 19
#define DBUS_CLIENT 20
#define DBUS_SERVICE 21
#define SET_ROOT_HTTP 26
-#define SET_TRACEREQ 27
+#define SET_NO_HTTPD 28
-#define SHORTOPTS "vqhV"
+#define ADD_CALL 'c'
+#define SET_TRACEDITF 'D'
+#define SET_EXEC 'e'
+#define DISPLAY_HELP 'h'
+#define SET_QUIET 'q'
+#define SET_RNDTOKEN 'r'
+#define SET_TRACEREQ 'T'
+#define SET_AUTH_TOKEN 't'
+#define SET_UPLOAD_DIR 'u'
+#define DISPLAY_VERSION 'V'
+#define SET_VERBOSE 'v'
+#define SET_WORK_DIR 'w'
+
+#define SHORTOPTS "c:D:ehqrT:t:u:Vvw:"
// Command line structure hold cli --command + help text
typedef struct {
{SET_BACKGROUND, 0, "daemon", "Get all in background mode"},
{SET_TCP_PORT, 1, "port", "HTTP listening TCP port [default 1234]"},
- {SET_ROOT_DIR, 1, "rootdir", "Root Directory [default $HOME/.AFB]"},
- {SET_ROOT_HTTP, 1, "roothttp", "HTTP Root Directory [default rootdir]"},
+ {SET_ROOT_HTTP, 1, "roothttp", "HTTP Root Directory [default no root http (files not served but apis still available)]"},
{SET_ROOT_BASE, 1, "rootbase", "Angular Base Root URL [default /opa]"},
{SET_ROOT_API, 1, "rootapi", "HTML Root API URL [default /api]"},
- {SET_ALIAS, 1, "alias", "Muliple url map outside of rootdir [eg: --alias=/icons:/usr/share/icons]"},
+ {SET_ALIAS, 1, "alias", "Multiple url map outside of rootdir [eg: --alias=/icons:/usr/share/icons]"},
{SET_APITIMEOUT, 1, "apitimeout", "Binding API timeout in seconds [default 10]"},
{SET_CNTXTIMEOUT, 1, "cntxtimeout", "Client Session Context Timeout [default 900]"},
{SET_CACHE_TIMEOUT, 1, "cache-eol", "Client cache end of live [default 3600]"},
- {SET_SESSION_DIR, 1, "sessiondir", "Sessions file path [default rootdir/sessions]"},
+ {SET_WORK_DIR, 1, "workdir", "Set the working directory [default: $PWD or current working directory]"},
+ {SET_UPLOAD_DIR, 1, "uploaddir", "Directory for uploading files [default: workdir]"},
+ {SET_ROOT_DIR, 1, "rootdir", "Root Directory of the application [default: workdir]"},
+ {SET_SESSION_DIR, 1, "sessiondir", "OBSOLETE (was: Sessions file path)"},
+
+ {SET_LDPATH, 1, "ldpaths", "Load bindings from dir1:dir2:... [default = " BINDING_INSTALL_DIR "]"},
+ {SO_BINDING, 1, "binding", "Load the binding of path"},
- {SET_LDPATH, 1, "ldpaths", "Load bindingss from dir1:dir2:... [default = " BINDING_INSTALL_DIR "]"},
{SET_AUTH_TOKEN, 1, "token", "Initial Secret [default=no-session, --token= for session without authentication]"},
+ {SET_RNDTOKEN, 0, "random-token","Creates a random token"},
{DISPLAY_VERSION, 0, "version", "Display version and copyright"},
{DISPLAY_HELP, 0, "help", "Display this help"},
{SET_MODE, 1, "mode", "Set the mode: either local, remote or global"},
- {SET_READYFD, 1, "readyfd", "Set the #fd to signal when ready"},
{DBUS_CLIENT, 1, "dbus-client", "Bind to an afb service through dbus"},
{DBUS_SERVICE, 1, "dbus-server", "Provides an afb service through dbus"},
{WS_CLIENT, 1, "ws-client", "Bind to an afb service through websocket"},
{WS_SERVICE, 1, "ws-server", "Provides an afb service through websockets"},
- {SO_BINDING, 1, "binding", "Load the binding of path"},
{SET_SESSIONMAX, 1, "session-max", "Max count of session simultaneously [default 10]"},
{SET_TRACEREQ, 1, "tracereq", "Log the requests: no, common, extra, all"},
+ {SET_TRACEDITF, 1, "traceditf", "Log the requests: no, common, extra, all"},
+ {ADD_CALL, 1, "call", "call at start format of val: API/VERB:json-args"},
+
+ {SET_NO_HTTPD, 0, "no-httpd", "Forbids HTTP service"},
+ {SET_EXEC, 0, "exec", "Execute the remaining arguments"},
{0, 0, NULL, NULL}
/* *INDENT-ON* */
{ NULL, 0 }
};
+static struct enumdesc traceditf_desc[] = {
+ { "no", 0 },
+ { "common", afb_hook_flags_ditf_common },
+ { "extra", afb_hook_flags_ditf_extra },
+ { "all", afb_hook_flags_ditf_all },
+ { NULL, 0 }
+};
+
static struct enumdesc mode_desc[] = {
{ "local", AFB_MODE_LOCAL },
{ "remote", AFB_MODE_REMOTE },
name);
}
+
+/*----------------------------------------------------------
+ | adds a string to the list
+ +--------------------------------------------------------- */
+static char *random_token()
+{
+ static char uuidstr[37];
+ uuid_t uuid;
+ uuid_generate_random(uuid);
+ uuid_unparse(uuid, uuidstr);
+ return uuidstr;
+}
+
/*----------------------------------------------------------
| adds a string to the list
+--------------------------------------------------------- */
struct afb_config_list *item;
/*
- * search tail
+ * search tail
*/
item = *head;
while (item != NULL) {
}
/*
- * alloc the item
+ * alloc the item
*/
item = malloc(sizeof *item);
if (item == NULL) {
}
/*
- * init the item
+ * init the item
*/
*head = item;
item->value = value;
| helpers for argument scanning
+--------------------------------------------------------- */
-static char *argvalstr(int index)
+static const char *optname(int optc)
+{
+ AFB_options *o = cliOptions;
+ while (o->name && o->val != optc)
+ o++;
+ return o->name ? : "<unknown-option-name>";
+}
+
+static char *argvalstr(int optc)
{
if (optarg == 0) {
ERROR("option [--%s] needs a value i.e. --%s=xxx",
- cliOptions[index].name, cliOptions[index].name);
+ optname(optc), optname(optc));
exit(1);
}
return optarg;
}
-static int argvalenum(int index, struct enumdesc *desc)
+static int argvalenum(int optc, struct enumdesc *desc)
{
int i;
size_t len;
- char *list, *name = argvalstr(index);
+ char *list, *name = argvalstr(optc);
i = 0;
while(desc[i].name && strcmp(desc[i].name, name))
list = malloc(len + i + i);
if (!i || !list)
ERROR("option [--%s] bad value (found %s)",
- cliOptions[index].name, name);
+ optname(optc), name);
else {
i = 0;
strcpy(list, desc[i].name ? : "");
while(desc[++i].name)
strcat(strcat(list, ", "), desc[i].name);
ERROR("option [--%s] bad value, only accepts values %s (found %s)",
- cliOptions[index].name, list, name);
+ optname(optc), list, name);
}
free(list);
exit(1);
return desc[i].value;
}
-static int argvalint(int index, int mini, int maxi, int base)
+static int argvalint(int optc, int mini, int maxi, int base)
{
char *beg, *end;
long int val;
- beg = argvalstr(index);
+ beg = argvalstr(optc);
val = strtol(beg, &end, base);
if (*end || end == beg) {
ERROR("option [--%s] requires a valid integer (found %s)",
- cliOptions[index].name, beg);
+ optname(optc), beg);
exit(1);
}
if (val < (long int)mini || val > (long int)maxi) {
ERROR("option [--%s] value out of bounds (not %d<=%ld<=%d)",
- cliOptions[index].name, mini, val, maxi);
+ optname(optc), mini, val, maxi);
exit(1);
}
return (int)val;
}
-static int argvalintdec(int index, int mini, int maxi)
+static int argvalintdec(int optc, int mini, int maxi)
{
- return argvalint(index, mini, maxi, 10);
+ return argvalint(optc, mini, maxi, 10);
}
-static void noarg(int index)
+static void noarg(int optc)
{
if (optarg != 0) {
- ERROR("option [--%s] need no value (found %s)", cliOptions[index].name, optarg);
+ ERROR("option [--%s] need no value (found %s)", optname(optc), optarg);
exit(1);
}
}
static void parse_arguments(int argc, char **argv, struct afb_config *config)
{
char *programName = argv[0];
- int optionIndex = 0;
int optc, ind;
int nbcmd;
struct option *gnuOptions;
}
// get all options from command line
- while ((optc = getopt_long(argc, argv, SHORTOPTS, gnuOptions, &optionIndex)) != EOF) {
+ while ((optc = getopt_long(argc, argv, SHORTOPTS, gnuOptions, NULL)) != EOF) {
switch (optc) {
case SET_VERBOSE:
verbosity++;
break;
case SET_TCP_PORT:
- config->httpdPort = argvalintdec(optionIndex, 1024, 32767);
+ config->httpdPort = argvalintdec(optc, 1024, 32767);
break;
case SET_APITIMEOUT:
- config->apiTimeout = argvalintdec(optionIndex, 0, INT_MAX);
+ config->apiTimeout = argvalintdec(optc, 0, INT_MAX);
break;
case SET_CNTXTIMEOUT:
- config->cntxTimeout = argvalintdec(optionIndex, 0, INT_MAX);
+ config->cntxTimeout = argvalintdec(optc, 0, INT_MAX);
break;
case SET_ROOT_DIR:
- config->rootdir = argvalstr(optionIndex);
+ config->rootdir = argvalstr(optc);
INFO("Forcing Rootdir=%s", config->rootdir);
break;
case SET_ROOT_HTTP:
- config->roothttp = argvalstr(optionIndex);
+ config->roothttp = argvalstr(optc);
INFO("Forcing Root HTTP=%s", config->roothttp);
break;
case SET_ROOT_BASE:
- config->rootbase = argvalstr(optionIndex);
+ config->rootbase = argvalstr(optc);
INFO("Forcing Rootbase=%s", config->rootbase);
break;
case SET_ROOT_API:
- config->rootapi = argvalstr(optionIndex);
+ config->rootapi = argvalstr(optc);
INFO("Forcing Rootapi=%s", config->rootapi);
break;
case SET_ALIAS:
- list_add(&config->aliases, argvalstr(optionIndex));
+ list_add(&config->aliases, argvalstr(optc));
break;
case SET_AUTH_TOKEN:
- config->token = argvalstr(optionIndex);
+ config->token = argvalstr(optc);
break;
case SET_LDPATH:
- list_add(&config->ldpaths, argvalstr(optionIndex));
+ list_add(&config->ldpaths, argvalstr(optc));
+ break;
+
+ case ADD_CALL:
+ list_add(&config->calls, argvalstr(optc));
break;
case SET_SESSION_DIR:
- config->sessiondir = argvalstr(optionIndex);
+ /* config->sessiondir = argvalstr(optc); */
+ WARNING("Obsolete otpion %s ignored", optname(optc));
+ break;
+
+ case SET_UPLOAD_DIR:
+ config->uploaddir = argvalstr(optc);
+ break;
+
+ case SET_WORK_DIR:
+ config->workdir = argvalstr(optc);
break;
case SET_CACHE_TIMEOUT:
- config->cacheTimeout = argvalintdec(optionIndex, 0, INT_MAX);
+ config->cacheTimeout = argvalintdec(optc, 0, INT_MAX);
break;
case SET_SESSIONMAX:
- config->nbSessionMax = argvalintdec(optionIndex, 1, INT_MAX);
+ config->nbSessionMax = argvalintdec(optc, 1, INT_MAX);
break;
case SET_FORGROUND:
- noarg(optionIndex);
+ noarg(optc);
config->background = 0;
break;
case SET_BACKGROUND:
- noarg(optionIndex);
+ noarg(optc);
config->background = 1;
break;
case SET_MODE:
- config->mode = argvalenum(optionIndex, mode_desc);
- break;
-
- case SET_READYFD:
- config->readyfd = argvalintdec(optionIndex, 0, INT_MAX);
+ config->mode = argvalenum(optc, mode_desc);
break;
case DBUS_CLIENT:
- list_add(&config->dbus_clients, argvalstr(optionIndex));
+ list_add(&config->dbus_clients, argvalstr(optc));
break;
case DBUS_SERVICE:
- list_add(&config->dbus_servers, argvalstr(optionIndex));
+ list_add(&config->dbus_servers, argvalstr(optc));
break;
case WS_CLIENT:
- list_add(&config->ws_clients, argvalstr(optionIndex));
+ list_add(&config->ws_clients, argvalstr(optc));
break;
case WS_SERVICE:
- list_add(&config->ws_servers, argvalstr(optionIndex));
+ list_add(&config->ws_servers, argvalstr(optc));
break;
case SO_BINDING:
- list_add(&config->so_bindings, argvalstr(optionIndex));
+ list_add(&config->so_bindings, argvalstr(optc));
break;
case SET_TRACEREQ:
- config->tracereq = argvalenum(optionIndex, tracereq_desc);
+ config->tracereq = argvalenum(optc, tracereq_desc);
+ break;
+
+ case SET_TRACEDITF:
+ config->traceditf = argvalenum(optc, traceditf_desc);
+ break;
+
+ case SET_NO_HTTPD:
+ noarg(optc);
+ config->noHttpd = 1;
+ break;
+
+ case SET_EXEC:
+ config->exec = &argv[optind];
+ optind = argc;
+ break;
+
+ case SET_RNDTOKEN:
+ config->token = random_token();
break;
case DISPLAY_VERSION:
- noarg(optionIndex);
+ noarg(optc);
printVersion(stdout);
exit(0);
if (config->nbSessionMax == 0)
config->nbSessionMax = CTX_NBCLIENTS;
- if (config->rootdir == NULL) {
- config->rootdir = getenv("AFBDIR");
- if (config->rootdir == NULL) {
- config->rootdir = malloc(512);
- strncpy(config->rootdir, getenv("HOME"), 512);
- strncat(config->rootdir, "/.AFB", 512);
- }
- }
+ /* set directories */
+ if (config->workdir == NULL)
+ config->workdir = ".";
+
+ if (config->rootdir == NULL)
+ config->rootdir = ".";
+
+ if (config->uploaddir == NULL)
+ config->uploaddir = ".";
+
// if no Angular/HTML5 rootbase let's try '/' as default
if (config->rootbase == NULL)
config->rootbase = "/opa";
if (config->ldpaths == NULL)
list_add(&config->ldpaths, BINDING_INSTALL_DIR);
- // if no session dir create a default path from rootdir
- if (config->sessiondir == NULL) {
- config->sessiondir = malloc(512);
- strncpy(config->sessiondir, config->rootdir, 512);
- strncat(config->sessiondir, "/sessions", 512);
- }
- // if no config dir create a default path from sessiondir
+ // if no config dir create a default path from uploaddir
if (config->console == NULL) {
config->console = malloc(512);
- strncpy(config->console, config->sessiondir, 512);
+ strncpy(config->console, config->uploaddir, 512);
strncat(config->console, "/AFB-console.out", 512);
}
}
{
struct afb_config_list *l;
struct enumdesc *e;
+ char **v;
#define NN(x) (x)?:""
#define P(...) fprintf(stderr, __VA_ARGS__)
#define S(x) PF(x);P("%s",NN(config->x));PE;
#define D(x) PF(x);P("%d",config->x);PE;
#define H(x) PF(x);P("%x",config->x);PE;
+#define B(x) PF(x);P("%s",config->x?"yes":"no");PE;
#define L(x) PF(x);l=config->x;if(l){P("%s\n",NN(l->value));for(l=l->next;l;l=l->next)P("-- %15s %s\n","",NN(l->value));}else PE;
-#define E(x,d) for(e=d;e->name&&e->value!=config->x;e++);PF(x);if(e->name)P("%s",e->name);else P("%d",config->x);PE;
+#define E(x,d) for(e=d;e->name&&e->value!=config->x;e++);if(e->name){PF(x);P("%s",e->name);PE;}else{D(x);}
+#define V(x) P("-- %15s:", #x);for(v=config->x;v&&*v;v++)P(" %s",*v); PE;
- P("-- BEGIN OF CONFIG --\n");
+ P("---BEGIN-OF-CONFIG---\n");
S(console)
S(rootdir)
S(roothttp)
S(rootbase)
S(rootapi)
- S(sessiondir)
+ S(workdir)
+ S(uploaddir)
S(token)
L(aliases)
L(ws_servers)
L(so_bindings)
L(ldpaths)
+ L(calls)
+
+ V(exec)
D(httpdPort)
- D(background)
- D(readyfd)
+ B(background)
D(cacheTimeout)
D(apiTimeout)
D(cntxTimeout)
D(nbSessionMax)
E(mode,mode_desc)
E(tracereq,tracereq_desc)
- P("-- END OF CONFIG --\n");
+ E(traceditf,traceditf_desc)
+ B(noHttpd)
+ P("---END-OF-CONFIG---\n");
+#undef V
#undef E
#undef L
+#undef B
#undef H
#undef D
#undef S