Merge pull request #373 from Gluejar/fix_bad_transaction

Fix bad transaction id

frontend/templates/download.html

@@ -74,7 +74,7 @@ $j(document).ready(function() {
         <ul class="social menu">
             {% with site.domain as domain %}
             <a href="https://www.facebook.com/sharer.php?u=https://{{ site.domain }}{% url work work.id|urlencode:"" %}"><li class="facebook first"><span>Facebook</span></li></a>
-            <a href="https://twitter.com/intent/tweet?url={{ request.build_absolute_uri|urlencode:"" }}&amp;text=I%27m%20enjoying%20{{ work.title|urlencode }}%2C%20a%20free%2C%20non%2DDRM%20ebook%2E%20You%20can%20too%21"><li class="twitter"><span>Twitter</span></li></a>
+            <a href="https://twitter.com/intent/tweet?url=https://{{ site.domain }}{% url work work.id|urlencode:"" %}&amp;text=I%27m%20enjoying%20{{ work.title|urlencode }}%2C%20a%20free%2C%20non%2DDRM%20ebook%2E%20You%20can%20too%21"><li class="twitter"><span>Twitter</span></li></a>
             {% endwith %}
             {% if request.user.is_authenticated %}<a href="{% url emailshare 'downloaded' %}?next={% url work work.id %}"><li class="email"><span>Email</span></li></a>{% endif %}
             <a id="embed2"><li class="embed"><span>Embed</span></li></a>

frontend/views.py

@@ -1521,45 +1521,53 @@ class FundCompleteView(TemplateView):
     def get(self, request, *args, **kwargs):
         context = self.get_context_data(**kwargs)
         
-        # if there is a redirect URL calculated in get_context_data -- redirect to that URL
+        if self.transaction:
-        if context.get('redirect'):
+            if self.transaction.campaign.type == THANKS:
-            return HttpResponseRedirect(context.get('redirect'))
+                return DownloadView.as_view()(request, work=self.transaction.campaign.work)
         
-        if context['campaign'].type == THANKS:
-            return DownloadView.as_view()(request, work=context['work'])
             else:
                 if request.user.is_authenticated:
+                    if self.user_is_ok():
                         return self.render_to_response(context)
+                    else:
+                         return HttpResponseRedirect(reverse('work', kwargs={'work_id': self.transaction.campaign.work.id}))
                 else:
                     return redirect_to_login(request.get_full_path())
+        else:
+            return HttpResponseRedirect(reverse('home'))
+    
+    def user_is_ok(self):
+        if not self.transaction:
+            return False   
+        if self.transaction.campaign.type == THANKS and self.transaction.user == None:
+            # to handle anonymous donors- leakage not an issue
+            return True
+        else: 
+            return self.request.user.id == self.transaction.user.id
         
             
 
     def get_context_data(self):
         # pick up all get and post parameters and display
         context = super(FundCompleteView, self).get_context_data()
+        self.transaction = None
         
         # pull out the transaction id and try to get the corresponding Transaction
-        transaction_id = self.request.REQUEST.get("tid", "")
+        transaction_id = self.request.REQUEST.get("tid")
         
-        # be more forgiving of tid --> e.g., if there is a trailing "/"
+        if not transaction_id:
-        
-        g = re.search("^(\d+)(\/?)$", transaction_id)
-        if g:
-            transaction_id=g.group(1)
-        else: # error -- redirect to home page
-            context['redirect'] = reverse('home')
             return context
+        try:
+            self.transaction = Transaction.objects.get(id=transaction_id)
+        except (ValueError, Transaction.DoesNotExist):
+            self.transaction = None
             
-        transaction = Transaction.objects.get(id=transaction_id)
+        if not self.transaction:
-        # if there is no valid transaction, redirect home
-        if not transaction:
-            context['redirect'] = reverse('home')
             return context
         
         # work and campaign in question
         try:
-            campaign = transaction.campaign
+            campaign = self.transaction.campaign
             work = campaign.work
         except Exception, e:
             campaign = None
@@ -1567,28 +1575,20 @@ class FundCompleteView(TemplateView):
             
         # # we need to check whether the user tied to the transaction is indeed the authenticated user.
         
-        if transaction.campaign.type == THANKS and transaction.user == None:
+        if not self.user_is_ok():
-            pass
-        elif self.request.user.id != transaction.user.id:
-            # let's redirect user to the work corresponding to the transaction if we can
-            if work:
-                context['redirect'] = reverse('work', kwargs={'work_id': work.id})
-            else:
-                context['redirect'] = reverse('home')
-                
             return context
         
         # add the work corresponding to the Transaction on the user's wishlist if it's not already on the wishlist
-        if transaction.user is not None and (campaign is not None) and (work is not None):
+        if self.transaction.user is not None and (campaign is not None) and (work is not None):
-            transaction.user.wishlist.add_work(work, 'pledging', notify=True)
+            self.transaction.user.wishlist.add_work(work, 'pledging', notify=True)
 
         #put info into session for download page to pick up.
-        self.request.session['amount']= transaction.amount
+        self.request.session['amount']= self.transaction.amount
-        if transaction.receipt:
+        if self.transaction.receipt:
-            self.request.session['receipt']= transaction.receipt
+            self.request.session['receipt']= self.transaction.receipt
                 
             
-        context["transaction"] = transaction
+        context["transaction"] = self.transaction
         context["work"] = work
         context["campaign"] = campaign
         context["faqmenu"] = "complete"