Ticket #1890: authen.diff

./wiki/web_ui.py

@@ -25 +25 @@
 from trac.perm import IPermissionRequestor
 from trac.Search import ISearchSource, query_to_sql, shorten_result
 from trac.Timeline import ITimelineEventProvider
-from trac.util import enum, format_datetime, get_reporter_id, \
+from trac.util import enum, format_datetime, get_reporter_id, get_authentic_id, \
                       pretty_timedelta, shorten_line, Markup
 from trac.versioncontrol.diff import get_diff_options, hdf_diff
 from trac.web.chrome import add_link, add_stylesheet, INavigationContributor
@@ -183 +183 @@
             # WIKI_ADMIN
             page.readonly = int(req.args.has_key('readonly'))
 
-        page.save(req.args.get('author'), req.args.get('comment'),
+        page.save(get_authentic_id(req, 'author'), req.args.get('comment'),
                   req.remote_addr)
         req.redirect(self.env.href.wiki(page.name))
 
@@ -283 +283 @@
         if preview:
             page.readonly = req.args.has_key('readonly')
 
-        author = req.args.get('author', get_reporter_id(req))
+        author = get_reporter_id(req, 'author')
         comment = req.args.get('comment', '')
         editrows = req.args.get('editrows')
         if editrows:

./ticket/web_ui.py

@@ -84 +84 @@
 
         ticket = Ticket(self.env, db=db)
         ticket.populate(req.args)
-        ticket.values.setdefault('reporter', util.get_reporter_id(req))
+        ticket.values['reporter'] = util.get_reporter_id(req, 'reporter')
 
         if ticket.values.has_key('description'):
             description = wiki_to_html(ticket['description'], self.env, req, db)
@@ -133 +133 @@
             raise TracError('Tickets must contain a summary.')
 
         ticket = Ticket(self.env, db=db)
-        ticket.values.setdefault('reporter', util.get_reporter_id(req))
         ticket.populate(req.args)
+        ticket.values['reporter'] = util.get_authentic_id(req, 'reporter')
         ticket.insert(db=db)
         db.commit()
 
@@ -182 +182 @@
         id = int(req.args.get('id'))
 
         ticket = Ticket(self.env, id, db=db)
-        reporter_id = util.get_reporter_id(req)
+        reporter_id = util.get_reporter_id(req, 'author')
 
         if req.method == 'POST':
             if not req.args.has_key('preview'):
@@ -195 +195 @@
                 req.hdf['ticket.reassign_owner'] = req.args.get('reassign_owner') \
                                                    or req.authname
                 req.hdf['ticket.resolve_resolution'] = req.args.get('resolve_resolution')
-                reporter_id = req.args.get('author')
                 comment = req.args.get('comment')
                 if comment:
                     req.hdf['ticket.comment'] = comment
@@ -343 +342 @@
             ticket['resolution'] = ''
 
         now = int(time.time())
-        ticket.save_changes(req.args.get('author', req.authname),
+        ticket.save_changes(util.get_authentic_id(req, 'author'),
                             req.args.get('comment'), when=now, db=db)
         db.commit()
 

./attachment.py

@@ -318 +318 @@
                                                     'utf-8')).encode('utf-8')
 
         attachment.description = req.args.get('description', '')
-        attachment.author = req.args.get('author', '')
+        attachment.author = util.get_authentic_id(req, 'author')
         attachment.ipnr = req.remote_addr
         if req.args.get('replace'):
             try:
@@ -376 +376 @@
         text, link = self._get_parent_link(attachment)
         req.hdf['attachment'] = {
             'mode': 'new',
-            'author': util.get_reporter_id(req),
+            'author': util.get_reporter_id(req, 'author'),
             'parent': {'type': attachment.parent_type,
                        'id': attachment.parent_id, 'name': text, 'href': link}
         }

./util.py

@@ -334 +334 @@
                 raise Exception('Failed to create unique name: ' + path)
             path = '%s.%d%s' % (parts[0], idx, parts[1])
 
-def get_reporter_id(req):
+def get_reporter_id(req, argname=None):
     name = req.session.get('name', None)
     email = req.session.get('email', None)
     
+    if argname:
+        r = req.args.get(argname)
+        if r:
+            return r
+    
     if req.authname != 'anonymous':
         return req.authname
     elif name and email:
@@ -347 +352 @@
     else:
         return req.authname
 
+def get_authentic_id(req, argname):
+    r = get_reporter_id(req, argname)
+    if req.authname == 'anonymous':
+        return r + ' [unauthenticated]'
+    else:
+        if r == req.authname:
+            return r
+        else:
+            return '%s (%s)' % (req.authname, r)
+
 # Date/time utilities
 
 def format_datetime(t=None, format='%x %X', gmt=False):