/*
- * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2015-2018 "IoT.bzh"
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
*/
#define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <getopt.h>
#include <limits.h>
+#include <unistd.h>
+#include <ctype.h>
-#include <uuid/uuid.h>
+#include <json-c/json.h>
+#if !defined(JSON_C_TO_STRING_NOSLASHESCAPE)
+#define JSON_C_TO_STRING_NOSLASHESCAPE 0
+#endif
#include "verbose.h"
#include "afb-config.h"
-#include "afb-hook.h"
+#include "afb-hook-flags.h"
+#include "wrap-json.h"
-#include <afb/afb-binding.h>
+#define _d2s_(x) #x
+#define d2s(x) _d2s_(x)
#if !defined(BINDING_INSTALL_DIR)
#error "you should define BINDING_INSTALL_DIR"
#endif
+#if !defined(AFB_VERSION)
+#error "you should define AFB_VERSION"
+#endif
-#define AFB_VERSION "0.5"
+/**
+ * The default timeout of sessions in seconds
+ */
+#define DEFAULT_SESSION_TIMEOUT 32000000
-// default
-#define DEFLT_CNTX_TIMEOUT 3600 // default Client Connection
- // Timeout
-#define DEFLT_API_TIMEOUT 20 // default Plugin API Timeout [0=NoLimit
- // for Debug Only]
-#define DEFLT_CACHE_TIMEOUT 100000 // default Static File Chache
- // [Client Side Cache
- // 100000~=1day]
-#define DEFLT_AUTH_TOKEN NULL // expect for debug should == NULL
-#define CTX_NBCLIENTS 10 // allow a default of 10 authenticated
- // clients
+/**
+ * The default timeout of api calls in seconds
+ */
+#define DEFAULT_API_TIMEOUT 20
+/**
+ * The default timeout of cache in seconds
+ */
+#define DEFAULT_CACHE_TIMEOUT 100000
+
+/**
+ * The default maximum count of sessions
+ */
+#define DEFAULT_MAX_SESSION_COUNT 200
+
+/**
+ * The default HTTP port to serve
+ */
+#define DEFAULT_HTTP_PORT 1234
// Define command line option
-#define SET_BACKGROUND 2
-#define SET_FORGROUND 3
+#define SET_BACKGROUND 1
+#define SET_FOREGROUND 2
+#define SET_ROOT_DIR 3
+#define SET_ROOT_BASE 4
+#define SET_ROOT_API 5
+#define ADD_ALIAS 6
-#define SET_TCP_PORT 5
-#define SET_ROOT_DIR 6
-#define SET_ROOT_BASE 7
-#define SET_ROOT_API 8
-#define SET_ALIAS 9
+#define SET_CACHE_TIMEOUT 7
-#define SET_CACHE_TIMEOUT 10
-#define SET_SESSION_DIR 11
+#define AUTO_WS 8
+#define AUTO_LINK 9
-#define SET_LDPATH 13
-#define SET_APITIMEOUT 14
-#define SET_CNTXTIMEOUT 15
+#define ADD_LDPATH 10
+#define SET_API_TIMEOUT 11
+#define SET_SESSION_TIMEOUT 12
+#define ADD_WEAK_LDPATH 13
+#define SET_NO_LDPATH 14
+#define SET_SESSIONMAX 15
-#define SET_MODE 18
-#define SET_READYFD 19
+#define ADD_WS_CLIENT 16
+#define ADD_WS_SERVICE 17
-#define DBUS_CLIENT 20
-#define DBUS_SERVICE 21
-#define SO_BINDING 22
+#define SET_ROOT_HTTP 18
-#define SET_SESSIONMAX 23
+#define SET_NO_HTTPD 19
-#define WS_CLIENT 24
-#define WS_SERVICE 25
+#define SET_TRACEEVT 20
+#define SET_TRACESES 21
+#define SET_TRACEREQ 22
+#define SET_TRACEAPI 23
+#define SET_TRACEGLOB 24
+#if !defined(REMOVE_LEGACY_TRACE)
+#define SET_TRACEDITF 25
+#define SET_TRACESVC 26
+#endif
-#define SET_ROOT_HTTP 26
+#if defined(WITH_DBUS_TRANSPARENCY)
+# define ADD_DBUS_CLIENT 30
+# define ADD_DBUS_SERVICE 31
+#endif
-#define SET_NO_HTTPD 28
+#define ADD_AUTO_API 'A'
+#define ADD_BINDING 'b'
+#define SET_CONFIG 'C'
+#define ADD_CALL 'c'
+#define SET_DAEMON 'D'
#define SET_EXEC 'e'
-#define DISPLAY_HELP 'h'
+#define GET_HELP 'h'
+#define SET_LOG 'l'
+#if defined(WITH_MONITORING_OPTION)
+#define SET_MONITORING 'M'
+#endif
+#define SET_NAME 'n'
+#define SET_OUTPUT 'o'
+#define SET_PORT 'p'
#define SET_QUIET 'q'
-#define SET_RNDTOKEN 'r'
-#define SET_TRACEREQ 'T'
-#define SET_AUTH_TOKEN 't'
-#define DISPLAY_VERSION 'V'
+#define SET_RANDOM_TOKEN 'r'
+#define SET_TOKEN 't'
+#define SET_UPLOAD_DIR 'u'
+#define GET_VERSION 'V'
#define SET_VERBOSE 'v'
+#define SET_WORK_DIR 'w'
+
+/* structure for defining of options */
+struct option_desc {
+ int id; /* id of the option */
+ int has_arg; /* is a value required */
+ char *name; /* long name of the option */
+ char *help; /* help text */
+};
-#define SHORTOPTS "ehqrT:t:Vv"
+/* definition of options */
+static struct option_desc optdefs[] = {
+/* *INDENT-OFF* */
+ {SET_VERBOSE, 0, "verbose", "Verbose Mode, repeat to increase verbosity"},
+ {SET_QUIET, 0, "quiet", "Quiet Mode, repeat to decrease verbosity"},
+ {SET_LOG, 1, "log", "Tune log level"},
-// Command line structure hold cli --command + help text
-typedef struct {
- int val; // command number within application
- int has_arg; // command number within application
- char *name; // command as used in --xxxx cli
- char *help; // help text
-} AFB_options;
+ {SET_FOREGROUND, 0, "foreground", "Get all in foreground mode"},
+ {SET_BACKGROUND, 0, "background", "Get all in background mode"},
+ {SET_DAEMON, 0, "daemon", "Get all in background mode"},
-// Supported option
-static AFB_options cliOptions[] = {
-/* *INDENT-OFF* */
- {SET_VERBOSE, 0, "verbose", "Verbose Mode, repeat to increase verbosity"},
- {SET_QUIET, 0, "quiet", "Quiet Mode, repeat to decrease verbosity"},
+ {SET_NAME, 1, "name", "Set the visible name"},
- {SET_FORGROUND, 0, "foreground", "Get all in foreground mode"},
- {SET_BACKGROUND, 0, "daemon", "Get all in background mode"},
+ {SET_PORT, 1, "port", "HTTP listening TCP port [default " d2s(DEFAULT_HTTP_PORT) "]"},
+ {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]"},
+ {ADD_ALIAS, 1, "alias", "Multiple url map outside of rootdir [eg: --alias=/icons:/usr/share/icons]"},
- {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_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_API_TIMEOUT, 1, "apitimeout", "Binding API timeout in seconds [default " d2s(DEFAULT_API_TIMEOUT) "]"},
+ {SET_SESSION_TIMEOUT, 1, "cntxtimeout", "Client Session Context Timeout [default " d2s(DEFAULT_SESSION_TIMEOUT) "]"},
+ {SET_CACHE_TIMEOUT, 1, "cache-eol", "Client cache end of live [default " d2s(DEFAULT_CACHE_TIMEOUT) "]"},
- {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_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", "Sessions file path [default rootdir/sessions]"},
+ {ADD_LDPATH, 1, "ldpaths", "Load bindings from dir1:dir2:... [default = " BINDING_INSTALL_DIR "]"},
+ {ADD_BINDING, 1, "binding", "Load the binding of path"},
+ {ADD_WEAK_LDPATH, 1, "weak-ldpaths","Same as --ldpaths but ignore errors"},
+ {SET_NO_LDPATH, 0, "no-ldpaths", "Discard default ldpaths loading"},
- {SET_LDPATH, 1, "ldpaths", "Load bindings from dir1:dir2:... [default = " BINDING_INSTALL_DIR "]"},
- {SET_AUTH_TOKEN, 1, "token", "Initial Secret [default=no-session, --token= for session without authentication]"},
+ {SET_TOKEN, 1, "token", "Initial Secret [default=random, use --token="" to allow any token]"},
+ {SET_RANDOM_TOKEN, 0, "random-token","Enforce a random token"},
- {DISPLAY_VERSION, 0, "version", "Display version and copyright"},
- {DISPLAY_HELP, 0, "help", "Display this help"},
+ {GET_VERSION, 0, "version", "Display version and copyright"},
+ {GET_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"},
+#if defined(WITH_DBUS_TRANSPARENCY)
+ {ADD_DBUS_CLIENT, 1, "dbus-client", "Bind to an afb service through dbus"},
+ {ADD_DBUS_SERVICE, 1, "dbus-server", "Provide an afb service through dbus"},
+#endif
+ {ADD_WS_CLIENT, 1, "ws-client", "Bind to an afb service through websocket"},
+ {ADD_WS_SERVICE, 1, "ws-server", "Provide an afb service through websockets"},
- {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"},
+ {ADD_AUTO_API, 1, "auto-api", "Automatic load of api of the given directory"},
- {SET_SESSIONMAX, 1, "session-max", "Max count of session simultaneously [default 10]"},
+ {SET_SESSIONMAX, 1, "session-max", "Max count of session simultaneously [default " d2s(DEFAULT_MAX_SESSION_COUNT) "]"},
- {SET_TRACEREQ, 1, "tracereq", "Log the requests: no, common, extra, all"},
+ {SET_TRACEREQ, 1, "tracereq", "Log the requests: none, common, extra, all"},
+ {SET_TRACEEVT, 1, "traceevt", "Log the events: none, common, extra, all"},
+ {SET_TRACESES, 1, "traceses", "Log the sessions: none, all"},
+ {SET_TRACEAPI, 1, "traceapi", "Log the apis: none, common, api, event, all"},
+ {SET_TRACEGLOB, 1, "traceglob", "Log the globals: none, all"},
+#if !defined(REMOVE_LEGACY_TRACE)
+ {SET_TRACEDITF, 1, "traceditf", "Log the daemons: no, common, all"},
+ {SET_TRACESVC, 1, "tracesvc", "Log the services: no, all"},
+#endif
- {SET_NO_HTTPD, 0, "no-httpd", "Forbids HTTP service"},
- {SET_EXEC, 0, "exec", "Execute the remaining arguments"},
- {SET_RNDTOKEN, 0, "random-token","creates a random token"},
+ {ADD_CALL, 1, "call", "Call at start, format of val: API/VERB:json-args"},
+
+ {SET_NO_HTTPD, 0, "no-httpd", "Forbid HTTP service"},
+ {SET_EXEC, 0, "exec", "Execute the remaining arguments"},
+
+#if defined(WITH_MONITORING_OPTION)
+ {SET_MONITORING, 0, "monitoring", "Enable HTTP monitoring at <ROOT>/monitoring/"},
+#endif
+
+ {SET_CONFIG, 1, "config", "Load options from the given config file"},
+ {SET_OUTPUT, 1, "output", "Redirect stdout and stderr to output file (when --daemon)"},
{0, 0, NULL, NULL}
/* *INDENT-ON* */
};
+#if defined(WITH_MONITORING_OPTION)
+static const char MONITORING_ALIAS[] = "/monitoring:"BINDING_INSTALL_DIR"/monitoring";
+#endif
-struct enumdesc
-{
- const char *name;
- int value;
+static const struct {
+ int optid;
+ int valdef;
+} default_optint_values[] = {
+ { SET_PORT, DEFAULT_HTTP_PORT },
+ { SET_API_TIMEOUT, DEFAULT_API_TIMEOUT },
+ { SET_CACHE_TIMEOUT, DEFAULT_CACHE_TIMEOUT },
+ { SET_SESSION_TIMEOUT, DEFAULT_SESSION_TIMEOUT },
+ { SET_SESSIONMAX, DEFAULT_MAX_SESSION_COUNT }
};
-static struct enumdesc tracereq_desc[] = {
- { "no", 0 },
- { "common", afb_hook_flags_req_common },
- { "extra", afb_hook_flags_req_extra },
- { "all", afb_hook_flags_req_all },
- { NULL, 0 }
+static const struct {
+ int optid;
+ const char *valdef;
+} default_optstr_values[] = {
+ { SET_WORK_DIR, "." },
+ { SET_ROOT_DIR, "." },
+ { SET_UPLOAD_DIR, "." },
+ { SET_ROOT_BASE, "/opa" },
+ { SET_ROOT_API, "/api" }
};
-static struct enumdesc mode_desc[] = {
- { "local", AFB_MODE_LOCAL },
- { "remote", AFB_MODE_REMOTE },
- { "global", AFB_MODE_GLOBAL },
- { NULL, 0 }
-};
+/**********************************
+* preparing items
+***********************************/
+
+static char *shortopts = NULL;
+static int *id2idx = NULL;
+
+static void *oomchk(void *ptr)
+{
+ if (!ptr) {
+ ERROR("Out of memory");
+ exit(1);
+ }
+ return ptr;
+}
+
+static char is_short_option(int val)
+{
+ return (val >= 'a' && val <= 'z') || (val >= 'A' && val <= 'Z') || (val >= '0' && val <= '9');
+}
+
+static void init_options()
+{
+ int i, ns, mi, id;
+
+ if (!shortopts) {
+ ns = 2;
+ mi = -1;
+ for (i = 0 ; optdefs[i].name ; i++) {
+ id = optdefs[i].id;
+ if (id > mi)
+ mi = id;
+ if (is_short_option(id))
+ ns += 1 + !!optdefs[i].has_arg;
+ }
+ shortopts = oomchk(malloc(2 + ns));
+ id2idx = oomchk(calloc(1 + mi, sizeof *id2idx));
+ shortopts[ns = 0] = ':';
+ for (i = 0 ; optdefs[i].name ; i++) {
+ id = optdefs[i].id;
+ id2idx[id] = i;
+ if (is_short_option(id)) {
+ shortopts[++ns] = (char)id;
+ if (optdefs[i].has_arg)
+ shortopts[++ns] = ':';
+ }
+ }
+ shortopts[++ns] = 0;
+ }
+}
+
+static const char *name_of_optid(int optid)
+{
+ return optdefs[id2idx[optid]].name;
+}
+
+static int get_enum_val(const char *name, int optid, int (*func)(const char*))
+{
+ int i;
+
+ i = func(name);
+ if (i < 0) {
+ ERROR("option [--%s] bad value (found %s)",
+ name_of_optid(optid), name);
+ exit(1);
+ }
+ return i;
+}
+
/*----------------------------------------------------------
| printversion
+--------------------------------------------------------- */
static void printVersion(FILE * file)
{
- fprintf(file, "\n----------------------------------------- \n");
- fprintf(file, " AFB [Application Framework Binder] version=%s |\n",
- AFB_VERSION);
- fprintf(file, " \n");
fprintf(file,
- " Copyright (C) 2015, 2016, 2017 \"IoT.bzh\" [fulup -at- iot.bzh]\n");
- fprintf(file, " AFB comes with ABSOLUTELY NO WARRANTY.\n");
- fprintf(file, " Licence Apache 2\n\n");
+ "\n"
+ " AGL Framework Binder [AFB %s] "
+#if defined(WITH_DBUS_TRANSPARENCY)
+ "+"
+#else
+ "-"
+#endif
+ "DBUS "
+#if defined(WITH_MONITORING_OPTION)
+ "+"
+#else
+ "-"
+#endif
+ "MONITOR "
+#if defined(WITH_SUPERVISION)
+ "+"
+#else
+ "-"
+#endif
+ "SUPERVISION [BINDINGS "
+#if defined(WITH_LEGACY_BINDING_V1)
+ "+"
+#else
+ "-"
+#endif
+ "V1 "
+#if defined(WITH_LEGACY_BINDING_VDYN)
+ "+"
+#else
+ "-"
+#endif
+ "VDYN +V2 +V3]\n"
+ "\n",
+ AFB_VERSION
+ );
+ fprintf(file,
+ " Copyright (C) 2015-2018 \"IoT.bzh\"\n"
+ " AFB comes with ABSOLUTELY NO WARRANTY.\n"
+ " Licence Apache 2\n"
+ "\n");
}
/*----------------------------------------------------------
static void printHelp(FILE * file, const char *name)
{
int ind;
- char command[50];
-
- fprintf(file, "%s:\nallowed options\n", name);
- for (ind = 0; cliOptions[ind].name != NULL; ind++) {
- strcpy(command, cliOptions[ind].name);
- if (cliOptions[ind].has_arg)
+ char command[50], sht[4];
+
+ fprintf(file, "%s:\nallowed options\n", strrchr(name, '/') ? strrchr(name, '/') + 1 : name);
+ sht[3] = 0;
+ for (ind = 0; optdefs[ind].name != NULL; ind++) {
+ if (is_short_option(optdefs[ind].id)) {
+ sht[0] = '-';
+ sht[1] = (char)optdefs[ind].id;
+ sht[2] = ',';
+ } else {
+ sht[0] = sht[1] = sht[2] = ' ';
+ }
+ strcpy(command, optdefs[ind].name);
+ if (optdefs[ind].has_arg)
strcat(command, "=xxxx");
- fprintf(file, " --%-15s %s\n", command, cliOptions[ind].help);
+ fprintf(file, " %s --%-17s %s\n", sht, command, optdefs[ind].help);
}
fprintf(file,
- "Example:\n %s --verbose --port=1234 --token='azerty' --ldpaths=build/bindings:/usr/lib64/agl/bindings\n",
+ "Example:\n %s --verbose --port="
+ d2s(DEFAULT_HTTP_PORT)
+ " --token='azerty' --ldpaths=build/bindings:/usr/lib64/agl/bindings\n",
name);
}
+/**********************************
+* json helpers
+***********************************/
-/*----------------------------------------------------------
- | adds a string to the list
- +--------------------------------------------------------- */
-static char *random_token()
+static struct json_object *joomchk(struct json_object *value)
{
- static char uuidstr[37];
- uuid_t uuid;
- uuid_generate_random(uuid);
- uuid_unparse(uuid, uuidstr);
- return uuidstr;
+ return oomchk(value);
}
-/*----------------------------------------------------------
- | adds a string to the list
- +--------------------------------------------------------- */
-static void list_add(struct afb_config_list **head, char *value)
+static struct json_object *to_jstr(const char *value)
{
- struct afb_config_list *item;
-
- /*
- * search tail
- */
- item = *head;
- while (item != NULL) {
- head = &item->next;
- item = item->next;
- }
+ return joomchk(json_object_new_string(value));
+}
- /*
- * alloc the item
- */
- item = malloc(sizeof *item);
- if (item == NULL) {
- ERROR("out of memory");
- exit(1);
- }
+static struct json_object *to_jint(int value)
+{
+ return joomchk(json_object_new_int(value));
+}
- /*
- * init the item
- */
- *head = item;
- item->value = value;
- item->next = NULL;
+static struct json_object *to_jbool(int value)
+{
+ return joomchk(json_object_new_boolean(value));
}
-/*---------------------------------------------------------
- | helpers for argument scanning
- +--------------------------------------------------------- */
+/**********************************
+* arguments helpers
+***********************************/
-static const char *optname(int optc)
+static void noarg(int optid)
{
- AFB_options *o = cliOptions;
- while (o->name && o->val != optc)
- o++;
- return o->name ? : "<unknown-option-name>";
+ if (optarg) {
+ ERROR("option [--%s] need no value (found %s)", name_of_optid(optid), optarg);
+ exit(1);
+ }
}
-static char *argvalstr(int optc)
+static const char *get_arg(int optid)
{
if (optarg == 0) {
ERROR("option [--%s] needs a value i.e. --%s=xxx",
- optname(optc), optname(optc));
+ name_of_optid(optid), name_of_optid(optid));
exit(1);
}
return optarg;
}
-static int argvalenum(int optc, struct enumdesc *desc)
+static void config_del(struct json_object *config, int optid)
{
- int i;
- size_t len;
- char *list, *name = argvalstr(optc);
+ return json_object_object_del(config, name_of_optid(optid));
+}
- i = 0;
- while(desc[i].name && strcmp(desc[i].name, name))
- i++;
- if (!desc[i].name) {
- len = 0;
- i = 0;
- while(desc[i].name)
- len += strlen(desc[i++].name);
- list = malloc(len + i + i);
- if (!i || !list)
- ERROR("option [--%s] bad value (found %s)",
- 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)",
- optname(optc), list, name);
- }
- free(list);
- exit(1);
+static int config_has(struct json_object *config, int optid)
+{
+ return json_object_object_get_ex(config, name_of_optid(optid), NULL);
+}
+
+static int config_has_bool(struct json_object *config, int optid)
+{
+ struct json_object *x;
+ return json_object_object_get_ex(config, name_of_optid(optid), &x)
+ && json_object_get_boolean(x);
+}
+
+static int config_has_str(struct json_object *config, int optid, const char *val)
+{
+ int i, n;
+ struct json_object *a;
+
+ if (!json_object_object_get_ex(config, name_of_optid(optid), &a))
+ return 0;
+
+ if (!json_object_is_type(a, json_type_array))
+ return !strcmp(val, json_object_get_string(a));
+
+ n = (int)json_object_array_length(a);
+ for (i = 0 ; i < n ; i++) {
+ if (!strcmp(val, json_object_get_string(json_object_array_get_idx(a, i))))
+ return 1;
}
- return desc[i].value;
+ return 0;
+}
+
+static void config_set(struct json_object *config, int optid, struct json_object *val)
+{
+ json_object_object_add(config, name_of_optid(optid), val);
+}
+
+static void config_set_str(struct json_object *config, int optid, const char *val)
+{
+ config_set(config, optid, to_jstr(val));
+}
+
+static void config_set_optstr(struct json_object *config, int optid)
+{
+ config_set_str(config, optid, get_arg(optid));
+}
+
+static void config_set_int(struct json_object *config, int optid, int value)
+{
+ config_set(config, optid, to_jint(value));
}
-static int argvalint(int optc, int mini, int maxi, int base)
+static void config_set_bool(struct json_object *config, int optid, int value)
{
- char *beg, *end;
+ config_set(config, optid, to_jbool(value));
+}
+
+static void config_set_optint_base(struct json_object *config, int optid, int mini, int maxi, int base)
+{
+ const char *beg, *end;
long int val;
- beg = argvalstr(optc);
- val = strtol(beg, &end, base);
+
+ beg = get_arg(optid);
+ val = strtol(beg, (char**)&end, base);
if (*end || end == beg) {
ERROR("option [--%s] requires a valid integer (found %s)",
- optname(optc), beg);
+ name_of_optid(optid), beg);
exit(1);
}
if (val < (long int)mini || val > (long int)maxi) {
- ERROR("option [--%s] value out of bounds (not %d<=%ld<=%d)",
- optname(optc), mini, val, maxi);
+ ERROR("option [--%s] value %ld out of bounds (not in [%d , %d])",
+ name_of_optid(optid), val, mini, maxi);
exit(1);
}
- return (int)val;
+ config_set_int(config, optid, (int)val);
}
-static int argvalintdec(int optc, int mini, int maxi)
+static void config_set_optint(struct json_object *config, int optid, int mini, int maxi)
{
- return argvalint(optc, mini, maxi, 10);
+ return config_set_optint_base(config, optid, mini, maxi, 10);
}
-static void noarg(int optc)
+static void config_set_optenum(struct json_object *config, int optid, int (*func)(const char*))
{
- if (optarg != 0) {
- ERROR("option [--%s] need no value (found %s)", optname(optc), optarg);
- exit(1);
+ const char *name = get_arg(optid);
+ get_enum_val(name, optid, func);
+ config_set_str(config, optid, name);
+}
+
+static void config_add(struct json_object *config, int optid, struct json_object *val)
+{
+ struct json_object *a;
+ if (!json_object_object_get_ex(config, name_of_optid(optid), &a)) {
+ a = json_object_new_array();
+ oomchk(a);
+ json_object_object_add(config, name_of_optid(optid), a);
}
+ json_object_array_add(a, val);
}
-/*---------------------------------------------------------
- | Parse option and launch action
- +--------------------------------------------------------- */
+static void config_add_str(struct json_object *config, int optid, const char *val)
+{
+ config_add(config, optid, to_jstr(val));
+}
-static void parse_arguments(int argc, char **argv, struct afb_config *config)
+static void config_add_optstr(struct json_object *config, int optid)
{
- char *programName = argv[0];
- int optc, ind;
- int nbcmd;
- struct option *gnuOptions;
+ config_add_str(config, optid, get_arg(optid));
+}
- // ------------------ Process Command Line -----------------------
+/*---------------------------------------------------------
+ | set the log levels
+ +--------------------------------------------------------- */
- // build GNU getopt info from cliOptions
- nbcmd = sizeof(cliOptions) / sizeof(AFB_options);
- gnuOptions = malloc(sizeof(*gnuOptions) * (unsigned)nbcmd);
- for (ind = 0; ind < nbcmd; ind++) {
- gnuOptions[ind].name = cliOptions[ind].name;
- gnuOptions[ind].has_arg = cliOptions[ind].has_arg;
- gnuOptions[ind].flag = 0;
- gnuOptions[ind].val = cliOptions[ind].val;
+static void set_log(const char *args)
+{
+ char o = 0, s, *p, *i = strdupa(args);
+ int lvl;
+
+ for(;;) switch (*i) {
+ case 0:
+ return;
+ case '+':
+ case '-':
+ o = *i;
+ /*@fallthrough@*/
+ case ' ':
+ case ',':
+ i++;
+ break;
+ default:
+ p = i;
+ while (isalpha(*p)) p++;
+ s = *p;
+ *p = 0;
+ lvl = verbose_level_of_name(i);
+ if (lvl < 0) {
+ i = strdupa(i);
+ *p = s;
+ ERROR("Bad log name '%s' in %s", i, args);
+ exit(1);
+ }
+ *p = s;
+ i = p;
+ if (o == '-')
+ verbose_sub(lvl);
+ else {
+ if (!o) {
+ verbose_clear();
+ o = '+';
+ }
+ verbose_add(lvl);
+ }
+ break;
}
+}
- // get all options from command line
- while ((optc = getopt_long(argc, argv, SHORTOPTS, gnuOptions, NULL)) != EOF) {
- switch (optc) {
+/*---------------------------------------------------------
+ | Parse option and launch action
+ +--------------------------------------------------------- */
+
+static void parse_arguments_inner(int argc, char **argv, struct json_object *config, struct option *options)
+{
+ struct json_object *conf;
+ int optid, cind;
+
+ for (;;) {
+ cind = optind;
+ optid = getopt_long(argc, argv, shortopts, options, NULL);
+ if (optid < 0) {
+ /* end of options */
+ break;
+ }
+ switch (optid) {
case SET_VERBOSE:
- verbosity++;
+ verbose_inc();
break;
case SET_QUIET:
- verbosity--;
+ verbose_dec();
break;
- case SET_TCP_PORT:
- config->httpdPort = argvalintdec(optc, 1024, 32767);
+ case SET_LOG:
+ set_log(get_arg(optid));
break;
- case SET_APITIMEOUT:
- config->apiTimeout = argvalintdec(optc, 0, INT_MAX);
+ case SET_PORT:
+ config_set_optint(config, optid, 1024, 32767);
break;
- case SET_CNTXTIMEOUT:
- config->cntxTimeout = argvalintdec(optc, 0, INT_MAX);
+ case SET_API_TIMEOUT:
+ case SET_SESSION_TIMEOUT:
+ case SET_CACHE_TIMEOUT:
+ config_set_optint(config, optid, 0, INT_MAX);
break;
- case SET_ROOT_DIR:
- config->rootdir = argvalstr(optc);
- INFO("Forcing Rootdir=%s", config->rootdir);
+ case SET_SESSIONMAX:
+ config_set_optint(config, optid, 1, INT_MAX);
break;
+ case SET_ROOT_DIR:
case SET_ROOT_HTTP:
- config->roothttp = argvalstr(optc);
- INFO("Forcing Root HTTP=%s", config->roothttp);
- break;
-
case SET_ROOT_BASE:
- config->rootbase = argvalstr(optc);
- INFO("Forcing Rootbase=%s", config->rootbase);
- break;
-
case SET_ROOT_API:
- config->rootapi = argvalstr(optc);
- INFO("Forcing Rootapi=%s", config->rootapi);
+ case SET_TOKEN:
+ case SET_UPLOAD_DIR:
+ case SET_WORK_DIR:
+ case SET_NAME:
+ config_set_optstr(config, optid);
break;
- case SET_ALIAS:
- list_add(&config->aliases, argvalstr(optc));
- break;
-
- case SET_AUTH_TOKEN:
- config->token = argvalstr(optc);
- break;
-
- case SET_LDPATH:
- list_add(&config->ldpaths, argvalstr(optc));
- break;
-
- case SET_SESSION_DIR:
- config->sessiondir = argvalstr(optc);
- break;
-
- case SET_CACHE_TIMEOUT:
- config->cacheTimeout = argvalintdec(optc, 0, INT_MAX);
+#if defined(WITH_DBUS_TRANSPARENCY)
+ case ADD_DBUS_CLIENT:
+ case ADD_DBUS_SERVICE:
+#endif
+ case ADD_ALIAS:
+ case ADD_LDPATH:
+ case ADD_WEAK_LDPATH:
+ case ADD_CALL:
+ case ADD_WS_CLIENT:
+ case ADD_WS_SERVICE:
+ case ADD_BINDING:
+ case ADD_AUTO_API:
+ config_add_optstr(config, optid);
break;
- case SET_SESSIONMAX:
- config->nbSessionMax = argvalintdec(optc, 1, INT_MAX);
+#if defined(WITH_MONITORING_OPTION)
+ case SET_MONITORING:
+#endif
+ case SET_RANDOM_TOKEN:
+ case SET_NO_HTTPD:
+ case SET_NO_LDPATH:
+ noarg(optid);
+ config_set_bool(config, optid, 1);
break;
- case SET_FORGROUND:
- noarg(optc);
- config->background = 0;
- break;
+ case SET_FOREGROUND:
case SET_BACKGROUND:
- noarg(optc);
- config->background = 1;
+ case SET_DAEMON:
+ noarg(optid);
+ config_set_bool(config, SET_DAEMON, optid != SET_FOREGROUND);
break;
- case SET_MODE:
- config->mode = argvalenum(optc, mode_desc);
+ case SET_TRACEREQ:
+ config_set_optenum(config, optid, afb_hook_flags_xreq_from_text);
break;
- case SET_READYFD:
- config->readyfd = argvalintdec(optc, 0, INT_MAX);
+ case SET_TRACEEVT:
+ config_set_optenum(config, optid, afb_hook_flags_evt_from_text);
break;
- case DBUS_CLIENT:
- list_add(&config->dbus_clients, argvalstr(optc));
+ case SET_TRACESES:
+ config_set_optenum(config, optid, afb_hook_flags_session_from_text);
break;
- case DBUS_SERVICE:
- list_add(&config->dbus_servers, argvalstr(optc));
+ case SET_TRACEAPI:
+ config_set_optenum(config, optid, afb_hook_flags_api_from_text);
break;
- case WS_CLIENT:
- list_add(&config->ws_clients, argvalstr(optc));
+ case SET_TRACEGLOB:
+ config_set_optenum(config, optid, afb_hook_flags_global_from_text);
break;
- case WS_SERVICE:
- list_add(&config->ws_servers, argvalstr(optc));
+#if !defined(REMOVE_LEGACY_TRACE)
+ case SET_TRACEDITF:
+ config_set_optenum(config, optid, afb_hook_flags_legacy_ditf_from_text);
break;
- case SO_BINDING:
- list_add(&config->so_bindings, argvalstr(optc));
- break;
-
- case SET_TRACEREQ:
- config->tracereq = argvalenum(optc, tracereq_desc);
- break;
-
- case SET_NO_HTTPD:
- noarg(optc);
- config->noHttpd = 1;
+ case SET_TRACESVC:
+ config_set_optenum(config, optid, afb_hook_flags_legacy_svc_from_text);
break;
+#endif
case SET_EXEC:
- config->exec = &argv[optind];
- optind = argc;
+ if (optind == argc) {
+ ERROR("The option --exec requires arguments");
+ exit(1);
+ }
+ while (optind != argc)
+ config_add_str(config, optid, argv[optind++]);
break;
- case SET_RNDTOKEN:
- config->token = random_token();
+ case SET_CONFIG:
+ conf = json_object_from_file(get_arg(optid));
+ if (!conf) {
+ ERROR("Can't read config file %s", get_arg(optid));
+ exit(1);
+ }
+ wrap_json_object_add(config, conf);
+ json_object_put(conf);
break;
- case DISPLAY_VERSION:
- noarg(optc);
+ case GET_VERSION:
+ noarg(optid);
printVersion(stdout);
exit(0);
- case DISPLAY_HELP:
- printHelp(stdout, programName);
+ case GET_HELP:
+ printHelp(stdout, argv[0]);
exit(0);
default:
+ ERROR("Bad option detected, check %s", argv[cind]);
exit(1);
}
}
- free(gnuOptions);
+ /* TODO: check for extra value */
+}
+
+static void parse_arguments(int argc, char **argv, struct json_object *config)
+{
+ int ind;
+ struct option *options;
+
+ /* create GNU getopt options from optdefs */
+ options = malloc((sizeof optdefs / sizeof * optdefs) * sizeof * options);
+ for (ind = 0; optdefs[ind].name; ind++) {
+ options[ind].name = optdefs[ind].name;
+ options[ind].has_arg = optdefs[ind].has_arg;
+ options[ind].flag = NULL;
+ options[ind].val = optdefs[ind].id;
+ }
+ memset(&options[ind], 0, sizeof options[ind]);
+
+ /* parse the arguments */
+ parse_arguments_inner(argc, argv, config, options);
+
+ /* release the memory of options */
+ free(options);
}
-// load config from disk and merge with CLI option
-static void config_set_default(struct afb_config *config)
+static void fulfill_config(struct json_object *config)
{
- // default HTTP port
- if (config->httpdPort == 0)
- config->httpdPort = 1234;
+ int i;
- // default binding API timeout
- if (config->apiTimeout == 0)
- config->apiTimeout = DEFLT_API_TIMEOUT;
+ for (i = 0 ; i < sizeof default_optint_values / sizeof * default_optint_values ; i++)
+ if (!config_has(config, default_optint_values[i].optid))
+ config_set_int(config, default_optint_values[i].optid, default_optint_values[i].valdef);
+
+ for (i = 0 ; i < sizeof default_optstr_values / sizeof * default_optstr_values ; i++)
+ if (!config_has(config, default_optstr_values[i].optid))
+ config_set_str(config, default_optstr_values[i].optid, default_optstr_values[i].valdef);
// default AUTH_TOKEN
- if (config->token == NULL)
- config->token = DEFLT_AUTH_TOKEN;
-
- // cache timeout default one hour
- if (config->cacheTimeout == 0)
- config->cacheTimeout = DEFLT_CACHE_TIMEOUT;
-
- // cache timeout default one hour
- if (config->cntxTimeout == 0)
- config->cntxTimeout = DEFLT_CNTX_TIMEOUT;
-
- // max count of sessions
- 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);
- }
+ if (config_has_bool(config, SET_RANDOM_TOKEN))
+ config_del(config, SET_TOKEN);
+
+ if (!config_has(config, ADD_LDPATH) && !config_has(config, ADD_WEAK_LDPATH) && !config_has_bool(config, SET_NO_LDPATH))
+ config_add_str(config, ADD_LDPATH, BINDING_INSTALL_DIR);
+
+#if defined(WITH_MONITORING_OPTION)
+ if (config_has_bool(config, SET_MONITORING) && !config_has_str(config, ADD_ALIAS, MONITORING_ALIAS))
+ config_add_str(config, ADD_ALIAS, MONITORING_ALIAS);
+#endif
+
+#if !defined(REMOVE_LEGACY_TRACE) && 0
+ config->traceapi |= config->traceditf | config->tracesvc;
+#endif
+}
+
+static void dump(struct json_object *config, FILE *file, const char *prefix, const char *title)
+{
+ char z;
+ const char *head, *tail;
+
+ if (!prefix) {
+ z = 0;
+ prefix = &z;
}
- // if no Angular/HTML5 rootbase let's try '/' as default
- if (config->rootbase == NULL)
- config->rootbase = "/opa";
- if (config->rootapi == NULL)
- config->rootapi = "/api";
+ if (title)
+ fprintf(file, "%s----BEGIN OF %s-----\n", prefix, title);
- if (config->ldpaths == NULL)
- list_add(&config->ldpaths, BINDING_INSTALL_DIR);
+ head = json_object_to_json_string_ext(config, JSON_C_TO_STRING_PRETTY
+ |JSON_C_TO_STRING_SPACED|JSON_C_TO_STRING_NOSLASHESCAPE);
- // 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 (head) {
+ while(*head) {
+ for (tail = head ; *tail && *tail != '\n' ; tail++);
+ fprintf(file, "%s %.*s\n", prefix, (int)(tail - head), head);
+ head = tail + !!*tail;
+ }
}
- // if no config dir create a default path from sessiondir
- if (config->console == NULL) {
- config->console = malloc(512);
- strncpy(config->console, config->sessiondir, 512);
- strncat(config->console, "/AFB-console.out", 512);
+
+ if (title)
+ fprintf(file, "%s----END OF %s-----\n", prefix, title);
+}
+
+void afb_config_dump(struct json_object *config)
+{
+ dump(config, stderr, "--", "CONFIG");
+}
+
+static void on_environment_add(struct json_object *config, int optid, const char *name)
+{
+ char *value = getenv(name);
+
+ if (value && *value)
+ config_add_str(config, optid, value);
+}
+
+static void on_environment_enum(struct json_object *config, int optid, const char *name, int (*func)(const char*))
+{
+ char *value = getenv(name);
+
+ if (value) {
+ if (func(value) == -1)
+ WARNING("Unknown value %s for environment variable %s, ignored", value, name);
+ else
+ config_set_str(config, optid, value);
}
}
-void afb_config_dump(struct afb_config *config)
-{
- struct afb_config_list *l;
- struct enumdesc *e;
- char **v;
-
-#define NN(x) (x)?:""
-#define P(...) fprintf(stderr, __VA_ARGS__)
-#define PF(x) P("-- %15s: ", #x)
-#define PE P("\n")
-#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++);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");
- S(console)
- S(rootdir)
- S(roothttp)
- S(rootbase)
- S(rootapi)
- S(sessiondir)
- S(token)
-
- L(aliases)
- L(dbus_clients)
- L(dbus_servers)
- L(ws_clients)
- L(ws_servers)
- L(so_bindings)
- L(ldpaths)
-
- V(exec)
-
- D(httpdPort)
- B(background)
- D(readyfd)
- D(cacheTimeout)
- D(apiTimeout)
- D(cntxTimeout)
- D(nbSessionMax)
- E(mode,mode_desc)
- E(tracereq,tracereq_desc)
- B(noHttpd)
- P("---END-OF-CONFIG---\n");
-
-#undef V
-#undef E
-#undef L
-#undef B
-#undef H
-#undef D
-#undef S
-#undef PE
-#undef PF
-#undef P
-#undef NN
-}
-
-struct afb_config *afb_config_parse_arguments(int argc, char **argv)
-{
- struct afb_config *result;
-
- result = calloc(1, sizeof *result);
+static void parse_environment(struct json_object *config)
+{
+ on_environment_enum(config, SET_TRACEREQ, "AFB_TRACEREQ", afb_hook_flags_xreq_from_text);
+ on_environment_enum(config, SET_TRACEEVT, "AFB_TRACEEVT", afb_hook_flags_evt_from_text);
+ on_environment_enum(config, SET_TRACESES, "AFB_TRACESES", afb_hook_flags_session_from_text);
+ on_environment_enum(config, SET_TRACEAPI, "AFB_TRACEAPI", afb_hook_flags_api_from_text);
+ on_environment_enum(config, SET_TRACEGLOB, "AFB_TRACEGLOB", afb_hook_flags_global_from_text);
+ on_environment_add(config, ADD_LDPATH, "AFB_LDPATHS");
+#if !defined(REMOVE_LEGACY_TRACE)
+ on_environment_enum(config, SET_TRACEDITF, "AFB_TRACEDITF", afb_hook_flags_legacy_ditf_from_text);
+ on_environment_enum(config, SET_TRACESVC, "AFB_TRACESVC", afb_hook_flags_legacy_svc_from_text);
+#endif
+}
+
+struct json_object *afb_config_parse_arguments(int argc, char **argv)
+{
+ struct json_object *result;
+
+ init_options();
+
+ result = json_object_new_object();
+ parse_environment(result);
parse_arguments(argc, argv, result);
- config_set_default(result);
- if (verbosity >= 3)
+ fulfill_config(result);
+ if (verbose_wants(Log_Level_Info))
afb_config_dump(result);
return result;
}
+struct json_object *afb_config_json(struct json_object *config)
+{
+ return NULL;
+}
+
Code Review / src / app-framework-binder.git / blobdiff