Merge lp:~benoit.pierre/sloecode/incubation into lp:sloecode

[Thomi Richards]

Various changes. I'm creating the merge proposal since I need somewhere to make notes about the changes as I'm scanning through them.

These changes look great - I was thinking of adding similar functionality myself. There's a few places where things need to be tweaked. I'll add comments below, and we can discuss them here, or on IRC. It seems like we're not in similar timezones (I'm currently +1300), so another option may be on the sloecode-developers mailing list.

[Thomi Richards (thomir-deactivatedaccount)]

Revision 129 & 130 are fine.

Revision 131 looks fine, but I'm a bit concerned about revision 132. I understand that you need to add new users to the sloecode database once they're authenticated, but surely there's a hook in the repoze PAM authentication plugin that can be used for this? In fact, I think it can be easily done by specialising the PAMAuthenticatorPlugin and overriding the authenticate(...) method such that successful authentications are then inserted into the database, if they don't already exist. See:

http://docs.repoze.org/who/1.0/narr.html#writing-an-authenticator-plugin

for more information. Also, while you're doing this, I think it makes sense to set the password in the database correctly - that way one can switch away from PAM authentication in the future and existing accounts will continue to work. Once you're making the change listed above, this should be trivial to implement.

Revisions 133, 134, 135 look fine.

Revision 136: the public_projects() function in sloecode/model/project.py should really use a SQLAlchemy query to get all the public projects, rather than getting all projects and iterating over them. You should be able to do something similar to:

def public_projects():
    return Project.get(public=True)

Unfortunately, whenever we make a database schema change we need to also write a database patch file that is able to alter a live database without deleting the current data. These are simple SQL scripts that make the appropriate changes, and are run as part of the debian package's upgrade scripts. See the existing ones in 'dbpatches/patches/*/' - you need to write one for mysql and one for SQLite. SQLite is a bit more tricky because it doesn't let you alter tables much, but you should be able to adapt an existing patch file for your needs. I'd suggest adding the 'public' column, and setting all projects to private by default.

Also, it would be nice to have some text explaining what a public project is in the template - either as a short string next to the 'Public' checkbox, or as a help page. Something that explains that public projects are readable by anyone with access to the sloecode server, but write access is still restricted to developers and managers. I also wonder whether we should not allow the addition of 'Observers' to a public project - then again, that UI needs to be re-done anyway, so maybe we'll deal with that later.

Finally, this isn't a bug that you've introduced, but in the nav.html file, projects should be listed alphabetically, in a case-insensitive fashion. If you're able to make that change without too much trouble that would be superb!

Rev 137 is great, and has already been merged with trunk.

Rev 138 needs more thought. I'd like users to have some control over whether their branches are public or private.... or maybe this is a config setting?

Revision 139 looks OK, but maybe thumper can comment on this?

Revision 140 - I'd like some more information on the change - it looks potentially good, but I can't see any change in output on my test system... In any case we'd need to get rid of the 'if False' thing ;)

Revision 141 looks good.

Revision 142: Same comment as rev 140 - I'd l...

review: Needs Fixing

[Benoit Pierre (benoit.pierre)]

On Thu, 29 Sep 2011 00:45:28 -0000, Thomi Richards <email address hidden> wrote:
> Review: Needs Fixing
>
> Revision 129 & 130 are fine.

OK, I'll create a branch/merge proposal for this.

>
> Revision 131 looks fine, but I'm a bit concerned about revision 132. I
> understand that you need to add new users to the sloecode database
> once they're authenticated, but surely there's a hook in the repoze
> PAM authentication plugin that can be used for this? In fact, I think
> it can be easily done by specialising the PAMAuthenticatorPlugin and
> overriding the authenticate(...) method such that successful
> authentications are then inserted into the database, if they don't
> already exist. See:
>
> http://docs.repoze.org/who/1.0/narr.html#writing-an-authenticator-plugin
>
> for more information.

OK.

> Also, while you're doing this, I think it makes sense to set the
> password in the database correctly - that way one can switch away from
> PAM authentication in the future and existing accounts will continue
> to work. Once you're making the change listed above, this should be
> trivial to implement.

I'm really not sure mirroring the password should be done, or if it's
even possible at all. And how do you handle password changes, where
there are not done through the sloecode web interface?

AFAIK, redmine or reviewboard don't do it when using an external
authentication mechanism (like PAM, LDAP, or ActiveDirectory).

I used PAM because it was easier to setup, but I started by looking at
the LDAP plugin, I think some of the authentication configuration could
be moved to the configuration file.

> Finally, if you're using PAM authentication, how do you change the
> admin password from it's initial, insecure setting?

This is a real problem :) Ideally, the admin account should be special:
always using the internal authentication mechanism, especially if at
some point, LDAP/PAM configuration is available through the web
interface, so you can always login to fix an invalid configuration.

> Revisions 133, 134, 135 look fine.
>
> Revision 136: the public_projects() function in
> sloecode/model/project.py should really use a SQLAlchemy query to get
> all the public projects, rather than getting all projects and
> iterating over them. You should be able to do something similar to:
>
> def public_projects():
> return Project.get(public=True)
>
> Unfortunately, whenever we make a database schema change we need to
> also write a database patch file that is able to alter a live database
> without deleting the current data. These are simple SQL scripts that
> make the appropriate changes, and are run as part of the debian
> package's upgrade scripts. See the existing ones in
> 'dbpatches/patches/*/' - you need to write one for mysql and one for
> SQLite. SQLite is a bit more tricky because it doesn't let you alter
> tables much, but you should be able to adapt an existing patch file
> for your needs. I'd suggest adding the 'public' column, and setting
> all projects to private by default.
>
> Also, it would be nice to have some text explaining what a public
> project is in the template - either as a short string next to the
> 'Public' checkbox, or as...

[Thomi Richards (thomir-deactivatedaccount)]

> On Thu, 29 Sep 2011 00:45:28 -0000, Thomi Richards <email address hidden> wrote:
> > Also, while you're doing this, I think it makes sense to set the
> > password in the database correctly - that way one can switch away from
> > PAM authentication in the future and existing accounts will continue
> > to work. Once you're making the change listed above, this should be
> > trivial to implement.
>
> I'm really not sure mirroring the password should be done, or if it's
> even possible at all. And how do you handle password changes, where
> there are not done through the sloecode web interface?
>
> AFAIK, redmine or reviewboard don't do it when using an external
> authentication mechanism (like PAM, LDAP, or ActiveDirectory).
>
> I used PAM because it was easier to setup, but I started by looking at
> the LDAP plugin, I think some of the authentication configuration could
> be moved to the configuration file.
>

Good point.

Unmerged revisions

143. By Benoit Pierre on 2011-09-26

More fine-grained control for projects.

142. By Benoit Pierre on 2011-09-26

Quick hack: change branches display name.

141. By Benoit Pierre on 2011-09-26

More fine-grained control for projects.

Read-only access for:
* everybody when project is public
* all project members if project is private

Read/write access for:
* managers and developers of the project

140. By Benoit Pierre on 2011-09-26

Quick hack: change branches display name.

Use path relative to containing repository, instead of nickname.

139. By Benoit Pierre on 2011-09-23

Change logfile name to include username when launching 'bzr sc-serve'.

138. By Benoit Pierre on 2011-09-23

Quick hack to allow read-only access to all user repositories.

137. By Benoit Pierre on 2011-09-22

Fix "permission denied" trace when accessing another user repository.

136. By Benoit Pierre on 2011-09-22

Add support for public projects.

A public project will automatically be read-only accessible by all users,
without the need to manually add them as observers.

135. By Benoit Pierre on 2011-09-22

Remove left-over debug trace in helpers.

134. By Benoit Pierre on 2011-09-22

Fix user creation to work when password modification is not allowed.

Even when using PAM for authentication, it can still be useful to create users:
- an administrator can manage the details of user creation.
- even if the user don't exist on the PAM side, and won't be allowed to connect
  to the web interface, he may still interact with the code hosting server.

=== modified file 'development.ini'
--- development.ini	2011-06-04 07:57:38 +0000
+++ development.ini	2011-09-28 23:56:23 +0000
@@ -6,7 +6,8 @@
 [DEFAULT]
 debug = true
 # Uncomment and replace with the address which should receive any error reports
-#email_to = [e-mail]
+#email_domain = yourdomain.com
+#email_to = you@%(email_domain)
 smtp_server = localhost
 error_email_from = paste@localhost
 
@@ -39,6 +40,8 @@
 use = egg:sloecode
 full_stack = true
 static_files = true
+# Uncomment to switch to PAM for user authentication.
+#use_pam = true
 
 cache_dir = %(here)s/data
 beaker.session.key = sloecode

=== modified file 'sloecode/bzr/display.py'
--- sloecode/bzr/display.py	2011-08-15 00:56:40 +0000
+++ sloecode/bzr/display.py	2011-09-28 23:56:23 +0000
@@ -9,7 +9,7 @@
 from bzrlib.branch import Branch
 from bzrlib.log import LogFormatter
 from bzrlib.osutils import format_date
-from bzrlib.urlutils import parse_url
+from bzrlib.urlutils import parse_url, relative_url
 
 class BazaarRepositoryAdaptor(object):
     """Wrap a bzrlib repository object and expose useful information
@@ -36,9 +36,14 @@
         """Get a branch adaptor object for a single, named branch.
         """
         for b in self.branches:
-            if b.get_name() == branch_name:
+            if b.get_name(self.get_path()) == branch_name:
                 return b
 
+    def get_path(self):
+        """Return repository path.
+        """
+        return self.repo.user_url
+
     def delete_branch(self, branch_name):
         """
         Delete a branch from disk. This method WILL NOT BACKUP THE BRANCH, so
@@ -74,13 +79,17 @@
                 """))
         self.branch = branch
 
-    def get_name(self):
+    def get_name(self, basepath=None):
         """Get the branch name.
 
         In fact this returns the branch nickname, since the branch name
         seems to always be set to None
         """
-        return html_escape(self.branch.get_config().get_nickname())
+        if basepath is None:
+            name = self.branch.get_config().get_nickname()
+        else:
+            name = relative_url(basepath, self.branch.base)
+        return html_escape(name)
 
     def get_log(self):
         """Get a log of this branch.

=== modified file 'sloecode/codehosting/server.py'
--- sloecode/codehosting/server.py	2011-09-27 21:11:43 +0000
+++ sloecode/codehosting/server.py	2011-09-28 23:56:23 +0000
@@ -120,11 +120,21 @@
         unregister_transport(self.scheme, self._transportFactory)
 
     def translateUserPath(self, username):
+        if False:
+            if username != self.username and not self.is_admin:
+                raise PermissionDenied(
+                    "You (%s) do not have access to user %s's branches." %
+                    (self.username, username))
+        transport = self.user_transport.clone(username)
         if username != self.username and not self.is_admin:
+<<<<<<< TREE
             raise PermissionDenied(
                 "You (%s) do not have access to user %s's branches." %
                 (self.username, username))
         transport = self.user_transport.clone(username)
+=======
+            transport = get_readonly_transport(transport)
+>>>>>>> MERGE-SOURCE
         return transport
 
     def translateProjectPath(self, project_name):

=== modified file 'sloecode/config/middleware.py'
--- sloecode/config/middleware.py	2010-12-20 22:16:03 +0000
+++ sloecode/config/middleware.py	2011-09-28 23:56:23 +0000
@@ -46,7 +46,7 @@
     app = SessionMiddleware(app, config)
 
     # Add out authorisation & authentication framework:
-    app = add_auth(app)
+    app = add_auth(app, config)
 
     if asbool(full_stack):
         # Handle Python exceptions

=== modified file 'sloecode/controllers/admin/person.py'
--- sloecode/controllers/admin/person.py	2011-07-02 22:51:24 +0000
+++ sloecode/controllers/admin/person.py	2011-09-28 23:56:23 +0000
@@ -46,6 +46,9 @@
         # we use FormEncode to validate the incoming data. First, create the
         # schema for the model object we are trying to validate against:
         schema = PersonSchema()
+        if not h.allow_password_modification():
+            del schema.fields['password']
+            del schema.fields['password_verify']
         try:
             # try and validate it. The formencode.Invalid exception will be
             # thrown if anything is wrong (e.g.- missing fields)
@@ -63,7 +66,8 @@
         # has given us python values, rather than raw strings:
         new_person = Person()
         new_person.login = form_result['login']
-        new_person.password = form_result['password']
+        if h.allow_password_modification():
+            new_person.password = form_result['password']
         new_person.name = form_result['name']
         new_person.email = form_result['email']
         for role in form_result['site_roles']:
@@ -111,9 +115,14 @@
         schema = PersonSchema()
         # we don't care about the login any more:
         del schema.fields['login']
-        # we need to set the password & password-verify fields to be optional:
-        schema.fields['password'].not_empty = False
-        schema.fields['password_verify'].not_empty = False
+
+        if h.allow_password_modification():
+            # we need to set the password & password-verify fields to be optional:
+            schema.fields['password'].not_empty = False
+            schema.fields['password_verify'].not_empty = False
+        else:
+            del schema.fields['password']
+            del schema.fields['password_verify']
 
         try:
             form_result = schema.to_python(request.params)
@@ -125,10 +134,11 @@
         person_id = id
         person = Person.get(id=person_id)[0]
 
-        # only update password if the user filled it in.
-        pw = form_result['password']
-        if pw.strip() != "":
-            person.password = pw
+        if h.allow_password_modification():
+            # only update password if the user filled it in.
+            pw = form_result['password']
+            if pw.strip() != "":
+               person.password = pw
 
         person.name = form_result['name']
         person.email = form_result['email']

=== modified file 'sloecode/controllers/admin/project.py'
--- sloecode/controllers/admin/project.py	2011-06-22 06:54:54 +0000
+++ sloecode/controllers/admin/project.py	2011-09-28 23:56:23 +0000
@@ -53,6 +53,7 @@
         new_project.name = form_result['name']
         new_project.displayname = form_result['displayname']
         new_project.description = form_result['description']
+        new_project.public = form_result['public']
 
         Session.add(new_project)
         Session.commit()
@@ -88,6 +89,7 @@
         project = Project.get(id=id)[0]
         project.displayname = form_result['displayname']
         project.description = form_result['description']
+        project.public = form_result['public']
 
         Session.merge(project)
         Session.commit()

=== modified file 'sloecode/controllers/person.py'
--- sloecode/controllers/person.py	2011-08-15 01:43:23 +0000
+++ sloecode/controllers/person.py	2011-09-28 23:56:23 +0000
@@ -79,6 +79,37 @@
         return redirect(h.url(controller='person', action='index',
                                 person_name=user.login))
 
+    @ActionProtector(Any(has_site_role(role=USER_ADMIN), not_anonymous()))
+    def me_or_new(self):
+        """Redirect to the main user page or to account settings if new user.
+        """
+        identity = request.environ['repoze.who.identity']
+        user = identity.get('user')
+        if user is None:
+            # If we're here, user was authenticated, so password is valid, but
+            # does not exists in the DB, which can only happen when using an
+            # external authentication scheme, so create it automatically.
+            login = identity.get('repoze.who.userid')
+            new_person = Person()
+            new_person.login = login
+            new_person.password = ''
+            new_person.name = login
+            email_domain = config.get('email_domain', None)
+            if email_domain is None:
+                new_person.email = ''
+            else:
+                new_person.email = '%s@%s' % (login, email_domain)
+            Session.add(new_person)
+            Session.commit()
+            config['bzr.factory'].create_shared_repository_for_person(new_person.login)
+            return self.render('/admin/person-update.html',
+                               {'person': new_person,
+                                'personal_modification': True,
+                                'password_modification': False})
+        else:
+            # Existing user.
+            return redirect(h.url(controller='person', action='me'))
+
     @ActionProtector(Any(has_site_role(role=USER_ADMIN), owns_page()))
     def manage_ssh_keys(self, person_name):
         """Render page that displays stored SSH keys, and allows user to add

=== modified file 'sloecode/controllers/project.py'
--- sloecode/controllers/project.py	2011-08-15 01:43:23 +0000
+++ sloecode/controllers/project.py	2011-09-28 23:56:23 +0000
@@ -11,12 +11,11 @@
 from sloecode.model.membership import Membership
 from sloecode.model.site_role import PROJECT_ADMIN
 from sloecode.model.meta import Session
-from sloecode.lib.predicates import has_site_role, is_project_member
+from sloecode.lib.predicates import has_site_role, has_project_read_access, has_project_write_access
 import sloecode.lib.helpers as h
 
 log = logging.getLogger(__name__)
 
-@ControllerProtector(Any(has_site_role(PROJECT_ADMIN), is_project_member()))
 class ProjectController(BaseController):
     """ProjectController contains basic admin functionality for the Project
     model.
@@ -24,6 +23,7 @@
     This includes basic CRUD information.
     """
 
+    @ControllerProtector(Any(has_site_role(PROJECT_ADMIN), has_project_read_access()))
     def index(self, project_name):
         """Render project details page.
         """
@@ -46,6 +46,7 @@
                                 'user_role': user_role,
                                 'repo': repo})
 
+    @ControllerProtector(Any(has_site_role(PROJECT_ADMIN), has_project_read_access()))
     def branch_log(self, project_name):
         projects = Project.get(name=project_name)
         existing_project = projects[0] if projects else None
@@ -60,6 +61,7 @@
                             {'project': existing_project,
                             'branch': branch})
 
+    @ControllerProtector(Any(has_site_role(PROJECT_ADMIN), has_project_write_access()))
     def delete_branch(self, project_name):
         """Delete a branch on disk.
         """
@@ -73,6 +75,7 @@
         return redirect(h.url(controller='project', action='index',
                                 project_name=project_name))
 
+    @ControllerProtector(Any(has_site_role(PROJECT_ADMIN), has_project_write_access()))
     def manage_users(self, project_name):
         """
         Add/Remove users from this project.
@@ -97,6 +100,7 @@
                            {'all_people': all_people,
                             'project_name': project_name})
 
+    @ControllerProtector(Any(has_site_role(PROJECT_ADMIN), has_project_write_access()))
     def process_manage_users(self, project_name):
         """
         Process the change in the users-in-projects

=== modified file 'sloecode/controllers/xmlrpc.py'
--- sloecode/controllers/xmlrpc.py	2011-03-25 08:45:06 +0000
+++ sloecode/controllers/xmlrpc.py	2011-09-28 23:56:23 +0000
@@ -5,6 +5,7 @@
 
 from pylons.controllers.xmlrpc import XMLRPCController
 from sloecode.model import Person, Project
+from sloecode.model.project import public_projects
 from sloecode.model.site_role import PROJECT_ADMIN
 from sloecode.model.membership import PR_DEVELOPER, PR_MANAGER
 
@@ -79,6 +80,12 @@
                     writable_projects.append(mem.project.name)
                 else:
                     readable_projects.append(mem.project.name)
+            for project in public_projects():
+                if project.name in writable_projects:
+                    continue
+                if project.name in readable_projects:
+                    continue
+                readable_projects.append(project.name)
         return [isAdmin, readable_projects, writable_projects]
 
     getAccessPermissionsForUser.signature = [['array', 'string']]

=== modified file 'sloecode/lib/auth.py'
--- sloecode/lib/auth.py	2011-03-25 04:58:16 +0000
+++ sloecode/lib/auth.py	2011-09-28 23:56:23 +0000
@@ -2,7 +2,6 @@
 """
 
 from repoze.what.middleware import setup_auth
-from repoze.who.plugins.sa import SQLAlchemyAuthenticatorPlugin
 from repoze.who.plugins.sa import SQLAlchemyUserMDPlugin
 from repoze.who.plugins.friendlyform import FriendlyFormPlugin
 from repoze.who.plugins.auth_tkt import AuthTktCookiePlugin
@@ -11,7 +10,7 @@
 from sloecode.model import Person
 
 
-def add_auth(app):
+def add_auth(app, config):
     """
     Add authentication and authorization middleware to the ``app``.
 
@@ -26,12 +25,20 @@
 
     """
 
-    # we use the SQLAlchemy repoze.who plugin for authentication:
-    authenticator = SQLAlchemyAuthenticatorPlugin(Person, Session)
-    # override the default names for the login column, and the verification
-    # method:
-    authenticator.translations['user_name'] = 'login'
-    authenticator.translations['validate_password'] = 'verify_password'
+    use_pam = config.get('use_pam', False)
+    if use_pam:
+        from repoze.who.plugins.pam import PamAuthenticatorPlugin
+        authenticator = PamAuthenticatorPlugin()
+        authenticator_name = 'pam_auth'
+    else:
+        # we use the SQLAlchemy repoze.who plugin for authentication:
+        from repoze.who.plugins.sa import SQLAlchemyAuthenticatorPlugin
+        authenticator = SQLAlchemyAuthenticatorPlugin(Person, Session)
+        authenticator_name = 'sa_auth'
+        # override the default names for the login column, and the verification
+        # method:
+        authenticator.translations['user_name'] = 'login'
+        authenticator.translations['validate_password'] = 'verify_password'
 
     # We also want to use the SA metadata providor:
     mdprovidor = SQLAlchemyUserMDPlugin(Person, Session)
@@ -50,7 +57,7 @@
     auth_tkt = AuthTktCookiePlugin('S3cr3tStr1ng')
 
     identifiers = [('form', id_form),('auth_tkt', auth_tkt)]
-    authenticators = [('sa_auth', authenticator)]
+    authenticators = [(authenticator_name, authenticator)]
     challengers = [('form', id_form)]
     mdproviders = [('sa_md', mdprovidor)]
 

=== modified file 'sloecode/lib/helpers.py'
--- sloecode/lib/helpers.py	2011-08-11 08:10:00 +0000
+++ sloecode/lib/helpers.py	2011-09-28 23:56:23 +0000
@@ -18,11 +18,12 @@
 # to the generated URL.
 #
 # Bottom line: ALL generated URLs MUST be wrapped in a call to url():
-from pylons import url
+from pylons import url, config
 
 # Roles information
 from sloecode.model.membership import PROJECT_ROLES
 from sloecode.model.site_role import SITE_ROLES
+from sloecode.model.project import public_projects
 
 # a simple link_to implementation that handles a confirm kwarg that prints
 # very simple javascript asking the user if they really want to continue.
@@ -56,7 +57,7 @@
 
 # import helper functions that let templates determine if the user has
 # certain permissions:
-from sloecode.lib.security import has_site_role, has_project_role
+from sloecode.lib.security import has_site_role, has_project_role, has_project_access
 # import site role names as well:
 from sloecode.model.site_role import USER_ADMIN, PROJECT_ADMIN
 
@@ -76,3 +77,13 @@
 
     link = url('/help/' + target)
     return link_to(label, link, class_='help_link')
+
+def allow_password_modification():
+    # No password modification if PAM is used for authentication.
+    use_pam = config.get('use_pam', False)
+    return not use_pam
+
+def allow_user_creation():
+    # Don't allow user creation when using PAM for authentication.
+    use_pam = config.get('use_pam', False)
+    return not use_pam

=== modified file 'sloecode/lib/predicates.py'
--- sloecode/lib/predicates.py	2011-02-12 08:06:36 +0000
+++ sloecode/lib/predicates.py	2011-09-28 23:56:23 +0000
@@ -4,6 +4,7 @@
 from repoze.what.predicates import Predicate
 
 import sloecode.lib.security as security
+from sloecode.model.project import Project
 
 class has_site_role(Predicate):
     """Checks whether the logged in user has the desired site role.
@@ -57,22 +58,42 @@
         except KeyError:
             self.unmet()
 
-class is_project_member(Predicate):
-    """Checks whether the logged in user is a member of the project resource
-    being requested.
-    """
-
-    message = "You must be a member of a project in order to view it's page."
-
-    def evaluate(self, environ, credentials):
-        try:
-            user = environ['repoze.who.identity'].get('user')
-            args = self.parse_variables(environ)
-            named_args = args['named_args']
-            project_name = named_args['project_name']
-            for membership in user.projects:
-                if membership.project.name == project_name:
-                    return
-            self.unmet()
-        except KeyError:
-            self.unmet()
+class has_project_read_access(Predicate):
+    """Checks whether the logged in user as read-only access to the project resource
+    being requested.
+    """
+
+    message = "You must be a member of a project or it must be public in order to view it's page."
+
+    def evaluate(self, environ, credentials):
+        try:
+            user = environ['repoze.who.identity'].get('user')
+            args = self.parse_variables(environ)
+            named_args = args['named_args']
+            project_name = named_args['project_name']
+            if security.has_project_access(project_name, user, read_only=True):
+                return
+            self.unmet()
+        except KeyError:
+            self.unmet()
+
+
+class has_project_write_access(Predicate):
+    """Checks whether the logged in user as read/write access to the project resource
+    being requested.
+    """
+
+    message = "You must be a developper/manager of a project in order to have write access."
+
+    def evaluate(self, environ, credentials):
+        try:
+            user = environ['repoze.who.identity'].get('user')
+            args = self.parse_variables(environ)
+            named_args = args['named_args']
+            project_name = named_args['project_name']
+            if security.has_project_access(project_name, user, read_only=False):
+                return
+            self.unmet()
+        except KeyError:
+            self.unmet()
+

=== modified file 'sloecode/lib/security.py'
--- sloecode/lib/security.py	2011-01-22 23:30:57 +0000
+++ sloecode/lib/security.py	2011-09-28 23:56:23 +0000
@@ -5,6 +5,7 @@
 from pylons import request
 from sloecode.model import Person, Membership, Project
 from sloecode.model.meta import Session
+from sloecode.model.membership import PR_MANAGER, PR_DEVELOPER
 
 
 def has_site_role(role_name, user=None):
@@ -27,11 +28,7 @@
         return False
 
 
-def has_project_role(project, role_name, user=None):
-    """Determines whether the currently logged in user has the specified role
-    for a given project. The project can either be the project name (as a
-    string or unicode string), a Project object, or the project id (int).
-    """
+def _get_project_object(project):
     prj_obj = None
     if isinstance(project, Project):
         prj_obj = project
@@ -40,17 +37,27 @@
         if len(projects):
             prj_obj = projects[0]
         else:
-            # that ID does not exist. return false:
-            return False
+            # that ID does not exist.
+            return None
     elif isinstance(project, basestring):
         projects = Project.get(name=project)
         if len(projects):
             prj_obj = projects[0]
         else:
-            # that name does not exist. return false:
-            return False
+            # that name does not exist.
+            return None
     else:
         raise TypeError("project must be Project,str,unicode, or int type.")
+    return prj_obj
+
+def has_project_role(project, role_name, user=None):
+    """Determines whether the currently logged in user has the specified role
+    for a given project. The project can either be the project name (as a
+    string or unicode string), a Project object, or the project id (int).
+    """
+    prj_obj = _get_project_object(project)
+    if prj_obj is None:
+        return False
     try:
         if not user:
             e = request.environ
@@ -61,4 +68,30 @@
         # any results?
         return q.count() > 0
     except KeyError:
-        return False
\ No newline at end of file
+        return False
+
+def has_project_access(project, user=None, read_only=True):
+    """Checks whether user as read access to the project resource."""
+    prj_obj = _get_project_object(project)
+    if prj_obj is None:
+        return False
+    if read_only and prj_obj.public:
+        # Read only access allowed for everybody if project is public.
+        return True
+    try:
+        if not user:
+            e = request.environ
+            user = e['repoze.who.identity'].get('user')
+    except KeyError:
+        return False
+    for membership in user.projects:
+        if membership.project.name == project.name:
+            if read_only:
+                # Read only access allowed for all project roles.
+                return True
+            if membership.role in [PR_MANAGER, PR_DEVELOPER]:
+                # Only allow write access for managers and developpers.
+                return True
+            return False
+    return False
+

=== modified file 'sloecode/model/person.py'
--- sloecode/model/person.py	2011-07-22 04:20:11 +0000
+++ sloecode/model/person.py	2011-09-28 23:56:23 +0000
@@ -78,7 +78,7 @@
     """A simple formencode validator that checks that Person logins are unique.
     """
 
-    login_regex = re.compile(r'^[a-z0-9]{3,24}$')
+    login_regex = re.compile(r'^[a-z0-9][a-z0-9_.-]{2,23}$')
 
     def _to_python(self, value, state):
         """Try to validate form data.
@@ -88,7 +88,7 @@
                 'That login already exists.', value, state)
 
         if not self.login_regex.match(value):
-            raise formencode.Invalid('Logins must be lower-case letters or numbers only.', value, state)
+            raise formencode.Invalid('Logins must be lower-case letters, numbers, or _-. only.', value, state)
 
         return value
 

=== modified file 'sloecode/model/project.py'
--- sloecode/model/project.py	2011-07-02 07:13:32 +0000
+++ sloecode/model/project.py	2011-09-28 23:56:23 +0000
@@ -6,7 +6,7 @@
 
 from sqlalchemy import Column
 from sqlalchemy.orm import relationship
-from sqlalchemy.types import Integer, String, Text
+from sqlalchemy.types import Boolean, Integer, String, Text
 
 
 from sloecode.model.meta import Base, QueryMixin
@@ -22,6 +22,7 @@
 
     id = Column(Integer, primary_key=True)
     name = Column(String(24), unique=True)
+    public = Column(Boolean)
     displayname = Column(String(32))
     description = Column(Text())
 
@@ -32,7 +33,7 @@
 class UniqueProject(formencode.FancyValidator):
     "A simple formencode validator that checks Project names are unique."
 
-    project_regex = re.compile(r'^[a-z0-9]{3,24}$')
+    project_regex = re.compile(r'^[a-z0-9][a-z0-9_.-]{2,23}$')
 
     def _to_python(self, value, state):
         """Validate form-data.
@@ -44,7 +45,7 @@
 
         if not self.project_regex.match(value):
             raise formencode.Invalid(
-                'A project name must be lower case letters and numbers, and be 3-24 characters long.',
+                'A project name must be lower case letters, numbers, or _-., and be 3-24 characters long.',
                 value, state)
 
         return value
@@ -57,5 +58,16 @@
     filter_extra_fields = True
 
     name = UniqueProject(not_empty=True)
+    public = formencode.validators.Bool()
     displayname = formencode.validators.String(not_empty=True, max=32)
     description = formencode.validators.String(not_empty=False)
+
+
+def public_projects():
+    """ Return the list of public projects. """
+    projects = []
+    for project in Project.get():
+        if project.public:
+            projects.append(project)
+    return projects
+

=== modified file 'sloecode/sshserver/launcher.py'
--- sloecode/sshserver/launcher.py	2011-05-07 00:10:27 +0000
+++ sloecode/sshserver/launcher.py	2011-09-28 23:56:23 +0000
@@ -204,6 +204,8 @@
         environment = dict(os.environ)
         environment['BZR_EMAIL'] = '%s@%s' % (avatar.username, self.hostname)
         environment['BZR_PLUGIN_PATH'] = get_BZR_PLUGIN_PATH_for_subprocess()
+        environment['BZR_LOG'] = '%s/.bzr.log-%s' % (environment['HOME'],
+                                                     avatar.username)
 
         return RestrictedExecOnlySession(
             avatar, reactor, allowed_command, command, environment=environment)

=== modified file 'sloecode/templates/admin/person-create.html'
--- sloecode/templates/admin/person-create.html	2011-06-22 06:54:54 +0000
+++ sloecode/templates/admin/person-create.html	2011-09-28 23:56:23 +0000
@@ -23,6 +23,7 @@
           <td>Login:</td>
           <td>{{ mt.text('login') }}</td>
         </tr>
+        {% if h.allow_password_modification() %}
         <tr>
           <td>Password:</td>
           <td>{{ mt.password('password') }}</td>
@@ -31,6 +32,7 @@
           <td>Verify Password:</td>
           <td>{{ mt.password('password_verify') }}</td>
         </tr>
+        {% endif %}
         <tr>
           <td>Name:</td>
           <td>{{ mt.text('name') }}</td>

=== modified file 'sloecode/templates/admin/person-update.html'
--- sloecode/templates/admin/person-update.html	2011-07-02 22:51:24 +0000
+++ sloecode/templates/admin/person-update.html	2011-09-28 23:56:23 +0000
@@ -25,6 +25,7 @@
           <td>Username:</td>
           <td>{{ person.login }}</td>
         </tr>
+        {% if h.allow_password_modification() %}
         <tr>
           <td>Password:</td>
           <td>{{ h.password('password') }}</td>
@@ -33,6 +34,7 @@
           <td>Confirm Password:</td>
           <td>{{ h.password('password_verify') }}</td>
         </tr>
+        {% endif %}
         <tr>
           <td>Name:</td>
           <td>{{ mt.text('name') }}</td>
@@ -75,6 +77,10 @@
   </div>
 </div>
 <script type="text/javascript" language="JavaScript">
+{% if h.allow_password_modification() %}
   document.forms['person_update_form'].elements['password'].focus();
+{% else %}
+  document.forms['person_update_form'].elements['name'].focus();
+{% endif %}
 </script>
 {% endblock %}

=== modified file 'sloecode/templates/admin/project-create.html'
--- sloecode/templates/admin/project-create.html	2011-06-22 06:54:54 +0000
+++ sloecode/templates/admin/project-create.html	2011-09-28 23:56:23 +0000
@@ -37,6 +37,12 @@
           <td>{{ mt.textarea('description', cols=45, rows=5) }}</td>
         </tr>
         <tr>
+          <td>Public</td>
+          <td>
+            {{mt.checkbox('public')}}
+          </td>
+        </tr>
+        <tr>
           <td colspan="2">
             {{h.submit('update', 'Create Project')}}
           </td>

=== modified file 'sloecode/templates/admin/project-list.html'
--- sloecode/templates/admin/project-list.html	2011-06-22 06:54:54 +0000
+++ sloecode/templates/admin/project-list.html	2011-09-28 23:56:23 +0000
@@ -21,6 +21,7 @@
           <th>Name</th>
           <th>Display Name</th>
           <th>Description</th>
+          <th>Public</th>
           <th>Actions</th>
         </tr>
         {% set row_class = cycler('odd', 'even') %}
@@ -31,6 +32,7 @@
             class='project') }}</td>
           <td>{{project.displayname|e}}</td>
           <td>{{project.description|e}}</td>
+          <td>{% if project.public %}Yes{% else %}No{% endif %}</td>
           <td>{{h.link_to('Edit',
             h.url(controller='admin/project',
             action='update',

=== modified file 'sloecode/templates/admin/project-update.html'
--- sloecode/templates/admin/project-update.html	2011-06-22 06:54:54 +0000
+++ sloecode/templates/admin/project-update.html	2011-09-28 23:56:23 +0000
@@ -18,6 +18,10 @@
     <td>{{ mt.textarea('description') }}</td>
   </tr>
   <tr>
+    <td>Public</td>
+    <td>{{ mt.checkbox('public') }}</td>
+  </tr>
+  <tr>
     <td colspan="2">
       {{h.submit('update', 'Update Project')}}
     </td>

=== modified file 'sloecode/templates/login.html'
--- sloecode/templates/login.html	2011-06-22 06:54:54 +0000
+++ sloecode/templates/login.html	2011-09-28 23:56:23 +0000
@@ -29,7 +29,7 @@
           <td colspan="2"> {{ h.submit('login_btn', 'Login') }} </td>
         </tr>
       </table>
-      {{ h.hidden('came_from', h.url(controller='person', action='me')) }}
+      {{ h.hidden('came_from', h.url(controller='person', action='me_or_new')) }}
       {{ h.end_form() }}
     </div>
   </div>

=== modified file 'sloecode/templates/macros/nav.html'
--- sloecode/templates/macros/nav.html	2011-07-02 22:51:24 +0000
+++ sloecode/templates/macros/nav.html	2011-09-28 23:56:23 +0000
@@ -31,7 +31,8 @@
             class='yui3-menuitem-content') }}
       </li>
 
-      {% if user_details.projects|length %}
+      {% set projects = h.public_projects() + user_details.projects %}
+      {% if projects|length %}
       <li>
         <a class="yui3-menu-label" href="#proj_list">
           <em>Projects</em>
@@ -41,11 +42,11 @@
           <div class="yui3-menu-content">
             <ul>
               {# List of projects that this user is in #}
-              {% for membership in user_details.projects %}
+              {% for project in projects %}
               <li class="yui3-menuitem">
-                {{ h.link_to(membership.project.name,
+                {{ h.link_to(project.name,
                 	h.url(controller='project',
-                	project_name=membership.project.name),
+                	project_name=project.name),
                 	class='yui3-menuitem-content'
                 ) }}
               </li>
@@ -81,12 +82,14 @@
                           class='yui3-menuitem-content')
                           }}
                         </li>
+			{% if h.allow_user_creation() %}
                         <li class="yui3-menuitem">
                           {{ h.link_to('Create New',
                           h.url(controller='admin/person', action='create'),
                           class='yui3-menuitem-content')
                           }}
                         </li>
+			{% endif %}
                       </ul>
                     </div>
                   </div>

=== modified file 'sloecode/templates/person-details.html'
--- sloecode/templates/person-details.html	2011-08-15 00:56:40 +0000
+++ sloecode/templates/person-details.html	2011-09-28 23:56:23 +0000
@@ -65,17 +65,17 @@
           {% for branch in branches %}
             <tr>
               <td>{{h.image(h.url('/bzr_icon.png'), 'Bazaar Branch')}}</td>
-              <td>{{branch.get_name()}}</td>
+              <td>{{branch.get_name(repo.get_path())}}</td>
               <td>{{branch.get_last_revision_number()}} revisions</td>
               <td>{{h.link_to(h.image(h.url('/application-list.png'), 'Branch Log'),
                     h.url(controller='person', person_name=person.login,
-                    action='branch_log', branch_name=branch.get_name()),
+                    action='branch_log', branch_name=branch.get_name(repo.get_path())),
                     title="Branch Log")}}
                   {{h.link_to(h.image(h.url('/bin-exclamation.png'), 'Delete Branch'),
                     h.url(controller='person', person_name=person.login,
-                    action='delete_branch', branch_name=branch.get_name()),
+                    action='delete_branch', branch_name=branch.get_name(repo.get_path())),
                     title="Delete Branch",
-                    confirm="Are you sure you want to delete the '" + branch.get_name()
+                    confirm="Are you sure you want to delete the '" + branch.get_name(repo.get_path())
                     + "' branch? Branch deletion is permanent!")}}
               </td>
             </tr>

=== modified file 'sloecode/templates/project-details.html'
--- sloecode/templates/project-details.html	2011-08-15 01:43:23 +0000
+++ sloecode/templates/project-details.html	2011-09-28 23:56:23 +0000
@@ -40,7 +40,7 @@
             {{h.image(h.url('/bzr_icon.png'), 'Bazaar Branch')}}
           </td>
           <td>
-            {{branch.get_name()}}
+            {{branch.get_name(repo.get_path())}}
           </td>
           <td>
             {{branch.get_last_revision_number()}}
@@ -48,14 +48,16 @@
           <td>
             {{h.link_to(h.image(h.url('/application-list.png'), 'Branch Log'),
                 h.url(controller='project', project_name=project.name,
-                action='branch_log', branch_name=branch.get_name()),
+                action='branch_log', branch_name=branch.get_name(repo.get_path())),
                 title="Branch Log")}}
+            {% if h.has_project_access(project, read_only=False) %}
             {{h.link_to(h.image(h.url('/bin-exclamation.png'), 'Delete Branch'),
                     h.url(controller='project', project_name=project.name,
-                    action='delete_branch', branch_name=branch.get_name()),
+                    action='delete_branch', branch_name=branch.get_name(repo.get_path())),
                     title="Delete Branch",
-                    confirm="Are you sure you want to delete the '" + branch.get_name()
+                    confirm="Are you sure you want to delete the '" + branch.get_name(repo.get_path())
                     + "' branch? Branch deletion is permanent!")}}
+            {% endif %}
           </td>
         </tr>
         {% endfor %}