Merge lp:~mhall119/awstrial/add-logging into lp:~newz/awstrial/logging-tests

[Michael Hall]

Mock out DNS.DnsRequest().req() to immitate a tor exit node match or not

=== modified file 'awstrial/templates/404.html'
--- awstrial/templates/404.html	2011-10-04 15:26:38 +0000
+++ awstrial/templates/404.html	2011-10-20 23:51:23 +0000
@@ -9,6 +9,12 @@
 {% endwith %}
 {% endblock %}
 
+{% block logo_img %}
+{% with '/ubuntu-website/media' as ubuntu_website_media %}
+{{ block.super }}
+{% endwith %}
+{% endblock %}
+
 {% block extrahead %}
 {% with '/media' as MEDIA_URL %}
 {{ block.super }}
@@ -18,6 +24,6 @@
 
 
 {% block content %}
-<h3>Oops!</h3>
-<p>This page could not be found (404)</p>
+<h2>404</h2>
+<p>This page could not be found</p>
 {% endblock %}
 
=== modified file 'awstrial/templates/500.html'
--- awstrial/templates/500.html	2011-10-04 15:26:38 +0000
+++ awstrial/templates/500.html	2011-10-20 23:51:23 +0000
@@ -9,6 +9,12 @@
 {% endwith %}
 {% endblock %}
 
+{% block logo_img %}
+{% with '/ubuntu-website/media' as ubuntu_website_media %}
+{{ block.super }}
+{% endwith %}
+{% endblock %}
+
 {% block extrahead %}
 {% with '/media' as MEDIA_URL %}
 {{ block.super }}
@@ -17,6 +23,6 @@
 {% block main_nav_links %}{% endblock %}
 
 {% block content %}
-<h3>Oops!</h3>
+<h2>500</h2>
 <p>It seems an error has been encountered, we have been informed.  Please try again later.</p>
 {% endblock %}
 
=== modified file 'awstrial/templates/503.html'
--- awstrial/templates/503.html	2011-09-15 15:20:29 +0000
+++ awstrial/templates/503.html	2011-10-20 23:51:23 +0000
@@ -1,7 +1,29 @@
 {% extends "base.html" %}
-{% block header %}
+
+
+{% block title %}Error | Try Ubuntu Cloud Guest{% endblock %}
+
+{% block defaulthead %}
+{% with '/ubuntu-website/media' as ubuntu_website_media %}
+{{ block.super }}
+{% endwith %}
+{% endblock %}
+
+{% block logo_img %}
+{% with '/ubuntu-website/media' as ubuntu_website_media %}
+{{ block.super }}
+{% endwith %}
+{% endblock %}
+
+{% block extrahead %}
+{% with '/media' as MEDIA_URL %}
+{{ block.super }}
+{% endwith %}
 <meta http-equiv="REFRESH" content="0;url=http://ubuntu.com/cloud"></HEAD>
 {% endblock %}
+{% block main_nav_links %}{% endblock %}
+
 {% block content %}
-<h1>There was an error fulfilling the request at this time. Please try again later.</h1>
+<h2>503</h2>
+<p>There was an error fulfilling the request at this time. Please try again later.</p>
 {% endblock %}
 
=== renamed file 'awstrial/templates/cloud-init/byobu-enable' => 'awstrial/templates/cloud-init/byobu-countdown'
--- awstrial/templates/cloud-init/byobu-enable	2010-09-30 12:58:03 +0000
+++ awstrial/templates/cloud-init/byobu-countdown	2011-10-20 23:51:23 +0000
@@ -1,14 +1,9 @@
 #!/bin/sh
-#sudo -Hu ubuntu byobu-launcher-install # single user
-sem="/var/lib/cloud/sem/byobu-enable.${INSTANCE_ID}"
+
+sem="/var/lib/cloud/sem/byobu-countdown.${INSTANCE_ID}"
 [ -e "${sem}" ] && exit 0
 
-debconf-set-selections <<EOF
-byobu byobu/launch-by-default boolean true
-EOF
-dpkg-reconfigure byobu --frontend=noninteractive
-
-# above does it for all users, but below is only for 'ubuntu' user
+# Add AWSTrial countdown widget only for 'ubuntu' user
 sudo -Hu ubuntu sh -c 'mkdir -p ~/.byobu/bin/ &&
    cat > ~/.byobu/bin/1_countdown && chmod +x ~/.byobu/bin/1_countdown' <<"EOF"
 #!/bin/sh
 
=== modified file 'awstrial/templates/cloud-init/info-callback'
--- awstrial/templates/cloud-init/info-callback	2011-10-18 13:58:40 +0000
+++ awstrial/templates/cloud-init/info-callback	2011-10-20 23:51:23 +0000
@@ -6,9 +6,14 @@
 CALLBACK_URL="{{ callback_url }}"
 
 mdurl="http://169.254.169.254/2009-04-04/meta-data/%s"
+
 dumpk="""
 hn=$1; set -e; f=$(mktemp); trap "rm -f '$f'" EXIT;
-ssh-keyscan -t rsa,dsa localhost 2>/dev/null > "$f"
+rkeys="rsa,dsa"; [ -f "/etc/ssh/ssh_host_ecdsa_key" ] && rkeys="$rkeys,ecdsa"
+{% if debug %}
+echo "Requesting fingerprints for: $rkeys" >> /var/log/instance-testing
+{% endif %}
+ssh-keyscan -t "$rkeys" localhost 2>/dev/null > "$f"
 [ -n "${hn}" ] && sed -i "s,localhost,${hn}," "$f"
 ssh-keygen -lf "$f"
 """
 
=== modified file 'awstrial/templates/contacts.html'
--- awstrial/templates/contacts.html	2011-10-04 15:26:38 +0000
+++ awstrial/templates/contacts.html	2011-10-20 23:51:23 +0000
@@ -14,7 +14,7 @@
         <p>We will give you the hostname and you can SSH directly to the instance with your public SSH key on file in <a href=http://launchpad.net>Launchpad</a>.  You will have full <a href=https://help.ubuntu.com/community/RootSudo>sudo (root) access</a>, so take it for an hour-long joyride, install applications, configure services, test your programs, and evaluate the overall experience.  We will terminate and clean up the instance automatically within an hour.</p>
 
         {% if set_password %}
-        <p><em>You do not have ssh keys on file in your launchpad account.  We strongly recommend you follow the documentation mentioned above and add keys to your launchpad account.  Ssh key authentication is much more secure than password authentication.  However, if you would like to launch an instance without using ssh keys, you may do so.  Click 'Launch' below, and you will be generated a one-time use password and forced to change it on first login</em></p>
+        <p><em>You do not have ssh keys on file in your launchpad account.  We strongly recommend you follow the documentation mentioned above and add keys to your launchpad account.  Ssh key authentication is much more secure than password authentication.  However, if you would like to launch an instance without using ssh keys, you may do so.  Click 'Launch' below, and you will be generated a random password which you can then change after login</em></p>
         {% endif %}
         <div id="contact" class="clearfix">
             <div id="c_form">
 
=== modified file 'awstrial/templates/instance.html'
--- awstrial/templates/instance.html	2011-10-18 13:58:40 +0000
+++ awstrial/templates/instance.html	2011-10-20 23:51:23 +0000
@@ -82,7 +82,7 @@
       {% endif %}
     {% else %}
     {% if instance.password %}
-  <p>Your randomly generated one time password is '<b>{{ instance.password }}</b>'.  You will be forced to change that on initial login.</p>
+  <p>Your randomly generated one time password is '<b>{{ instance.password }}</b>'.</p>
     {% endif %}
   <p>You can <a href=https://help.ubuntu.com/community/SSH/OpenSSH/ConnectingTo target="_blank" >SSH</a> to your Cloud Server using:</p>
 <pre>    ssh ubuntu@{{instance.ip}}</pre>
 
=== modified file 'awstrial/trial/auth.py'
--- awstrial/trial/auth.py	2011-10-19 19:20:08 +0000
+++ awstrial/trial/auth.py	2011-10-20 23:51:23 +0000
@@ -41,8 +41,9 @@
     if settings.USER_BLOCK_TOR_GATEWAY:
 
       DNS.ParseResolvConf()
-    
-      client = ".".join(reversed(request.META['REMOTE_ADDR'].strip().split('.')))
+
+      remote_addr = request.META['REMOTE_ADDR']
+      client = ".".join(reversed(remote_addr.strip().split('.')))
 
       TARGET = ".".join(reversed(socket.gethostbyname(request.META['SERVER_NAME']).strip().split('.')))
       PORT = "443"
@@ -54,7 +55,7 @@
 
       if answer.header['status'] == "NOERROR":
         logger = logging.getLogger('root')
-        logger.info('Client %s is using TOR' % client)
+        logger.info('Client %s is using TOR' % remote_addr)
         return True
     return False
 
 
=== modified file 'awstrial/trial/ec2_helper.py'
--- awstrial/trial/ec2_helper.py	2011-10-18 13:58:40 +0000
+++ awstrial/trial/ec2_helper.py	2011-10-20 23:51:23 +0000
@@ -21,6 +21,7 @@
 
 from trial.models import Campaign, Instances
 from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from django.template.loader import render_to_string
 
 from django.conf import settings
@@ -62,8 +63,7 @@
 
     return connection
 
-def runit(campaign,lpid=None,regions=None,config=None, byobu=False,
-          password=None):
+def runit(campaign,lpid=None,regions=None,config=None, password=None):
     sec_key = util.rand_str(32)
     if regions is None:
         regions = [r for r in settings.REGIONS_TRY_ORDER
@@ -72,7 +72,6 @@
                          if settings.REGION2AMI.has_key(r)]
 
     cust = { }
-    cust['byobu'] = False
     cust['config'] = config
     cust['password'] = password
 
@@ -82,8 +81,9 @@
             render_to_string("import-launchpad-ssh-keys",
                 { 'debug' : settings.DEBUG, 'launchpad_id' : lpid, 'password' : password } ),
             part_type=util.CI_SCRIPT, filename="10-launchpad-ssh-keys"))
-    
-    callback_url = "%s/info_callback/%s" % (settings.BASE_URL, sec_key)
+
+    site = Site.objects.get(pk=settings.SITE_ID)
+    callback_url = "%s/info_callback/%s" % (site.name, sec_key)
     parts.append(
         util.partItem(
             render_to_string("info-callback",
@@ -113,12 +113,11 @@
                 { 'debug' : settings.DEBUG, 'user': 'ubuntu', 'password' : password }),
             part_type=util.CI_SCRIPT, filename="55-password-enable"))
 
-    if str(byobu).lower() == "true":
-        parts.append(
-            util.partItem(
-                render_to_string("byobu-enable", { 'debug' : settings.DEBUG, }),
-                part_type=util.CI_BOOTHOOK, filename="byobu-enable"))
-        cust['byobu']=True
+    parts.append(
+        util.partItem(
+            render_to_string("byobu-countdown", { 'debug' : settings.DEBUG, }),
+            part_type=util.CI_BOOTHOOK, filename="byobu-countdown"))
+    cust['byobu']=True
 
     instcfg = None
     for c in settings.CONFIGS:
 
=== modified file 'awstrial/trial/tests.py'
--- awstrial/trial/tests.py	2011-10-20 20:41:18 +0000
+++ awstrial/trial/tests.py	2011-10-20 23:51:23 +0000
@@ -25,6 +25,7 @@
 from django.test import TestCase as DjangoTestCase
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from mock import patch, Mock
 from trial import ec2_helper
 from trial.models import Campaign, Instances
@@ -99,6 +100,7 @@
         self.old_access_key = getattr(settings, 'AWS_ACCESS_KEY_ID', None)
         self.old_secret_key = getattr(settings, 'AWS_SECRET_ACCESS_KEY', None)
         self.old_alternate_cloud = getattr(settings, 'ALTERNATE_CLOUD', None)
+        self.old_site_id = getattr(settings, 'SITE_ID', None)
         settings.AWS_ACCESS_KEY_ID = 'TestAccessKey'
         settings.AWS_SECRET_ACCESS_KEY = 'TestSecretKey'
         settings.ALTERNATE_CLOUD = None
@@ -107,6 +109,7 @@
         settings.AWS_ACCESS_KEY_ID = self.old_access_key
         settings.AWS_SECRET_ACCESS_KEY = self.old_secret_key
         settings.ALTERNATE_CLOUD = self.old_alternate_cloud
+        settings.SITE_ID = self.old_site_id
 
     def call_run_instance(self, campaign):
         post_data = {
@@ -117,6 +120,63 @@
         return self.client.post('/%s/run/' % campaign.name, post_data)
 
     @patch('boto.ec2.EC2Connection')
+    def test_uses_sites_framework(self, mock_connection):
+        """
+        Checks that the callback url is based off the Site.name for this
+        configuration
+        """
+
+        newsite = Site.objects.create(
+            domain='testing.awstrial.org',
+            name='http://testing.awstrial.org:8000',
+        )
+        settings.SITE_ID = newsite.id
+        self.call_count=0
+        class MockInstance(object):
+        
+            def __init__(self, instance_id):
+                self.id = instance_id
+                
+        class MockReservation(object):
+        
+            def __init__(self, instance_ids):
+                self.instances = [MockInstance(i) for i in instance_ids]
+        
+        campaign = Campaign.objects.create(
+            name='test-campaign',
+            verbose_name='Test Campaign',
+            max_instances=5,
+            active=True,
+        )
+        
+        def mock_run_instances(conn, *args, **kwargs):
+            self.call_count += 1
+            self.assertTrue('user_data' in kwargs)
+
+            import StringIO, gzip, email
+            gzipped_mime_data = StringIO.StringIO()
+            gzipped_mime_data.write(kwargs['user_data'])
+            gzipped_mime_data.seek(0)
+            gzipped_mime_file = gzip.GzipFile(fileobj=gzipped_mime_data, mode='r')
+            mime_data = gzipped_mime_file.read()
+            mime_msg = email.message_from_string(mime_data)
+            self.assertTrue(mime_msg.is_multipart())
+
+            for mime_part in mime_msg.get_payload():
+                if mime_part.get_filename() == '99-info-callback':
+                    self.assertTrue('http://testing.awstrial.org:8000/info_callback/' in mime_part.get_payload())
+
+            return MockReservation(['i-test-%s'%self.call_count])
+        mock_connection.return_value.run_instances.side_effect = mock_run_instances
+        
+        user = User.objects.create_user('testuser', '[e-mail]', 'testpasswd')
+        self.client.login(username='testuser', password='testpasswd')
+        
+        response = self.call_run_instance(campaign)
+        self.assertEquals(1, Instances.objects.all().count())
+        instance = Instances.objects.all()[0]
+
+    @patch('boto.ec2.EC2Connection')
     def test_disallow_multiple_instances(self, mock_connection):
         """
         Checks that a user can't create multiple isntances by making requests
@@ -333,11 +393,16 @@
         super(LogHandlerTestCase, self).setUp()
         self.memento_handler = self.MementoHandler()
         self.root_logger = logging.getLogger()
+        self.root_logger.setLevel(logging.INFO)
         self.root_logger.addHandler(self.memento_handler)
+        self.old_block_tor = settings.USER_BLOCK_TOR_GATEWAY
+        self.old_block_email = settings.USER_BLOCK_EMAIL_BLACKLIST
 
     def tearDown(self):
         """Remove the memento handler from the root logger."""
         self.root_logger.removeHandler(self.memento_handler)
+        settings.USER_BLOCK_TOR_GATEWAY = self.old_block_tor
+        settings.USER_BLOCK_EMAIL_BLACKLIST = self.old_block_email
         super(LogHandlerTestCase, self).tearDown()
 
     def assertLogLevelContains(self, level, message, with_exc_info=False):
@@ -346,19 +411,25 @@
         self.assertTrue(
             self.memento_handler.check(level, message, with_exc_info))
 
-    def test_client_using_tor(self):
+    @patch('DNS.DnsRequest')
+    def test_client_using_tor(self, mock_dns_request):
         # verify that a client that is a TOR exit node is blocked
-        tor_exit = socket.gethostbyname('ip-port.exitlist.torproject.org')
+        settings.USER_BLOCK_TOR_GATEWAY = True
         request = MockRequest()
         request.META['SERVER_NAME'] = '127.0.0.1'
-        request.META['REMOTE_ADDR'] = tor_exit
+        request.META['REMOTE_ADDR'] = '127.0.0.2'
+        mock_dns_request.return_value.req.side_effect = type('answer', (), {'header': {'status': 'NOERROR'}})
         self.assertTrue(client_using_tor(request))
+        self.assertLogLevelContains('INFO', 'Client 127.0.0.2 is using TOR')
     
-    def test_client_not_using_tor(self):
+    @patch('DNS.DnsRequest')
+    def test_client_not_using_tor(self, mock_dns_request):
         # verify that a client that is not a TOR exit node is not blocked
-        me = socket.gethostname()
+        settings.USER_BLOCK_TOR_GATEWAY = True
         request = MockRequest()
         request.META['SERVER_NAME'] = '127.0.0.1'
-        request.META['REMOTE_ADDR'] = me
+        request.META['REMOTE_ADDR'] = '127.0.0.2'
+        mock_dns_request.return_value.req.side_effect = type('answer', (), {'header': {'status': 'ERROR'}})
         self.assertFalse(client_using_tor(request))
+        self.assertFalse(self.memento_handler.check('INFO', 'Client 127.0.0.2 is using TOR'))
 
 
=== modified file 'awstrial/trial/views.py'
--- awstrial/trial/views.py	2011-10-18 20:11:39 +0000
+++ awstrial/trial/views.py	2011-10-20 23:51:23 +0000
@@ -86,14 +86,13 @@
                     else:
                         regions = settings.REGIONS_TRY_ORDER
                     config = request.POST.get('config', '')
-                    byobu = request.POST.get('byobu','')
                     set_password = request.POST.get('set_password',None)
 
                     password=None
                     if set_password:
                         password=util.rand_user_password()
 
-                    ec2_helper.runit(campaign,lpid=request.user, regions=regions, config=config, byobu=byobu, password=password)
+                    ec2_helper.runit(campaign,lpid=request.user, regions=regions, config=config, password=password)
                     #send_mail(subject, message, from_email, ['[e-mail]'])
                     #except BadHeaderError:   #Example of basic error handling
                     #	return HttpResponse('Invalid header found.')