From 8609ad03805edb0b71f401aee46f80f898a59098 Mon Sep 17 00:00:00 2001
From: Michael Elkins <melkins@tislabs.com>
Date: Tue, 8 Jan 2013 17:46:22 +0000
Subject: merge ^/branches/tk325

svn path=/trunk/; revision=4957
---
 rpkid/rpki/gui/app/templates/app/dashboard.html | 33 ++++++++++++++++++++-----
 rpkid/rpki/gui/app/views.py                     | 18 +++++++++++++-
 2 files changed, 44 insertions(+), 7 deletions(-)

(limited to 'rpkid/rpki/gui')

diff --git a/rpkid/rpki/gui/app/templates/app/dashboard.html b/rpkid/rpki/gui/app/templates/app/dashboard.html
index b6a7a9cb..0af4bae6 100644
--- a/rpkid/rpki/gui/app/templates/app/dashboard.html
+++ b/rpkid/rpki/gui/app/templates/app/dashboard.html
@@ -65,6 +65,7 @@
     <p>The following resources have not been allocated to a child, nor appear in a ROA.
 
     {% if unused_asns %}
+    <h3>ASNs</h3>
     <ul>
       {% for asn in unused_asns %}
       <li>AS{{ asn }}
@@ -73,19 +74,39 @@
     {% endif %}
 
     {% if unused_prefixes %}
-    <ul>
+    <h3>IPv4</h3>
+    <table class="table table-condensed table-striped">
+      <tr><th>Prefix</th><th>Action</th></tr>
       {% for addr in unused_prefixes %}
-      <li>{{ addr }}
+      <tr>
+	<td>{{ addr }}</td>
+	<td>
+	  {# if addr can be represented as a prefix, add a button for issuing a roa #}
+	  {% if addr.is_prefix %}
+	  <a class="btn btn-mini" title="Create ROA using this prefix" href="{% url rpki.gui.app.views.roa_create %}?prefix={{ addr }}">ROA</a>
+	  {% endif %}
+	</td>
+      </tr>
       {% endfor %} <!-- addrs -->
-    </ul>
+    </table>
     {% endif %}
 
     {% if unused_prefixes_v6 %}
-    <ul>
+    <h3>IPv6</h3>
+    <table class="table table-condensed table-striped">
+      <tr><th>Prefix</th><th></th></tr>
       {% for addr in unused_prefixes_v6 %}
-      <li>{{ addr }}
+      <tr>
+	<td>{{ addr }}</td>
+	<td>
+	  {# if addr can be represented as a prefix, add a button for issuing a roa #}
+	  {% if addr.is_prefix %}
+	  <a class="btn btn-mini" title='create roa using this prefix' href="{% url rpki.gui.app.views.roa_create %}?prefix={{ addr }}">roa</a>
+	  {% endif %}
+	</td>
+      </tr>
       {% endfor %} <!-- addrs -->
-    </ul>
+    </table>
     {% endif %}
 
   </div><!-- /span -->
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index fc1e9cce..535ffe6c 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -38,6 +38,7 @@ from rpki.gui.app import models, forms, glue, range_list
 from rpki.resource_set import (resource_range_as, resource_range_ipv4,
                                resource_range_ipv6, roa_prefix_ipv4)
 from rpki import sundial
+import rpki.exceptions
 
 from rpki.gui.cacheview.models import ROAPrefixV4, ROA
 from rpki.gui.routeview.models import RouteOrigin
@@ -195,6 +196,16 @@ def dashboard(request):
     my_prefixes_v6 = range_list.RangeList([obj.as_resource_range() for obj in prefixes_v6])
 
     unused_prefixes = my_prefixes.difference(used_prefixes)
+    # monkey-patch each object with a boolean value indicating whether or not
+    # it is a prefix.  We have to do this here because in the template there is
+    # no way to catch the MustBePrefix exception.
+    for x in unused_prefixes:
+        try:
+            x.prefixlen()
+            x.is_prefix = True
+        except rpki.exceptions.MustBePrefix:
+            x.is_prefix = False
+
     unused_prefixes_v6 = my_prefixes_v6.difference(used_prefixes_v6)
 
     clients = models.Client.objects.all() if request.user.is_superuser else None
@@ -487,7 +498,12 @@ def roa_create(request):
                            'max_prefixlen': max_prefixlen,
                            'routes': routes})
     else:
-        form = forms.ROARequest()
+        # pull initial values from query parameters
+        d = {}
+        for s in ('asn', 'prefix'):
+            if s in request.GET:
+                d[s] = request.GET[s]
+        form = forms.ROARequest(initial=d)
 
     return render(request, 'app/roarequest_form.html', {'form': form})
 
-- 
cgit v1.2.3


From e065bbc64b4dc3fc51387eb5275ece174baf8242 Mon Sep 17 00:00:00 2001
From: Michael Elkins <melkins@tislabs.com>
Date: Thu, 31 Jan 2013 01:13:24 +0000
Subject: require a connection secured with TLS, otherwise return a HTTP 500
 error

closes #401

svn path=/branches/tk401/; revision=4985
---
 rpkid/rpki/gui/app/templates/base.html             |  2 +-
 .../rpki/gui/app/templates/registration/login.html |  2 +-
 rpkid/rpki/gui/app/views.py                        |  2 ++
 rpkid/rpki/gui/decorators.py                       | 31 ++++++++++++++++++++++
 rpkid/rpki/gui/urls.py                             |  4 +--
 rpkid/rpki/gui/views.py                            | 30 +++++++++++++++++++++
 6 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 rpkid/rpki/gui/decorators.py
 create mode 100644 rpkid/rpki/gui/views.py

(limited to 'rpkid/rpki/gui')

diff --git a/rpkid/rpki/gui/app/templates/base.html b/rpkid/rpki/gui/app/templates/base.html
index 0af1d241..89aa0b9a 100644
--- a/rpkid/rpki/gui/app/templates/base.html
+++ b/rpkid/rpki/gui/app/templates/base.html
@@ -24,7 +24,7 @@
 	  {% if user.is_authenticated %}
 	    <li><p class="navbar-text">Logged in as {{ user }}</li>
 	    <li class="divider-vertical"></li>
-	    <li><a href="{% url django.contrib.auth.views.logout %}">Log Out</a></li>
+	    <li><a href="{% url rpki.gui.views.logout %}">Log Out</a></li>
 	  {% endif %}
 	  </ul>
 	</div>
diff --git a/rpkid/rpki/gui/app/templates/registration/login.html b/rpkid/rpki/gui/app/templates/registration/login.html
index 27ad21cf..d2ee9468 100644
--- a/rpkid/rpki/gui/app/templates/registration/login.html
+++ b/rpkid/rpki/gui/app/templates/registration/login.html
@@ -8,7 +8,7 @@
 </div>
 {% endif %}
 
-<form method="post" action="{% url django.contrib.auth.views.login %}">
+<form method="post" action="{% url rpki.gui.views.login %}">
   {% csrf_token %}
 
   <div class="clearfix">
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index 535ffe6c..2d674c95 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -42,6 +42,7 @@ import rpki.exceptions
 
 from rpki.gui.cacheview.models import ROAPrefixV4, ROA
 from rpki.gui.routeview.models import RouteOrigin
+from rpki.gui.decorators import tls_required
 
 
 def superuser_required(f):
@@ -63,6 +64,7 @@ def handle_required(f):
 
     """
     @login_required
+    @tls_required
     def wrapped_fn(request, *args, **kwargs):
         if 'handle' not in request.session:
             if request.user.is_superuser:
diff --git a/rpkid/rpki/gui/decorators.py b/rpkid/rpki/gui/decorators.py
new file mode 100644
index 00000000..69d20c46
--- /dev/null
+++ b/rpkid/rpki/gui/decorators.py
@@ -0,0 +1,31 @@
+# Copyright (C) 2013  SPARTA, Inc. a Parsons Company
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND SPARTA DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL SPARTA BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+__version__ = '$Id$'
+
+from django import http
+
+
+def tls_required(f):
+    """Decorator which returns a 500 error if the connection is not secured
+    with TLS (https).
+
+    """
+    def _tls_required(request, *args, **kwargs):
+        if not request.is_secure():
+            return http.HttpResponseServerError(
+                'This resource may only be accessed securely via https',
+                content_type='text/plain')
+        return f(request, *args, **kwargs)
+    return _tls_required
diff --git a/rpkid/rpki/gui/urls.py b/rpkid/rpki/gui/urls.py
index 52949b73..58e2ea9f 100644
--- a/rpkid/rpki/gui/urls.py
+++ b/rpkid/rpki/gui/urls.py
@@ -30,7 +30,7 @@ urlpatterns = patterns('',
     (r'^cacheview/', include('rpki.gui.cacheview.urls')),
     (r'^rpki/', include('rpki.gui.app.urls')),
 
-    (r'^accounts/login/$', 'django.contrib.auth.views.login'),
-    (r'^accounts/logout/$', 'django.contrib.auth.views.logout',
+    (r'^accounts/login/$', 'rpki.gui.views.login'),
+    (r'^accounts/logout/$', 'rpki.gui.views.logout',
         {'next_page': '/rpki/'}),
 )
diff --git a/rpkid/rpki/gui/views.py b/rpkid/rpki/gui/views.py
new file mode 100644
index 00000000..5c62cf62
--- /dev/null
+++ b/rpkid/rpki/gui/views.py
@@ -0,0 +1,30 @@
+# Copyright (C) 2013  SPARTA, Inc. a Parsons Company
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND SPARTA DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL SPARTA BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+__version__ = '$Id$'
+
+import django.contrib.auth.views
+from rpki.gui.decorators import tls_required
+
+
+@tls_required
+def login(request, *args, **kwargs):
+    "Wrapper around django.contrib.auth.views.login to force use of TLS."
+    return django.contrib.auth.views.login(request, *args, **kwargs)
+
+
+@tls_required
+def logout(request, *args, **kwargs):
+    "Wrapper around django.contrib.auth.views.logout to force use of TLS."
+    return django.contrib.auth.views.login(request, *args, **kwargs)
-- 
cgit v1.2.3