Commit fd8f2245 authored by jan.koester's avatar jan.koester
Browse files

test

parent 4d2c3406
Loading
Loading
Loading
Loading
+8 −6
Changes for editor/src/webedit_db.cpp: 8 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ webedit::Database::~Database() {
void webedit::Database::initTables() {
    dbpp::SQL sql;
    dbpp::DBResult res;
    const std::string keyColumn = dbpp::quoteIdentifier(*_db, "key");

    sql << "CREATE TABLE IF NOT EXISTS documents("
        <<   "id " << _db->getUUIDType(sql) << ","
@@ -73,7 +74,7 @@ void webedit::Database::initTables() {

    sql << "CREATE TABLE IF NOT EXISTS session_data("
        <<   "sessionid " << _db->getUUIDType(sql) << ","
        <<   "key varchar(255),"
        <<   keyColumn << " varchar(255),"
        <<   "value text,"
        <<   "FOREIGN KEY (sessionid) REFERENCES session (id)"
        << ");";
@@ -102,7 +103,7 @@ void webedit::Database::initTables() {

    sql << "CREATE TABLE IF NOT EXISTS options("
        <<   "id " << _db->getUUIDType(sql) << ","
        <<   "key varchar(255) UNIQUE NOT NULL,"
        <<   keyColumn << " varchar(255) UNIQUE NOT NULL,"
        <<   "value text NOT NULL,"
        <<   "PRIMARY KEY (id)"
        << ");";
@@ -144,7 +145,7 @@ std::string webedit::Database::getOption(const std::string &key,
    dbpp::DBResult res;
    std::vector<char> escapedKey;

    sql << "SELECT value FROM options WHERE key='"
    sql << "SELECT value FROM options WHERE " << dbpp::quoteIdentifier(*_db, "key") << "='"
        << dbpp::SQL::escaped(escapedKey, key.c_str()) << "';";

    int rows = _db->exec(sql, res);
@@ -157,8 +158,9 @@ void webedit::Database::setOption(const std::string &key, const std::string &val
    dbpp::SQL sql;
    dbpp::DBResult res;
    std::vector<char> escapedKey, escapedVal;
    const std::string keyColumn = dbpp::quoteIdentifier(*_db, "key");

    sql << "SELECT value FROM options WHERE key='"
    sql << "SELECT value FROM options WHERE " << keyColumn << "='"
        << dbpp::SQL::escaped(escapedKey, key.c_str()) << "';";

    int rows = _db->exec(sql, res);
@@ -169,14 +171,14 @@ void webedit::Database::setOption(const std::string &key, const std::string &val
    if (rows < 1) {
        uuid::uuid id;
        id.generate();
        sql << "INSERT INTO options (id, key, value) VALUES ('"
        sql << "INSERT INTO options (id, " << keyColumn << ", value) VALUES ('"
            << id.c_str() << "','"
            << dbpp::SQL::escaped(escapedKey, key.c_str()) << "','"
            << dbpp::SQL::escaped(escapedVal, value.c_str()) << "');";
    } else {
        sql << "UPDATE options SET value='"
            << dbpp::SQL::escaped(escapedVal, value.c_str())
            << "' WHERE key='"
            << "' WHERE " << keyColumn << "='"
            << dbpp::SQL::escaped(escapedKey, key.c_str()) << "';";
    }
    _db->exec(sql, res);
+4 −4
Changes for editor/src/webedit_session.cpp: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ void webedit::Session::addData(const std::string &sessionid,
    // Delete existing key first
    sql << "DELETE FROM session_data WHERE sessionid='"
        << dbpp::SQL::escaped(escapedId, sessionid.c_str())
        << "' AND key='"
        << "' AND " << dbpp::quoteIdentifier(_db, "key") << "='"
        << dbpp::SQL::escaped(escapedKey, key.c_str()) << "';";
    _db.exec(sql, res);

@@ -119,7 +119,7 @@ void webedit::Session::addData(const std::string &sessionid,
    escapedId.clear();
    escapedKey.clear();

    sql << "INSERT INTO session_data (sessionid, key, value) VALUES ('"
    sql << "INSERT INTO session_data (sessionid, " << dbpp::quoteIdentifier(_db, "key") << ", value) VALUES ('"
        << dbpp::SQL::escaped(escapedId, sessionid.c_str()) << "','"
        << dbpp::SQL::escaped(escapedKey, key.c_str()) << "','"
        << dbpp::SQL::escaped(escapedVal, value.c_str()) << "');";
@@ -136,7 +136,7 @@ void webedit::Session::getData(const std::string &sessionid,

    sql << "SELECT value FROM session_data WHERE sessionid='"
        << dbpp::SQL::escaped(escapedId, sessionid.c_str())
        << "' AND key='"
        << "' AND " << dbpp::quoteIdentifier(_db, "key") << "='"
        << dbpp::SQL::escaped(escapedKey, key.c_str()) << "';";

    int rows = _db.exec(sql, res);
@@ -152,7 +152,7 @@ void webedit::Session::delData(const std::string &sessionid,

    sql << "DELETE FROM session_data WHERE sessionid='"
        << dbpp::SQL::escaped(escapedId, sessionid.c_str())
        << "' AND key='"
        << "' AND " << dbpp::quoteIdentifier(_db, "key") << "='"
        << dbpp::SQL::escaped(escapedKey, key.c_str()) << "';";

    _db.exec(sql, res);
+8 −4
Changes for src/blogi.cpp: 8 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ blogi::Blogi::Blogi(std::vector<netplus::socket*> serversocket,bool debug) : Htt

        optsql << "CREATE TABLE IF NOT EXISTS options ("
                   << "id " << initdb->getUUIDType(optsql) << " PRIMARY KEY,"
                   << "key character varying(255) NOT NULL,"
                   << dbpp::quoteIdentifier(*initdb, "key") << " character varying(255) NOT NULL,"
                   << "value text NOT NULL);"
               << "CREATE TABLE IF NOT EXISTS theme_colors ("
                   << "id " << initdb->getUUIDType(optsql) << " PRIMARY KEY,"
@@ -260,8 +260,10 @@ blogi::Blogi::Blogi(std::vector<netplus::socket*> serversocket,bool debug) : Htt
                   << "variable character varying(64) NOT NULL,"
                   << "value character varying(64) NOT NULL);";

        if(dcfg.dbDriver != "sqlite")
         if(dcfg.dbDriver == "pgsql" || dcfg.dbDriver == "postgresql")
               optsql << "ALTER TABLE options ALTER COLUMN value TYPE text;";
         else if(dcfg.dbDriver == "mariadb" || dcfg.dbDriver == "mysql")
             optsql << "ALTER TABLE options MODIFY COLUMN value text NOT NULL;";

        try {
            initdb->exec(optsql, optres);
@@ -380,15 +382,17 @@ bool blogi::Blogi::reloadConfig() {
            dbpp::DBResult optres;
            optsql << "CREATE TABLE IF NOT EXISTS options ("
                       << "id " << initdb->getUUIDType(optsql) << " PRIMARY KEY,"
                       << "key character varying(255) NOT NULL,"
                       << dbpp::quoteIdentifier(*initdb, "key") << " character varying(255) NOT NULL,"
                       << "value text NOT NULL);"
                   << "CREATE TABLE IF NOT EXISTS theme_colors ("
                       << "id " << initdb->getUUIDType(optsql) << " PRIMARY KEY,"
                       << "profile character varying(32) NOT NULL,"
                       << "variable character varying(64) NOT NULL,"
                       << "value character varying(64) NOT NULL);";
            if (dcfg.dbDriver != "sqlite")
            if (dcfg.dbDriver == "pgsql" || dcfg.dbDriver == "postgresql")
                optsql << "ALTER TABLE options ALTER COLUMN value TYPE text;";
            else if (dcfg.dbDriver == "mariadb" || dcfg.dbDriver == "mysql")
                optsql << "ALTER TABLE options MODIFY COLUMN value text NOT NULL;";
            try { initdb->exec(optsql, optres); } catch (std::runtime_error &e) {
                std::cerr << "[blogi] Reload: DB init failed for '" << dcfg.names[0] << "': " << e.what() << std::endl;
            }
+7 −4
Changes for src/conf.h: 7 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ namespace blogi {
    inline void getConfig(dbpp::ReplicatedDatabase &db,const std::string &key,std::string &value){
        dbpp::SQL sql;
        dbpp::DBResult res;
        sql << "SELECT value FROM options WHERE key='" << key.c_str() << "'";
        std::vector<char> buf;
        sql << "SELECT value FROM options WHERE " << dbpp::quoteIdentifier(db, "key") << "='" << dbpp::SQL::escaped(buf, key.c_str()) << "'";
        int rows=db.exec(sql,res);
        if(rows<1){
            throw std::runtime_error("configkey not found: " + key);
@@ -184,16 +185,18 @@ namespace blogi {
        dbpp::SQL sql;
        dbpp::DBResult res;
        std::vector<char> buf;
        const std::string keyColumn = dbpp::quoteIdentifier(db, "key");

        sql << "SELECT value FROM options WHERE key='" << key.c_str() << "'";
        sql << "SELECT value FROM options WHERE " << keyColumn << "='" << dbpp::SQL::escaped(buf, key.c_str()) << "'";
        int rows=db.exec(sql,res);
        sql.clear();
        buf.clear();
        if(rows<1){
            uuid::uuid id;
            id.generate();
            sql << "INSERT INTO OPTIONS (id,key,value) VALUES ('"<< id.c_str() <<"','"<< sql.escaped(buf,key.c_str()) << "','" << sql.escaped(buf,value.c_str()) <<"')";
            sql << "INSERT INTO OPTIONS (id," << keyColumn << ",value) VALUES ('"<< id.c_str() <<"','"<< dbpp::SQL::escaped(buf,key.c_str()) << "','" << dbpp::SQL::escaped(buf,value.c_str()) <<"')";
        }else{
            sql << "UPDATE OPTIONS set value='"<<sql.escaped(buf,value.c_str()) <<"' WHERE key='"<< sql.escaped(buf,key.c_str())  <<"'";
            sql << "UPDATE OPTIONS set value='"<<dbpp::SQL::escaped(buf,value.c_str()) <<"' WHERE " << keyColumn << "='"<< dbpp::SQL::escaped(buf,key.c_str())  <<"'";
        }
        db.exec(sql,res);
    }
+5 −4
Changes for src/session.cpp: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ blogi::Session::~Session(){
void blogi::Session::_initSession(){
    dbpp::SQL sql;
    dbpp::DBResult res;
    const std::string keyColumn = dbpp::quoteIdentifier(_sessiondb, "key");

    sql << "CREATE TABLE IF NOT EXISTS session("
    <<   "id " << _sessiondb.getUUIDType(sql) << ","
@@ -57,7 +58,7 @@ void blogi::Session::_initSession(){
    << ");"
    << "CREATE TABLE IF NOT EXISTS session_data("
    <<   "sessionid " << _sessiondb.getUUIDType(sql) << ","
    <<   "key varchar(255),"
    <<   keyColumn << " varchar(255),"
    <<   "value text,"
    <<   "FOREIGN KEY (sessionid) REFERENCES session (id)"
    << ");";
@@ -115,7 +116,7 @@ void blogi::Session::addSessionData(const std::string &sessionid,const char *key

    std::vector<char> sbuf;

    sql << "INSERT INTO session_data (sessionid,key,value) VALUES ('" << sql.escaped(sbuf,sessionid.c_str()) << "','" << sql.escaped(sbuf,key) << "','" << sql.escaped(sbuf,value) << "');";
    sql << "INSERT INTO session_data (sessionid," << dbpp::quoteIdentifier(_sessiondb, "key") << ",value) VALUES ('" << sql.escaped(sbuf,sessionid.c_str()) << "','" << sql.escaped(sbuf,key) << "','" << sql.escaped(sbuf,value) << "');";

    try{
            _sessiondb.exec(sql,res);
@@ -139,7 +140,7 @@ void blogi::Session::delSessionData(const std::string &sessionid, const char* ke

    std::vector<char> sbuf;

    sql << "DELETE FROM session_data WHERE sessionid='" << sql.escaped(sbuf,sessionid.c_str()) << "' AND key='" << sql.escaped(sbuf,key) << "';";
    sql << "DELETE FROM session_data WHERE sessionid='" << sql.escaped(sbuf,sessionid.c_str()) << "' AND " << dbpp::quoteIdentifier(_sessiondb, "key") << "='" << sql.escaped(sbuf,key) << "';";

    _sessiondb.exec(sql,res);
}
@@ -158,7 +159,7 @@ void blogi::Session::getSessionData(const std::string &sessionid,const char *key

    std::vector<char> sbuf;

    sql << "Select value from session_data where sessionid='" << sql.escaped(sbuf,sessionid.c_str()) <<"'  AND key='" << sql.escaped(sbuf,key) <<"';";
    sql << "Select value from session_data where sessionid='" << sql.escaped(sbuf,sessionid.c_str()) <<"'  AND " << dbpp::quoteIdentifier(_sessiondb, "key") << "='" << sql.escaped(sbuf,key) <<"';";

    if(_sessiondb.exec(sql,res)>0){
        value=res[0][0];
Loading