X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fcocanwiki.ml;h=037c65451a1ae5274c781abbacea9eba07d1af5b;hb=232d52d33fe530971f81b57bbc8b024fb259c4fd;hp=cfe43f72d3538c6eb1ee2811470ed862dbee3548;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git diff --git a/scripts/cocanwiki.ml b/scripts/cocanwiki.ml index cfe43f7..037c654 100644 --- a/scripts/cocanwiki.ml +++ b/scripts/cocanwiki.ml @@ -1,7 +1,22 @@ -(* COCANWIKI scripts. +(* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: cocanwiki.ml,v 1.2 2004/09/07 13:40:10 rich Exp $ + * $Id: cocanwiki.ml,v 1.13 2004/09/27 12:37:54 rich Exp $ + * + * 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; either version 2 of the License, or + * (at your option) any later version. + * + * 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; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *) open Apache @@ -9,38 +24,24 @@ open Registry open Cgi open Printf -open Merjisforwiki - open Cocanwiki_ok +open Cocanwiki_strings module Pool = DbiPool (Dbi_postgres) -(* Generate a printable datestamp for pages. *) -let printable_date (date, _) = - sprintf "%d %s %04d" date.Dbi.day (short_month date.Dbi.month) date.Dbi.year - -let printable_date_time (date, time) = - sprintf "%d %s %04d %02d:%02d" date.Dbi.day (short_month date.Dbi.month) - date.Dbi.year time.Dbi.hour time.Dbi.min - (* This function is used to grab a database handle. It's used in a couple * of very special places, and is not for general consumption. *) let _get_dbh r = Pool.get r "cocanwiki" -(* The [CgiExit] exception should be folded back into the base - * mod_caml code at some point. It just causes the 'run' function to - * return at that point safely. (XXX) - *) -exception CgiExit - (* Permissions and restrictions. * * Use the optional ~restrict parameter to register_script to restrict * who can use the script. For example: * register_script ~restrict:[CanEdit ; CanManageUsers] run *) -type permissions_t = CanEdit | CanManageUsers +type permissions_t = CanEdit | CanManageUsers | CanManageContacts + | CanManageSite | CanEditGlobalCSS (* The "user object". *) type user_t = Anonymous (* Not logged in. *) @@ -55,9 +56,33 @@ let test_permission edit_anon perm user = let can_edit edit_anon = test_permission edit_anon CanEdit let can_manage_users = test_permission false CanManageUsers +let can_manage_contacts = test_permission false CanManageContacts +let can_manage_site = test_permission false CanManageSite +let can_edit_global_css = test_permission false CanEditGlobalCSS + +(* The "host object". *) +type host_t = { hostname : string; + edit_anon : bool; } -(* Our wrapper around the standard [register_script] function. *) -let register_script ?(restrict = []) run = +(* Our wrapper around the standard [register_script] function. + * + * The optional ~restrict and ~anonymous parameters work as follows: + * + * By default (neither parameter given), anonymous or logged-in users + * at any level are permitted to run the script. + * + * If ~anonymous:false then a user must be logged in to use the script. + * + * If ~restrict contains a list of permissions (eg. CanEdit, etc.) then + * the user must have the ability to do AT LEAST ONE of those actions. + * (Note that this does not necessarily imply that the user must be + * logged in, because in some circumstances even anonymous users have + * the CanEdit permission - very typical for a wiki). + * + * If ~anonymous:false and ~restrict is given then the user must be + * logged in AND have the ability to do AT LEAST ONE of those actions. + *) +let register_script ?(restrict = []) ?(anonymous = true) run = (* Actually register the script with the real [Registry] module. *) register_script (fun r -> @@ -89,6 +114,9 @@ let register_script ?(restrict = []) run = failwith ("Hostname ``" ^ hostname ^ "'' not found in " ^ "the hosts/hostnames tables in the database.") in + (* Create the host object. *) + let host = { hostname = hostname; edit_anon = edit_anon; } in + (* Look for the user's cookie, and determine from this the user * object. *) @@ -115,16 +143,30 @@ let register_script ?(restrict = []) run = let sth = dbh#prepare_cached - "select u.id, u.name, u.can_edit, u.can_manage_users + "select u.id, u.name, u.can_edit, u.can_manage_users, + u.can_manage_contacts, u.can_manage_site, + u.can_edit_global_css from usercookies uc, users u where uc.cookie = ? and uc.userid = u.id and u.hostid = ?" in sth#execute [`String cookie; `Int hostid]; (match sth#fetch1 () with [ `Int userid; `String name; - `Bool can_edit; `Bool can_manage_users ] -> + `Bool can_edit; `Bool can_manage_users; + `Bool can_manage_contacts; `Bool can_manage_site; + `Bool can_edit_global_css ] -> + let perms = if can_edit then [ CanEdit ] else [] in + let perms = + if can_manage_users then CanManageUsers :: perms + else perms in + let perms = + if can_manage_contacts then CanManageContacts :: perms + else perms in let perms = - (if can_edit then [ CanEdit ] else []) @ - (if can_manage_users then [ CanManageUsers ] else []) in + if can_manage_site then CanManageSite :: perms + else perms in + let perms = + if can_edit_global_css then CanEditGlobalCSS :: perms + else perms in User (userid, name, perms) | _ -> assert false) with @@ -135,20 +177,31 @@ let register_script ?(restrict = []) run = * the user has sufficient permission to run this script. *) let permitted = - match restrict with - [] -> true (* empty list = no restrictions *) - | rs -> - List.fold_left ((||)) false - (List.map (fun r -> test_permission edit_anon r user) rs) in + if not anonymous && user = Anonymous then false + else + match restrict with + [] -> true (* empty list = no restrictions *) + | rs -> + List.fold_left (||) false + (List.map (fun r -> test_permission edit_anon r user) rs) in if permitted then ( (* Call the actual CGI script. *) - try - run r q dbh (hostid, hostname, edit_anon) user - with - CgiExit -> () + run r q dbh hostid host user ) else error ~back_button:true ~title:"Access denied" q "You do not have permission to access this part of the site." ) + +(* Convert a section name into something valid for use in + * XXX This breaks horribly for non-7-bit strings. + * XXX This is stuck here because we don't have a good place for it, and + * because it needs to be fixed for i18n compliance. + *) +let linkname_of_sectionname str = + let str = String.copy str in + for i = 0 to String.length str - 1 do + if not (isalnum str.[i]) then str.[i] <- '_' + done; + str