crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[wiki/auth/categorie_public] Bugs et optimization

Browse source 
page.getCategories() ne renvoie pas toujours le catégories de la
page, mais parfois juste une liste vide. Du coup, lorsque ça arrive,
on regarde dans le corps de la page (ce qui est à priori lent).
Si la page à les acl All:read, on retourne immédiatement sans rien faire.
This commit is contained in:
Valentin Samir 2013-06-16 22:28:07 +02:00
parent 1eb6e67ff1
commit 083358deea
1 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

29
wiki/auth/categorie_public.py
View file

@ -32,10 +32,31 @@ class PublicCategories(AnonymousAuth):
def can_view(self, request):
p = urlparse.urlparse(request.url)
categories = Page(request, p.path[1:]).getCategories(request)
if p.path[1:] == "":
return False
if request.page is not None:
sys.stderr.write("Getting page from cache")
page = request.page
else:
page = Page(request, unicode(urllib.unquote(p.path[1:]),'utf-8'))
acl = page.getACL(request)
if acl.acl and [a[0] for a in acl.acl if a[0] == 'All' and a[1].get('read',False)]:
sys.stderr.write("acl All:read\n")
return False
categories = page.getCategories(request)
if categories:
for cat in self.pub_cats:
if cat in categories:
sys.stderr.write("%r dans la page %r\n" % (cat, p.path[1:]))
return True
else:
sys.stderr.write("categories is empty, searching in page body of %s\n" % p.path[1:])
body = page.getPageText()
for cat in self.pub_cats:
if cat in body:
sys.stderr.write("%r dans la page %r\n" % (cat, p.path[1:]))
return True
for cat in self.pub_cats:
if cat in categories:
return True
sys.stderr.write("%r n'est pas dans la page %r, %r\n" % (cat, p.path[1:], categories))
return False