added: functions: chmod, chown

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@587 e52654a7-88a9-db11-a3e9-0013d4bc506e

content/content.cpp

@@ -216,12 +216,13 @@ void Content::MakeStandardFunction()
 	else
 	if( request.pfunction->code == FUN_UNAME )
 		FunUname();
+*/
 	else
 	if( request.pfunction->code == FUN_CHMOD )
-		FunChmod();
+		FunPriv();
 	else
 	if( request.pfunction->code == FUN_CHOWN )
-		FunChown();*/
+		FunPriv();
 	else
 		request.status = Error::permission_denied;
 
@@ -268,6 +269,8 @@ void Content::MakePost()
 		break;	
 
 		case FUN_PRIV:
+		case FUN_CHMOD:
+		case FUN_CHOWN:
 		PostFunPriv();
 		break;	
 

content/content.h

@@ -51,7 +51,7 @@ class Content
 	void FunLogout();
 	void FunLs();
 	void FunEmacs();
-	void FunPriv();
+
 
 	void FunCKEditor();
 
@@ -101,18 +101,32 @@ class Content
 	long PostFunDefaultParsePath();
 	void PostFunDefault();
 
+
+	/*
+		function: priv, chmod, chown
+	*/
 	bool PrivCheckAccess();
-	void PrivLog(const char * what, const std::string & url, long user, long group, int priv);
+	void PrivLogStart(const char * what, long user, long group, int priv);
+	void PrivLog(const char * what, long id, const std::string & url);
+	bool ChangeOwner(Item & item, long user_id, long group_id);
+	bool ChangePrivileges(Item & item, int privileges);
+	void ChangePriv(Item & item, long user_id, long group_id, int privileges);
 	void PostFunPriv();
 	void PrivFilesInDir(long parent_id);
 	void PrivDir(long parent_id);
-	void FunPriv(Item & item, long user_id, long group_id, int privileges);
+
+
 	bool ReadPriv(const char * user_in, const char * group_in, const char * priv_in, long & user_id, long & group_id, int & priv);
 	void PrivDir();
 	void PrivOneItem();
+	void FunPriv();
 
 	long user_id_file, group_id_file, user_id_dir, group_id_dir;
 	int priv_file, priv_dir;
+	bool subdirectories;
+	bool change_owner, change_priv;
+
+
 
 	bool FunCreateThreadCheckAccess();
 	bool FunCreateThreadCheckAbuse();

content/priv.cpp

@@ -2,7 +2,7 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2009, Tomasz Sowa
+ * Copyright (c) 2008-2010, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -14,6 +14,10 @@
 #include "../core/data.h"
 
 
+
+
+
+
 bool Content::PrivCheckAccess()
 {
 	// we do not check permissions here
@@ -32,61 +36,135 @@ return true;
 
 
 
-
+bool Content::ChangeOwner(Item & item, long user_id, long group_id)
-void Content::FunPriv(Item & item, long user_id, long group_id, int privileges)
 {
-	if( user_id==item.user_id && group_id==item.group_id && privileges==item.privileges )
+	if( user_id!=item.user_id || group_id!=item.group_id )
-		return;
-
-	if( !request.CanChangeUser(item, user_id) )
 	{
-		log << log3 << "Content: can't change the user" << logend;
+		if( !request.CanChangeUser(item, user_id) )
-		return;
+		{
-	}
+			log << log3 << "Content: can't change the user" << logend;
-	
+			return false;
-	if( !request.CanChangeGroup(item, group_id) )
+		}
-	{
+		
-		log << log3 << "Content: can't change the group" << logend;
+		if( !request.CanChangeGroup(item, group_id) )
-		return;
+		{
+			log << log3 << "Content: can't change the group" << logend;
+			return false;
+		}
 	}
 
-	if( !request.CanChangePrivileges(item, privileges) )
+	item.user_id  = user_id;
+	item.group_id = group_id;
+
+return true;
+}
+
+
+
+bool Content::ChangePrivileges(Item & item, int privileges)
+{
+	if(	privileges != item.privileges )
 	{
-		log << log3 << "Content: can't change privileges" << logend;
+		if( !request.CanChangePrivileges(item, privileges) )
-		return;
+		{
+			log << log3 << "Content: can't change privileges" << logend;
+			return false;
+		}
 	}
 
-	item.user_id    = user_id;
-	item.group_id   = group_id;
 	item.privileges = privileges;
 
+return true;
+}
+
+
+
+void Content::ChangePriv(Item & item, long user_id, long group_id, int privileges)
+{
+	if( change_owner )
+	{
+		if( !ChangeOwner(item, user_id, group_id) )
+			return;
+	}
+
+	if( change_priv )
+	{
+		if( !ChangePrivileges(item, privileges) )
+			return;
+	}
+
 	request.session->done_status = db.EditPrivById(item, item.id);
 }
 
 
-void Content::PrivLog(const char * what, const std::string & url, long user, long group, int priv)
+
+void Content::PrivLogStart(const char * what, long user, long group, int priv)
 {
-	log << log3 << "Content: "
+	log << log2 << what;
-		<< what        << url
+
-		<< ", user: "  << user
+	if( change_owner )
-		<< ", group: " << group
+	{
-		<< ", priv: "  << priv
+		User  * puser  = data.users.GetUser(user);
-		<< logend;
+		Group * pgroup = data.groups.GetGroup(group);
+
+		log << "new user: ";
+
+		if( puser )
+			log << puser->name;
+		else
+			log << "id: " << user;
+
+		log << ", new group: ";
+
+		if( pgroup )
+			log << pgroup->name;
+		else
+			log << "id: " << group;
+
+		if( change_priv )
+			log << ", ";
+	}
+
+	if( change_priv )
+	{
+		char buf[30];
+		sprintf(buf, "0%o", priv);
+		log << "privileges: " << buf;
+	}
+
+	log << logend;
 }
 
 
 
+void Content::PrivLog(const char * what, long id, const std::string & url)
+{
+Item * root = 0;
+
+	if( id != -1 )
+		root = data.dirs.GetRootDir();
+
+	log << log3 << "Content: " << what;
+
+	if( root && root->id == id )
+		log << "(root)";
+	else
+		log << url;
+
+	log << logend;
+}
+
+
 void Content::PrivFilesInDir(long parent_id)
 {
-	request.item_table.clear();
 	db.GetItems(request.item_table, parent_id, Item::file, false, false, true);
 
 	std::vector<Item>::iterator i = request.item_table.begin();
 
 	for( ; i != request.item_table.end() ; ++i)
 	{
-		PrivLog("changed file: ", i->url, user_id_file, group_id_file, priv_file);
+		PrivLog("changed file: ", -1, i->url);
-		FunPriv(*i, user_id_file, group_id_file, priv_file);
+		ChangePriv(*i, user_id_file, group_id_file, priv_file);
 	}
 }
 
@@ -101,9 +179,11 @@ void Content::PrivDir(long parent_id)
 
 	for( ; i != data.dirs.ParentEnd() ; i = data.dirs.NextParent(i) )
 	{
-		PrivLog("changed dir: ", i->second->url, user_id_dir, group_id_dir, priv_dir);
+		PrivLog("changed dir: ", -1, i->second->url);
-		FunPriv(*(i->second), user_id_dir, group_id_dir, priv_dir);
+		ChangePriv(*(i->second), user_id_dir, group_id_dir, priv_dir);
-		PrivDir(i->second->id);
+
+		if( subdirectories )
+			PrivDir(i->second->id);
 	}
 }
 
@@ -115,15 +195,26 @@ bool Content::ReadPriv(const char * user_in, const char * group_in, const char *
 	std::string * group_str = request.PostVar(group_in);
 	std::string * priv_str  = request.PostVar(priv_in);
 
-	if( !user_str || !group_str || !priv_str )
+	if( change_owner && (!user_str || !group_str) )
 	{
-		log << log1 << "Content: PostFunPriv: there is no some post variables" << logend;
+		log << log1 << "Content: PostFunPriv: there is no some post variables for changing the owner" << logend;
 		return false;
 	}
 
-	user_id   = data.users.GetUserId( *user_str );
+	if( change_priv && !priv_str )
-	group_id  = data.groups.GetGroupId( *group_str );
+	{
-	priv      = strtol( priv_str->c_str() , 0, 8);
+		log << log1 << "Content: PostFunPriv: there is no some post variables for changing privileges" << logend;
+		return false;
+	}
+
+	if( change_owner )
+	{
+		user_id   = data.users.GetUserId( *user_str );
+		group_id  = data.groups.GetGroupId( *group_str );
+	}
+
+	if( change_priv )
+		priv = strtol( priv_str->c_str() , 0, 8);
 
 return true;
 }
@@ -137,13 +228,21 @@ void Content::PrivDir()
 	if( !ReadPriv("userdir", "groupdir", "privilegesdir", user_id_dir, group_id_dir, priv_dir) )
 		return;
 
+	PrivLogStart("Content: changes for files: ", user_id_file, group_id_file, priv_file);
+	PrivLogStart("Content: changes for dirs:  ", user_id_dir,  group_id_dir,  priv_dir);
+
+
 	if( request.IsPostVar("changecurrentdir") )
 	{
-		PrivLog("changed dir: ", request.dir_table.back()->url, user_id_dir, group_id_dir, priv_dir);
+		Item & last_dir = *request.dir_table.back();
-		FunPriv(*request.dir_table.back(), user_id_dir, group_id_dir, priv_dir);
+		PrivLog("changed dir: ", last_dir.id, last_dir.url);
+		ChangePriv(*request.dir_table.back(), user_id_dir, group_id_dir, priv_dir);
 	}
 
-	// go through all directories (recurrence)
+
+	subdirectories = request.IsPostVar("changesubdirs");
+
+	// go through all directories
 	PrivDir(request.dir_table.back()->id);
 
 	RedirectToLastDir();
@@ -157,14 +256,16 @@ void Content::PrivOneItem()
 	if( !ReadPriv("user", "group", "privileges", user_id_file, group_id_file, priv_file) )
 		return;
 
+	PrivLogStart("Content: changes:  ", user_id_file,  group_id_file,  priv_file);
+
 	if( request.is_item )
 	{
-		FunPriv(request.item, user_id_file, group_id_file, priv_file);
+		ChangePriv(request.item, user_id_file, group_id_file, priv_file);
 		RedirectTo(request.item);
 	}
 	else
 	{
-		FunPriv(*request.dir_table.back(), user_id_file, group_id_file, priv_file);
+		ChangePriv(*request.dir_table.back(), user_id_file, group_id_file, priv_file);
 		RedirectToLastDir();
 	}
 }
@@ -176,6 +277,8 @@ void Content::PostFunPriv()
 	if( !PrivCheckAccess() )
 		return;
 
+	change_owner = (request.pfunction->code == FUN_PRIV || request.pfunction->code == FUN_CHOWN);
+	change_priv  = (request.pfunction->code == FUN_PRIV || request.pfunction->code == FUN_CHMOD);
 
 	if( request.IsParam("r") )
 	{
@@ -185,6 +288,8 @@ void Content::PostFunPriv()
 	{
 		PrivOneItem();
 	}
+
+	data.dirs.CheckRootDir();
 }
 
 
@@ -193,3 +298,5 @@ void Content::FunPriv()
 {
 	PrivCheckAccess();
 }
+
+

core/Makefile.dep

@@ -20,6 +20,9 @@ dircontainer.o: dircontainer.h item.h log.h
 dirs.o: dirs.h item.h dircontainer.h error.h log.h db.h user.h group.h
 dirs.o: thread.h ugcontainer.h ticket.h data.h users.h groups.h functions.h
 dirs.o: function.h lastcontainer.h mounts.h mount.h rebus.h loadavg.h
+dirs.o: request.h requesttypes.h session.h done.h compress.h
+dirs.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h
+dirs.o: postmultiparser.h
 done.o: done.h
 error.o: error.h log.h
 function.o: function.h item.h

core/dirs.cpp

@@ -12,6 +12,7 @@
 #include "log.h"
 #include "db.h"
 #include "data.h"
+#include "request.h"
 
 
 void Dirs::Clear()
@@ -26,7 +27,17 @@ void Dirs::CheckRootDir()
 	DirContainer::Iterator i = dir_table.GetRoot();
 
 	if( i != dir_table.End() )
+	{
+		if( !request.HasReadExecAccessForRoot(*i) )
+		{
+			i->privileges = 0755;
+			log << log1 << "Dirs: there is no access for root (admin) to the root dir, setting 0755 for root dir" << logend;
+			db.EditPrivById(*i, i->id);
+		}
+
 		return;
+	}
+	
 		
 	log << log1 << "Dirs: there is no a root dir in the database (creating one)" << logend;
 
@@ -272,7 +283,8 @@ void Dirs::SplitPath(const std::string & path, std::string & dir, std::string &
 
 
 
-
+// !! przeniesc to do rm
+// mamy juz interfejs do chodzenia po parentach
 void Dirs::DeleteDir(long id)
 {
 	DirContainer::ParentIterator pnext, p = dir_table.FindFirstParent(id);

core/function.h

@@ -38,8 +38,8 @@
 #define FUN_UPTIME			21
 //#define FUN_MV				23
 //#define FUN_UNAME			24
-//#define FUN_CHMOD			25
+#define FUN_CHMOD			25
-//#define FUN_CHOWN			26
+#define FUN_CHOWN			26
 #define FUN_CKEDITOR		27
 
 

core/functions.cpp

@@ -124,6 +124,7 @@ void Functions::ReadFunctions()
 	f.code = FUN_UNAME;
 	f.item.url  = "uname";
 	table.insert( std::make_pair(f.item.url, f) );
+	*/
 
 	f.code = FUN_CHMOD;
 	f.item.url  = "chmod";
@@ -132,7 +133,7 @@ void Functions::ReadFunctions()
 	f.code = FUN_CHOWN;
 	f.item.url  = "chown";
 	table.insert( std::make_pair(f.item.url, f) );
-	*/
+	
 
 	f.code = FUN_CKEDITOR;
 	f.item.url  = "ckeditor";

core/request.cpp

@@ -676,6 +676,14 @@ bool Request::HasReadExecAccess(const Item & item)
 }
 
 
+bool Request::HasReadExecAccessForRoot(const Item & item)
+{
+		// there must be at least one 'x' (for the root)
+	
+	return (item.privileges & 0111) != 0;
+}
+
+
 // returning true if we can create a thread in the current directory
 bool Request::CanCreateThread(bool check_root)
 {

core/request.h

@@ -150,6 +150,7 @@ struct Request
 	bool HasWriteAccess(const Item & item);
 	bool HasReadWriteAccess(const Item & item);
 	bool HasReadExecAccess(const Item & item);
+	bool HasReadExecAccessForRoot(const Item & item);
 
 	bool CanCreateThread(bool check_root = false);
 	bool CanCreateTicket(bool check_root = false);

html/fun_priv.html

@@ -1,3 +1,6 @@
+[# this template is for following functions: priv, chmod, chown]
+
+
 <h1>{priv_header}</h1>
 
 
@@ -8,11 +11,14 @@
 
 [is-no winix_function_param_is "r"]
 
-<form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end]priv">
+<form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end][winix_function]">
 <fieldset>
 	<legend>{priv_form_legend}</legend>
 	
 	<table class="withoutborder">
+	
+	[if-one priv_show_form_chown]
+	
 		<tr><th>{user}:</th><td>
 		<select name="user" class="users">
 		[for priv_user_tab]
@@ -29,7 +35,12 @@
 		</select>
 		</td></tr>
 		
+	[end]
+		
+	[if-one priv_show_form_chmod]
 		<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privileges" value="[priv_privileges]"></td></tr>
+	[end]
+		
 	</table>
 	
 	<input class="submit" type="submit" value="{change}">
@@ -38,13 +49,15 @@
 
 [else]
 
-<form id="additem" method="post" action="[doc_base_url][dir]priv/r">
+<form id="additem" method="post" action="[doc_base_url][dir][winix_function]/r">
 <fieldset>
 	<legend>{priv_form_legend}</legend>
 	<p class="withnext">{priv_change_in_dir}: [dir]</p>
 	
 	<h2>{priv_for_all_files}:</h2>
 	<table class="withoutborder">
+	
+	[if-one priv_show_form_chown]
 		<tr><th>{user}:</th><td>
 		<select name="userfile" class="users">
 		[for priv_user_tab]
@@ -60,13 +73,19 @@
 		[end]
 		</select>
 		</td></tr>
-		
+	[end]
+	
+	[if-one priv_show_form_chmod]
 		<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privilegesfile" value="[priv_privileges_for_files]"></td></tr>
+	[end]
+	
 	</table>
 	
 
 	<h2>{priv_for_all_dirs}:</h2>
 	<table class="withoutborder">
+	
+	[if-one priv_show_form_chown]
 		<tr><th>{user}:</th><td>
 		<select name="userdir" class="users">
 		[for priv_user_tab]
@@ -82,11 +101,17 @@
 		[end]
 		</select>
 		</td></tr>
-		
+	[end]
+	
+	[if-one priv_show_form_chmod]
 		<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privilegesdir" value="[priv_privileges_for_dirs]"></td></tr>
+	[end]
+	
+	
 	</table>
 
-	<label><input type="checkbox" name="changecurrentdir">{priv_change_current_dir}: [dir_without_slash]</label>
+	<label><input class="check" type="checkbox" name="changesubdirs">{priv_change_all}</label>
+	<label><input class="check" type="checkbox" name="changecurrentdir">{priv_change_current_dir}: [dir_without_slash]</label>
 
 	<input class="submit" type="submit" value="{change}">
 </fieldset>

locale/en

@@ -117,9 +117,9 @@ priv_form_legend = Permissions
 priv_change_in_dir = Change permissions for all items in the following directory
 priv_for_all_files = For all files to
 priv_for_all_dirs = For all directories to
+priv_change_all = Change subdirectories as well
 priv_change_current_dir = Change also the current directory
 
-
 reload_header = Reload
 reload_was_error = We are sorry  but there were errors while reloading.
 templates_reloaded_successfully = Templates reloaded successfully.

locale/pl

@@ -16,7 +16,7 @@ home_page = Strona g
 button_login = Loguj
 
 load_avg = średnie obciążenie
-req_per_sec = Wywo³añ na sekundê
+req_per_sec = wywo³añ na sekundê
 
 added_by = Dodane przez
 last_modified = ostatnio modyfikowany
@@ -116,8 +116,10 @@ priv_form_legend = Uprawnienia
 priv_change_in_dir = Zmień hurtowo uprawnienia w katalogu
 priv_for_all_files = Dla wszystkich plików na
 priv_for_all_dirs = Dla wszystkich katalogów na
+priv_change_all = Zmieñ tak¿e w podkatalogach
 priv_change_current_dir = Zmień także sam katalog bieżący
 
+
 reload_header = Przeładuj
 reload_was_error = Przykro nam ale wystąpiły błędy podczas ponownego wczytywania.
 templates_reloaded_successfully = Szablony zostały pomyślnie wczytane.

static/layout1/winix.css

@@ -420,6 +420,16 @@ display: block;
 width: 530px;
 }
 
+#additem .check {
+vertical-align: middle;
+}
+
+#additem label {
+vertical-align: middle;
+margin: 0.3em 0 0.3em 0;
+padding: 0.2em;
+display: block;
+}
 
 #additem select {
 border: 1px solid #dedede;

templates/priv.cpp

@@ -266,6 +266,19 @@ void priv_privileges_for_dirs(Info & i)
 }
 
 
+void priv_show_form_chown(Info & i)
+{
+	i.result = (request.pfunction->code == FUN_PRIV || request.pfunction->code == FUN_CHOWN);
+}
+
+
+void priv_show_form_chmod(Info & i)
+{
+	i.result = (request.pfunction->code == FUN_PRIV || request.pfunction->code == FUN_CHMOD);
+}
+
+
+
 
 } // namespace TemplatesFunctions
 

templates/templates.cpp

@@ -50,6 +50,8 @@ Ezc::Pattern * p = 0;
 		{FUN_MKDIR,			pat_fun_mkdir},
 		{FUN_DEFAULT,		pat_fun_default},
 		{FUN_PRIV,			pat_fun_priv},
+		{FUN_CHMOD,			pat_fun_priv},
+		{FUN_CHOWN,			pat_fun_priv},
 		{FUN_RUN,			pat_fun_run},
 		{FUN_WHO,			pat_fun_who},
 		{FUN_LAST,			pat_fun_last},
@@ -309,7 +311,10 @@ void Templates::CreateFunctions()
 	functions.Insert("priv_privileges",           priv_privileges);
 	functions.Insert("priv_privileges_for_files", priv_privileges_for_files);
 	functions.Insert("priv_privileges_for_dirs",  priv_privileges_for_dirs);
-	
+	functions.Insert("priv_show_form_chown",      priv_show_form_chown);
+	functions.Insert("priv_show_form_chmod",      priv_show_form_chmod);
+
+
 	
 	/*
 		done
@@ -457,6 +462,7 @@ void Templates::CreateFunctions()
 	*/
 	functions.Insert("winix_cur_time",            winix_cur_time);
 	functions.Insert("winix_users_logged",        winix_users_logged);
+	functions.Insert("winix_function",            winix_function);
 	functions.Insert("winix_function_is",         winix_function_is);
 	functions.Insert("winix_function_param_is",   winix_function_param_is);
 	functions.Insert("winix_loadavg_now",         winix_loadavg_now);

templates/templates.h

@@ -207,6 +207,7 @@ namespace TemplatesFunctions
 	void user_can_use_bbcode(Info & i);
 	void user_can_use_raw(Info & i);
 	
+
 	/*
 		privileges
 	*/
@@ -222,6 +223,9 @@ namespace TemplatesFunctions
 	void priv_privileges_for_files(Info & i);
 	void priv_privileges_for_dirs(Info & i);
 	
+	void priv_show_form_chown(Info & i);
+	void priv_show_form_chmod(Info & i);
+
 
 	/*
 		done
@@ -365,6 +369,7 @@ namespace TemplatesFunctions
 	*/
 	void winix_cur_time(Info & i);
 	void winix_users_logged(Info & i);
+	void winix_function(Info & i);
 	void winix_function_is(Info & i);
 	void winix_function_param_is(Info & i);
 	void winix_loadavg_now(Info & i);

templates/winix.cpp

@@ -37,6 +37,11 @@ void winix_users_logged(Info & i)
 }
 
 
+void winix_function(Info & i)
+{
+	i.out << request.pfunction->item.url;
+}
+
 
 void winix_function_is(Info & i)
 {