Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / ACL.mdwn

diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index fe6c44192e625ada61a47b95381c3a7a028ccab2..e9fb2717f10d4f6edd18fd1175d8eac763effcdf 100644 (file)
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -21,6 +21,32 @@ something, that I think is very valuable.
 >>>> Which would rule out openid, or other fun forms of auth. And routing all access
 >>>> through the CGI sort of defeats the purpose of ikiwiki. --[[Ethan]]
 
+Also see [[!debbug 443346]].
+
+> Just a few quick thoughts about this:
+>
+>* I'm only thinking about write ACLs.  As Joey noted, read ACLs need to be done in the web server.
+>* ACLs are going to be really hard for people with direct access to the revision control system.
+>  Which means that we really only need to define ACLs for web access.
+>* ACLs for web access can then be defined by the web master.  These might not need to be
+>  defined in the wiki pages (although they could be).
+>* Given the previous two points, can't this be done with the `match_user()`
+> function defined by the [[plugins/attachment]] plugin (see the [[ikiwiki/pagespec/attachment]] pagespec info)
+> and the [[plugins/lockedit]] plugin?
+>
+> For example, add the following to your config file:
+>
+> locked_pages => '!(user(john) and */Discussion) and *',
+>
+> would lock all pages unless you're john and editing a Discussion page.
+> It's a thought anyway :-).  -- [[Will]]
+
+>> Yes, writing per-user commit ACLs has become somewhat easier with recent
+>> features. Breaking `match_user` out of attachment, and making the
+>> lockedit plugin pass`user` and `ip` params when it calls `pagespec_match`
+>> would be sufficient. And [[done]], configurable via
+>> [[plugin/lockedit]]'s `locked_pages`. --[[Joey]]
+
 I am considering giving this a try, implementing it as a module.
 Here is how I see it:
 
@@ -28,10 +54,10 @@ Here is how I see it:
     for a given (user, page, operation), as in:
 
     <pre>
-    \[[acl user=joe page=*.png allow=upload]]
-    \[[acl user=bob page=/blog/bob/* allow=*]]
-    \[[acl user=* page=/blog/bob/* deny=*]]
-    \[[acl user=http://jeremie.koenig.myopenid.com/ page=/todo/* deny=create
+    \[[!acl user=joe page=*.png allow=upload]]
+    \[[!acl user=bob page=/blog/bob/* allow=*]]
+    \[[!acl user=* page=/blog/bob/* deny=*]]
+    \[[!acl user=http://jeremie.koenig.myopenid.com/ page=/todo/* deny=create
            reason="spends his time writing todo items instead of source code"]]
     </pre>
 
@@ -41,5 +67,5 @@ Here is how I see it:
     Possibly could refer to other ACL pages, as in:
 
     <pre>
-    \[[acl user=* page=/subsite/* acl=/subsite/acl.mdwn]]
+    \[[!acl user=* page=/subsite/* acl=/subsite/acl.mdwn]]
     </pre>