tomasz.sowa
/
winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

added: privileges (user, groups, permissions)

Browse Source 
(not finished yet)
       classes: User, Group, Users, Groups, UGContainer
changed: Dir class into Dirs


git-svn-id: svn://ttmath.org/publicrep/cmslu/trunk@467 e52654a7-88a9-db11-a3e9-0013d4bc506e
pull/3/head
Tomasz Sowa 14 years ago
parent 86f28faf8d
commit 55cd813141
29 changed files with 1518 additions and 119 deletions
Show Stats Download Patch File Download Diff File

29
Makefile
Unescape View File

@ -1,5 +1,5 @@
CC = g++
o = dir.o data.o content.o log.o sessionmanager.o requestcontroller.o dircontainer.o session.o main.o done.o request.o misc.o templates.o httpsimpleparser.o db.o error.o db_itemcolumns.o config.o confparser.o ezc.o
o = data.o content.o log.o sessionmanager.o requestcontroller.o dircontainer.o session.o main.o done.o request.o misc.o templates.o httpsimpleparser.o db.o error.o db_itemcolumns.o users.o config.o dirs.o groups.o confparser.o ezc.o
CFLAGS = -Wall -pedantic -g -I/usr/local/include -L/usr/local/lib
name = cmslu.fcgi
@ -19,29 +19,32 @@ $(name): $(o)
dir.o: core/dir.cpp core/dir.h core/item.h core/error.h core/log.h core/db.h core/misc.h core/dircontainer.h
data.o: core/data.cpp core/data.h core/misc.h core/log.h core/item.h core/error.h core/dir.h core/db.h core/dircontainer.h
content.o: core/content.cpp core/content.h core/templates.h core/../../ezc/src/ezc.h core/data.h core/misc.h core/log.h core/item.h core/error.h core/dir.h core/db.h core/dircontainer.h core/request.h core/requesttypes.h core/session.h core/done.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h
data.o: core/data.cpp core/data.h core/misc.h core/log.h core/item.h core/error.h core/dirs.h core/db.h core/dircontainer.h core/user.h core/group.h core/ugcontainer.h core/users.h core/groups.h
content.o: core/content.cpp core/content.h core/templates.h core/../../ezc/src/ezc.h core/data.h core/misc.h core/log.h core/item.h core/error.h core/dirs.h core/db.h core/dircontainer.h core/user.h core/group.h core/ugcontainer.h core/users.h core/groups.h core/request.h core/requesttypes.h core/session.h core/done.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h
log.o: core/log.cpp core/log.h
sessionmanager.o: core/sessionmanager.cpp core/sessionmanager.h core/request.h core/requesttypes.h core/log.h core/session.h core/error.h core/item.h core/done.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h core/data.h core/misc.h core/dir.h core/db.h core/dircontainer.h
requestcontroller.o: core/requestcontroller.cpp core/requestcontroller.h core/data.h core/misc.h core/log.h core/item.h core/error.h core/dir.h core/db.h core/dircontainer.h core/request.h core/requesttypes.h core/session.h core/done.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h core/content.h core/templates.h core/../../ezc/src/ezc.h core/sessionmanager.h
sessionmanager.o: core/sessionmanager.cpp core/sessionmanager.h core/request.h core/requesttypes.h core/log.h core/session.h core/error.h core/item.h core/done.h core/user.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h core/data.h core/misc.h core/dirs.h core/db.h core/dircontainer.h core/group.h core/ugcontainer.h core/users.h core/groups.h
requestcontroller.o: core/requestcontroller.cpp core/requestcontroller.h core/data.h core/misc.h core/log.h core/item.h core/error.h core/dirs.h core/db.h core/dircontainer.h core/user.h core/group.h core/ugcontainer.h core/users.h core/groups.h core/request.h core/requesttypes.h core/session.h core/done.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h core/content.h core/templates.h core/../../ezc/src/ezc.h core/sessionmanager.h
dircontainer.o: core/dircontainer.cpp core/dircontainer.h core/item.h core/log.h
session.o: core/session.cpp core/session.h core/requesttypes.h core/error.h core/log.h core/item.h core/done.h
main.o: core/main.cpp core/requestcontroller.h core/data.h core/misc.h core/log.h core/item.h core/error.h core/dir.h core/db.h core/dircontainer.h core/request.h core/requesttypes.h core/session.h core/done.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h core/content.h core/templates.h core/../../ezc/src/ezc.h core/sessionmanager.h core/config.h core/../confparser/confparser.h
session.o: core/session.cpp core/session.h core/requesttypes.h core/error.h core/log.h core/item.h core/done.h core/user.h
main.o: core/main.cpp core/requestcontroller.h core/data.h core/misc.h core/log.h core/item.h core/error.h core/dirs.h core/db.h core/dircontainer.h core/user.h core/group.h core/ugcontainer.h core/users.h core/groups.h core/request.h core/requesttypes.h core/session.h core/done.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h core/content.h core/templates.h core/../../ezc/src/ezc.h core/sessionmanager.h core/config.h core/../confparser/confparser.h
done.o: core/done.cpp core/done.h
request.o: core/request.cpp core/request.h core/requesttypes.h core/log.h core/session.h core/error.h core/item.h core/done.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h
request.o: core/request.cpp core/request.h core/requesttypes.h core/log.h core/session.h core/error.h core/item.h core/done.h core/user.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h
misc.o: core/misc.cpp core/misc.h core/log.h core/item.h
templates.o: core/templates.cpp core/templates.h core/../../ezc/src/ezc.h core/data.h core/misc.h core/log.h core/item.h core/error.h core/dir.h core/db.h core/dircontainer.h core/request.h core/requesttypes.h core/session.h core/done.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h
templates.o: core/templates.cpp core/templates.h core/../../ezc/src/ezc.h core/data.h core/misc.h core/log.h core/item.h core/error.h core/dirs.h core/db.h core/dircontainer.h core/user.h core/group.h core/ugcontainer.h core/users.h core/groups.h core/request.h core/requesttypes.h core/session.h core/done.h core/getparser.h core/httpsimpleparser.h core/postparser.h core/cookieparser.h
httpsimpleparser.o: core/httpsimpleparser.cpp core/httpsimpleparser.h
db.o: core/db.cpp core/db.h core/log.h core/item.h core/misc.h core/error.h core/dircontainer.h
db.o: core/db.cpp core/db.h core/log.h core/item.h core/misc.h core/error.h core/dircontainer.h core/user.h core/group.h core/ugcontainer.h
error.o: core/error.cpp core/error.h core/log.h
db_itemcolumns.o: core/db_itemcolumns.cpp core/db.h core/log.h core/item.h core/misc.h core/error.h core/dircontainer.h
config.o: core/config.cpp core/config.h core/../confparser/confparser.h core/error.h core/log.h core/data.h core/misc.h core/item.h core/dir.h core/db.h core/dircontainer.h
db_itemcolumns.o: core/db_itemcolumns.cpp core/db.h core/log.h core/item.h core/misc.h core/error.h core/dircontainer.h core/user.h core/group.h core/ugcontainer.h
users.o: core/users.cpp core/users.h core/user.h core/db.h core/log.h core/item.h core/misc.h core/error.h core/dircontainer.h core/group.h core/ugcontainer.h
config.o: core/config.cpp core/config.h core/../confparser/confparser.h core/error.h core/log.h core/data.h core/misc.h core/item.h core/dirs.h core/db.h core/dircontainer.h core/user.h core/group.h core/ugcontainer.h core/users.h core/groups.h
dirs.o: core/dirs.cpp core/dirs.h core/item.h core/error.h core/log.h core/db.h core/misc.h core/dircontainer.h core/user.h core/group.h core/ugcontainer.h
groups.o: core/groups.cpp core/groups.h core/group.h core/db.h core/log.h core/item.h core/misc.h core/error.h core/dircontainer.h core/user.h core/ugcontainer.h
confparser.o: confparser/confparser.cpp confparser/confparser.h
ezc.o: ../ezc/src/ezc.cpp ../ezc/src/ezc.h
clean:
rm -f *.o
rm -f $(name)

5
core/config.cpp
Unescape View File

@ -103,7 +103,10 @@ void Config::AssignValues()
data.db_pass = Text("db_pass");
data.base_url = Text("base_url");
data.one_item_is_showed = Bool("one_item_is_showed");
data.dir.root.default_item = Int("dir.root.default_item");
data.dirs.root.default_item = Int("dir.root.default_item");
data.priv_no_user = Text("priv_no_user");
data.priv_no_group = Text("priv_no_group");
}

175
core/content.cpp
Unescape View File

@ -26,72 +26,99 @@ return true;
void Content::AddItem()
{
if( !request.session->is_logged )
return;
try
{
request.session->done = Done::added_item;
// request.item_table.resize(1);
// Item & item = request.item_table[0];
request.item.subject = request.PostVar("subject");
request.item.content = request.PostVar("content");
request.item.parent_id = data.dir.GetDirId( request.PostVar("directory") );
request.item.type = Item::file;
if( !request.session->puser || !request.session->puser->super_user )
// !! chwilowo tylko super user moze
throw Error(Error::permision_denied);
request.item.user_id = data.users.GetUserId( request.PostVar("user") );
request.item.group_id = data.groups.GetGroupId( request.PostVar("group") );
request.item.privileges = strtol( request.PostVar("privileges").c_str() , 0, 8);
request.item.subject = request.PostVar("subject");
request.item.content = request.PostVar("content");
request.item.parent_id = data.dirs.GetDirId( request.PostVar("directory") );
request.item.type = Item::file;
PrepareUrlSubject(request.item);
request.session->done_status = db.AddItem(request.item);
request.session->done_timer = 1;
request.session->done_timer = 2;
request.session->item = request.item;
// if( request.session->done_status != Request::added_item )
//request.item_table.resize(1);
//request.item_table[0] = request.item;
RedirectTo(request.item);
}
catch(const Error & e)
{
log << log1 << "Content: AddItem: Error: " << e << logend;
request.session->done_status = e;
request.session->done_timer = 1;
}
}
void Content::EditItem()
void Content::AssertPrivileges(Item & old_item, Item & new_item)
{
if( !request.session->is_logged )
return;
if( !request.CanChangeUser(old_item, new_item.user_id) )
throw Error(Error::cant_change_user);
if( !request.CanChangeGroup(old_item, new_item.group_id) )
throw Error(Error::cant_change_group);
if( !request.CanChangePrivileges(old_item, new_item.privileges) )
throw Error(Error::cant_change_privileges);
}
void Content::EditItem()
{
try
{
request.session->done = Done::edited_item;
// request.item_table.resize(1);
// Item & item = request.item_table[0];
request.item.subject = request.PostVar("subject");
request.item.content = request.PostVar("content");
request.item.id = atol( request.PostVar("id").c_str() );
request.item.id = atol( request.PostVar("id").c_str() );
request.item.user_id = data.users.GetUserId( request.PostVar("user") );
request.item.group_id = data.groups.GetGroupId( request.PostVar("group") );
request.item.privileges = strtol( request.PostVar("privileges").c_str() , 0, 8);
request.item.subject = request.PostVar("subject");
request.item.content = request.PostVar("content");
bool with_subject = false;
if( request.PostVar("old_subject") != request.item.subject )
with_subject = true;
request.item.parent_id = data.dir.GetDirId( request.PostVar("directory") );
request.item.parent_id = data.dirs.GetDirId( request.PostVar("directory") ); // !! moze nie byc takiego, zglosic komunikat
request.item.type = Item::file;
PrepareUrlSubject(request.item);
request.session->done_status = db.EditItem(request.item, with_subject);
request.session->done_timer = 1;
Item old_item;
db.GetPriv(old_item, request.item.id);
AssertPrivileges(old_item, request.item);
if( !request.HasWriteAccess(old_item) )
throw Error(Error::permision_denied);
request.session->done_status = db.EditItemById(request.item, with_subject);
}
catch(const Error & e)
{
log << log1 << "Content: EditItem: Error: " << e << logend;
request.session->done_status = e;
}
request.session->item = request.item;
request.session->done_timer = 2;
RedirectTo(request.item);
}
void Content::LogUser()
{
try
@ -102,9 +129,17 @@ void Content::LogUser()
if( db.CheckUser(login, pass, user_id) )
{
request.session->puser = data.users.GetUser(user_id);
if( !request.session->puser )
{
log << log1 << "Content: user: " << login << " is in the database but is not in data.users" << logend;
return;
}
request.session->is_logged = true;
request.session->user_id = user_id;
request.session->user = login;
log << log2 << "User " << login << " (id: " << user_id << ") logged" << logend;
}
@ -125,7 +160,7 @@ void Content::MakeDirectoryStructure()
{
Item * pdir;
if( !data.dir.GetDir(request.get_table[get_index], parent, &pdir) )
if( !data.dirs.GetDir(request.get_table[get_index], parent, &pdir) )
break;
parent = pdir->id;
@ -134,7 +169,7 @@ void Content::MakeDirectoryStructure()
// parent - last directory (or -1 if none)
request.dir = parent;
data.dir.GetDirChilds(parent, request.dir_table);
data.dirs.GetDirChilds(parent, request.dir_table);
}
@ -190,6 +225,16 @@ bool Content::MakeGetCheckDir()
if( get_index == request.get_table.size() )
{
// request was for a directory
////
if( !request.cur_dir_table.empty() && !request.HasReadAccess(request.cur_dir_table.back()) )
{
request.result = Request::err_per_denied;
return true;
}
////
db.GetItems(request.item_table, item);
@ -198,7 +243,7 @@ bool Content::MakeGetCheckDir()
long default_id = -1;
if( request.cur_dir_table.empty() )
{
default_id = data.dir.root.default_item;
default_id = data.dirs.root.default_item;
}
else
{
@ -277,9 +322,15 @@ void Content::MakeGet()
// err404 at the end
return;
////
if( request.HasReadAccess(request.item_table[0]) )// !! tymczasowo dla 0 tylko
request.result = Request::show_item;
else
request.result = Request::err_per_denied;
////
if( get_index == request.get_table.size() )
{
request.result = Request::show_item;
return;
}
@ -288,6 +339,21 @@ void Content::MakeGet()
}
void Content::MakeAddItem()
{
if( !request.session->puser )
{
// not logged
request.item.Clear();
}
else
{
request.item.user_id = request.session->puser->id;
}
}
void Content::MakeEditItem()
{
if( !request.item_table.empty() )
@ -328,10 +394,7 @@ void Content::MakeShowItemById()
request.result = Request::err404;
else
{
request.result = Request::redirect;
std::string path;
data.dir.MakePath(request.item_table[0].parent_id, path);
request.str = data.base_url + path + request.item_table[0].url;
RedirectTo(request.item_table[0]);
}
}
}
@ -340,15 +403,24 @@ void Content::MakeShowItemById()
void Content::MakeDelItem()
{
if( !request.session->is_logged )
return;
if( request.item_table.empty() )
{
request.result = Request::err404;
return;
}
if( !request.session->puser || !request.session->puser->super_user )
// !! chwilowo tylko super user moze
{
request.result = Request::err_per_denied;
request.CopyFirstItem();
return;
}
if( get_index == request.get_table.size() )
{
@ -389,16 +461,16 @@ void Content::MakeLogout()
{
if( request.session->is_logged )
{
log << log2 << "User " << request.session->user << " (id: " << request.session->user_id << ") logged out" << logend;
log << log2 << "User id: " << request.session->user_id << " logged out" << logend;
request.session->is_logged = false;
request.session->user.clear();
request.session->user_id = 0;
request.session->puser = 0;
}
request.result = Request::redirect;
std::string path;
data.dir.MakePath(request.dir, path);
data.dirs.MakePath(request.dir, path);
request.str = data.base_url + path;
if( !request.item_table.empty() )
@ -412,6 +484,11 @@ void Content::MakeLogout()
void Content::MakeStandardFunction()
{
if( request.result == Request::add_item )
{
MakeAddItem();
}
else
if( request.result == Request::edit_item )
{
MakeEditItem();
@ -455,6 +532,10 @@ void Content::MakePost()
void Content::Make()
{
MakePost();
if( request.result == Request::redirect )
return;
MakeGet();
MakeStandardFunction();
@ -467,6 +548,14 @@ void Content::Make()
void Content::RedirectTo(const Item & item)
{
std::string path;
request.result = Request::redirect;
data.dirs.MakePath(item.parent_id, path);
request.str = data.base_url + path + item.url;
}

8
core/content.h
Unescape View File

@ -18,7 +18,7 @@
#include "error.h"
#include "misc.h"
#include "db.h"
#include "user.h"
@ -38,6 +38,7 @@ class Content
Templates templates;
void AssertPrivileges(Item & old_item, Item & new_item);
void AddItem();
void EditItem();
@ -48,6 +49,7 @@ class Content
void PrepareUrlSubject(Item & item);
bool MakeGetCheckDir();
void MakeAddItem();
void MakeEditItem();
void MakeShowItemById();
void MakeDelItem();
@ -60,6 +62,10 @@ class Content
void MakePost();
void MakeGet();
void RedirectTo(const Item & item);
public:
bool Init();

18
core/data.h
Unescape View File

@ -18,7 +18,10 @@
#include "misc.h"
#include "item.h"
#include "error.h"
#include "dir.h"
#include "dirs.h"
#include "users.h"
#include "groups.h"
@ -75,6 +78,10 @@ public:
// (instead of showing directory contents)
bool one_item_is_showed;
// string used in a place where is a user (or group) selected
std::string priv_no_user;
std::string priv_no_group;
// end config members
// -----------------------------------------------------------------
@ -87,7 +94,7 @@ public:
volatile bool signal_hup;
// contains current directories tree
Dir dir;
Dirs dirs;
// based on base_url
// set by SetAdditionalVariables()
@ -97,6 +104,13 @@ public:
void SetAdditionalVariables();
// users
Users users;
// groups
Groups groups;
Data();

247
core/db.cpp
Unescape View File

@ -89,6 +89,9 @@ void Db::AssertConnection()
else
{
log << log2 << "ok" << logend;
if( PQsetClientEncoding(pg_conn, "LATIN2") == -1 )
log << log1 << "Db: Can't set the proper client encoding" << logend;
}
}
}
@ -493,10 +496,10 @@ Error Db::EditItemInItem(Item & item, bool with_subject)
{
AssertConnection();
std::ostringstream query;
query << "update core.item set (user_id, group_id, privileges, type, parent_id,";
query << "update core.item set (user_id, group_id, privileges, type, parent_id";
if( with_subject )
query << " url";
query << ", url";
query << ") = (";
query << '\'' << item.user_id << "', ";
@ -566,21 +569,108 @@ return result;
}
Error Db::EditItemGetId(Item & item)
{
PGresult * r = 0;
Error result = Error::ok;
try
{
AssertConnection();
std::ostringstream query;
query << "select item.id, content.id from core.item left join core.content on item.content_id = content.id where item.parent_id='";
query << item.parent_id << "' and item.url='" << Escape(item.url) << "';";
r = AssertQuery(query.str());
AssertResultStatus(r, PGRES_TUPLES_OK);
if( PQntuples(r) != 1 || PQnfields(r) != 2 )
throw Error(Error::db_no_item);
// we cannot use AssertColumn() with a name because both columns are called 'id'
item.id = atol( AssertValue(r, 0, 0) );
item.content_id = atol( AssertValue(r, 0, 1) );
}
catch(const Error & e)
{
result = e;
}
ClearResult(r);
return result;
}
Error Db::EditItem(Item & item, bool with_subject)
Error Db::EditItemGetContentId(Item & item)
{
Error result = EditItemInContent(item);
PGresult * r = 0;
Error result = Error::ok;
try
{
AssertConnection();
std::ostringstream query;
query << "select content_id from core.item left join core.content on item.content_id = content.id where item.id='";
query << item.id << "';";
r = AssertQuery(query.str());
AssertResultStatus(r, PGRES_TUPLES_OK);
if( PQntuples(r) != 1 || PQnfields(r) != 1 )
throw Error(Error::db_no_item);
item.content_id = atol( AssertValue(r, 0, 0) );
}
catch(const Error & e)
{
result = e;
}
ClearResult(r);
return result;
}
// item.id must be set
Error Db::EditItemById(Item & item, bool with_subject)
{
Error result = EditItemGetContentId(item);
if( result == Error::ok )
result = EditItemInItem(item, with_subject);
{
result = EditItemInContent(item);
if( result == Error::ok )
result = EditItemInItem(item, with_subject);
}
return result;
}
// item.url and item.parent_id must be set
Error Db::EditItemByUrl(Item & item, bool with_subject)
{
Error result = EditItemGetId(item);
if( result == Error::ok )
{
result = EditItemInContent(item);
if( result == Error::ok )
result = EditItemInItem(item, with_subject);
}
return result;
}
PGresult * Db::GetItemsQuery(Item & item_ref)
{
std::ostringstream query;
@ -670,6 +760,44 @@ void Db::GetItem(std::vector<Item> & item_table, long id)
bool Db::GetPriv(Item & item, long id)
{
bool result = false;
PGresult * r = 0;
try
{
AssertConnection();
std::ostringstream query;
query << "select user_id, group_id, privileges, subject, content from core.item left join core.content on item.content_id = content.id where item.id='" << id << "';"; // !! tymczasowo odczytujemy z content i subject
r = AssertQuery( query.str() );
AssertResultStatus(r, PGRES_TUPLES_OK);
int rows = PQntuples(r);
if( rows != 1 )
throw Error();
ItemColumns col;
col.SetColumns(r);
col.SetItem(r, 0, item);
result = true;
}
catch(const Error &)
{
}
ClearResult(r);
return result;
}
bool Db::DelItemDelItem(const Item & item)
{
@ -831,6 +959,115 @@ void Db::GetDirs(DirContainer & dir_table)
void Db::GetUsers(UGContainer<User> & user_table)
{
PGresult * r = 0;
try
{
AssertConnection();
std::ostringstream query;
query << "select id, login, super_user, group_id from core.user left outer join core.group_mem on core.user.id = core.group_mem.user_id order by id asc;";
r = AssertQuery( query.str() );
AssertResultStatus(r, PGRES_TUPLES_OK);
int rows = PQntuples(r);
int cid = AssertColumn(r, "id");
int cname = AssertColumn(r, "login");
int csuper_user = AssertColumn(r, "super_user");
int cgroup_id = AssertColumn(r, "group_id");
User u;
long last_id = -1;
UGContainer<User>::Iterator iter;
for(int i = 0 ; i<rows ; ++i)
{
u.id = atol( AssertValue(r, i, cid) );
if( u.id != last_id )
{
u.name = AssertValue(r, i, cname);
u.super_user = static_cast<bool>( atoi( AssertValue(r, i, csuper_user) ) );
log << log1 << "Db: get user: id:" << u.id << ", name:" << u.name << ", super_user:" << u.super_user << logend;
iter = user_table.PushBack( u );
last_id = u.id;
}
long group_id = atol( AssertValue(r, i, cgroup_id) );
if( !PQgetisnull(r, i, cgroup_id) && group_id!=-1 && !user_table.Empty() )
{
iter->groups.push_back(group_id);
log << log3 << "Db: user:" << iter->name << " is a member of group_id:" << group_id << logend;
}
}
}
catch(const Error &)
{
}
ClearResult(r);
}
void Db::GetGroups(UGContainer<Group> & group_table)
{
PGresult * r = 0;
try
{
AssertConnection();
std::ostringstream query;
query << "select id, core.group.group, user_id from core.group left outer join core.group_mem on core.group.id = core.group_mem.group_id order by id asc;";
r = AssertQuery( query.str() );
AssertResultStatus(r, PGRES_TUPLES_OK);
int rows = PQntuples(r);
int cid = AssertColumn(r, "id");
int cname = AssertColumn(r, "group");
int cuser_id = AssertColumn(r, "user_id");
Group g;
long last_id = -1;
UGContainer<Group>::Iterator iter;
for(int i = 0 ; i<rows ; ++i)
{
g.id = atol( AssertValue(r, i, cid) );
if( g.id != last_id )
{
g.name = AssertValue(r, i, cname);
log << log3 << "Db: get group, id:" << g.id << ", group:" << g.name << logend;
iter = group_table.PushBack( g );
last_id = g.id;
}
long user_id = atol( AssertValue(r, i, cuser_id) );
if( !PQgetisnull(r, i, cuser_id) && user_id!=-1 && !group_table.Empty() )
{
iter->members.push_back(user_id);
log << log3 << "Db: get group member: user_id:" << user_id << logend;
}
}
}
catch(const Error &)
{
}
ClearResult(r);
}

13
core/db.h
Unescape View File

@ -24,7 +24,9 @@
#include "misc.h"
#include "error.h"
#include "dircontainer.h"
#include "user.h"
#include "group.h"
#include "ugcontainer.h"
class Db
@ -37,13 +39,16 @@ public:
void Init(const std::string & database, const std::string & user, const std::string & pass);
bool CheckUser(std::string & login, std::string & password, long & user_id);
Error AddItem(Item & item);
Error EditItem(Item & item, bool with_subject = true);
Error EditItemById(Item & item, bool with_subject = true);
Error EditItemByUrl(Item & item, bool with_subject = true);
void CheckAllUrlSubject();
void GetItems(std::vector<Item> & item_table, Item & item_ref);
void GetItem(std::vector<Item> & item_table, long id);
bool GetPriv(Item & item, long id);
bool DelItem(const Item & item);
void GetDirs(DirContainer & dir_table);
void GetUsers(UGContainer<User> & user_table);
void GetGroups(UGContainer<Group> & group_table);
@ -70,6 +75,8 @@ protected:
Error EditItemInItem(Item & item, bool with_subject);
Error EditItemInContent(Item & item);
Error EditItemGetId(Item & item);
Error EditItemGetContentId(Item & item);
void CheckAllUrlSubjectModifyItem(Item & item);

26
core/db_itemcolumns.cpp
Unescape View File

@ -1,7 +1,7 @@
#include "db.h"
#include "db.h"
void Db::ItemColumns::SetColumns(PGresult * r)
{
// PQfnumber returns -1 if there is no such a column
@ -18,7 +18,7 @@ void Db::ItemColumns::SetColumns(PGresult * r)
content = PQfnumber(r, "content");
content_type = PQfnumber(r, "content_type");
}
void Db::ItemColumns::SetItem(PGresult * r, long row, Item & item)
@ -36,11 +36,11 @@ void Db::ItemColumns::SetItem(PGresult * r, long row, Item & item)
if( content != -1 ) item.content = Db::AssertValue(r, row, content);
if( content_type != -1 ) item.content_type = atoi( Db::AssertValue(r, row, content_type) );
}

4
core/dircontainer.cpp
Unescape View File

@ -9,8 +9,8 @@
#include "dircontainer.h"
// !! tutaj ostatecznie ustawic wartosc np okolo 100
// chwilowo do testow ustawione 2
DirContainer::DirContainer()
{
}

30
core/dir.cpp → core/dirs.cpp
Unescape View File

@ -7,10 +7,10 @@
*
*/
#include "dir.h"
#include "dirs.h"
void Dir::Clear()
void Dirs::Clear()
{
dir_table.Clear();
@ -20,7 +20,7 @@ void Dir::Clear()
}
void Dir::ReadDirs()
void Dirs::ReadDirs()
{
Clear();
@ -30,7 +30,7 @@ void Dir::ReadDirs()
bool Dir::GetDir(const std::string & name, long parent, Item ** item)
bool Dirs::GetDir(const std::string & name, long parent, Item ** item)
{
DirContainer::ParentIterator i = dir_table.FindFirstParent(parent);
@ -45,7 +45,7 @@ return false;
}
bool Dir::ExtractName(const char * & s, std::string & name)
bool Dirs::ExtractName(const char * & s, std::string & name)
{
name.clear();
@ -61,7 +61,7 @@ return !name.empty();
bool Dir::GetDir(const std::string & path, Item ** item)
bool Dirs::GetDir(const std::string & path, Item ** item)
{
long parent = -1;
std::string name;
@ -82,7 +82,7 @@ return true;
bool Dir::GetDirId(const std::string & path, long * id)
bool Dirs::GetDirId(const std::string & path, long * id)
{
Item * pitem;
@ -95,7 +95,7 @@ return true;
}
bool Dir::GetDirId(const std::string & name, long parent, long * id)
bool Dirs::GetDirId(const std::string & name, long parent, long * id)
{
Item * pitem;
@ -109,7 +109,7 @@ return true;
bool Dir::IsDir(long id)
bool Dirs::IsDir(long id)
{
if( id == -1 )
// root directory
@ -126,7 +126,7 @@ return true;
bool Dir::GetDirChilds(long parent, std::vector<Item> & childs_table)
bool Dirs::GetDirChilds(long parent, std::vector<Item> & childs_table)
{
if( !IsDir(parent) )
return false;
@ -146,7 +146,7 @@ return true;
// dodatkowo moze metoda AppendPath dodajaca sciezke do biezacego stringa?
// albo tutaj stringa nie czyscic?
// O(m * log n) (m- how many parts are in 'id')
bool Dir::MakePath(long id, std::string & path)
bool Dirs::MakePath(long id, std::string & path)
{
DirContainer::Iterator i;
@ -172,7 +172,7 @@ DirContainer::Iterator i;
// with exceptions
Item * Dir::GetDir(const std::string & path)
Item * Dirs::GetDir(const std::string & path)
{
Item * pitem;
@ -183,7 +183,7 @@ return pitem;
}
Item * Dir::GetDir(const std::string & name, long parent)
Item * Dirs::GetDir(const std::string & name, long parent)
{
Item * pitem;
@ -195,7 +195,7 @@ return pitem;
}
long Dir::GetDirId(const std::string & path)
long Dirs::GetDirId(const std::string & path)
{
long id;
@ -206,7 +206,7 @@ return id;
}
long Dir::GetDirId(const std::string & name, long parent)
long Dirs::GetDirId(const std::string & name, long parent)
{
long id;

7
core/dir.h → core/dirs.h
Unescape View File

@ -7,8 +7,8 @@
*
*/
#ifndef headerfiledir
#define headerfiledir
#ifndef headerfiledirs
#define headerfiledirs
#include <vector>
@ -21,7 +21,8 @@
#include "dircontainer.h"
class Dir
class Dirs
{
private:

11
core/error.cpp
Unescape View File

@ -28,6 +28,12 @@ Error::Error(int i)
}
Error::Error(const Error & e)
{
code = e.code;
}
Error::operator int() const
{
return static_cast<int>(code);
@ -40,6 +46,11 @@ Error & Error::operator=(Code c)
return *this;
}
Error & Error::operator=(const Error & e)
{
code = e.code;
return *this;
}
bool Error::operator==(Code c) const
{

11
core/error.h
Unescape View File

@ -33,18 +33,25 @@ public:
db_incorrect_login,
db_more_than_one_login,
db_err_currval,
no_cookie,
incorrect_dir,
cant_change_user,
cant_change_group,
cant_change_privileges,
permision_denied,
unknown = 1000
};
Error();
Error(Code c);
Error(int i);
Error(const Error & e);
Error & operator=(Code c);
Error & operator=(const Error & e);
operator int() const;

43
core/group.h
Unescape View File

@ -0,0 +1,43 @@
/*
* This file is a part of CMSLU -- Content Management System like Unix
* and is not publicly distributed
*
* Copyright (c) 2008, Tomasz Sowa
* All rights reserved.
*
*/
#ifndef headerfilegroup
#define headerfilegroup
#include <string>
#include <vector>
struct Group
{
long id;
std::string name; // group name
std::vector<long> members; // users id
Group()
{
Clear();
}
void Clear()
{
id = -1;
name.clear();
members.clear();
}
};
#endif

118
core/groups.cpp
Unescape View File

@ -0,0 +1,118 @@
/*
* This file is a part of CMSLU -- Content Management System like Unix
* and is not publicly distributed
*
* Copyright (c) 2008, Tomasz Sowa
* All rights reserved.
*
*/
#include "groups.h"
Groups::Groups()
{
Clear();
}
void Groups::Clear()
{
table.Clear();
}
void Groups::ReadGroups()
{
Clear();
db.GetGroups(table);
}
Group * Groups::GetGroup(long group_id)
{
Table::Iterator i = table.FindId(group_id);
if( i == table.End() )
return 0;
return &(*i);
}
Group * Groups::GetGroup(const std::string & name)
{
Table::Iterator i = table.FindName(name);
if( i == table.End() )
return 0;
return &(*i);
}
long Groups::GetGroupId(const std::string & name)
{
Group * pgroup = GetGroup(name);
if( !pgroup )
return -1;
return pgroup->id;
}
Groups::Iterator Groups::Begin()
{
return table.Begin();
}
Groups::Iterator Groups::End()
{
return table.End();
}
Groups::SizeType Groups::Size()
{
return table.Size();
}
Group & Groups::operator[](Groups::SizeType pos)
{
return table[pos];
}

51
core/groups.h
Unescape View File

@ -0,0 +1,51 @@
/*
* This file is a part of CMSLU -- Content Management System like Unix
* and is not publicly distributed
*
* Copyright (c) 2008, Tomasz Sowa
* All rights reserved.
*
*/
#ifndef headerfilegroups
#define headerfilegroups
#include <map>
#include "group.h"
#include "db.h"
#include "ugcontainer.h"
class Groups
{
typedef UGContainer<Group> Table;
Table table;
public:
typedef Table::Iterator Iterator;
typedef Table::SizeType SizeType;
Groups();
void Clear();
void ReadGroups();
Group * GetGroup(long group_id);
Group * GetGroup(const std::string & name);
long GetGroupId(const std::string & name);
Iterator Begin();
Iterator End();
SizeType Size();
Group & operator[](SizeType pos);
};
#endif

4
core/misc.cpp
Unescape View File

@ -119,6 +119,9 @@ std::string::const_iterator i;
else
if( *i == '>' )
out << "&gt;";
else
if( *i == '&' )
out << "&amp;";
else
out << *i;
}
@ -136,3 +139,4 @@ return out.str();

1
core/misc.h
Unescape View File

@ -29,5 +29,4 @@ void HtmlSpecial(std::ostringstream & out, const std::string & in);
std::string HtmlSpecial(const std::string & in);
#endif

132
core/request.cpp
Unescape View File

@ -113,7 +113,7 @@ std::string & Request::PostVar(const char * var)
p = post_table.find(var);
if( p == post_table.end() )
throw Error();
throw Error(Error::no_cookie);
return p->second;
}
@ -288,3 +288,133 @@ void Request::SendAll()
bool Request::CanChangeUser(const Item & item, long new_user_id)
{
if( !session )
// session must be set
return false;
if( session->puser && session->puser->super_user )
// super user is allowed everything
return true;
if( item.user_id != new_user_id )
// only super user can change the owner of an item
return false;
return true;
}