X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fcocanwiki.ml;h=56645826b4247d906f4bf84adc2c1cc31ada00b9;hb=aa707ecceaeb33816feb249f7f68423c1e5ee697;hp=837028a58273af55b322705b726521c720196a47;hpb=5def59b20559a1d352d0d9c3304d9b09c2523b41;p=cocanwiki.git diff --git a/scripts/cocanwiki.ml b/scripts/cocanwiki.ml index 837028a..5664582 100644 --- a/scripts/cocanwiki.ml +++ b/scripts/cocanwiki.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: cocanwiki.ml,v 1.7 2004/09/17 15:24:54 rich Exp $ + * $Id: cocanwiki.ml,v 1.15 2004/10/07 16:54:24 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 @@ -25,6 +25,7 @@ open Cgi open Printf open Cocanwiki_ok +open Cocanwiki_strings module Pool = DbiPool (Dbi_postgres) @@ -33,11 +34,10 @@ module Pool = DbiPool (Dbi_postgres) *) 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 +(* The "host object". *) +type host_t = { hostname : string; + edit_anon : bool; + view_anon : bool } (* Permissions and restrictions. * @@ -45,26 +45,26 @@ exception CgiExit * who can use the script. For example: * register_script ~restrict:[CanEdit ; CanManageUsers] run *) -type permissions_t = CanEdit | CanManageUsers | CanManageContacts +type permissions_t = CanView | CanEdit | CanManageUsers | CanManageContacts + | CanManageSite | CanEditGlobalCSS (* The "user object". *) type user_t = Anonymous (* Not logged in. *) | User of int * string * permissions_t list (* Userid, name, permissions. *) -let test_permission edit_anon perm user = +let test_permission {edit_anon = edit_anon; view_anon = view_anon} perm user = if perm = CanEdit && edit_anon then true + else if perm = CanView && view_anon then true else match user with Anonymous -> false | User (_, _, perms) -> List.mem perm perms -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 - -(* The "host object". *) -type host_t = { hostname : string; - edit_anon : bool; } +let can_edit host = test_permission host CanEdit +let can_manage_users host = test_permission host CanManageUsers +let can_manage_contacts host = test_permission host CanManageContacts +let can_manage_site host = test_permission host CanManageSite +let can_edit_global_css host = test_permission host CanEditGlobalCSS (* Our wrapper around the standard [register_script] function. * @@ -94,22 +94,23 @@ let register_script ?(restrict = []) ?(anonymous = true) run = (* Get the host ID, by comparing the Host: header with the hostnames * table in the database. *) - let hostid, hostname, edit_anon = + let hostid, hostname, edit_anon, view_anon = let hostname = try Request.hostname r with Not_found -> failwith "No ``Host:'' header in request" in let hostname = String.lowercase hostname in let sth = dbh#prepare_cached - "select h.id, h.canonical_hostname, h.edit_anon + "select h.id, h.canonical_hostname, h.edit_anon, h.view_anon from hostnames hn, hosts h where hn.name = ? and hn.hostid = h.id" in sth#execute [`String hostname]; try (match sth#fetch1 () with - [ `Int id; `String hostname; `Bool edit_anon ] -> - id, hostname, edit_anon + [ `Int id; `String hostname; + `Bool edit_anon; `Bool view_anon ] -> + id, hostname, edit_anon, view_anon | _ -> assert false) with Not_found -> @@ -117,7 +118,9 @@ let register_script ?(restrict = []) ?(anonymous = true) run = "the hosts/hostnames tables in the database.") in (* Create the host object. *) - let host = { hostname = hostname; edit_anon = edit_anon; } in + let host = { hostname = hostname; + edit_anon = edit_anon; + view_anon = view_anon } in (* Look for the user's cookie, and determine from this the user * object. @@ -146,19 +149,33 @@ let register_script ?(restrict = []) ?(anonymous = true) run = let sth = dbh#prepare_cached "select u.id, u.name, u.can_edit, u.can_manage_users, - u.can_manage_contacts + 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_manage_contacts ] -> + `Bool can_manage_contacts; `Bool can_manage_site; + `Bool can_edit_global_css ] -> + (* Every logged in user can view. *) + let perms = [CanView] in + let perms = + if can_edit then CanEdit :: perms + else perms in + let perms = + if can_manage_users then CanManageUsers :: perms + else perms in let perms = - (if can_edit then [ CanEdit ] else []) @ - (if can_manage_users then [ CanManageUsers ] else []) @ - (if can_manage_contacts then [ CanManageContacts ] else []) - in + if can_manage_contacts then CanManageContacts :: perms + else perms in + let perms = + 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 @@ -174,17 +191,34 @@ let register_script ?(restrict = []) ?(anonymous = true) run = 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 + List.fold_left (||) false + (List.map (fun r -> test_permission host r user) rs) in if permitted then ( (* Call the actual CGI script. *) - try - run r q dbh hostid host user - with - CgiExit -> () - ) else - error ~back_button:true - ~title:"Access denied" - q "You do not have permission to access this part of the site." + run r q dbh hostid host user + ) else ( + if user = Anonymous then + q#redirect ("http://" ^ hostname ^ "/_login") + 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 + +(* List of extensions currently registered. *) +type extension_t = Dbi.connection -> int -> string -> string +let extensions = ref ([] : (string * extension_t) list)