[asterisk-commits] russell: branch russell/sqlite r58859 - in
/team/russell/sqlite: ./ cdr/ conf...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Mar 13 12:25:28 MST 2007
Author: russell
Date: Tue Mar 13 14:25:28 2007
New Revision: 58859
URL: http://svn.digium.com/view/asterisk?view=rev&rev=58859
Log:
Add cdr_sqlite3_custom from issue 7149, heavily modified by me to avoid SQL
injection vulnerabilities
Added:
team/russell/sqlite/cdr/cdr_sqlite3_custom.c (with props)
team/russell/sqlite/configs/cdr_sqlite3_custom.conf (with props)
Modified:
team/russell/sqlite/configure
Added: team/russell/sqlite/cdr/cdr_sqlite3_custom.c
URL: http://svn.digium.com/view/asterisk/team/russell/sqlite/cdr/cdr_sqlite3_custom.c?view=auto&rev=58859
==============================================================================
--- team/russell/sqlite/cdr/cdr_sqlite3_custom.c (added)
+++ team/russell/sqlite/cdr/cdr_sqlite3_custom.c Tue Mar 13 14:25:28 2007
@@ -1,0 +1,264 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2007, Digium, Inc.
+ *
+ * Mark Spencer <markster at digium.com> and others.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief Custom SQLite3 CDR records.
+ *
+ * \author Adapted by Alejandro Rios <alejandro.rios at avatar.com.co> and
+ * Russell Bryant <russell at digium.com> from
+ * cdr_mysql_custom by Edward Eastman <ed at dm3.co.uk>,
+ * and cdr_sqlite by Holger Schurig <hs4233 at mail.mn-solutions.de>
+ *
+ *
+ * \arg See also \ref AstCDR
+ *
+ *
+ * \ingroup cdr_drivers
+ */
+
+/*** moduleinfo
+ <depend>sqlite3</depend>
+ ***/
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sqlite3.h>
+
+#include "asterisk/channel.h"
+#include "asterisk/cdr.h"
+#include "asterisk/module.h"
+#include "asterisk/config.h"
+#include "asterisk/pbx.h"
+#include "asterisk/logger.h"
+#include "asterisk/utils.h"
+#include "asterisk/cli.h"
+#include "asterisk/options.h"
+
+AST_MUTEX_DEFINE_STATIC(lock);
+
+static const char config_file[] = "cdr_sqlite3_custom.conf";
+
+static char *desc = "Customizable SQLite3 CDR Backend";
+static char *name = "cdr_sqlite3_custom";
+static sqlite3 *db = NULL;
+
+static char table[80];
+static char columns[1024];
+static char values[1024];
+
+static int load_config(int reload)
+{
+ struct ast_config *cfg;
+ struct ast_variable *mappingvar;
+ const char *tmp;
+
+ if (!(cfg = ast_config_load(config_file))) {
+ if (reload)
+ ast_log(LOG_WARNING, "%s: Failed to reload configuration file.\n", name);
+ else {
+ ast_log(LOG_WARNING,
+ "%s: Failed to load configuration file. Module not activated.\n",
+ name);
+ }
+ return -1;
+ }
+
+ if (!reload)
+ ast_mutex_lock(&lock);
+
+ if (!(mappingvar = ast_variable_browse(cfg, "master"))) {
+ /* nothing configured */
+ ast_config_destroy(cfg);
+ return 0;
+ }
+
+ /* Mapping must have a table name */
+ tmp = ast_variable_retrieve(cfg, "master", "table");
+ if (!ast_strlen_zero(tmp))
+ ast_copy_string(table, tmp, sizeof(table));
+ else {
+ ast_log(LOG_WARNING, "%s: Table name not specified. Assuming cdr.\n", name);
+ strcpy(table, "cdr");
+ }
+
+ tmp = ast_variable_retrieve(cfg, "master", "columns");
+ if (!ast_strlen_zero(tmp))
+ ast_copy_string(columns, tmp, sizeof(columns));
+ else {
+ ast_log(LOG_WARNING, "%s: Column names not specified. Module not loaded.\n",
+ name);
+ ast_config_destroy(cfg);
+ return -1;
+ }
+
+ tmp = ast_variable_retrieve(cfg, "master", "values");
+ if (!ast_strlen_zero(tmp))
+ ast_copy_string(values, tmp, sizeof(values));
+ else {
+ ast_log(LOG_WARNING, "%s: Values not specified. Module not loaded.\n", name);
+ ast_config_destroy(cfg);
+ return -1;
+ }
+
+ if (!reload)
+ ast_mutex_unlock(&lock);
+
+ ast_config_destroy(cfg);
+
+ return 0;
+}
+
+/* assumues 'to' buffer is at least strlen(from) * 2 + 1 bytes */
+static int do_escape(char *to, const char *from)
+{
+ char *out = to;
+
+ for (; *from; from++) {
+ if (*from == '\'' || *from == '\\')
+ *out++ = *from;
+ *out++ = *from;
+ }
+ *out = '\0';
+
+ return 0;
+}
+
+static int sqlite3_log(struct ast_cdr *cdr)
+{
+ int res = 0;
+ char *zErr = 0;
+ char *sql_cmd;
+ struct ast_channel dummy = { 0, };
+ int count;
+
+ { /* Make it obvious that only sql_cmd should be used outside of this block */
+ char *sql_tmp_cmd;
+ char sql_insert_cmd[2048] = "";
+ sql_tmp_cmd = sqlite3_mprintf("INSERT INTO %q (%q) VALUES (%q)", table, columns, values);
+ dummy.cdr = cdr;
+ pbx_substitute_variables_helper(&dummy, sql_tmp_cmd, sql_insert_cmd, sizeof(sql_insert_cmd) - 1);
+ sqlite3_free(sql_tmp_cmd);
+ sql_cmd = alloca(strlen(sql_insert_cmd) * 2 + 1);
+ do_escape(sql_cmd, sql_insert_cmd);
+ }
+
+ ast_mutex_lock(&lock);
+
+ for (count = 0; count < 5; count++) {
+ res = sqlite3_exec(db, sql_cmd, NULL, NULL, &zErr);
+ if (res != SQLITE_BUSY && res != SQLITE_LOCKED)
+ break;
+ usleep(200);
+ }
+
+ if (zErr) {
+ ast_log(LOG_ERROR, "%s: %s. sentence: %s.\n", name, zErr, sql_cmd);
+ sqlite3_free(zErr);
+ }
+
+ ast_mutex_unlock(&lock);
+
+ return res;
+}
+
+static int unload_module(void)
+{
+ if (db)
+ sqlite3_close(db);
+
+ ast_cdr_unregister(name);
+
+ return 0;
+}
+
+static int load_module(void)
+{
+ char *zErr;
+ char fn[PATH_MAX];
+ int res;
+ char *sql_cmd;
+
+ if (!load_config(0)) {
+ res = ast_cdr_register(name, desc, sqlite3_log);
+ if (res) {
+ ast_log(LOG_ERROR, "%s: Unable to register custom SQLite3 CDR handling\n", name);
+ return -1;
+ }
+ }
+
+ /* is the database there? */
+ snprintf(fn, sizeof(fn), "%s/master.db", ast_config_AST_LOG_DIR);
+ res = sqlite3_open(fn, &db);
+ if (!db) {
+ ast_log(LOG_ERROR, "%s: Could not open database %s.\n", name, fn);
+ sqlite3_free(zErr);
+ return -1;
+ }
+
+ /* is the table there? */
+ sql_cmd = sqlite3_mprintf("SELECT COUNT(AcctId) FROM %q;", table);
+ res = sqlite3_exec(db, sql_cmd, NULL, NULL, NULL);
+ sqlite3_free(sql_cmd);
+ if (res) {
+ sql_cmd = sqlite3_mprintf("CREATE TABLE %q (AcctId INTEGER PRIMARY KEY,%q)", table, columns);
+ res = sqlite3_exec(db, sql_cmd, NULL, NULL, &zErr);
+ sqlite3_free(sql_cmd);
+ if (zErr) {
+ ast_log(LOG_WARNING, "%s: %s.\n", name, zErr);
+ sqlite3_free(zErr);
+ return 0;
+ }
+
+ if (res) {
+ ast_log(LOG_ERROR, "%s: Unable to create table '%s': %s.\n", name, table, zErr);
+ sqlite3_free(zErr);
+ if (db)
+ sqlite3_close(db);
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+static int reload(void)
+{
+ int res;
+
+ ast_mutex_lock(&lock);
+ res = load_config(1);
+ ast_mutex_unlock(&lock);
+
+ return res;
+}
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "SQLite3 Custom CDR Module",
+ .load = load_module,
+ .unload = unload_module,
+ .reload = reload,
+);
Propchange: team/russell/sqlite/cdr/cdr_sqlite3_custom.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/russell/sqlite/cdr/cdr_sqlite3_custom.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/russell/sqlite/cdr/cdr_sqlite3_custom.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: team/russell/sqlite/configs/cdr_sqlite3_custom.conf
URL: http://svn.digium.com/view/asterisk/team/russell/sqlite/configs/cdr_sqlite3_custom.conf?view=auto&rev=58859
==============================================================================
--- team/russell/sqlite/configs/cdr_sqlite3_custom.conf (added)
+++ team/russell/sqlite/configs/cdr_sqlite3_custom.conf Tue Mar 13 14:25:28 2007
@@ -1,0 +1,7 @@
+;
+; Mappings for custom config file
+;
+[master] ; currently, only file "master.db" is supported, with only one table at a time.
+table => cdr
+columns => calldate, clid, dcontext, channel, dstchannel, lastapp, lastdata, duration, billsec, disposition, amaflags, accountcode, uniqueid, userfield, test
+values => '${CDR(start)}','${CDR(clid)}','${CDR(dcontext)}','${CDR(channel)}','${CDR(dstchannel)}','${CDR(lastapp)}','${CDR(lastdata)}','${CDR(duration)}','${CDR(billsec)}','${CDR(disposition)}','${CDR(amaflags)}','${CDR(accountcode)}','${CDR(uniqueid)}','${CDR(userfield)}','${CDR(test)}'
Propchange: team/russell/sqlite/configs/cdr_sqlite3_custom.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/russell/sqlite/configs/cdr_sqlite3_custom.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/russell/sqlite/configs/cdr_sqlite3_custom.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/russell/sqlite/configure
URL: http://svn.digium.com/view/asterisk/team/russell/sqlite/configure?view=diff&rev=58859&r1=58858&r2=58859
==============================================================================
--- team/russell/sqlite/configure (original)
+++ team/russell/sqlite/configure Tue Mar 13 14:25:28 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 58321 .
+# From configure.ac Revision: 58858 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60.
#
More information about the asterisk-commits
mailing list