提交: 0e4a3d40e3defc5454c2658c55c778b44b63c4e8 - allura (git)

allura

Commit MetaInfo

• 修訂: 0e4a3d40e3defc5454c2658c55c778b44b63c4e8 (tree)
• 時間: 2010-05-20 02:05:46
• 作者: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Log Message

[#414] - Update user API so that it works if the user exists in SFX but not allura

Change Summary

• modified: ForgeSVN/forgesvn/model/svn.py
• modified: ForgeWiki/forgewiki/wiki_main.py
• modified: pyforge/pyforge/controllers/auth.py
• modified: pyforge/pyforge/controllers/project.py
• modified: pyforge/pyforge/controllers/test.py
• modified: pyforge/pyforge/ext/admin/admin_main.py
• modified: pyforge/pyforge/ext/sfx/lib/sfx_api.py
• modified: pyforge/pyforge/ext/user_profile/user_main.py
• modified: pyforge/pyforge/lib/custom_middleware.py
• modified: pyforge/pyforge/model/auth.py

差異

--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -87,7 +87,7 @@ class SVNCommit(Commit):
         result = cls(id=entry.revision.number, repo=repo)
         result.__dict__['_impl'] = entry
         result.author_username=entry.author
-        result.author=User.query.get(username=entry.author)
+        result.author=User.by_username(entry.author)
         result.datetime=datetime.utcfromtimestamp(entry.date)
         return result
 

--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -448,7 +448,7 @@ class PageController(object):
                     if u['id'] == 'all':
                         self.page.viewable_by.remove('all')
                     else:
-                        user = User.query.get(username=str(u['id']))
+                        user = User.by_username(str(u['id']))
                         if user:
                             self.page.viewable_by.remove(user.username)
         redirect('.')

--- a/pyforge/pyforge/controllers/auth.py
+++ b/pyforge/pyforge/controllers/auth.py
@@ -86,7 +86,7 @@ class AuthController(object):
     def save_new(self,display_name=None,open_ids=None,email_addresses=None,
                  username=None,password=None):
         username = username.lower()
-        if M.User.query.get(username=username):
+        if M.User.by_username(username):
             flash('That username is already taken. Please choose another.',
                   'error')
             redirect('create_account')
@@ -130,7 +130,7 @@ class AuthController(object):
 
     @expose()
     def do_setup_openid_user(self, username=None, display_name=None):
-        if M.User.query.get(username=username) and username != c.user.username:
+        if M.User.by_username(username) and username != c.user.username:
             flash('That username is already taken.  Please choose another.',
                   'error')
             redirect('setup_openid_user')
@@ -173,7 +173,7 @@ class AuthController(object):
 
     @expose()
     def do_login(self, username, password, came_from=None):
-        user = M.User.query.get(username=username)
+        user = M.User.by_username(username)
         if user is None:
             session['userid'] = None
             session.save()

--- a/pyforge/pyforge/controllers/project.py
+++ b/pyforge/pyforge/controllers/project.py
@@ -408,7 +408,7 @@ class NeighborhoodAdminController(object):
                 else:
                     self.neighborhood.acl[permission].remove(None)
         if new.get('add'):
-            u = M.User.query.get(username=new['username'])
+            u = M.User.by_username(new['username'])
             self.neighborhood.acl[permission].append(u._id)
         redirect('permissions')
 

--- a/pyforge/pyforge/controllers/test.py
+++ b/pyforge/pyforge/controllers/test.py
@@ -90,7 +90,7 @@ class TestController(BaseController, ProjectController):
     def __call__(self, environ, start_response):
         c.app = None
         c.project = M.Project.query.get(shortname='test')
-        c.user = M.User.query.get(username=environ.get('username', 'test_admin'))
+        c.user = M.User.by_username(environ.get('username', 'test_admin'))
         return BaseController.__call__(self, environ, start_response)
 
 class DispatchTest(object):

--- a/pyforge/pyforge/ext/admin/admin_main.py
+++ b/pyforge/pyforge/ext/admin/admin_main.py
@@ -296,7 +296,7 @@ class ProjectAdminController(object):
             if new['id']:
                 c.project.acl[permission].append(ObjectId(str(new['id'])))
             else:
-                user = M.User.query.get(username=new['username'])
+                user = M.User.by_username(new['username'])
                 if user is None:
                     flash('No user %s' % new['username'], 'error')
                     redirect('.')
@@ -334,7 +334,7 @@ class ProjectAdminController(object):
         if role is None: role = []
         for r in role:
             if r.get('new', {}).get('add'):
-                user = M.User.query.find({'username':str(r['new']['id'])}).first()
+                user = M.User.by_username(str(r['new']['id']))
                 if user:
                     ur = user.project_role()
                     if ObjectId(str(r['id'])) not in ur.roles:

--- a/pyforge/pyforge/ext/sfx/lib/sfx_api.py
+++ b/pyforge/pyforge/ext/sfx/lib/sfx_api.py
@@ -1,12 +1,54 @@
 import json
 import httplib
+import urllib2
 from contextlib import closing
 
 from tg import config
 from pylons import c, request
 
+from pyforge import model as M
 from pyforge.lib.security import roles_with_project_access
 
+class SFXUserApi(object):
+    
+    def __init__(self):
+        self.project_host = config.get('sfx.api.host', None)
+        self.project_path = config.get('sfx.api.project_path', '/api/user')
+
+    def _username_api_url(self, username):
+        return 'http://%s/api/user/username/%s/json' % (
+            self.project_host or request.host,
+            username)
+
+    def _userid_api_url(self, id):
+        return 'http://%s/api/user/id/%s/json' % (
+            self.project_host or request.host,
+            id)
+
+    def user_data(self, username, timeout=2):
+        """
+        given a sfnet hostname and userid, returns a dict of user data
+        """
+        try:
+            url = self._userid_api_url(int(username))
+        except TypeError:
+            url = self._username_api_url(username)
+        url_handle = urllib2.urlopen(url, timeout=timeout)
+        return json.load(url_handle)['User']
+
+    def upsert_user(self, username, user_data=None):
+        if user_data is None:
+            user_data = self.user_data(username)
+        u = M.User.query.get(username=username)
+        if u is None:
+            u = M.User(username=username)
+            n = M.Neighborhood.query.get(name='Users')
+            n.register_project('u/' + u.username, u, user_project=True)
+        if u.display_name != user_data['name']:
+            u.display_name = user_data.name
+        if u.sfx_userid != user_data['id']:
+            u.sfx_userid = user_data['id']
+
 class SFXProjectApi(object):
 
     def __init__(self):

--- a/pyforge/pyforge/ext/user_profile/user_main.py
+++ b/pyforge/pyforge/ext/user_profile/user_main.py
@@ -71,13 +71,13 @@ class UserProfileController(object):
     @expose('pyforge.ext.user_profile.templates.user_index')
     def index(self):
         username = c.project.shortname.split('/')[1]
-        user = User.query.find({'username':username}).first()
+        user = User.by_username(username)
         return dict(user=user)
 
     @expose('pyforge.ext.user_profile.templates.user_dashboard_configuration')
     def configuration(self):
         username = c.project.shortname.split('/')[1]
-        user = User.query.find({'username':username}).first()
+        user = User.by_username(username)
         return dict(user=user)
 
     @h.vardec
@@ -132,7 +132,7 @@ class UserProfileController(object):
         """
 
         username = c.project.shortname.split('/')[1]
-        user = User.query.get(username=username)
+        user = User.by_username(username)
         parts = [p for p in repo_path.split(os.path.sep) if p]
         project_path = '/' + '/'.join(parts[1:])
         project, rest = h.find_project(project_path)

--- a/pyforge/pyforge/lib/custom_middleware.py
+++ b/pyforge/pyforge/lib/custom_middleware.py
@@ -88,18 +88,8 @@ class SfxLoginMiddleware(object):
         if sfx_user_id:
             server_name = request.environ['HTTP_HOST']
             user_data = mgr.user_data(server_name, sfx_user_id)
-            user = M.User.query.get(username=user_data['username'])
-            if not user:
-                with fake_pylons_context(request):
-                    user = M.User(username=user_data['username'],
-                                  display_name=user_data['name'])
-                    n = M.Neighborhood.query.get(name='Users')
-                    n.register_project('u/' + user.username, user, user_project=True)
-            if user.display_name != user_data['name']:
-                user.display_name = user_data['name']
-            sfx_user_id_num = int(sfx_user_id.split(':')[-1])
-            if user.sfx_userid != sfx_user_id_num:
-                user.sfx_userid = sfx_user_id_num
+            with fake_pylons_context(request):
+                user = M.User.by_username(user_data['username'], user_data)
             session['sfx-sessid'] = request.cookies[cookie_name]
             session['userid'] = user._id
             session.save()

--- a/pyforge/pyforge/model/auth.py
+++ b/pyforge/pyforge/model/auth.py
@@ -170,11 +170,20 @@ class User(MappedClass):
         return '/u/' + self.username + '/'
 
     @classmethod
-    def by_email_address(self, addr):
+    def by_email_address(cls, addr):
         ea = EmailAddress.query.get(_id=addr)
         if ea is None: return None
         return ea.claimed_by_user()
 
+    @classmethod
+    def by_username(cls, name, extra=None):
+        u = cls.query.get(username=name)
+        if u is None and config.get('auth.method', 'local') == 'sfx':
+            from pyforge.ext.sfx.lib import sfx_api
+            api = sfx_api.SFXUserApi()
+            u = api.upsert_user(name, extra)
+        return u
+
     def address_object(self, addr):
         return EmailAddress.query.get(_id=addr, claimed_by_user_id=self._id)