Rearranged some files in the sqlite3 driver

1 files changed, 0 insertions, 151 deletions

diff --git a/database/sqlite/blacklist.c b/database/sqlite/blacklist.c
deleted file mode 100644
index 1d9bff7..0000000
--- a/database/sqlite/blacklist.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* blacklist.c  --  Functions for processing openvpn_blacklist records
- *
- *  GPLv2 only - Copyright (C) 2008, 2009
- *               David Sommerseth <dazo@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; version 2
- *  of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- */
-
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-
-#include <libxml/tree.h>
-
-#ifndef DRIVERAPIVERSION
-# define DRIVERAPIVERSION 2
-#endif
-
-#include <sqlite3.h>
-
-#include <eurephia_nullsafe.h>
-#include <eurephia_context.h>
-#include <eurephia_admin_struct.h>
-#include <eurephia_log.h>
-#include <eurephia_xml.h>
-#include <eurephia_values.h>
-#include <eurephiadb_session_struct.h>
-#include <eurephiadb_mapping.h>
-#include <passwd.h>
-
-#ifndef DRIVER_MODE
-#define DRIVER_MODE
-#endif
-
-#include "sqlite.h"
-
-
-xmlDoc *blacklist_list(eurephiaCTX *ctx, eDBfieldMap *fmap) {
-        dbresult *res = NULL;
-        xmlDoc *doc = NULL;
-        xmlNode *root_n = NULL, *uname_n = NULL, *cert_n = NULL, *remip_n = NULL;
-        int i = 0;
-
-        // Query the database for registered attempts
-        res = sqlite_query_mapped(ctx, SQL_SELECT,
-                                  "SELECT username, digest, remoteip,"
-                                  "       registered, last_accessed, blid"
-                                  "  FROM openvpn_blacklist",
-                                  NULL, fmap, "blid");
-        if( res == NULL ) {
-                eurephia_log(ctx, LOG_ERROR, 0, "Error querying the blacklist register");
-                return NULL;
-        }
-
-        eurephiaXML_CreateDoc(ctx, 1, "blacklist", &doc, &root_n);
-        xmlNewProp(root_n, (xmlChar *) "mode", (xmlChar *) "list");
-
-        for( i = 0; i < sqlite_get_numtuples(res); i++ ) {
-                xmlNode *blist_n = NULL;
-
-                if( sqlite_get_value(res, i, 0) != NULL ) { // Username
-                        if( uname_n == NULL ) {
-                                uname_n = xmlNewChild(root_n, NULL, (xmlChar *) "username", NULL);
-                                assert( uname_n != NULL );
-                        }
-                        blist_n = xmlNewChild(uname_n, NULL, (xmlChar *) "blacklisted", NULL);
-                        sqlite_xml_value(blist_n, XML_NODE, "username", res, i, 0);
-                } else if( sqlite_get_value(res, i, 1) != NULL ) { // Digest
-                        if( cert_n == NULL ) {
-                                cert_n  = xmlNewChild(root_n, NULL, (xmlChar *) "certificate", NULL);
-                                assert( cert_n != NULL );
-                        }
-                        blist_n = xmlNewChild(cert_n, NULL, (xmlChar *) "blacklisted", NULL);
-                        sqlite_xml_value(blist_n, XML_NODE, "certificate", res, i, 1);
-                } else if( sqlite_get_value(res, i, 2) != NULL ) { // IP address
-                        if( remip_n == NULL ) {
-                                remip_n = xmlNewChild(root_n, NULL, (xmlChar *) "ipaddress", NULL);
-                                assert( remip_n != NULL );
-                        }
-                        blist_n = xmlNewChild(remip_n, NULL, (xmlChar *) "blacklisted", NULL);
-                        sqlite_xml_value(blist_n, XML_NODE, "ipaddress", res, i, 2);
-                } else {
-                        continue;
-                }
-
-                sqlite_xml_value(blist_n, XML_ATTR, "blid", res, i, 5);
-                sqlite_xml_value(blist_n, XML_NODE, "registered", res, i, 3);
-                sqlite_xml_value(blist_n, XML_NODE, "last_accessed", res, i, 4);
-        }
-        sqlite_free_results(res);
-        return doc;
-}
-
-
-xmlDoc *blacklist_add(eurephiaCTX *ctx, eDBfieldMap *fmap) {
-        dbresult *res = NULL;
-        xmlDoc *ret = NULL;
-        int fields = 0;
-
-        fields = eDBmappingFieldsPresent(fmap);
-        if( (fields != FIELD_UNAME) && (fields != FIELD_CERTDIGEST) && (fields != FIELD_REMOTEIP) ) {
-                return eurephiaXML_ResultMsg(ctx, exmlERROR,
-                                             "Missing username, IP address or certificate digest, "
-                                             "or multiple of these fields were given.");
-        }
-
-        res = sqlite_query_mapped(ctx, SQL_INSERT, "INSERT INTO openvpn_blacklist", fmap, NULL, NULL);
-        if( res == NULL ) {
-                eurephia_log(ctx, LOG_FATAL, 0, "Could not blacklist the requested data");
-                ret = eurephiaXML_ResultMsg(ctx, exmlERROR, "Blacklisting failed");
-        } else {
-                ret = eurephiaXML_ResultMsg(ctx, exmlRESULT, "Record registered in the blacklist");
-                sqlite_free_results(res);
-        }
-        return ret;
-}
-
-xmlDoc *blacklist_delete(eurephiaCTX *ctx, eDBfieldMap *fmap) {
-        dbresult *res = NULL;
-        xmlDoc *ret = NULL;
-        int fields;
-
-        fields = eDBmappingFieldsPresent(fmap);
-        if( (fields & (FIELD_UNAME | FIELD_CERTDIGEST | FIELD_REMOTEIP | FIELD_RECID)) == 0 ) {
-                return eurephiaXML_ResultMsg(ctx, exmlERROR,
-                                             "Missing username, IP address, certificate digest or blacklist ID");
-        }
-
-        res = sqlite_query_mapped(ctx, SQL_DELETE, "DELETE FROM openvpn_blacklist", NULL, fmap, NULL);
-        if( res == NULL ) {
-                eurephia_log(ctx, LOG_FATAL, 0, "Could not remove blacklisting");
-                ret = eurephiaXML_ResultMsg(ctx, exmlERROR, "Failed to remove the blacklisting");
-        } else {
-                ret = eurephiaXML_ResultMsg(ctx, exmlRESULT, "Blacklisting removed");
-                sqlite_free_results(res);
-        }
-        return ret;
-}