Projects now has owners, and you must be logged in to register/upload

3 files changed, 16 insertions, 6 deletions

diff --git a/djangopypi/forms.py b/djangopypi/forms.py
index 1cf9a9d..7865723 100644
--- a/djangopypi/forms.py
+++ b/djangopypi/forms.py
@@ -47,11 +47,12 @@ class ProjectRegisterForm(forms.Form):
     version = forms.CharField()
     platform = forms.CharField(required=False)
 
-    def save(self, classifiers, file=None):
+    def save(self, classifiers, user, file=None):
         values = dict(self.cleaned_data)
         name = values.pop("name")
         version = values.pop("version")
         platform = values.pop("platform")
+        values["owner"] = user
         project, c = Project.objects.get_or_create(name=name, defaults=values)
         for classifier in classifiers:
             project.classifiers.add(
diff --git a/djangopypi/models.py b/djangopypi/models.py
index d66f5c8..d7c5fc7 100644
--- a/djangopypi/models.py
+++ b/djangopypi/models.py
@@ -32,6 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os
 from django.db import models
+from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
 
 OS_NAMES = (
@@ -85,6 +86,7 @@ class Project(models.Model):
     description = models.TextField(blank=True)
     author_email = models.CharField(max_length=255, blank=True)
     classifiers = models.ManyToManyField(Classifier)
+    owner = models.ForeignKey(User, related_name="projects")
 
     class Meta:
         verbose_name = _(u"project")
@@ -108,7 +110,8 @@ class Release(models.Model):
         verbose_name_plural = _(u"releases")
 
     def __unicode__(self):
-        return self.version
+        return u"%s %s (%s)" % (
+                self.project.name, self.version, self.distribution.name)
 
     @property
     def filename(self):
diff --git a/djangopypi/views.py b/djangopypi/views.py
index b1323fb..560b461 100644
--- a/djangopypi/views.py
+++ b/djangopypi/views.py
@@ -31,8 +31,9 @@ POSSIBILITY OF SUCH DAMAGE.
 """
 
 from django.http import Http404, HttpResponse, HttpResponseBadRequest
-from django.http import QueryDict
+from django.http import QueryDict, HttpResponseForbidden
 from django.shortcuts import render_to_response
+from django.contrib.auth import authenticate, login
 from djangopypi.models import Project
 from djangopypi.forms import ProjectRegisterForm
 from django.template import RequestContext
@@ -73,14 +74,19 @@ def parse_weird_post_data(data):
 
 def simple(request, template_name="djangopypi/simple.html"):
     if request.method == "POST":
+        if not request.user.is_authenticated():
+            return HttpResponseForbidden(
+                    "Not logged in, or invalid user/password")
         post_data, files = parse_weird_post_data(request.raw_post_data)
         action = post_data.get(":action")
         classifiers = post_data.getlist("classifiers")
         register_form = ProjectRegisterForm(post_data.copy())
         if register_form.is_valid():
-            return HttpResponse(register_form.save(classifiers,
-                file=files.get("content")))
-            return HttpResponse("Successfully registered.")
+            registered = register_form.save(classifiers, request.user,
+                                            file=files.get("content"))
+            if registered:
+                return HttpResponse("Successfully registered.")
+            return HttpResponseForbidden("That's not your project!")
         return HttpResponse("ERRORS: %s" % register_form.errors)
 
     dists = Project.objects.all()