Changeset 634

Timestamp:

04/09/06 14:08:54 (2 years ago)

Author:

puffy

Message:

WikiRbacPatch:

Integrate heinlein@madboa.com's modifications (see ticket #221) to get WikiRBAC to apply on > 0.9.2.

Files:

• wikirbacpatch/0.9/rbac.patch (modified) (13 diffs)

wikirbacpatch/0.9/rbac.patch

@@ -1 @@
-
-
-
-
+
+
-@@ -32,13 +32,15 @@
- from trac.web import IRequestHandler
- from trac.wiki.model import WikiPage
- from trac.wiki.formatter import wiki_to_html, wiki_to_oneliner
+-
-+from trac.wiki.rbac import WikiAuthorizer
- 
--
- class WikiModule(Component):
- 
@@ -20 +18 @@
- 
-     def get_active_navigation_item(self, req):
-2,6 +74
+4,6 +76
-         pagename = req.args.get('page', 'WikiStart')
-         version = req.args.get('version')
@@ -28 +26 @@
-         page = WikiPage(self.env, pagename, version, db)
- 
-6,6 +119,12
+8,6 +121,13
-         req.hdf['wiki.action'] = action
-escape(page.name)
-escape(self.env.href.wiki(page.name)
+page.name
+self.env.href.wiki(page.name
-+        for permission in self.get_permission_actions():
-+            if isinstance(permission, (list, tuple)):
-                              
+                               
-+            self.log.debug("PERMISSION: %s", permission)
-+            req.hdf['trac.acl.' + permission] =\
-+                self.authz.has_authorization(req.perm, req.authname, page.name, permission)
++
-         return 'wiki.cs', None
- 
-     # ITimelineEventProvider methods
-3,25 +142,30
+5,24 +145,29
-                            "FROM wiki WHERE time>=%s AND time<=%s",
-                            (start, stop))
-             for t,name,comment,author in cursor:
-
-
+
--                if format == 'rss':
--                    href = self.env.abs_href.wiki(name)
@@ -57 +55 @@
--                yield 'wiki', href, title, t, author, comment
-+                if self.authz.has_authorization(req.perm, req.authname, name, 'WIKI_VIEW'):
-
-
+
-+                    if format == 'rss':
-+                        href = self.env.abs_href.wiki(name)
@@ -83 +80 @@
-         if req.args.has_key('cancel'):
-             req.redirect(self.env.href.wiki(page.name))
-3,8 +187
+4,8 +189
-             req.perm.assert_permission('WIKI_ADMIN')
-         elif not page.exists:
@@ -94 +91 @@
-         page.text = req.args.get('text')
-         if req.perm.has_permission('WIKI_ADMIN'):
-1,6 +207
+2,6 +209
-             req.perm.assert_permission('WIKI_ADMIN')
-         else:
@@ -102 +99 @@
-         version = None
-         if req.args.has_key('delete_version'):
-09,6 +226
+10,6 +228
- 
-     def _render_diff(self, req, db, page):
@@ -110 +107 @@
-         if not page.exists:
-             raise TracError, "Version %s of page %s does not exist" \
-5
+6
- 
-     def _render_editor(self, req, db, page, preview=False):
@@ -118 +115 @@
-         if req.args.has_key('text'):
-             page.text = req.args.get('text')
-39
+40
-         page.
-         """
@@ -126 +123 @@
-         if not page.exists:
-             raise TracError, "Page %s does not exist" % page.name
-4
+5
- 
-     def _render_view(self, req, db, page):
@@ -134 +131 @@
-         if page.name == 'WikiStart':
-             req.hdf['title'] = ''
-6
+7
-             history_href = self.env.href.wiki(page.name, action='history')
-escape(history_href)
+history_href
-         else:
--            if not req.perm.has_permission('WIKI_CREATE'):
@@ -142 +139 @@
-+                self.authz.has_authorization(req.perm, req.authname, page.name, 'WIKI_CREATE'):
-                 raise TracError('Page %s not found' % page.name)
-'<p>Describe "%s" here</p>' % page.name
-
-4,7 +396
+Markup('<p>Describe "%s" here</p>',
+                                               page.name)
+5,7 +398
-         for attachment in Attachment.select(self.env, 'wiki', page.name, db):
-             attachments.append(attachment_to_hdf(self.env, db, req, attachment))
@@ -154 +151 @@
-             req.hdf['wiki.attach_href'] = attach_href
- 
-8,7 +421
+9,7 +423
-                        "AND " + sql_query, args)
- 
-         for name, date, author, text in cursor:
--            yield (self.env.href.wiki(name),
-escape(shorten_line(text)
+shorten_line(text
--                   date, author,
-escape(shorten_result(text, query.split()
-
+shorten_result(text, query.split(
+req.authname, 
-+                yield (self.env.href.wiki(name),
-escape(shorten_line(text)
+shorten_line(text
-+                    date, author,
-
-
-
-
-
+
+
+
-@@ -0,0 +1,82 @@
-+from trac.core import *