5 files changed, 57 insertions, 7 deletions
diff --git a/Bugs-Everywhere-Web/beweb/config/app.cfg b/Bugs-Everywhere-Web/beweb/config/app.cfg
index d37cf67..15555b7 100644
--- a/Bugs-Everywhere-Web/beweb/config/app.cfg
+++ b/Bugs-Everywhere-Web/beweb/config/app.cfg
@@ -33,6 +33,56 @@
 # Set to True if the scheduler should be started
 # tg.scheduler = False
 
+# IDENTITY
+# General configuration of the TurboGears Identity management module
+# --------
+
+# Switch to turn on or off the Identity management module
+identity.on=True
+
+# [REQUIRED] URL to which CherryPy will internally redirect when an access
+# control check fails. If Identity management is turned on, a value for this
+# option must be specified.
+identity.failure_url="/login"
+
+# identity.provider='sqlobject'
+
+# The names of the fields on the login form containing the visitor's user ID
+# and password. In addition, the submit button is specified simply so its
+# existence may be stripped out prior to passing the form data to the target
+# controller.
+# identity.form.user_name="user_name"
+# identity.form.password="password"
+# identity.form.submit="login"
+
+# What sources should the identity provider consider when determining the
+# identity associated with a request? Comma separated list of identity sources.
+# Valid sources: form, visit, http_auth
+# identity.source="form,http_auth,visit"
+
+# SqlObjectIdentityProvider
+# Configuration options for the default IdentityProvider
+# -------------------------
+
+# The classes you wish to use for your Identity model. Remember to not use reserved
+# SQL keywords for class names (at least unless you specify a different table
+# name using sqlmeta).
+identity.soprovider.model.user="stfa.model.User"
+identity.soprovider.model.group="stfa.model.Group"
+identity.soprovider.model.permission="stfa.model.Permission"
+
+# The password encryption algorithm used when comparing passwords against what's
+# stored in the database. Valid values are 'md5' or 'sha1'. If you do not
+# specify an encryption algorithm, passwords are expected to be clear text.
+# The SqlObjectProvider *will* encrypt passwords supplied as part of your login
+# form.  If you set the password through the password property, like:
+# my_user.password = 'secret'
+# the password will be encrypted in the database, provided identity is up and
+# running, or you have loaded the configuration specifying what encryption to
+# use (in situations where identity may not yet be running, like tests).
+
+# identity.soprovider.encryption_algorithm=None
+
 [/static]
 static_filter.on = True
 static_filter.dir = "%(top_level_dir)s/static"
diff --git a/Bugs-Everywhere-Web/beweb/controllers.py b/Bugs-Everywhere-Web/beweb/controllers.py
index 358e74a..8def76c 100644
--- a/Bugs-Everywhere-Web/beweb/controllers.py
+++ b/Bugs-Everywhere-Web/beweb/controllers.py
@@ -26,6 +26,7 @@ def comment_url(project, bug, comment, **kwargs):
                           (project, bug, comment), kwargs)
 
 class Comment(PrestHandler):
+    @identity.require( identity.has_permission("editbugs"))
     @provide_action("action", "New comment")
     def new_comment(self, comment_data, comment, *args, **kwargs):
         bug_tree = project_tree(comment_data['project'])
@@ -37,6 +38,7 @@ class Comment(PrestHandler):
         raise cherrypy.HTTPRedirect(comment_url(comment=comment.uuid, 
                                     **comment_data))
 
+    @identity.require( identity.has_permission("editbugs"))
     @provide_action("action", "Reply")
     def reply_comment(self, comment_data, comment, *args, **kwargs):
         bug_tree = project_tree(comment_data['project'])
diff --git a/Bugs-Everywhere-Web/beweb/templates/about.kid b/Bugs-Everywhere-Web/beweb/templates/about.kid
index 45d0093..fa3548a 100644
--- a/Bugs-Everywhere-Web/beweb/templates/about.kid
+++ b/Bugs-Everywhere-Web/beweb/templates/about.kid
@@ -8,15 +8,13 @@
 
 <body>
 <h1>About Bugs Everywhere</h1>
-<p>Bug Everywhere was designed by Aaron Bentley and implemented by Aaron
-    Bentley and Oleg Romanyshyn.
+<p>Bugs Everywhere is a "distributed bugtracker", designed to complement distributed revision control systems.
 </p>
 <p>
-    Development is sponsored by 
-    <a href="http://panoramicfeedback.com/">Panoramic Feedback</a>.
+Bugs Everywhere was conceived and written by developers at <a href="http://panoramicfeedback.com/">Panoramic Feedback</a>, primarily Aaron Bentley. <a href="http://panoramicfeedback.com/">Panoramic Feedback</a> is no longer developing BE, and the current maintainer is <a href="http://bugseverywhere.org/be/show/ChrisBall">Chris Ball</a>.
 </p>
 <p>
-    Bugs Everywhere <a href="http://panoramicfeedback.com/opensource">web site</a>
+    Bugs Everywhere <a href="http://bugseverywhere.org/">web site</a>
 </p>
 <a href="/">Project List</a>
 </body>
diff --git a/Bugs-Everywhere-Web/libbe b/Bugs-Everywhere-Web/libbe
index 6081eee..4e5e17e 120000
--- a/Bugs-Everywhere-Web/libbe
+++ b/Bugs-Everywhere-Web/libbe
@@ -1 +1 @@
-../libbe/
-\ No newline at end of file
+../libbe
+\ No newline at end of file
diff --git a/Bugs-Everywhere-Web/start-beweb.py b/Bugs-Everywhere-Web/start-beweb.py
index 39100e7..4070abd 100755
--- a/Bugs-Everywhere-Web/start-beweb.py
+++ b/Bugs-Everywhere-Web/start-beweb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python
 import pkg_resources
 pkg_resources.require("TurboGears")