fedora-updates-system/updatessystem controllers.py, 1.8, 1.9 model.py, 1.6, 1.7 new.py, 1.6, 1.7

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4002/updatessystem

Modified Files:
	controllers.py model.py new.py 
Log Message:
- Wrote a Bugzilla IdentityProvider and added identity support



Index: controllers.py
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/controllers.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- controllers.py	31 Dec 2006 09:10:14 -0000	1.8
+++ controllers.py	1 Jan 2007 06:16:13 -0000	1.9
@@ -24,8 +24,6 @@
 from sqlite import IntegrityError
 from buildsys import SRPMNotFound
 from sqlobject import SQLObjectNotFound
-#from updatessystem import json
-
 from turbogears import (controllers, expose, validate, redirect, identity,
                         paginate, flash, error_handler)
 
@@ -36,16 +34,13 @@
     new = NewUpdateController()
     push = PushController()
 
-    @expose(template="updatessystem.templates.welcome")
+    @expose()
+    @identity.require(identity.not_anonymous())
     def index(self):
         raise redirect('/list')
 
     @expose(template="updatessystem.templates.login")
     def login(self, forward_url=None, previous_url=None, *args, **kw):
-        """
-        TODO: fedora account system integration
-        """
-
         if not identity.current.anonymous \
             and identity.was_login_attempted() \
             and not identity.get_identity_errors():
@@ -59,10 +54,11 @@
                   "did not grant access to this resource.")
         elif identity.get_identity_errors():
             msg=_("You must provide your credentials before accessing "
-                   "this resource.")
+                  "this resource.")
         else:
             msg=_("Please log in.")
             forward_url= cherrypy.request.headers.get("Referer", "/")
+
         cherrypy.response.status=403
         return dict(message=msg, previous_url=previous_url, logging_in=True,
                     original_parameters=cherrypy.request.params,
@@ -89,6 +85,7 @@
         return dict(update=update)
 
     @expose()
+    @identity.require(identity.not_anonymous())
     def delete(self, update):
         try:
             up = PackageUpdate.byNvr(update)
@@ -113,6 +110,7 @@
             flash("%s deleted" % update)
         raise redirect("/list")
 
+    @identity.require(identity.not_anonymous())
     @expose(template='updatessystem.templates.form')
     def edit(self, update):
         import string
@@ -137,6 +135,7 @@
     @expose()
     @error_handler(new.index)
     @validate(form=update_form)
+    @identity.require(identity.not_anonymous())
     def save(self, release, bugs, cves, edited, **kw):
         """ Save an update.  This includes new updates and edited. """
         release = Release.byName(release)


Index: model.py
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/model.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- model.py	31 Dec 2006 09:10:14 -0000	1.6
+++ model.py	1 Jan 2007 06:16:13 -0000	1.7
@@ -253,24 +253,24 @@
 
     user_name = UnicodeCol(length=16, alternateID=True,
                            alternateMethodName="by_user_name")
-    email_address = UnicodeCol(length=255, alternateID=True,
-                               alternateMethodName="by_email_address")
-    display_name = UnicodeCol(length=255)
-    password = UnicodeCol(length=40)
+    #email_address = UnicodeCol(length=255, alternateID=True,
+    #                           alternateMethodName="by_email_address")
+    #display_name = UnicodeCol(length=255)
+    #password = UnicodeCol(length=40)
     def _get_permissions(self):
         perms = set()
         for g in self.groups:
             perms = perms | set(g.permissions)
         return perms
 
-    def _set_password(self, cleartext_password):
-        "Runs cleartext_password through the hash algorithm before saving."
-        hash = identity.encrypt_password(cleartext_password)
-        self._SO_set_password(hash)
-
-    def set_password_raw(self, password):
-        "Saves the password as-is to the database."
-        self._SO_set_password(password)
+    #def _set_password(self, cleartext_password):
+    #    "Runs cleartext_password through the hash algorithm before saving."
+    #    hash = identity.encrypt_password(cleartext_password)
+    #    self._SO_set_password(hash)
+
+    #def set_password_raw(self, password):
+    #    "Saves the password as-is to the database."
+    #    self._SO_set_password(password)
 
 
 


Index: new.py
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/new.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- new.py	31 Dec 2006 09:10:14 -0000	1.6
+++ new.py	1 Jan 2007 06:16:13 -0000	1.7
@@ -19,7 +19,7 @@
 from sqlobject import SQLObjectNotFound
 
 from turbogears import (expose, controllers, validate, validators, flash,
-                        error_handler, redirect)
+                        error_handler, redirect, identity)
 
 from turbogears.widgets import (WidgetsList, TextField, SingleSelectField,
                                 CheckBox, TextArea, CalendarDateTimePicker,
@@ -50,6 +50,7 @@
 
 class NewUpdateController(controllers.Controller):
 
+    @identity.require(identity.not_anonymous())
     @expose(template="updatessystem.templates.form")
     def index(self, *args, **kw):
         return dict(form=update_form, values={}, action="/save")