Changeset 6

Timestamp:

01/03/07 11:45:59 (5 years ago)

Author:

nicolast

Message:

It's working. Now time for fixing bugs, refactoring, attribute support, better templates,...

Files:

• trunk/djangoid/server/models.py (modified) (2 diffs)
• trunk/djangoid/server/views.py (modified) (4 diffs)
• trunk/djangoid/urls.py (modified) (1 diff)
• trunk/djangoid/users/models.py (modified) (5 diffs)
• trunk/djangoid/users/views.py (modified) (2 diffs)

trunk/djangoid/server/models.py

@@ -1 +1 @@
-from django.db import models
-
+#These are some dumb mappings of the original OpenID store tables as used by the SQLStore implemenation(s).
+#They're used by "DjangoidStore"
-class OidStoreNonce(models.Model):
-        nonce = models.CharField(maxlength = 8, primary_key = True)
@@ -20 +22 @@
-
-        class Meta:
+                #Django got no multi-column primary keys
-                unique_together = (("server_url", "handle"),)
-

trunk/djangoid/server/views.py

@@ -4 +4 @@
-from django.conf import settings
-from django.shortcuts import render_to_response
-
+djangoid.
-import re
-
+#Regex to extract username out of identity delegate URI, like
+#       http://id.nicolast.be/nicolas/
+#                             ^^^^^^^
+#Watch the trailing /
-_identityRe = re.compile(settings.BASE_URL + "(?P<uid>[^/]+)/$")
-
+#Global OpenID server instance, using a DjangoidStore object as container
-openidserver = server.Server(DjangoidStore())
-
-
+
+
+
-        try:
-                webresponse = openidserver.encodeResponse(response)
@@ -24 +31 @@
-        return r
-
-
+
+
-        uid = _identityRe.match(identity).groupdict()["uid"]
-        print "Found uid: ", uid
-        user = DjangoidUser.objects.filter(djangouser = uid)
-        if not len(user) == 0:
-                return user[0]
-
+
+
-
+#Server endpoint. URI: http://id.nicolast.be/
-def endpoint(request):
+        #If this is (most likely) a YADIS request, handle it using the YADIS view function
-        if request.META.has_key("HTTP_ACCEPT"):
-                ct = request.META["HTTP_ACCEPT"]
@@ -38 +48 @@
-                        return serveryadis(request)
-
+        #Copy over all query (GET and POST) key-value pairs, so we can pass them to out OpenID server.
+        #request.REQUEST.copy() seems not to work, as openidserver.decodeRequest seems to use some function
+        #on the passed object that's not implemented in the copied object.
-        query = {}
-        for i in request.REQUEST.items():
@@ -46 +59 @@
-                raise
-
+        #If the request wasnt a valid OpenID server request, render some static page.
+        #TODO: use render_to_response("about.html")
-        if r is None:
-                return HttpResponse("about")
-
+        #Check whether we got to do anything...
-        if r.mode in ["checkid_immediate", "checkid_setup"]:
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                else:
-
+
+
-        else:
-                response = openidserver.handleRequest(r)
-
-_
+
-
+#A server YADIS document is requested. I don't think this is widely used yet, but well... Let's just return it.
-def serveryadis(request):
-        res = render_to_response("server/yadis.xrds", {"server_url": settings.BASE_URL})

trunk/djangoid/urls.py

@@ -8 +8 @@
-    (r'^admin/', include('django.contrib.admin.urls')),
-    (r'^login/$', 'djangoid.users.views.login'),
+    (r'^accept/$', 'djangoid.users.views.accept'),
-    (r'^(?P<uid>[^/]+)/yadis/$', 'djangoid.users.views.useryadis'),
-    (r'^(?P<uid>[^/]+)/$', 'djangoid.users.views.userpage'),

trunk/djangoid/users/models.py

@@ -2 +2 @@
-from django.contrib import auth
-
+#Represent one trusted root URI. Can be shared between several users.
-class TrustedRoot(models.Model):
-        root = models.URLField(primary_key = True)
@@ -11 +12 @@
-                pass
-
+#Represent one system user, based on Django's internal user system.
-class DjangoidUser(models.Model):
-        #This seems not to work:
@@ -34 +36 @@
-                pass
-
+#Identities can have attributes. These items represent one possible attribute.
-class IdentityAttribute(models.Model):
-        name = models.CharField(maxlength = 128)
@@ -48 +51 @@
-                unique_together = (("name", "namespace"),)
-
+#This maps an attribute to a user, including a value, obviously
-class UserAttribute(models.Model):
-        user = models.ForeignKey(DjangoidUser)
-        attribute = models.ForeignKey(IdentityAttribute)
-        value = models.TextField()
+        #True if this attribute's value may be displayed to all trust roots
-        public = models.BooleanField()
+        #List of specific trust roots this attribute may be displayed to.
+        #If "public" is True, this got no meaning at all
-        public_for = models.ManyToManyField(TrustedRoot, blank = True, null = True)
-
@@ -62 +69 @@
-
-        class Meta:
+                #Only store an attribute once for every user
-                unique_together = (("user", "attribute"),)

trunk/djangoid/users/views.py

@@ -1 +1 @@
-from django.shortcuts import render_to_response
+from django.http import HttpResponse
-from django.conf import settings
+from openid.server import server
+
+from djangoid.server.views import openidserver, convertOpenidServerResponse, getDjangoidUserFromIdentity
+from djangoid.users.models import TrustedRoot
-
-def useryadis(request, uid):
@@ -21 +26 @@
-def testid(request):
-        return userpage(request, "nicolas")
+
+def accept(request):
+        #Copy over all query (GET and POST) key-value pairs, so we can pass them to out OpenID server.
+        #request.REQUEST.copy() seems not to work, as openidserver.decodeRequest seems to use some function
+        #on the passed object that's not implemented in the copied object.
+        query = {}
+        for i in request.REQUEST.items():
+                query[i[0]] = i[1]
+        try:
+                r = openidserver.decodeRequest(query)
+        except server.ProtocolError, why:
+                raise
+
+        if r is None:
+                return HttpResponse("Nothing here")
+
+        if request.method == "GET":
+                return render_to_response("users/accept_root.html", {"openid_request": r})
+
+        if request.method == "POST":
+                if request.POST.has_key("cancel"):
+                        return convertOpenidServerResponse(r.answer(False))
+                if request.POST.has_key("remember"):
+                        user = getDjangoidUserFromIdentity(r.identity)
+                        root = TrustedRoot.objects.get(root = r.trust_root)
+                        user.trusted_roots.add(root)
+                return convertOpenidServerResponse(r.answer(True))
+