Michael Ploujnikov [Mon, 20 Apr 2009 01:05:24 +0000 (21:05 -0400)]
replace the log_level explanation with one for the logging_settings table
Michael Ploujnikov [Mon, 20 Apr 2009 00:54:06 +0000 (20:54 -0400)]
replace remaining cgilua.errorlog() calls by uwiki_log_*() calls
Michael Ploujnikov [Mon, 20 Apr 2009 00:46:36 +0000 (20:46 -0400)]
commit remove log_level related code
This was replaced with a logging_settings table
Michael Ploujnikov [Mon, 20 Apr 2009 00:41:19 +0000 (20:41 -0400)]
rely on channel prefix in the log message to identify its meaning
Michael Ploujnikov [Sat, 11 Apr 2009 23:37:26 +0000 (19:37 -0400)]
implement syslog-like priority and channel based logging
* assume a log level if level_settings hasn't been defined yet
* take care of adding newlines to the log messages for the user of the uwiki_log* functions
* prepend the channel name to log messages
Michael Ploujnikov [Mon, 13 Apr 2009 00:47:46 +0000 (20:47 -0400)]
ignore the apache modules directory
Michael Ploujnikov [Sun, 12 Apr 2009 22:49:05 +0000 (18:49 -0400)]
start the web server in a more general way
* use relative paths for modules
* set the ServerRoot on the command line
* load the mod_log_config module for the CustomLog directive
* try to find the apache executable in different locations
Christian Thaeter [Tue, 7 Apr 2009 02:20:53 +0000 (04:20 +0200)]
implement multiple expansion funcs for utable parsers
Christian Thaeter [Mon, 6 Apr 2009 19:13:16 +0000 (21:13 +0200)]
brainfart, recursive parsing is so much easier
Christian Thaeter [Mon, 6 Apr 2009 14:36:23 +0000 (16:36 +0200)]
gitignore backup files and other cruft
Christian Thaeter [Mon, 6 Apr 2009 14:35:52 +0000 (16:35 +0200)]
the _sys meta was missing yet (forgot to commit)
Christian Thaeter [Mon, 6 Apr 2009 14:35:00 +0000 (16:35 +0200)]
make utable_split_at_space not split after certain punctation chars
This allow comma separated lists containing spaces
'foo bar, baz barf'
will be split to
'foo' 'bar,baz' 'barf'
Christian Thaeter [Mon, 6 Apr 2009 14:32:43 +0000 (16:32 +0200)]
New ACL implementation underway
* add (incomplete) documentation about acls
* remove/fix acl metadata (only toplevel acl for now)
* Uppercase known group
Christian Thaeter [Mon, 6 Apr 2009 14:09:42 +0000 (16:09 +0200)]
Recursive expansion of groups and roles FIXME: cycles are not yet detected
Christian Thaeter [Sun, 5 Apr 2009 16:43:47 +0000 (18:43 +0200)]
there is a simpler way to return a one element iterator
Christian Thaeter [Sun, 5 Apr 2009 04:44:39 +0000 (06:44 +0200)]
group and role expansions for metaacls
Christian Thaeter [Sun, 5 Apr 2009 04:44:01 +0000 (06:44 +0200)]
put 'path' into the daemon table instead passing it as parameter
Christian Thaeter [Sun, 5 Apr 2009 04:42:45 +0000 (06:42 +0200)]
Add a 'elem' parameter to utable queries to return only a single key
Christian Thaeter [Sun, 5 Apr 2009 03:51:50 +0000 (05:51 +0200)]
make roles Uppercased too
Christian Thaeter [Sun, 5 Apr 2009 03:50:24 +0000 (05:50 +0200)]
simplify utable again, only 'state' needed
Christian Thaeter [Sat, 4 Apr 2009 22:25:32 +0000 (00:25 +0200)]
give utable_parse an extra state parameter
This is needed for the following changes where 'self' as context needs to
be passed around
Christian Thaeter [Sat, 4 Apr 2009 22:23:46 +0000 (00:23 +0200)]
rename groups to Uppercase names to differentiate them from user names
Christian Thaeter [Fri, 3 Apr 2009 21:47:23 +0000 (23:47 +0200)]
preliminary metadata library
This will be later split into a client and a daemon part.
Provides:
* instantiate a metadata object which later acts as authentication token
* low level interface to put and freeze parameters (daemon protocol)
* metaacl checks to restrict access to metadata, example metaacl included
* direct metadata api (intermediate level), lookup/get/set
Todo:
* high level metadata api for uwiki internal functionality (Acl checks)
Christian Thaeter [Thu, 2 Apr 2009 14:01:49 +0000 (16:01 +0200)]
Merge commit 'alcarinque/master' into devel
* commit 'alcarinque/master':
Updated draft. Using Object prototipe
Added a basic structure for the scm interface
fix configs due to renaming changes
alcarinque [Thu, 2 Apr 2009 03:10:04 +0000 (00:10 -0300)]
Updated draft. Using Object prototipe
Christian Thaeter [Wed, 1 Apr 2009 20:11:03 +0000 (22:11 +0200)]
moved libproto to the main lib dir
Christian Thaeter [Wed, 1 Apr 2009 17:13:30 +0000 (19:13 +0200)]
rename the default object functions to __reserved names
The default names clone and inherits are aliased to __clone and __inherits
This makes it possible to redefine the frontend functions while still
having the standard implementations available.
Christian Thaeter [Wed, 1 Apr 2009 00:01:18 +0000 (02:01 +0200)]
libproto, prototype based OO for Lua
So far this is a very basic prototype based system. Only clone() and
inherits() are supported, no frills.
Christian Thaeter [Tue, 31 Mar 2009 00:29:37 +0000 (02:29 +0200)]
Missed a chunk in previous commit
Christian Thaeter [Sun, 29 Mar 2009 13:23:28 +0000 (15:23 +0200)]
FIX: negative matches (!name) iterated until found a match
Use the original line to identify from which source an expanded row came.
Skip all rows from the same origin line when a negative match was found.
Christian Thaeter [Sun, 29 Mar 2009 01:04:33 +0000 (03:04 +0200)]
add function returning the first match only
Christian Thaeter [Sun, 29 Mar 2009 00:37:22 +0000 (01:37 +0100)]
add assertion to check parameter quantity. Needs to be improved..
Christian Thaeter [Sun, 29 Mar 2009 00:30:09 +0000 (01:30 +0100)]
renamed libtable to libutable not to confuse with lua tables
Christian Thaeter [Sun, 29 Mar 2009 00:28:44 +0000 (01:28 +0100)]
table matcher, iterate over all entries in a utable which match a query
Christian Thaeter [Sat, 28 Mar 2009 00:31:04 +0000 (01:31 +0100)]
Table parser improvements
* start little documentation in pipadoc/asciidoc for example
* rename libtable functions to 'utable_*'
* add a optional cache for parsed tables
* make expansions generic
* provide few default expansion functions
alcarinque [Thu, 26 Mar 2009 19:06:08 +0000 (16:06 -0300)]
Added a basic structure for the scm interface
Christian Thaeter [Tue, 24 Mar 2009 17:26:44 +0000 (18:26 +0100)]
rename /lib to /uwikid .. less confusion i suppose
Christian Thaeter [Tue, 24 Mar 2009 14:15:34 +0000 (15:15 +0100)]
fix configs due to renaming changes
Serge Gielkens [Wed, 25 Mar 2009 21:31:02 +0000 (22:31 +0100)]
Path to meta was incorrect
Serge Gielkens [Wed, 25 Mar 2009 21:10:12 +0000 (22:10 +0100)]
Error in path to userDB
Serge Gielkens [Wed, 25 Mar 2009 21:03:52 +0000 (22:03 +0100)]
Path to _sys changed into _uwiki
Christian Thaeter [Tue, 24 Mar 2009 14:15:34 +0000 (15:15 +0100)]
fix configs due to renaming changes
Christian Thaeter [Mon, 23 Mar 2009 20:57:02 +0000 (21:57 +0100)]
a new try, rename _sys to _uwiki
Christian Thaeter [Mon, 23 Mar 2009 20:53:14 +0000 (21:53 +0100)]
chroot fixes
moved meta and users back from chroot into the main hierarchy
Christian Thaeter [Mon, 23 Mar 2009 20:44:06 +0000 (21:44 +0100)]
Merge branch 'master' of git://git.pipapo.org/uwiki/raevol into devel
* 'master' of git://git.pipapo.org/uwiki/raevol:
Attempt at uWiki.txt
Attempt at metaacl.txt
Christian Thaeter [Mon, 23 Mar 2009 20:43:06 +0000 (21:43 +0100)]
Merge commit 'origin/master' into devel
* commit 'origin/master': (23 commits)
Removed old commented code that still lingered on from the Lua tables
Pending was moved to userDB, so account.lua had to be modified for that.
removed the group 'pending'. it is now part of the userDB
Along the way the style sheets got lots. Readded them.
Corrected small error when action cannot be found
Removed hardcoded _sys directory and made it a variable
Prevent error when a group appears not exist
Temporary hard coded true to have an error free page.
Deleted old code not used anymore in libacl
Complete rewrite of acl_allow. It uses now sets to make the code much
The same for UWIKI.sys.dir -> UWIKI.dir
Renamed UWIKI.sys.users -> UWIKI.users to be consistent
Added lib to internal directory structure
Moved all configuration that only concerns the uWiki internals into
Added logging when user is not authorized at all to access uWiki
Temporarily disabled .gitignore so that changes in any uwiki-directory
Moved init.lua back into doc/_sys structure
Made a directory lib outside the doc directory. That should contain
Initial directory layout with chroot directory
Debugging
...
Conflicts:
chroot/doc/_sys/actions/account.lua
chroot/doc/_sys/actions/create.lua
chroot/doc/_sys/actions/edit.lua
chroot/doc/_sys/actions/no_action.lua
chroot/doc/_sys/actions/raw.lua
chroot/doc/_sys/actions/recent_changes.lua
chroot/doc/_sys/actions/unauthorized.lua
chroot/doc/_sys/include/init.lua
chroot/lib/libacl.lua
chroot/lib/libgit.lua
chroot/lib/libhtml.lua
chroot/lib/libhttp.lua
chroot/lib/libio.lua
chroot/lib/libtab.lua
chroot/meta/_sys/actions/account.lua/_acl
chroot/meta/_sys/actions/account.lua/_type
chroot/meta/_sys/actions/recent_changes.lua/_acl
chroot/meta/_sys/actions/recent_changes.lua/_type
chroot/meta/_sys/types/raw.lua/_acl
chroot/meta/_sys/types/raw.lua/_type
chroot/sources/g/z
doc/_sys/actions/account.lua
doc/_sys/actions/create.lua
doc/_sys/actions/edit.lua
doc/_sys/actions/no_action.lua
doc/_sys/actions/raw.lua
doc/_sys/actions/recent_changes.lua
doc/_sys/actions/unauthorized.lua
doc/_sys/include/init.lua
doc/_sys/include/libacl.lua
doc/_sys/include/libgit.lua
doc/_sys/include/libhtml.lua
doc/_sys/include/libhttp.lua
doc/_sys/include/libio.lua
doc/_sys/include/libtab.lua
doc/_uwiki/actions/account.lua
doc/_uwiki/actions/create.lua
doc/_uwiki/actions/edit.lua
doc/_uwiki/actions/no_action.lua
doc/_uwiki/actions/raw.lua
doc/_uwiki/actions/recent_changes.lua
doc/_uwiki/actions/unauthorized.lua
doc/_uwiki/include/init.lua
doc/_uwiki/include/libacl.lua
doc/_uwiki/include/libgit.lua
doc/_uwiki/include/libhtml.lua
doc/_uwiki/include/libhttp.lua
doc/_uwiki/include/libio.lua
doc/_uwiki/include/libtab.lua
meta/_sys/actions/account.lua/_acl
meta/_sys/actions/account.lua/_type
meta/_sys/actions/recent_changes.lua/_acl
meta/_sys/actions/recent_changes.lua/_type
meta/_sys/types/raw.lua/_acl
meta/_sys/types/raw.lua/_type
meta/_uwiki/actions/account.lua/_acl
meta/_uwiki/actions/account.lua/_type
meta/_uwiki/actions/recent_changes.lua/_acl
meta/_uwiki/actions/recent_changes.lua/_type
meta/_uwiki/types/raw.lua/_acl
meta/_uwiki/types/raw.lua/_type
Christian Thaeter [Mon, 23 Mar 2009 18:39:31 +0000 (19:39 +0100)]
Generic Table parser, first try
uwiki_table_parse(path, template)
parses the table (uwiki ACL etc) at 'path' into a lua table which uses keys
from 'template'.
uwiki tables have a simple syntax with a expansion scheme.
Comma separated entries define disjunct entries which will be expanded:
1,2 3,4 5
becomes:
1 3 5
2 3 5
1 4 5
2 4 5
Mickey Lyle [Mon, 23 Mar 2009 12:11:47 +0000 (05:11 -0700)]
Attempt at uWiki.txt
Raevol [Mon, 23 Mar 2009 10:37:13 +0000 (03:37 -0700)]
Attempt at metaacl.txt
Christian Thaeter [Mon, 23 Mar 2009 09:31:35 +0000 (10:31 +0100)]
some doc changes for raevol ...
Christian Thaeter [Mon, 23 Mar 2009 09:25:59 +0000 (10:25 +0100)]
include the old docs from the haserl uwiki prototype
This is are very premature texts which dont reflect the current state,
They need to be carefully reviewed/fixed and then integrated into the new
uwiki documentation.
Note: the uWiki.txt got lost somehow, only the html available, this shoudl
be asciidoced again.
The license is the AGPL3 (Affero Gnu Pubic License V3) is from texi2html,
Either the original texi document or an asciidoced version should be
integrated. The texi version can be found on the web (gnu.org)
Serge Gielkens [Sun, 22 Mar 2009 16:24:35 +0000 (17:24 +0100)]
Removed old commented code that still lingered on from the Lua tables
era.
Serge Gielkens [Sun, 22 Mar 2009 15:35:55 +0000 (16:35 +0100)]
Pending was moved to userDB, so account.lua had to be modified for that.
Serge Gielkens [Sun, 22 Mar 2009 14:59:35 +0000 (15:59 +0100)]
removed the group 'pending'. it is now part of the userDB
Serge Gielkens [Sun, 22 Mar 2009 14:57:03 +0000 (15:57 +0100)]
Along the way the style sheets got lots. Readded them.
Serge Gielkens [Sun, 22 Mar 2009 14:33:34 +0000 (15:33 +0100)]
Corrected small error when action cannot be found
Serge Gielkens [Sun, 22 Mar 2009 14:25:57 +0000 (15:25 +0100)]
Removed hardcoded _sys directory and made it a variable
Serge Gielkens [Sun, 22 Mar 2009 11:52:55 +0000 (12:52 +0100)]
Prevent error when a group appears not exist
Serge Gielkens [Sat, 21 Mar 2009 21:38:03 +0000 (22:38 +0100)]
Temporary hard coded true to have an error free page.
Serge Gielkens [Sat, 21 Mar 2009 21:28:39 +0000 (22:28 +0100)]
Deleted old code not used anymore in libacl
Serge Gielkens [Sat, 21 Mar 2009 21:22:25 +0000 (22:22 +0100)]
Complete rewrite of acl_allow. It uses now sets to make the code much
more compact and efficient.
Serge Gielkens [Sat, 21 Mar 2009 17:34:39 +0000 (18:34 +0100)]
The same for UWIKI.sys.dir -> UWIKI.dir
Serge Gielkens [Sat, 21 Mar 2009 17:28:16 +0000 (18:28 +0100)]
Renamed UWIKI.sys.users -> UWIKI.users to be consistent
Serge Gielkens [Sat, 21 Mar 2009 17:24:01 +0000 (18:24 +0100)]
Added lib to internal directory structure
Serge Gielkens [Sat, 21 Mar 2009 17:06:09 +0000 (18:06 +0100)]
Moved all configuration that only concerns the uWiki internals into
uwiki.lua
Serge Gielkens [Sat, 21 Mar 2009 15:41:29 +0000 (16:41 +0100)]
Added logging when user is not authorized at all to access uWiki
Serge Gielkens [Sat, 21 Mar 2009 14:50:27 +0000 (15:50 +0100)]
Temporarily disabled .gitignore so that changes in any uwiki-directory
are visible.
Serge Gielkens [Sat, 21 Mar 2009 14:48:04 +0000 (15:48 +0100)]
Moved init.lua back into doc/_sys structure
Serge Gielkens [Sat, 21 Mar 2009 14:26:02 +0000 (15:26 +0100)]
Made a directory lib outside the doc directory. That should contain
security related libraries. Splitting has been done roughly: moved
all libraries except init.lua.
Serge Gielkens [Sat, 21 Mar 2009 14:01:51 +0000 (15:01 +0100)]
Initial directory layout with chroot directory
Christian Thaeter [Thu, 19 Mar 2009 05:42:39 +0000 (06:42 +0100)]
metadata needs to be renamed from _sys to _uwiki too
Christian Thaeter [Thu, 19 Mar 2009 05:39:21 +0000 (06:39 +0100)]
An attempt to create some preliminary uwiki devel documentation
Christian Thaeter [Thu, 19 Mar 2009 05:28:06 +0000 (06:28 +0100)]
rename 'doc/_sys' to 'doc/_uwiki'
'_sys' conflicted with the '_sys' metadatatype.
see following documentation commits.
Serge Gielkens [Mon, 16 Mar 2009 22:59:25 +0000 (23:59 +0100)]
Debugging
Serge Gielkens [Mon, 16 Mar 2009 22:01:39 +0000 (23:01 +0100)]
Added acl for user anonymous
Serge Gielkens [Mon, 16 Mar 2009 21:44:21 +0000 (22:44 +0100)]
Added missing variable of cgi-bin directory
Serge Gielkens [Mon, 16 Mar 2009 21:19:56 +0000 (22:19 +0100)]
Finalized refactoring function acl_allow
Christian Thaeter [Sat, 14 Mar 2009 04:51:44 +0000 (05:51 +0100)]
removed the sources dir
Christian Thaeter [Sat, 14 Mar 2009 04:46:46 +0000 (05:46 +0100)]
set docroot to 'doc' and fix cgi-bin directory
Christian Thaeter [Sat, 14 Mar 2009 02:53:40 +0000 (03:53 +0100)]
make the apache start script little more sane, cleaning cruft up
Serge Gielkens [Fri, 6 Mar 2009 21:59:05 +0000 (22:59 +0100)]
Some typos
Serge Gielkens [Fri, 6 Mar 2009 20:12:05 +0000 (21:12 +0100)]
Moved uWiki configuration into meta-directory
Serge Gielkens [Fri, 6 Mar 2009 20:11:07 +0000 (21:11 +0100)]
Adapted libraries: _acl is a directory now
Serge Gielkens [Thu, 5 Mar 2009 20:00:33 +0000 (21:00 +0100)]
Meta lookup must be general and thus does not assume anything.
Therefore, lookup for _acl, _group and _roles needs complete subdirectory of
meta-directory
Serge Gielkens [Wed, 4 Mar 2009 20:58:09 +0000 (21:58 +0100)]
Moved config into meta-directory
Serge Gielkens [Wed, 4 Mar 2009 20:39:23 +0000 (21:39 +0100)]
Moved some directory naming and check from init.lua to uwiki.lua,
in particular meta, user and group directories
Serge Gielkens [Wed, 4 Mar 2009 19:02:34 +0000 (20:02 +0100)]
Some cleanup
Serge Gielkens [Wed, 4 Mar 2009 18:36:55 +0000 (19:36 +0100)]
Some corrections and optimalizations with regards to directory and file
names and locations
Serge Gielkens [Wed, 4 Mar 2009 18:21:28 +0000 (19:21 +0100)]
The CGI-script can now find the dispatcher and authorization module
uwiki.lua on its own; no need anymore to hard code it in config.lua
Serge Gielkens [Wed, 4 Mar 2009 18:04:47 +0000 (19:04 +0100)]
Made the directories relative and added the name of the meta dir.
Only one absolute path is neceesary: the one where uWiki resides
which is determined in the cgi-script.
Serge Gielkens [Wed, 4 Mar 2009 16:54:37 +0000 (17:54 +0100)]
Pushed required Lua packages to top level, i.e. cgi-bin script
Assembling them in one location makes clear what is required for uWiki
Reused global variable to replace absolute path in config.lua
Serge Gielkens [Wed, 4 Mar 2009 15:40:11 +0000 (16:40 +0100)]
Moved determination of CGILUA_CONF to cgi-script. That makes more sense
than storing CGILUA_CONF as Apache variable. This is also more flexible,
especially when you can't configure Apache.
Serge Gielkens [Tue, 3 Mar 2009 21:28:29 +0000 (22:28 +0100)]
Various changes to take care of new directory structure
Serge Gielkens [Wed, 18 Feb 2009 21:44:47 +0000 (22:44 +0100)]
Renamed temporary names _*.d -> _*
This was necessary for git; it got confused by renaming files into
directories with the same name.
Serge Gielkens [Wed, 18 Feb 2009 21:43:27 +0000 (22:43 +0100)]
Reformatted _acl and _roles to plain text format
Serge Gielkens [Wed, 18 Feb 2009 20:21:28 +0000 (21:21 +0100)]
Corrected wrong name of include directory
Serge Gielkens [Sun, 8 Feb 2009 20:49:07 +0000 (21:49 +0100)]
Start to refactor references to new directory structure.
Serge Gielkens [Sun, 8 Feb 2009 20:15:55 +0000 (21:15 +0100)]
Create 1 directory include to store libraries and other include files.
Serge Gielkens [Sun, 8 Feb 2009 18:35:02 +0000 (19:35 +0100)]
Moved raw.lua from types -> actions
Serge Gielkens [Sun, 8 Feb 2009 16:46:12 +0000 (17:46 +0100)]
Adapted no_action.lua for new directory structure.
Not sure though whether this script should be an action or a real fall
back not under uWiki control