diff --git a/website/html/media/scripts/register.js b/website/html/media/scripts/register.js
index 55d3365..87067d0 100644
--- a/website/html/media/scripts/register.js
+++ b/website/html/media/scripts/register.js
@@ -1,24 +1,24 @@
-/*
-	Edited by: Gaetano Pressimone
-	Last Modfied: Sept 20 2012
-*/
-$(document).ready(function() {
-	toggle_upload();
-	get_resources_loading_indicator();
-	$("#id_gen_upload_choice").change(toggle_upload);
-});
-
-function toggle_upload() {
-	if ($("#id_gen_upload_choice").val() == "1") {
-		$("#uploadkey").hide();
-	} else {
-		$("#uploadkey").show();
-	}
-}
-/* Disables submit button on press and shows the loading icon */
-function get_resources_loading_indicator() {
-	$("#middle > form").submit(function () {
-		$('input:submit').attr("disabled", true);
-		$("#loading_indicator").css('visibility', 'visible');
-	});
+/*
+	Edited by: Gaetano Pressimone
+	Last Modfied: Sept 20 2012
+*/
+$(document).ready(function() {
+	toggle_upload();
+	get_resources_loading_indicator();
+	$("#id_gen_upload_choice").change(toggle_upload);
+});
+
+function toggle_upload() {
+	if ($("#id_gen_upload_choice").val() == "1") {
+		$("#uploadkey").hide();
+	} else {
+		$("#uploadkey").show();
+	}
+}
+/* Disables submit button on press and shows the loading icon */
+function get_resources_loading_indicator() {
+	$("#middle > form").submit(function () {
+		$('input:submit').attr("disabled", true);
+		$("#loading_indicator").css('visibility', 'visible');
+	});
 }
\ No newline at end of file
diff --git a/website/html/templates/control/profile.html b/website/html/templates/control/profile.html
index 164ac88..fc480d3 100755
--- a/website/html/templates/control/profile.html
+++ b/website/html/templates/control/profile.html
@@ -1,304 +1,304 @@
-{% extends "control/control_base.html" %}
-
-{% comment %}
-<Program>
-  profile.html
-  
-<Author>
-  Originally by?:
-  Justin Samuel 2009
-
-  Modified:
-  Gaetano Pressimone Aug 2012
-  
-<Purpose>
-  Django template file for Seattle Clearinghouse's 'Profile' page.  The page 
-  shows user information and also allows editing of certain user fields.
-
-<extends>
-  control/control_base.html
-
-<Stylesheet>
-  common.css
-  profile.css
-
-<Scripts>
-  edit_profile.js
-
-<Template Variables>
-  email_form:
-    The form to change a user's email address.
-
-  affiliation_form:
-    The form to change a user's affiliation.
-
-  password_form:
-    The form to change a user's password.
-
-  username:
-		The currently logged in user.
-
-  affiliation: 
-		The logged in user's affiliation.
-
-  email: 
-		The logged in user's email address.
-
-  port:
-		The logged in user's port number.
-
-  api_key: 
-		The logged in user's api key.
-
-  has_privkey: 
-		Boolean value regarding if a user has deleted his private key or not.
-
-  info:
-		Message related to profile actions example-changing password.
-
-  error_msg:
-		Error message related to profile actions.
-
-  messages:
-    Django Social Auth error msg.
-
-  social_auth
-    Object containing info related to the logged in user's OpenID/OAuth
-    assocations.
-    .not_associated
-      All openid/oauth providers not associated with the logged in user.
-    .backends
-      All associated backends(facebook etc.) from the logged in user.
-    .associated
-      All associated backends organized by type (.oauth, .openid, .oauth2).
-
-{% endcomment %}
-
-{% block style %}
-{{ block.super }}
-<link href="{{ MEDIA_URL }}css/profile.css" rel="stylesheet" type="text/css" />
-{% endblock style %}
-
-{% block script %}
-{{ block.super }}
-<script type="text/javascript" src="{{ MEDIA_URL }}scripts/edit_profile.js" charset="utf-8"></script>
-{% endblock script %}
-
-{% block title %}
-Profile - {{ TESTBED }} {{ CLEARINGHOUSE }}
-{% endblock title %}
-
-{% block nav_profile %}
-<td class="active"><a href="{% url 'profile' %}">Profile</a></td>
-{% endblock nav_profile %}
-
-{% block content %}
-	<div id="main">
-		<div id="middle">
-		
-			<div id="download">
-				<a href="Set link to actual file!"><img src="{{ MEDIA_URL }}images/download_demokit.jpg" alt="Download {{ DEMOKIT }}"/>Download {{ DEMOKIT }} <br>Admin, set link!</a>
-			</div>
-			
-		   <table class="profile">          
-				{% if info %}
-				<tr class="even">
-					<td colspan="2">
-						<div id="info">{{ info }}</div>
-					</td>
-				</tr>
-				{% endif %}
-				{% if password_form.non_field_errors or email_form.errors or affiliation_form.errors or error_msg or messages %}
-				<tr class="even">
-					<td colspan="2">
-						<div id="error_msg">
-							{{ password_form.non_field_errors }}
-							{{ email_form.email.errors }}
-							{{ affiliation_form.affiliation.errors }}
-							{{ error_msg }}
-							{% for msg in messages %}
-								{% if msg.message %}
-									{{ msg.message }} ({{ msg.extra_tags }})
-								{% endif %}
-							{% endfor %}
-						</div>
-					</td>
-				</tr>
-				{% endif %}
-			    <tr class="odd">
-					<td class="key">Username</td>
-					<td class="value">{{ username }}</td>
-			    </tr>
-			    <tr class="even">
-					<td class="key">Password</td>
-					<td class="value"> <button class="edit" type="button" title="Password">Edit</button>
-						<span class="value">********</span>
-						<span class="hide_this">
-							<form action="{% url 'profile' %}" method="post">{% csrf_token %}
-								<table id="edit_password">
-									<tr>
-										<td>Enter password: </td>
-										<td class="field"> {{ password_form.password1 }}</td>
-									</tr>
-									<tr>
-										<td>Confirm password: </td>
-										<td class="field"> {{ password_form.password2 }} <input type="submit" value="Save"/> </td>
-									</tr>
-								</table>
-							</form>
-						</span>	
-					</td>
-			    </tr>
-			    <tr class="odd">
-					<td class="key">Affiliation</td>
-					<td class="value">
-						<span class="value">{{ affiliation }}</span>
-						<span class="hide_this">
-							<form  action="{% url 'profile' %}" method="post">{% csrf_token %}
-								{{ affiliation_form.affiliation }}
-								<input type="submit" value="Save"/>
-							</form>
-						</span>
-						<button class="edit" type="button" title="Affiliation">Edit</button>
-					</td>
-				</tr>
-				<tr class="even">
-					<td class="key">E-mail Address<img class="help" src="{{ MEDIA_URL }}images/help-icon.png"title="If you forget your password this email will be used to recover your account. The {{ CLEARINGHOUSE }} does not use your email for anything else."/></td>
-					<td class="value">
-						<span class="value" >{{ email }} </span>
-						<span class="hide_this">
-							<form action="{% url 'profile' %}" method="post">{% csrf_token %}
-								{{ email_form.email }}
-								<input type="submit" value="Save"/>
-							</form>
-						</span>
-						<button class="edit" type="button"title="E-mail">Edit</button>
-					</td>
-				</tr>
-				<tr class="odd">
-					<td class="key">API Key
-						<img class="help" src="{{ MEDIA_URL }}images/help-icon.png"title="The {{ CLEARINGHOUSE }} offers an API key that allows applications to perform actions on your behalf, such as acquiring, releasing, and renewing vessels.  If this key is lost or stolen, you can reset it at any time."/></td>
-					<td class="value api_cell"> 
-							<span class="api_cell" title="double click to show"><i>double click to show</i></span>
-							<span id="api_key" class="hide_this" title="double click to hide">{{ api_key }}</span>
-							<form action="{% url 'api_info' %}" method="post">{% csrf_token %}
-							<input type="hidden" name="generate_api_key" value="yes"/>
-							<button id="generate_api" type="submit"title="In some cases you may want to generate a new API key (for example, if you accidentally left your old one in a file that you shared publicly). Generating a new API key will make your old API key no longer work.">Generate new API Key</button>
-							</form>
-					</td>
-				</tr>
-				<tr class="even">
-					<td class="key">Port <img class="help" src="{{ MEDIA_URL }}images/help-icon.png"title="This indicates a port number that by default will be available for TCP / UDP on all of your acquired vessels."/></td>
-					<td class="value">{{ port }}</td>
-				</tr>
-				<tr class="odd">
-					<td class="key">Linked Accounts<img class="help" src="{{ MEDIA_URL }}images/help-icon.png"title="When you link an account you may then use it to log in to the {{ CLEARINGHOUSE }}."/></td>
-					<td class="value">
-					      
-        	  {% for type, accounts in social_auth.associated.items %}
-  					  {% for account in accounts %}
-								{% if account.provider == "facebook"%}
-									<img src="{{ MEDIA_URL }}images/Facebook-icon.png" title="Facebook account linked" />
-								{% endif %}
-								{% if account.provider == "google"%}
-									<img src="{{ MEDIA_URL }}images/google-icon.png" title="Gmail account linked" />
-								{% endif %}
-								{% if account.provider == "github"%}
-									<img src="{{ MEDIA_URL }}images/github-icon.png" title="Github account linked" />
-								{% endif %}
-								{% if account.provider == "live"%}
-									<img src="{{ MEDIA_URL }}images/windows-icon.png" title="Windows Live account linked" />
-								{% endif %}
-								{% if account.provider == "yahoo"%}
-									<img src="{{ MEDIA_URL }}images/yahoo-icon.png" title="Yahoo account linked" />
-								{% endif %}
-     						 {% comment %}  <span class="disconnect">
-											<a href={% url 'socialauth_disconnect_individual' account.provider account.id %}>
-												{{ account.provider|title }} (ID {{ account.id }})<br/></a></span> 
-								 {% endcomment %}
-   					 {% endfor %}
- 					 {% endfor %}
-					
-				{% for name, accounts in social_auth.not_associated.items %}
-					{% for name in accounts %}
-				  	<a rel="nofollow" href="{% url 'socialauth_begin' name %}">
-				    	{% if name == "facebook"%}
-				  		 <img src="{{ MEDIA_URL }}images/bw-Facebook-icon.png" title="A Facebook account is not yet associated, click to link it!"/>
-					    {% endif %}
-				    	{% if name == "google"%}
-					    	<img src="{{ MEDIA_URL }}images/bw-google-icon.png" title="A Google account is not yet associated, click to link it!"/>
-				    	{% endif %}
-				    	{% if name == "github"%}
-				    		<img src="{{ MEDIA_URL }}images/bw-github-icon.png" title="A Github account is not yet associated, click to link it!"/>
-			    		{% endif %}
-			    		{% if name == "live"%}
-			    			<img src="{{ MEDIA_URL }}images/bw-windows-icon.png" title="A Windows Live account is not yet associated, click to link it!"/>
-			    		{% endif %}
-			    		{% if name == "yahoo"%}
-				    		<img src="{{ MEDIA_URL }}images/bw-yahoo-icon.png" title="A Yahoo account is not yet associated, click to link it!"/>
-				    	{% endif %}
-			  		</a>
-			  	{% endfor %}
-  	  	{% endfor %}
-				  </td>
-		    	</table> <br/>
-		<table class="profile">
-			<tr>
-				<td><h3>Your Keys</h3></td>
-				<td> <form id="change_key" action="{% url 'change_key' %}" method="post"style="display:inline;">{% csrf_token %}
-					<input type="hidden" name="generate" value="yes"/>
-					<button id="generate_keypair" type="submit" title="The {{ CLEARINGHOUSE }} can generate a new key pair for you. After it is generated, you will need to download your public and private keys again." style=""> Generate new Key Pair</button>
-						</form>
-			</td> 
-			</tr>
-		</table>
-	<h1></h1>
-		<table class="profile">
-			<tr class="odd">
-				<td class="key">Public Key
-					<img class="help" src="{{ MEDIA_URL }}images/help-icon.png"
-								title="If you have generated a key pair on your own computer(for example, using Seash), you can upload your public key here. Do not upload your private key."/></td>
-				<td class="value">
-					<span class="value">********</span>
-					<span class="hide_this">
-						<button type="button" class="cancel" title="Cancel"> Cancel </button>
-						<form action="{% url 'change_key' %}" method="post" enctype="multipart/form-data">{% csrf_token %}
-							<input type="file" name="pubkey"/> <button type="submit" title="Upload a public key">Upload</button>
-						</form>
-					</span>
-					<form method="post" action="{% url 'pub_key' %}" id="download_pubkey_form">{% csrf_token %}
-						<button type="submit" class="download" title="Download your public key"> Download </button>
-					 </form>
-						<button id="show_keyform" type="button" title="Upload a public key"> Upload </button>
-				</td>
-			</tr>
-				{% if has_privkey %}
-				<tr class="even">
-					<td class="key">Private Key <img class="help" src="{{ MEDIA_URL }}images/red-help-icon.png"title="The {{ CLEARINGHOUSE }} does not need your private key to provide you access to vessels.  You may wish to download this key and then delete it from the server."/></td>
-					<td class="value">********<a href="#">
-						<form class="inline" method="post" action="{% url 'priv_key' %}">{% csrf_token %}
-							<button type="submit" title="Download your private key">Download </button>
-						</form>
-						<form class="inline" method="post" action="{% url 'del_priv' %}">{% csrf_token %}
-							<input type="hidden" name="keyToDelete" value={{ username }}/>
-							<button id="delete" type="submit" title="Delete your private key">Delete </button>
-						</form>
-					</td>
-				</tr>
-				<tr class="odd">
-					<td colspan="2">
-            <img id="up_arrow" src="{{ MEDIA_URL }}/images/red-up-arrow.png" />
-						<p class="warning"> For better
-						security we recommend that you
-						download and delete your 
-						private key from the 
-						server. Always store your 
-						private key in a secure 
-						location. </p>
-					</td>
-				</tr>
-				{% endif %}
-			</table>
-		</div>
-	</div>
-{% endblock content %}
+{% extends "control/control_base.html" %}
+
+{% comment %}
+<Program>
+  profile.html
+  
+<Author>
+  Originally by?:
+  Justin Samuel 2009
+
+  Modified:
+  Gaetano Pressimone Aug 2012
+  
+<Purpose>
+  Django template file for Seattle Clearinghouse's 'Profile' page.  The page 
+  shows user information and also allows editing of certain user fields.
+
+<extends>
+  control/control_base.html
+
+<Stylesheet>
+  common.css
+  profile.css
+
+<Scripts>
+  edit_profile.js
+
+<Template Variables>
+  email_form:
+    The form to change a user's email address.
+
+  affiliation_form:
+    The form to change a user's affiliation.
+
+  password_form:
+    The form to change a user's password.
+
+  username:
+		The currently logged in user.
+
+  affiliation: 
+		The logged in user's affiliation.
+
+  email: 
+		The logged in user's email address.
+
+  port:
+		The logged in user's port number.
+
+  api_key: 
+		The logged in user's api key.
+
+  has_privkey: 
+		Boolean value regarding if a user has deleted his private key or not.
+
+  info:
+		Message related to profile actions example-changing password.
+
+  error_msg:
+		Error message related to profile actions.
+
+  messages:
+    Django Social Auth error msg.
+
+  social_auth
+    Object containing info related to the logged in user's OpenID/OAuth
+    assocations.
+    .not_associated
+      All openid/oauth providers not associated with the logged in user.
+    .backends
+      All associated backends(facebook etc.) from the logged in user.
+    .associated
+      All associated backends organized by type (.oauth, .openid, .oauth2).
+
+{% endcomment %}
+
+{% block style %}
+{{ block.super }}
+<link href="{{ MEDIA_URL }}css/profile.css" rel="stylesheet" type="text/css" />
+{% endblock style %}
+
+{% block script %}
+{{ block.super }}
+<script type="text/javascript" src="{{ MEDIA_URL }}scripts/edit_profile.js" charset="utf-8"></script>
+{% endblock script %}
+
+{% block title %}
+Profile - {{ TESTBED }} {{ CLEARINGHOUSE }}
+{% endblock title %}
+
+{% block nav_profile %}
+<td class="active"><a href="{% url 'profile' %}">Profile</a></td>
+{% endblock nav_profile %}
+
+{% block content %}
+	<div id="main">
+		<div id="middle">
+		
+			<div id="download">
+				<a href="Set link to actual file!"><img src="{{ MEDIA_URL }}images/download_demokit.jpg" alt="Download {{ DEMOKIT }}"/>Download {{ DEMOKIT }} <br>Admin, set link!</a>
+			</div>
+			
+		   <table class="profile">          
+				{% if info %}
+				<tr class="even">
+					<td colspan="2">
+						<div id="info">{{ info }}</div>
+					</td>
+				</tr>
+				{% endif %}
+				{% if password_form.non_field_errors or email_form.errors or affiliation_form.errors or error_msg or messages %}
+				<tr class="even">
+					<td colspan="2">
+						<div id="error_msg">
+							{{ password_form.non_field_errors }}
+							{{ email_form.email.errors }}
+							{{ affiliation_form.affiliation.errors }}
+							{{ error_msg }}
+							{% for msg in messages %}
+								{% if msg.message %}
+									{{ msg.message }} ({{ msg.extra_tags }})
+								{% endif %}
+							{% endfor %}
+						</div>
+					</td>
+				</tr>
+				{% endif %}
+			    <tr class="odd">
+					<td class="key">Username</td>
+					<td class="value">{{ username }}</td>
+			    </tr>
+			    <tr class="even">
+					<td class="key">Password</td>
+					<td class="value"> <button class="edit" type="button" title="Password">Edit</button>
+						<span class="value">********</span>
+						<span class="hide_this">
+							<form action="{% url 'profile' %}" method="post">{% csrf_token %}
+								<table id="edit_password">
+									<tr>
+										<td>Enter password: </td>
+										<td class="field"> {{ password_form.password1 }}</td>
+									</tr>
+									<tr>
+										<td>Confirm password: </td>
+										<td class="field"> {{ password_form.password2 }} <input type="submit" value="Save"/> </td>
+									</tr>
+								</table>
+							</form>
+						</span>	
+					</td>
+			    </tr>
+			    <tr class="odd">
+					<td class="key">Affiliation</td>
+					<td class="value">
+						<span class="value">{{ affiliation }}</span>
+						<span class="hide_this">
+							<form  action="{% url 'profile' %}" method="post">{% csrf_token %}
+								{{ affiliation_form.affiliation }}
+								<input type="submit" value="Save"/>
+							</form>
+						</span>
+						<button class="edit" type="button" title="Affiliation">Edit</button>
+					</td>
+				</tr>
+				<tr class="even">
+					<td class="key">E-mail Address<img class="help" src="{{ MEDIA_URL }}images/help-icon.png"title="If you forget your password this email will be used to recover your account. The {{ CLEARINGHOUSE }} does not use your email for anything else."/></td>
+					<td class="value">
+						<span class="value" >{{ email }} </span>
+						<span class="hide_this">
+							<form action="{% url 'profile' %}" method="post">{% csrf_token %}
+								{{ email_form.email }}
+								<input type="submit" value="Save"/>
+							</form>
+						</span>
+						<button class="edit" type="button"title="E-mail">Edit</button>
+					</td>
+				</tr>
+				<tr class="odd">
+					<td class="key">API Key
+						<img class="help" src="{{ MEDIA_URL }}images/help-icon.png"title="The {{ CLEARINGHOUSE }} offers an API key that allows applications to perform actions on your behalf, such as acquiring, releasing, and renewing vessels.  If this key is lost or stolen, you can reset it at any time."/></td>
+					<td class="value api_cell"> 
+							<span class="api_cell" title="double click to show"><i>double click to show</i></span>
+							<span id="api_key" class="hide_this" title="double click to hide">{{ api_key }}</span>
+							<form action="{% url 'api_info' %}" method="post">{% csrf_token %}
+							<input type="hidden" name="generate_api_key" value="yes"/>
+							<button id="generate_api" type="submit"title="In some cases you may want to generate a new API key (for example, if you accidentally left your old one in a file that you shared publicly). Generating a new API key will make your old API key no longer work.">Generate new API Key</button>
+							</form>
+					</td>
+				</tr>
+				<tr class="even">
+					<td class="key">Port <img class="help" src="{{ MEDIA_URL }}images/help-icon.png"title="This indicates a port number that by default will be available for TCP / UDP on all of your acquired vessels."/></td>
+					<td class="value">{{ port }}</td>
+				</tr>
+				<tr class="odd">
+					<td class="key">Linked Accounts<img class="help" src="{{ MEDIA_URL }}images/help-icon.png"title="When you link an account you may then use it to log in to the {{ CLEARINGHOUSE }}."/></td>
+					<td class="value">
+					      
+        	  {% for type, accounts in social_auth.associated.items %}
+  					  {% for account in accounts %}
+								{% if account.provider == "facebook"%}
+									<img src="{{ MEDIA_URL }}images/Facebook-icon.png" title="Facebook account linked" />
+								{% endif %}
+								{% if account.provider == "google"%}
+									<img src="{{ MEDIA_URL }}images/google-icon.png" title="Gmail account linked" />
+								{% endif %}
+								{% if account.provider == "github"%}
+									<img src="{{ MEDIA_URL }}images/github-icon.png" title="Github account linked" />
+								{% endif %}
+								{% if account.provider == "live"%}
+									<img src="{{ MEDIA_URL }}images/windows-icon.png" title="Windows Live account linked" />
+								{% endif %}
+								{% if account.provider == "yahoo"%}
+									<img src="{{ MEDIA_URL }}images/yahoo-icon.png" title="Yahoo account linked" />
+								{% endif %}
+     						 {% comment %}  <span class="disconnect">
+											<a href={% url 'socialauth_disconnect_individual' account.provider account.id %}>
+												{{ account.provider|title }} (ID {{ account.id }})<br/></a></span> 
+								 {% endcomment %}
+   					 {% endfor %}
+ 					 {% endfor %}
+					
+				{% for name, accounts in social_auth.not_associated.items %}
+					{% for name in accounts %}
+				  	<a rel="nofollow" href="{% url 'socialauth_begin' name %}">
+				    	{% if name == "facebook"%}
+				  		 <img src="{{ MEDIA_URL }}images/bw-Facebook-icon.png" title="A Facebook account is not yet associated, click to link it!"/>
+					    {% endif %}
+				    	{% if name == "google"%}
+					    	<img src="{{ MEDIA_URL }}images/bw-google-icon.png" title="A Google account is not yet associated, click to link it!"/>
+				    	{% endif %}
+				    	{% if name == "github"%}
+				    		<img src="{{ MEDIA_URL }}images/bw-github-icon.png" title="A Github account is not yet associated, click to link it!"/>
+			    		{% endif %}
+			    		{% if name == "live"%}
+			    			<img src="{{ MEDIA_URL }}images/bw-windows-icon.png" title="A Windows Live account is not yet associated, click to link it!"/>
+			    		{% endif %}
+			    		{% if name == "yahoo"%}
+				    		<img src="{{ MEDIA_URL }}images/bw-yahoo-icon.png" title="A Yahoo account is not yet associated, click to link it!"/>
+				    	{% endif %}
+			  		</a>
+			  	{% endfor %}
+  	  	{% endfor %}
+				  </td>
+		    	</table> <br/>
+		<table class="profile">
+			<tr>
+				<td><h3>Your Keys</h3></td>
+				<td> <form id="change_key" action="{% url 'change_key' %}" method="post"style="display:inline;">{% csrf_token %}
+					<input type="hidden" name="generate" value="yes"/>
+					<button id="generate_keypair" type="submit" title="The {{ CLEARINGHOUSE }} can generate a new key pair for you. After it is generated, you will need to download your public and private keys again." style=""> Generate new Key Pair</button>
+						</form>
+			</td> 
+			</tr>
+		</table>
+	<h1></h1>
+		<table class="profile">
+			<tr class="odd">
+				<td class="key">Public Key
+					<img class="help" src="{{ MEDIA_URL }}images/help-icon.png"
+								title="If you have generated a key pair on your own computer(for example, using Seash), you can upload your public key here. Do not upload your private key."/></td>
+				<td class="value">
+					<span class="value">********</span>
+					<span class="hide_this">
+						<button type="button" class="cancel" title="Cancel"> Cancel </button>
+						<form action="{% url 'change_key' %}" method="post" enctype="multipart/form-data">{% csrf_token %}
+							<input type="file" name="pubkey"/> <button type="submit" title="Upload a public key">Upload</button>
+						</form>
+					</span>
+					<form method="post" action="{% url 'pub_key' %}" id="download_pubkey_form">{% csrf_token %}
+						<button type="submit" class="download" title="Download your public key"> Download </button>
+					 </form>
+						<button id="show_keyform" type="button" title="Upload a public key"> Upload </button>
+				</td>
+			</tr>
+				{% if has_privkey %}
+				<tr class="even">
+					<td class="key">Private Key <img class="help" src="{{ MEDIA_URL }}images/red-help-icon.png"title="The {{ CLEARINGHOUSE }} does not need your private key to provide you access to vessels.  You may wish to download this key and then delete it from the server."/></td>
+					<td class="value">********<a href="#">
+						<form class="inline" method="post" action="{% url 'priv_key' %}">{% csrf_token %}
+							<button type="submit" title="Download your private key">Download </button>
+						</form>
+						<form class="inline" method="post" action="{% url 'del_priv' %}">{% csrf_token %}
+							<input type="hidden" name="keyToDelete" value={{ username }}/>
+							<button id="delete" type="submit" title="Delete your private key">Delete </button>
+						</form>
+					</td>
+				</tr>
+				<tr class="odd">
+					<td colspan="2">
+            <img id="up_arrow" src="{{ MEDIA_URL }}/images/red-up-arrow.png" />
+						<p class="warning"> For better
+						security we recommend that you
+						download and delete your 
+						private key from the 
+						server. Always store your 
+						private key in a secure 
+						location. </p>
+					</td>
+				</tr>
+				{% endif %}
+			</table>
+		</div>
+	</div>
+{% endblock content %}
diff --git a/website/html/templates/download/installers.html b/website/html/templates/download/installers.html
index fda60ab..9d5edd9 100644
--- a/website/html/templates/download/installers.html
+++ b/website/html/templates/download/installers.html
@@ -1,39 +1,39 @@
-{% extends "download/download_base.html" %}
-
-{% block title %}
-Get Donations - {{ TESTBED }} {{ CLEARINGHOUSE }}
-{% endblock title %}
-
-{% block style %}
-{{ block.super }}
-<link href="{{ MEDIA_URL }}css/download.css" rel="stylesheet" type="text/css" />
-{% endblock style %}
-
-{% block script %}
-{{ block.super }}
-<script type="text/javascript" src="{{ MEDIA_URL }}scripts/jquery.js" charset="utf-8"></script>
-<script type="text/javascript" src="{{ MEDIA_URL }}scripts/jqbrowser.js" charset="utf-8"></script>
-<script type="text/javascript" src="{{ MEDIA_URL }}scripts/download.js" charset="utf-8"></script>
-{% endblock script %}
-
-{% block nav_getdonations %}
-<td class="active">Donate Resources</td>
-{% endblock nav_getdonations %}
-
-{% block content %}
-	<div id="main">
-		<div id="middle">
-		  <div id="downloadlink">
-		    {% if validuser %}
-		    <p>Donate resources on behalf of {{ username }}:</p>
-		    </div>
-			  {% include "common/installers.html" %}
-		    {% else %}
-		    <p>The given username doesn't exist!</p><br>
-		    <p>Please check the username.</p>
-		    </div>
-		    {% endif %}
-		</div>
-	</div>
-
-{% endblock content %}
+{% extends "download/download_base.html" %}
+
+{% block title %}
+Get Donations - {{ TESTBED }} {{ CLEARINGHOUSE }}
+{% endblock title %}
+
+{% block style %}
+{{ block.super }}
+<link href="{{ MEDIA_URL }}css/download.css" rel="stylesheet" type="text/css" />
+{% endblock style %}
+
+{% block script %}
+{{ block.super }}
+<script type="text/javascript" src="{{ MEDIA_URL }}scripts/jquery.js" charset="utf-8"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}scripts/jqbrowser.js" charset="utf-8"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}scripts/download.js" charset="utf-8"></script>
+{% endblock script %}
+
+{% block nav_getdonations %}
+<td class="active">Donate Resources</td>
+{% endblock nav_getdonations %}
+
+{% block content %}
+	<div id="main">
+		<div id="middle">
+		  <div id="downloadlink">
+		    {% if validuser %}
+		    <p>Donate resources on behalf of {{ username }}:</p>
+		    </div>
+			  {% include "common/installers.html" %}
+		    {% else %}
+		    <p>The given username doesn't exist!</p><br>
+		    <p>Please check the username.</p>
+		    </div>
+		    {% endif %}
+		</div>
+	</div>
+
+{% endblock content %}
diff --git a/website/html/tests/test_change_api_key.py b/website/html/tests/test_change_api_key.py
index 51effe1..f8ba446 100644
--- a/website/html/tests/test_change_api_key.py
+++ b/website/html/tests/test_change_api_key.py
@@ -1,117 +1,117 @@
-"""
-<Program>
-  test_view_change_api_key.py
-
-<Started>
-  Oct 16, 2009
-
-<Author>
-  Justin Samuel
-
-<Purpose>
-  Tests that the api_info view function which is responsible for displaying and
-  handling requests to regenerate the user's api key.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-import tempfile
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-
-
-
-
-
-# Declare our mock functions
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-
-
-
-
-def mock_noop(*args, **kwargs):
-  pass
-  
-  
-  
-  
-
-c = Client()
-
-interface.regenerate_api_key = mock_noop
-
-
-
-
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    login_test_user()
-    test_regenerate_api_key()
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-
-
-def test_regenerate_api_key():
-  """
-  <Purpose>
-    Tests submission of form to generate a new api key.
-  """
-  post_data = {'generate_api_key':'yes'}
-  response = c.post('/html/api_info', post_data, follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/api_info.html")
-  assert("Your API key has been regenerated" in response.content)
-
-
-
-
-
-  
-# Creates a test user in the test db, and uses the test client to 'login',
-# so all views that expect @login_required will now pass the login check. 
-def login_test_user():
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-
-
-
-if __name__ == "__main__":
-  main()
+"""
+<Program>
+  test_view_change_api_key.py
+
+<Started>
+  Oct 16, 2009
+
+<Author>
+  Justin Samuel
+
+<Purpose>
+  Tests that the api_info view function which is responsible for displaying and
+  handling requests to regenerate the user's api key.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+import tempfile
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+
+
+
+
+
+# Declare our mock functions
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+
+
+
+
+def mock_noop(*args, **kwargs):
+  pass
+  
+  
+  
+  
+
+c = Client()
+
+interface.regenerate_api_key = mock_noop
+
+
+
+
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    login_test_user()
+    test_regenerate_api_key()
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+
+
+def test_regenerate_api_key():
+  """
+  <Purpose>
+    Tests submission of form to generate a new api key.
+  """
+  post_data = {'generate_api_key':'yes'}
+  response = c.post('/html/api_info', post_data, follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/api_info.html")
+  assert("Your API key has been regenerated" in response.content)
+
+
+
+
+
+  
+# Creates a test user in the test db, and uses the test client to 'login',
+# so all views that expect @login_required will now pass the login check. 
+def login_test_user():
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+
+
+
+if __name__ == "__main__":
+  main()
diff --git a/website/html/tests/test_change_key.py b/website/html/tests/test_change_key.py
index de5a94a..6ad2a09 100644
--- a/website/html/tests/test_change_key.py
+++ b/website/html/tests/test_change_key.py
@@ -1,200 +1,200 @@
-"""
-<Program>
-  test_change_key.py
-
-<Started>
-  Oct 13, 2009
-
-<Author>
-  Justin Samuel
-
-<Purpose>
-  Tests that the change_key view function  handles normal operation and
-  exceptions correctly.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-import tempfile
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-
-
-
-
-# Declare our mock functions
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-
-
-
-
-def mock_noop(*args, **kwargs):
-  pass
-  
-  
-  
-  
-
-c = Client()
-
-interface.change_user_keys = mock_noop
-
-
-
-
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    login_test_user()
-    
-    test_regenerate_key()
-    test_upload_key_no_file()
-    test_upload_key_file()
-    test_upload_key_file_empty_file()
-    test_upload_key_file_invalid_key()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-
-def test_regenerate_key():
-  """
-  <Purpose>
-    Tests submission of form to generate a new user key.
-  """
-  post_data = {'generate':'yes'}
-  response = c.post('/html/change_key', post_data, follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  assert("Your new keys have been generated" in response.content)
-
-
-
-
-
-def test_upload_key_no_file():
-  """
-  <Purpose>
-    Tests submitting the upload key form with no key.
-  """
-  post_data = {}
-  response = c.post('/html/change_key', post_data, follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/change_key.html")
-  assert("You didn&#39;t select a public key file to upload" in response.content)
-
-
-
-
-
-def test_upload_key_file():
-  """
-  <Purpose>
-    Tests submitting the upload key form with no key.
-  """
-  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
-  uploaded_file.write('1 2')
-  uploaded_file.flush()
-  uploaded_file.seek(0)
-
-  post_data = {'pubkey':uploaded_file}
-  response = c.post('/html/change_key', post_data, follow=True)
-  
-  uploaded_file.close()
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  assert("Your public key has been successfully changed" in response.content)
-
-
-
-
-def test_upload_key_file_empty_file():
-  """
-  <Purpose>
-    Tests submitting the upload key form with no key.
-  """
-  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
-
-  post_data = {'pubkey':uploaded_file}
-  response = c.post('/html/change_key', post_data, follow=True)
-  
-  uploaded_file.close()
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/change_key.html")
-  assert("Invalid file uploaded" in response.content)
-
-
-
-
-
-def test_upload_key_file_invalid_key():
-  """
-  <Purpose>
-    Tests submitting the upload key form with no key.
-  """
-  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
-  uploaded_file.write('abc')
-  uploaded_file.flush()
-  uploaded_file.seek(0)
-
-  post_data = {'pubkey':uploaded_file}
-  response = c.post('/html/change_key', post_data, follow=True)
-  
-  uploaded_file.close()
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/change_key.html")
-  assert("Invalid public key uploaded" in response.content)
-
-
-
-
-  
-# Creates a test user in the test db, and uses the test client to 'login',
-# so all views that expect @login_required will now pass the login check. 
-def login_test_user():
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-
-
-
-if __name__ == "__main__":
-  main()
+"""
+<Program>
+  test_change_key.py
+
+<Started>
+  Oct 13, 2009
+
+<Author>
+  Justin Samuel
+
+<Purpose>
+  Tests that the change_key view function  handles normal operation and
+  exceptions correctly.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+import tempfile
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+
+
+
+
+# Declare our mock functions
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+
+
+
+
+def mock_noop(*args, **kwargs):
+  pass
+  
+  
+  
+  
+
+c = Client()
+
+interface.change_user_keys = mock_noop
+
+
+
+
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    login_test_user()
+    
+    test_regenerate_key()
+    test_upload_key_no_file()
+    test_upload_key_file()
+    test_upload_key_file_empty_file()
+    test_upload_key_file_invalid_key()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+
+def test_regenerate_key():
+  """
+  <Purpose>
+    Tests submission of form to generate a new user key.
+  """
+  post_data = {'generate':'yes'}
+  response = c.post('/html/change_key', post_data, follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  assert("Your new keys have been generated" in response.content)
+
+
+
+
+
+def test_upload_key_no_file():
+  """
+  <Purpose>
+    Tests submitting the upload key form with no key.
+  """
+  post_data = {}
+  response = c.post('/html/change_key', post_data, follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/change_key.html")
+  assert("You didn&#39;t select a public key file to upload" in response.content)
+
+
+
+
+
+def test_upload_key_file():
+  """
+  <Purpose>
+    Tests submitting the upload key form with no key.
+  """
+  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
+  uploaded_file.write('1 2')
+  uploaded_file.flush()
+  uploaded_file.seek(0)
+
+  post_data = {'pubkey':uploaded_file}
+  response = c.post('/html/change_key', post_data, follow=True)
+  
+  uploaded_file.close()
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  assert("Your public key has been successfully changed" in response.content)
+
+
+
+
+def test_upload_key_file_empty_file():
+  """
+  <Purpose>
+    Tests submitting the upload key form with no key.
+  """
+  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
+
+  post_data = {'pubkey':uploaded_file}
+  response = c.post('/html/change_key', post_data, follow=True)
+  
+  uploaded_file.close()
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/change_key.html")
+  assert("Invalid file uploaded" in response.content)
+
+
+
+
+
+def test_upload_key_file_invalid_key():
+  """
+  <Purpose>
+    Tests submitting the upload key form with no key.
+  """
+  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
+  uploaded_file.write('abc')
+  uploaded_file.flush()
+  uploaded_file.seek(0)
+
+  post_data = {'pubkey':uploaded_file}
+  response = c.post('/html/change_key', post_data, follow=True)
+  
+  uploaded_file.close()
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/change_key.html")
+  assert("Invalid public key uploaded" in response.content)
+
+
+
+
+  
+# Creates a test user in the test db, and uses the test client to 'login',
+# so all views that expect @login_required will now pass the login check. 
+def login_test_user():
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+
+
+
+if __name__ == "__main__":
+  main()
diff --git a/website/html/tests/test_del_resources.py b/website/html/tests/test_del_resources.py
index f82f94e..cc4e657 100644
--- a/website/html/tests/test_del_resources.py
+++ b/website/html/tests/test_del_resources.py
@@ -1,157 +1,157 @@
-"""
-<Program>
-  test_del_resources.py
-
-<Started>
-  8/30/2009
-
-<Author>
-  Jason Chen
-  jchen@cs.washington.edu
-
-<Purpose>
-  Tests that the del_resource view function 
-  handles normal operation and exceptions correctly.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-# Declare our mock functions
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-def mock_get_vessel_list(vesselhandle_list):
-  return ['test', 'test2']
-
-def mock_get_vessel_list_throws_DoesNotExistError(vesselhandle_list):
-  raise DoesNotExistError
-
-def mock_get_vessel_list_throws_InvalidRequestError(vesselhandle_list):
-  raise InvalidRequestError
-
-def mock_release_vessels(geniuser, vessel_list):
-  pass
-
-def mock_release_vessels_throws_InvalidRequestError(geniuser, vessel_list):
-  raise InvalidRequestError
-
-c = Client()
-good_data = {'handle':'12345'}
-interface.get_vessel_list = mock_get_vessel_list
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    login_test_user()
-    
-    test_normal()
-    test_get_vessel_list_throws_DoesNotExistError()
-    test_get_vessel_list_throws_InvalidRequestError()
-    test_release_vessels_throws_InvalidRequestError()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-def test_normal():
-  """
-  <Purpose>
-    Tests normal behavior.
-  """
-  interface.get_vessel_list = mock_get_vessel_list
-  interface.release_vessels = mock_release_vessels
-  response = c.post('/html/del_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_get_vessel_list_throws_DoesNotExistError():
-  """
-  <Purpose>
-    Tests behavior if interface.get_vessel_list throws a DoesNotExistError
-  """
-  interface.get_vessel_list = mock_get_vessel_list_throws_DoesNotExistError
-  interface.release_vessels = mock_release_vessels
-  response = c.post('/html/del_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to remove" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_get_vessel_list_throws_InvalidRequestError():
-  """
-  <Purpose>
-    Tests behavior if interface.get_vessel_list throws an InvalidRequestError 
-  """
-  interface.get_vessel_list = mock_get_vessel_list_throws_InvalidRequestError
-  interface.release_vessels = mock_release_vessels
-  response = c.post('/html/del_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to remove" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_release_vessels_throws_InvalidRequestError():
-  """
-  <Purpose>
-    Tests behavior if interface.release_vessels throws an InvalidRequestError
-  """
-  interface.get_vessel_list = mock_get_vessel_list
-  interface.release_vessels = mock_release_vessels_throws_InvalidRequestError
-  response = c.post('/html/del_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to remove" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-  
-  
-  
-# Creates a test user in the test db, and uses the test client to 'login',
-# so all views that expect @login_required will now pass the login check. 
-def login_test_user():
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-
-
-
-if __name__=="__main__":
-  main()
+"""
+<Program>
+  test_del_resources.py
+
+<Started>
+  8/30/2009
+
+<Author>
+  Jason Chen
+  jchen@cs.washington.edu
+
+<Purpose>
+  Tests that the del_resource view function 
+  handles normal operation and exceptions correctly.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+# Declare our mock functions
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+def mock_get_vessel_list(vesselhandle_list):
+  return ['test', 'test2']
+
+def mock_get_vessel_list_throws_DoesNotExistError(vesselhandle_list):
+  raise DoesNotExistError
+
+def mock_get_vessel_list_throws_InvalidRequestError(vesselhandle_list):
+  raise InvalidRequestError
+
+def mock_release_vessels(geniuser, vessel_list):
+  pass
+
+def mock_release_vessels_throws_InvalidRequestError(geniuser, vessel_list):
+  raise InvalidRequestError
+
+c = Client()
+good_data = {'handle':'12345'}
+interface.get_vessel_list = mock_get_vessel_list
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    login_test_user()
+    
+    test_normal()
+    test_get_vessel_list_throws_DoesNotExistError()
+    test_get_vessel_list_throws_InvalidRequestError()
+    test_release_vessels_throws_InvalidRequestError()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+def test_normal():
+  """
+  <Purpose>
+    Tests normal behavior.
+  """
+  interface.get_vessel_list = mock_get_vessel_list
+  interface.release_vessels = mock_release_vessels
+  response = c.post('/html/del_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_get_vessel_list_throws_DoesNotExistError():
+  """
+  <Purpose>
+    Tests behavior if interface.get_vessel_list throws a DoesNotExistError
+  """
+  interface.get_vessel_list = mock_get_vessel_list_throws_DoesNotExistError
+  interface.release_vessels = mock_release_vessels
+  response = c.post('/html/del_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to remove" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_get_vessel_list_throws_InvalidRequestError():
+  """
+  <Purpose>
+    Tests behavior if interface.get_vessel_list throws an InvalidRequestError 
+  """
+  interface.get_vessel_list = mock_get_vessel_list_throws_InvalidRequestError
+  interface.release_vessels = mock_release_vessels
+  response = c.post('/html/del_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to remove" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_release_vessels_throws_InvalidRequestError():
+  """
+  <Purpose>
+    Tests behavior if interface.release_vessels throws an InvalidRequestError
+  """
+  interface.get_vessel_list = mock_get_vessel_list
+  interface.release_vessels = mock_release_vessels_throws_InvalidRequestError
+  response = c.post('/html/del_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to remove" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+  
+  
+  
+# Creates a test user in the test db, and uses the test client to 'login',
+# so all views that expect @login_required will now pass the login check. 
+def login_test_user():
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+
+
+
+if __name__=="__main__":
+  main()
diff --git a/website/html/tests/test_get_resources.py b/website/html/tests/test_get_resources.py
index 97a83e6..118ca66 100644
--- a/website/html/tests/test_get_resources.py
+++ b/website/html/tests/test_get_resources.py
@@ -1,185 +1,185 @@
-"""
-<Program>
-  test_get_resources.py
-
-<Started>
-  8/30/2009
-
-<Author>
-  Jason Chen
-  jchen@cs.washington.edu
-
-<Purpose>
-  Tests that the get_resources view function 
-  handles normal operation and exceptions correctly.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-# Declare our mock functions
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-def mock_acquire_vessels(geniuser, vesselcount, vesseltype):
-  return ['test1', 'test2']
-
-def mock_acquire_vessels_throws_UnableToAcquireResourcesError(geniuser, vesselcount, vesseltype):
-  raise UnableToAcquireResourcesError
-
-def mock_acquire_vessels_throws_InsufficientUserResourcesError(geniuser, vesselcount, vesseltype):
-  raise InsufficientUserResourcesError
-
-c = Client()
-good_data = {'num':5, 'env':'rand'}
-
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    login_test_user()
-    
-    test_normal()
-    test_interface_throws_UnableToAcquireResourcesError()
-    test_interface_throws_InsufficientUserResourcesError()
-    test_blank_POST_data()
-    test_invalid_POST_data_invalid_num()
-    test_invalid_POST_data_invalid_env()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-def test_normal():
-  """
-  <Purpose>
-    Test normal behavior
-  """
-  interface.acquire_vessels = mock_acquire_vessels
-  response = c.post('/html/get_resources', good_data, follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-def test_interface_throws_UnableToAcquireResourcesError():
-  """
-  <Purpose>
-    Test behavior if interface throws UnableToAcquireResourcesError.
-  
-  <Note>
-    Checking only the existance of "action_summary" in the response
-    is sufficient in seeing whether the view caught the error, since 
-    error messages are shown in that html element. (Of course, so are
-    normal messages, but we are clearly having the interface throw an
-    exception, so normal messages don't even exist in this context).
-  """
-  interface.acquire_vessels = mock_acquire_vessels_throws_UnableToAcquireResourcesError
-  response = c.post('/html/get_resources', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-  assert("Unable to acquire vessels at this time" in response.content)
-
-
-
-def test_interface_throws_InsufficientUserResourcesError():
-  """
-  <Purpose>
-    Test behavior if interface throws InsufficientUserResourcesError.
-  """
-  interface.acquire_vessels = mock_acquire_vessels_throws_InsufficientUserResourcesError
-  response = c.post('/html/get_resources', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-  assert("Unable to acquire" in response.content)
-  assert("vessel credit" in response.content)
-
-
-
-def test_blank_POST_data():
-  """
-  <Purpose>
-    Test behavior if we submit blank POST data.
-  """
-  interface.acquire_vessels = mock_acquire_vessels
-  response = c.post('/html/get_resources', {}, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-  assert("This field is required" in response.content)
-
-
-
-def test_invalid_POST_data_invalid_num():
-  """
-  <Purpose>
-    Test behavior if we submit POST data with an invalid 'num' field.
-  """
-  interface.acquire_vessels = mock_acquire_vessels
-  test_data = {'num':-5, 'env':'rand'}
-  response = c.post('/html/get_resources', test_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-  assert("Select a valid choice" in response.content)
-
-
-
-def test_invalid_POST_data_invalid_env():
-  """
-  <Purpose>
-    Test behavior if we submit POST data with an invalid 'env' field.
-  """
-  interface.acquire_vessels = mock_acquire_vessels
-  test_data = {'num':5, 'env':'notvalid'}
-  response = c.post('/html/get_resources', test_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-  assert("Select a valid choice" in response.content)
-
-
-
-# Creates a test user in the test db, and uses the test client to 'login',
-# so all views that expect @login_required will now pass the login check. 
-def login_test_user():
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-
-
-
-if __name__=="__main__":
-  main()
+"""
+<Program>
+  test_get_resources.py
+
+<Started>
+  8/30/2009
+
+<Author>
+  Jason Chen
+  jchen@cs.washington.edu
+
+<Purpose>
+  Tests that the get_resources view function 
+  handles normal operation and exceptions correctly.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+# Declare our mock functions
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+def mock_acquire_vessels(geniuser, vesselcount, vesseltype):
+  return ['test1', 'test2']
+
+def mock_acquire_vessels_throws_UnableToAcquireResourcesError(geniuser, vesselcount, vesseltype):
+  raise UnableToAcquireResourcesError
+
+def mock_acquire_vessels_throws_InsufficientUserResourcesError(geniuser, vesselcount, vesseltype):
+  raise InsufficientUserResourcesError
+
+c = Client()
+good_data = {'num':5, 'env':'rand'}
+
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    login_test_user()
+    
+    test_normal()
+    test_interface_throws_UnableToAcquireResourcesError()
+    test_interface_throws_InsufficientUserResourcesError()
+    test_blank_POST_data()
+    test_invalid_POST_data_invalid_num()
+    test_invalid_POST_data_invalid_env()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+def test_normal():
+  """
+  <Purpose>
+    Test normal behavior
+  """
+  interface.acquire_vessels = mock_acquire_vessels
+  response = c.post('/html/get_resources', good_data, follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+def test_interface_throws_UnableToAcquireResourcesError():
+  """
+  <Purpose>
+    Test behavior if interface throws UnableToAcquireResourcesError.
+  
+  <Note>
+    Checking only the existance of "action_summary" in the response
+    is sufficient in seeing whether the view caught the error, since 
+    error messages are shown in that html element. (Of course, so are
+    normal messages, but we are clearly having the interface throw an
+    exception, so normal messages don't even exist in this context).
+  """
+  interface.acquire_vessels = mock_acquire_vessels_throws_UnableToAcquireResourcesError
+  response = c.post('/html/get_resources', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+  assert("Unable to acquire vessels at this time" in response.content)
+
+
+
+def test_interface_throws_InsufficientUserResourcesError():
+  """
+  <Purpose>
+    Test behavior if interface throws InsufficientUserResourcesError.
+  """
+  interface.acquire_vessels = mock_acquire_vessels_throws_InsufficientUserResourcesError
+  response = c.post('/html/get_resources', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+  assert("Unable to acquire" in response.content)
+  assert("vessel credit" in response.content)
+
+
+
+def test_blank_POST_data():
+  """
+  <Purpose>
+    Test behavior if we submit blank POST data.
+  """
+  interface.acquire_vessels = mock_acquire_vessels
+  response = c.post('/html/get_resources', {}, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+  assert("This field is required" in response.content)
+
+
+
+def test_invalid_POST_data_invalid_num():
+  """
+  <Purpose>
+    Test behavior if we submit POST data with an invalid 'num' field.
+  """
+  interface.acquire_vessels = mock_acquire_vessels
+  test_data = {'num':-5, 'env':'rand'}
+  response = c.post('/html/get_resources', test_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+  assert("Select a valid choice" in response.content)
+
+
+
+def test_invalid_POST_data_invalid_env():
+  """
+  <Purpose>
+    Test behavior if we submit POST data with an invalid 'env' field.
+  """
+  interface.acquire_vessels = mock_acquire_vessels
+  test_data = {'num':5, 'env':'notvalid'}
+  response = c.post('/html/get_resources', test_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+  assert("Select a valid choice" in response.content)
+
+
+
+# Creates a test user in the test db, and uses the test client to 'login',
+# so all views that expect @login_required will now pass the login check. 
+def login_test_user():
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+
+
+
+if __name__=="__main__":
+  main()
diff --git a/website/html/tests/test_register.py b/website/html/tests/test_register.py
index 9437f20..1de1dfa 100644
--- a/website/html/tests/test_register.py
+++ b/website/html/tests/test_register.py
@@ -1,392 +1,392 @@
-"""
-<Program>
-  test_register.py
-
-<Started>
-  8/26/2009
-
-<Author>
-  Jason Chen
-  jchen@cs.washington.edu
-
-<Purpose>
-  Tests the registration function of the HTML frontend view.
-
-<Notes>
-  We make use of the Django test client, which emulates a webclient and returns what django
-  considers the final rendered result (in HTML). This allows us to test purely the view functions.
-  Apart from testing the validity/sanity of the view functions, we also mock-out all calls into the
-  interface, and return test values to the view functions. This way, we can ensure that the views behave
-  properly in normal (and abnormal) interactions with the interface.
-"""
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-import StringIO
-import os
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.common.util import validations
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-from clearinghouse.website.html import forms
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-# Declare our mock functions
-def mock_register_user(username, password, email, affiliation, pubkey=None):
-  testuser = DjangoUser()
-  testuser.username = "test_user"
-  return testuser
-
-def mock_register_user_throws_ValidationError(username, password, email, affiliation, pubkey=None):
-  raise ValidationError
-
-def mock_get_logged_in_user(request):
-  raise DoesNotExistError
-
-# set up test data
-c = Client()
-good_data = {'username': 'tester', 
-             'password1': '12345678',
-             'password2': '12345678',  
-             'email': 'test@test.com',  
-             'affiliation': 'test affil', 
-             'gen_upload_choice':'1'}
-
-test_data = {}
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    # mock out interface calls
-    interface.register_user = mock_register_user
-    interface.get_logged_in_user = mock_get_logged_in_user
-    
-    # run tests
-    test_post_blank_form()
-    test_short_username()
-    test_long_username()
-    test_invalid_username()
-    test_short_password()
-    test_nonmatching_password()
-    test_matching_username_password()
-    test_short_affil()
-    test_long_affil()
-    test_invalid_email()
-    test_key_upload_with_no_file()
-    test_key_upload_with_oversized_file()
-    test_key_upload_with_bad_format_key()
-    test_key_upload_with_valid_key()
-    test_normal()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-  
-
-def test_post_blank_form():
-  """
-  <Purpose>
-    Test for posting blank form
-  
-  <Note>
-    Checking for the existance of (p class=\"warning\") in response.content is
-    sufficient in detecting whether the view caught an error; since the page
-    will only ever show that html element in the event of an error. And, this 
-    is all we care about: that the page recognized that bad data was passed in, 
-    and an error was raised.
-  """
-  response = c.post('/html/register', {'username': '', 
-                                       'password1':'', 
-                                       'password2':'', 
-                                       'email':'', 
-                                       'affiliation':'', 
-                                       'gen_upload_choice':'1'}, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_short_username():
-  """
-  <Purpose>
-    Test for username too short
-  """  
-  shortuser = ""
-  for n in range(0, validations.USERNAME_MIN_LENGTH - 1):
-    shortuser += "a"
-  
-  test_data = good_data.copy()
-  test_data['username'] = shortuser
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_long_username():
-  """
-  <Purpose>
-    Test for username too long
-  """  
-  longuser = ""
-  for n in range(0, validations.USERNAME_MAX_LENGTH + 1):
-    longuser += "a"
-  
-  test_data = good_data.copy()
-  test_data['username'] = longuser
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_invalid_username():
-  """
-  <Purpose>
-    Test for invalid username
-  """  
-  test_data = good_data.copy()
-  test_data['username'] = 'tester!!!'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_short_password():
-  """
-  <Purpose>
-    Test for password too short
-  """  
-  test_data = good_data.copy()
-  test_data['password1'] = '12345'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_nonmatching_password():
-  """
-  <Purpose>
-    Test for non-matching passwords
-  """  
-  test_data = good_data.copy()
-  test_data['password2'] = '87654321'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_matching_username_password():
-  """
-  <Purpose>
-    Test for same username and password
-  """  
-  test_data = good_data.copy()
-  test_data['username'] = 'tester'
-  test_data['password1'] = 'tester'
-  test_data['password2'] = 'tester'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_short_affil():
-  """
-  <Purpose>
-    Test for affiliation too short
-  """  
-  shortaffil = ""
-  for n in range(0, validations.AFFILIATION_MIN_LENGTH - 1):
-    shortaffil += "a"
-  
-  test_data = good_data.copy()
-  test_data['affiliation'] = shortaffil
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_long_affil():
-  """
-  <Purpose>
-    Test for affiliation too long
-  """  
-  longaffil = ""
-  for n in range(0, validations.AFFILIATION_MAX_LENGTH + 1):
-    longaffil += "a"
-  
-  test_data = good_data.copy()
-  test_data['affiliation'] = longaffil
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_invalid_email():
-  """
-  <Purpose>
-    Test for invalid e-mail
-  """  
-  test_data = good_data.copy()
-  test_data['email'] = 'invalid@email'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_key_upload_with_no_file():
-  """
-  <Purpose>
-    Test key upload with no file
-  """  
-  test_data = good_data.copy()
-  test_data['gen_upload_choice'] = '2'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_key_upload_with_oversized_file():
-  """
-  <Purpose>
-    Test key upload with oversized file
-  """  
-  test_data = good_data.copy()
-  test_data['gen_upload_choice'] = '2'
-  
-  # set up a temporary 'key' file object
-  data = ''
-  for n in range(0, forms.MAX_PUBKEY_UPLOAD_SIZE + 1):
-    data += '0'
-  
-  fh = open(os.path.join(os.getcwd(), 'bigkey'), 'w')
-  fh.write(data)
-  fh.close()
-  fh = open('bigkey')
-  test_data['pubkey'] = fh
-  
-  response = c.post('/html/register', test_data, follow=True)
-  fh.close()
-  os.remove(os.path.join(os.getcwd(), 'bigkey'))
-  
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_key_upload_with_bad_format_key():
-  """
-  <Purpose>
-    Test key upload with badly formatted key
-  """  
-  test_data = good_data.copy()
-  test_data['gen_upload_choice'] = '2'
-  
-  data = 'this is a fake key'
-  fh = open(os.path.join(os.getcwd(), 'fakekey'), 'w')
-  fh.write(data)
-  fh.close()
-  fh = open('fakekey')
-  test_data['pubkey'] = fh
-  
-  response = c.post('/html/register', test_data, follow=True)
-  fh.close()
-  os.remove(os.path.join(os.getcwd(), 'fakekey'))
-  
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_key_upload_with_valid_key():
-  """
-  <Purpose>
-    Test key upload with valid key
-  """  
-  test_data = good_data.copy()
-  test_data['gen_upload_choice'] = '2'
-  
-  data = '65537 1255529510320394315881981094520474315188224118590997402913761676258431241305254181126132200564438402053537493727356349330161335739149834523475129922460441305694528141374947142391183883986671526830986555904385942930184161960677388507'
-  fh = open(os.path.join(os.getcwd(), 'goodkey'), 'w')
-  fh.write(data)
-  fh.close()
-  fh = open('goodkey')
-  test_data['pubkey'] = fh
-  
-  response = c.post('/html/register', test_data, follow=True)
-  fh.close()
-  os.remove(os.path.join(os.getcwd(), 'goodkey'))
-  
-  assert(response.status_code == 200)
-  assert("successfully registered" in response.content)
-
-
-
-def test_interface_throws_ValidationError():
-  """
-  <Purpose>
-    Test behavior if interface throws a ValidationError, 
-    even after passing all validation
-  """  
-  interface.register_user = mock_register_user_throws_ValidationError
-  response = c.post('/html/register', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_normal():
-  """
-  <Purpose>
-    Test normal behavior
-  """  
-  interface.register_user = mock_register_user
-  response = c.post('/html/register', good_data, follow=True)
-  
-  # check that the view thinks the user has been registered
-  assert(response.status_code == 200)
-  assert("successfully registered" in response.content)
-  
-  # check that the current page is now the login page
-  assert(response.template[0].name == "accounts/login.html")
-
-
-if __name__=="__main__":
-  main()
+"""
+<Program>
+  test_register.py
+
+<Started>
+  8/26/2009
+
+<Author>
+  Jason Chen
+  jchen@cs.washington.edu
+
+<Purpose>
+  Tests the registration function of the HTML frontend view.
+
+<Notes>
+  We make use of the Django test client, which emulates a webclient and returns what django
+  considers the final rendered result (in HTML). This allows us to test purely the view functions.
+  Apart from testing the validity/sanity of the view functions, we also mock-out all calls into the
+  interface, and return test values to the view functions. This way, we can ensure that the views behave
+  properly in normal (and abnormal) interactions with the interface.
+"""
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+import StringIO
+import os
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.common.util import validations
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+from clearinghouse.website.html import forms
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+# Declare our mock functions
+def mock_register_user(username, password, email, affiliation, pubkey=None):
+  testuser = DjangoUser()
+  testuser.username = "test_user"
+  return testuser
+
+def mock_register_user_throws_ValidationError(username, password, email, affiliation, pubkey=None):
+  raise ValidationError
+
+def mock_get_logged_in_user(request):
+  raise DoesNotExistError
+
+# set up test data
+c = Client()
+good_data = {'username': 'tester', 
+             'password1': '12345678',
+             'password2': '12345678',  
+             'email': 'test@test.com',  
+             'affiliation': 'test affil', 
+             'gen_upload_choice':'1'}
+
+test_data = {}
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    # mock out interface calls
+    interface.register_user = mock_register_user
+    interface.get_logged_in_user = mock_get_logged_in_user
+    
+    # run tests
+    test_post_blank_form()
+    test_short_username()
+    test_long_username()
+    test_invalid_username()
+    test_short_password()
+    test_nonmatching_password()
+    test_matching_username_password()
+    test_short_affil()
+    test_long_affil()
+    test_invalid_email()
+    test_key_upload_with_no_file()
+    test_key_upload_with_oversized_file()
+    test_key_upload_with_bad_format_key()
+    test_key_upload_with_valid_key()
+    test_normal()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+  
+
+def test_post_blank_form():
+  """
+  <Purpose>
+    Test for posting blank form
+  
+  <Note>
+    Checking for the existance of (p class=\"warning\") in response.content is
+    sufficient in detecting whether the view caught an error; since the page
+    will only ever show that html element in the event of an error. And, this 
+    is all we care about: that the page recognized that bad data was passed in, 
+    and an error was raised.
+  """
+  response = c.post('/html/register', {'username': '', 
+                                       'password1':'', 
+                                       'password2':'', 
+                                       'email':'', 
+                                       'affiliation':'', 
+                                       'gen_upload_choice':'1'}, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_short_username():
+  """
+  <Purpose>
+    Test for username too short
+  """  
+  shortuser = ""
+  for n in range(0, validations.USERNAME_MIN_LENGTH - 1):
+    shortuser += "a"
+  
+  test_data = good_data.copy()
+  test_data['username'] = shortuser
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_long_username():
+  """
+  <Purpose>
+    Test for username too long
+  """  
+  longuser = ""
+  for n in range(0, validations.USERNAME_MAX_LENGTH + 1):
+    longuser += "a"
+  
+  test_data = good_data.copy()
+  test_data['username'] = longuser
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_invalid_username():
+  """
+  <Purpose>
+    Test for invalid username
+  """  
+  test_data = good_data.copy()
+  test_data['username'] = 'tester!!!'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_short_password():
+  """
+  <Purpose>
+    Test for password too short
+  """  
+  test_data = good_data.copy()
+  test_data['password1'] = '12345'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_nonmatching_password():
+  """
+  <Purpose>
+    Test for non-matching passwords
+  """  
+  test_data = good_data.copy()
+  test_data['password2'] = '87654321'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_matching_username_password():
+  """
+  <Purpose>
+    Test for same username and password
+  """  
+  test_data = good_data.copy()
+  test_data['username'] = 'tester'
+  test_data['password1'] = 'tester'
+  test_data['password2'] = 'tester'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_short_affil():
+  """
+  <Purpose>
+    Test for affiliation too short
+  """  
+  shortaffil = ""
+  for n in range(0, validations.AFFILIATION_MIN_LENGTH - 1):
+    shortaffil += "a"
+  
+  test_data = good_data.copy()
+  test_data['affiliation'] = shortaffil
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_long_affil():
+  """
+  <Purpose>
+    Test for affiliation too long
+  """  
+  longaffil = ""
+  for n in range(0, validations.AFFILIATION_MAX_LENGTH + 1):
+    longaffil += "a"
+  
+  test_data = good_data.copy()
+  test_data['affiliation'] = longaffil
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_invalid_email():
+  """
+  <Purpose>
+    Test for invalid e-mail
+  """  
+  test_data = good_data.copy()
+  test_data['email'] = 'invalid@email'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_key_upload_with_no_file():
+  """
+  <Purpose>
+    Test key upload with no file
+  """  
+  test_data = good_data.copy()
+  test_data['gen_upload_choice'] = '2'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_key_upload_with_oversized_file():
+  """
+  <Purpose>
+    Test key upload with oversized file
+  """  
+  test_data = good_data.copy()
+  test_data['gen_upload_choice'] = '2'
+  
+  # set up a temporary 'key' file object
+  data = ''
+  for n in range(0, forms.MAX_PUBKEY_UPLOAD_SIZE + 1):
+    data += '0'
+  
+  fh = open(os.path.join(os.getcwd(), 'bigkey'), 'w')
+  fh.write(data)
+  fh.close()
+  fh = open('bigkey')
+  test_data['pubkey'] = fh
+  
+  response = c.post('/html/register', test_data, follow=True)
+  fh.close()
+  os.remove(os.path.join(os.getcwd(), 'bigkey'))
+  
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_key_upload_with_bad_format_key():
+  """
+  <Purpose>
+    Test key upload with badly formatted key
+  """  
+  test_data = good_data.copy()
+  test_data['gen_upload_choice'] = '2'
+  
+  data = 'this is a fake key'
+  fh = open(os.path.join(os.getcwd(), 'fakekey'), 'w')
+  fh.write(data)
+  fh.close()
+  fh = open('fakekey')
+  test_data['pubkey'] = fh
+  
+  response = c.post('/html/register', test_data, follow=True)
+  fh.close()
+  os.remove(os.path.join(os.getcwd(), 'fakekey'))
+  
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_key_upload_with_valid_key():
+  """
+  <Purpose>
+    Test key upload with valid key
+  """  
+  test_data = good_data.copy()
+  test_data['gen_upload_choice'] = '2'
+  
+  data = '65537 1255529510320394315881981094520474315188224118590997402913761676258431241305254181126132200564438402053537493727356349330161335739149834523475129922460441305694528141374947142391183883986671526830986555904385942930184161960677388507'
+  fh = open(os.path.join(os.getcwd(), 'goodkey'), 'w')
+  fh.write(data)
+  fh.close()
+  fh = open('goodkey')
+  test_data['pubkey'] = fh
+  
+  response = c.post('/html/register', test_data, follow=True)
+  fh.close()
+  os.remove(os.path.join(os.getcwd(), 'goodkey'))
+  
+  assert(response.status_code == 200)
+  assert("successfully registered" in response.content)
+
+
+
+def test_interface_throws_ValidationError():
+  """
+  <Purpose>
+    Test behavior if interface throws a ValidationError, 
+    even after passing all validation
+  """  
+  interface.register_user = mock_register_user_throws_ValidationError
+  response = c.post('/html/register', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_normal():
+  """
+  <Purpose>
+    Test normal behavior
+  """  
+  interface.register_user = mock_register_user
+  response = c.post('/html/register', good_data, follow=True)
+  
+  # check that the view thinks the user has been registered
+  assert(response.status_code == 200)
+  assert("successfully registered" in response.content)
+  
+  # check that the current page is now the login page
+  assert(response.template[0].name == "accounts/login.html")
+
+
+if __name__=="__main__":
+  main()
diff --git a/website/html/tests/test_renew_resources.py b/website/html/tests/test_renew_resources.py
index 6b76487..7ce973d 100644
--- a/website/html/tests/test_renew_resources.py
+++ b/website/html/tests/test_renew_resources.py
@@ -1,157 +1,157 @@
-"""
-<Program>
-  test_renew_resources.py
-
-<Started>
-  Oct 13, 2009
-
-<Author>
-  Jason Chen <jchen@cs.washington.edu>
-  Justin Samuel
-
-<Purpose>
-  Tests that the renew_resource view function 
-  handles normal operation and exceptions correctly.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-# Declare our mock functions
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-def mock_get_vessel_list(vesselhandle_list):
-  return ['test', 'test2']
-
-def mock_get_vessel_list_throws_DoesNotExistError(vesselhandle_list):
-  raise DoesNotExistError
-
-def mock_get_vessel_list_throws_InvalidRequestError(vesselhandle_list):
-  raise InvalidRequestError
-
-def mock_renew_vessels(geniuser, vessel_list):
-  pass
-
-def mock_renew_vessels_throws_InvalidRequestError(geniuser, vessel_list):
-  raise InvalidRequestError
-
-c = Client()
-good_data = {'handle':'12345'}
-interface.get_vessel_list = mock_get_vessel_list
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    login_test_user()
-    
-    test_normal()
-    test_get_vessel_list_throws_DoesNotExistError()
-    test_get_vessel_list_throws_InvalidRequestError()
-    test_renew_vessels_throws_InvalidRequestError()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-def test_normal():
-  """
-  <Purpose>
-    Tests normal behavior.
-  """
-  interface.get_vessel_list = mock_get_vessel_list
-  interface.renew_vessels = mock_renew_vessels
-  response = c.post('/html/renew_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_get_vessel_list_throws_DoesNotExistError():
-  """
-  <Purpose>
-    Tests behavior if interface.get_vessel_list throws a DoesNotExistError
-  """
-  interface.get_vessel_list = mock_get_vessel_list_throws_DoesNotExistError
-  interface.renew_vessels = mock_renew_vessels
-  response = c.post('/html/renew_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to renew" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_get_vessel_list_throws_InvalidRequestError():
-  """
-  <Purpose>
-    Tests behavior if interface.get_vessel_list throws an InvalidRequestError 
-  """
-  interface.get_vessel_list = mock_get_vessel_list_throws_InvalidRequestError
-  interface.renew_vessels = mock_renew_vessels
-  response = c.post('/html/renew_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to renew" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_renew_vessels_throws_InvalidRequestError():
-  """
-  <Purpose>
-    Tests behavior if interface.renew_vessels throws an InvalidRequestError
-  """
-  interface.get_vessel_list = mock_get_vessel_list
-  interface.renew_vessels = mock_renew_vessels_throws_InvalidRequestError
-  response = c.post('/html/renew_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to renew" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-  
-  
-  
-# Creates a test user in the test db, and uses the test client to 'login',
-# so all views that expect @login_required will now pass the login check. 
-def login_test_user():
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-
-
-
-if __name__=="__main__":
-  main()
+"""
+<Program>
+  test_renew_resources.py
+
+<Started>
+  Oct 13, 2009
+
+<Author>
+  Jason Chen <jchen@cs.washington.edu>
+  Justin Samuel
+
+<Purpose>
+  Tests that the renew_resource view function 
+  handles normal operation and exceptions correctly.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+# Declare our mock functions
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+def mock_get_vessel_list(vesselhandle_list):
+  return ['test', 'test2']
+
+def mock_get_vessel_list_throws_DoesNotExistError(vesselhandle_list):
+  raise DoesNotExistError
+
+def mock_get_vessel_list_throws_InvalidRequestError(vesselhandle_list):
+  raise InvalidRequestError
+
+def mock_renew_vessels(geniuser, vessel_list):
+  pass
+
+def mock_renew_vessels_throws_InvalidRequestError(geniuser, vessel_list):
+  raise InvalidRequestError
+
+c = Client()
+good_data = {'handle':'12345'}
+interface.get_vessel_list = mock_get_vessel_list
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    login_test_user()
+    
+    test_normal()
+    test_get_vessel_list_throws_DoesNotExistError()
+    test_get_vessel_list_throws_InvalidRequestError()
+    test_renew_vessels_throws_InvalidRequestError()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+def test_normal():
+  """
+  <Purpose>
+    Tests normal behavior.
+  """
+  interface.get_vessel_list = mock_get_vessel_list
+  interface.renew_vessels = mock_renew_vessels
+  response = c.post('/html/renew_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_get_vessel_list_throws_DoesNotExistError():
+  """
+  <Purpose>
+    Tests behavior if interface.get_vessel_list throws a DoesNotExistError
+  """
+  interface.get_vessel_list = mock_get_vessel_list_throws_DoesNotExistError
+  interface.renew_vessels = mock_renew_vessels
+  response = c.post('/html/renew_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to renew" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_get_vessel_list_throws_InvalidRequestError():
+  """
+  <Purpose>
+    Tests behavior if interface.get_vessel_list throws an InvalidRequestError 
+  """
+  interface.get_vessel_list = mock_get_vessel_list_throws_InvalidRequestError
+  interface.renew_vessels = mock_renew_vessels
+  response = c.post('/html/renew_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to renew" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_renew_vessels_throws_InvalidRequestError():
+  """
+  <Purpose>
+    Tests behavior if interface.renew_vessels throws an InvalidRequestError
+  """
+  interface.get_vessel_list = mock_get_vessel_list
+  interface.renew_vessels = mock_renew_vessels_throws_InvalidRequestError
+  response = c.post('/html/renew_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to renew" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+  
+  
+  
+# Creates a test user in the test db, and uses the test client to 'login',
+# so all views that expect @login_required will now pass the login check. 
+def login_test_user():
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+
+
+
+if __name__=="__main__":
+  main()
diff --git a/website/html/tests/test_urls.py b/website/html/tests/test_urls.py
index 7df78ff..5607de6 100644
--- a/website/html/tests/test_urls.py
+++ b/website/html/tests/test_urls.py
@@ -1,317 +1,317 @@
-"""
-<Program>
-  test_urls.py
-
-<Started>
-  8/28/2009
-
-<Author>
-  Jason Chen
-  jchen@cs.washington.edu
-
-<Purpose>
-  Tests that all site urls are being *served* correctly.
-  This means that all urls eventually return an HTTP 200 OK, and that 
-  non-logged-in, and logged-in users are being redirected to correct pages.
-
-  Note that just because the pages are being served correctly does
-  not imply that they *function* correctly. Make sure all other tests
-  are run as well, to test the functional correctness of pages.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-import datetime
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-from clearinghouse.website.html import forms
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-
-# Declare our mock functions
-def mock_get_logged_in_user_throws_DoesNotExistError(request):
-  raise DoesNotExistError
-
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-def mock_get_total_vessel_credits(geniuser):
-  return 10
-
-def mock_get_acquired_vessels(geniuser):
-  return ['test', 'test2']
-
-def mock_get_vessel_infodict_list(vessel_list):
-  # At a minimum, the expires_in_seconds key must exist because it is used by
-  # the myvessels view.
-  return [{'expires_in_seconds':1}, 
-          {'expires_in_seconds':2}]
-
-def mock_delete_private_key(user):
-  pass
-
-# Mock out interface calls
-#interface.get_logged_in_user = mock_get_logged_in_user
-interface.get_total_vessel_credits = mock_get_total_vessel_credits
-interface.get_acquired_vessels = mock_get_acquired_vessels
-interface.get_vessel_infodict_list = mock_get_vessel_infodict_list
-interface.delete_private_key = mock_delete_private_key
-
-c = Client()
-
-
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    # Run tests
-    get_pages_without_user_logged_in()
-    get_pages_with_user_logged_in()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-def get_pages_without_user_logged_in():
-  # uses the mock get_logged_in_user function that represents no logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user_throws_DoesNotExistError
-  
-  response = c.get('/html/register', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/register.html")
-  
-  response = c.get('/html/login', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/logout', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/accounts_help', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/help.html")
-  
-  # The URLs we tell the user to distribute have "download" instead of "html"
-  # in them.
-  response = c.get('/download/tester/', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "download/installers.html")
-  
-  # The following pages should all bounce back to the login page,
-  # since there is no user logged in currently.
-  response = c.get('/html/profile', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/mygeni', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/myvessels', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/help', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/getdonations', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/get_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/del_resource', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/del_all_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/renew_resource', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/renew_all_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  # POST is required for deleting private key.
-  response = c.get('/html/del_priv', follow=True)
-  assert(response.status_code == 405)
-  
-  response = c.get('/html/priv_key', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/pub_key', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-
-  response = c.get('/html/change_key', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-
-  response = c.get('/html/api_info', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-
-
-
-
-
-def get_pages_with_user_logged_in():
-  _login_test_user()
-  
-  response = c.get('/html/register', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  
-  response = c.get('/html/login', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  
-  response = c.get('/html/profile', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  
-  response = c.get('/html/mygeni', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/mygeni.html")
-  
-  response = c.get('/html/myvessels', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/help', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/help.html")
-  
-  response = c.get('/html/getdonations', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/getdonations.html")
-  
-  ##########################################################################
-  # the following pages expect POST requests. when they see a GET request, #
-  # they should bounce the user back to the 'My Vessels' page              #
-  ##########################################################################
-  response = c.get('/html/get_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/del_resource', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/del_all_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/renew_resource', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/renew_all_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/api_info', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/api_info.html")
-  assert("Your API key is" in response.content)
-  
-  ##########################################################################
-  
-  # The change_key page accepts either GET or POST. If it is a GET request,
-  # the the forms for changing keys are displayed. If it is a POST and the
-  # POST is valid (either a request to generate new keys or upload of a key),
-  # the user is shown the profile. If it is an invalid POST, then the same
-  # page is redisplayed with a message.
-  
-  response = c.get('/html/change_key', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/change_key.html")
-
-  # Empty post data is invalid.
-  response = c.post('/html/change_key', {}, follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/change_key.html")
-  
-  ##########################################################################
-  
-  # POST is required for deleting private key.
-  response = c.get('/html/del_priv', follow=True)
-  assert(response.status_code == 405)
-  
-  response = c.post('/html/del_priv', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  assert("Your private key has been deleted" in response.content)
-  
-  # Make sure that priv_key returns an attachment response
-  response = c.get('/html/priv_key', follow=True)
-  assert(response.status_code == 200)
-  assert("attachment" in response['Content-Disposition'])
-  assert(".privatekey" in response['Content-Disposition'])
-  
-  # Make sure that pub_key returns an attachment response
-  response = c.get('/html/pub_key', follow=True)
-  assert(response.status_code == 200)
-  assert("attachment" in response['Content-Disposition'])
-  assert(".publickey" in response['Content-Disposition'])
-
-  # Logging out should return an HttpResponseRedirect to login
-  response = c.get('/html/logout', follow=True)
-  assert(response.status_code == 302)
-  assert("/html/login" in response['Location'])
-
-
-
-
-
-def _login_test_user():
-  """
-  <Purpose>
-    Creates a test user in the test db, and uses the test client to 'login',
-    so all views that expect @login_required will now pass the login check. 
-  """
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-  
-
-if __name__=="__main__":
-  main()
+"""
+<Program>
+  test_urls.py
+
+<Started>
+  8/28/2009
+
+<Author>
+  Jason Chen
+  jchen@cs.washington.edu
+
+<Purpose>
+  Tests that all site urls are being *served* correctly.
+  This means that all urls eventually return an HTTP 200 OK, and that 
+  non-logged-in, and logged-in users are being redirected to correct pages.
+
+  Note that just because the pages are being served correctly does
+  not imply that they *function* correctly. Make sure all other tests
+  are run as well, to test the functional correctness of pages.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+import datetime
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+from clearinghouse.website.html import forms
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+
+# Declare our mock functions
+def mock_get_logged_in_user_throws_DoesNotExistError(request):
+  raise DoesNotExistError
+
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+def mock_get_total_vessel_credits(geniuser):
+  return 10
+
+def mock_get_acquired_vessels(geniuser):
+  return ['test', 'test2']
+
+def mock_get_vessel_infodict_list(vessel_list):
+  # At a minimum, the expires_in_seconds key must exist because it is used by
+  # the myvessels view.
+  return [{'expires_in_seconds':1}, 
+          {'expires_in_seconds':2}]
+
+def mock_delete_private_key(user):
+  pass
+
+# Mock out interface calls
+#interface.get_logged_in_user = mock_get_logged_in_user
+interface.get_total_vessel_credits = mock_get_total_vessel_credits
+interface.get_acquired_vessels = mock_get_acquired_vessels
+interface.get_vessel_infodict_list = mock_get_vessel_infodict_list
+interface.delete_private_key = mock_delete_private_key
+
+c = Client()
+
+
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    # Run tests
+    get_pages_without_user_logged_in()
+    get_pages_with_user_logged_in()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+def get_pages_without_user_logged_in():
+  # uses the mock get_logged_in_user function that represents no logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user_throws_DoesNotExistError
+  
+  response = c.get('/html/register', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/register.html")
+  
+  response = c.get('/html/login', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/logout', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/accounts_help', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/help.html")
+  
+  # The URLs we tell the user to distribute have "download" instead of "html"
+  # in them.
+  response = c.get('/download/tester/', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "download/installers.html")
+  
+  # The following pages should all bounce back to the login page,
+  # since there is no user logged in currently.
+  response = c.get('/html/profile', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/mygeni', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/myvessels', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/help', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/getdonations', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/get_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/del_resource', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/del_all_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/renew_resource', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/renew_all_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  # POST is required for deleting private key.
+  response = c.get('/html/del_priv', follow=True)
+  assert(response.status_code == 405)
+  
+  response = c.get('/html/priv_key', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/pub_key', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+
+  response = c.get('/html/change_key', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+
+  response = c.get('/html/api_info', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+
+
+
+
+
+def get_pages_with_user_logged_in():
+  _login_test_user()
+  
+  response = c.get('/html/register', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  
+  response = c.get('/html/login', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  
+  response = c.get('/html/profile', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  
+  response = c.get('/html/mygeni', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/mygeni.html")
+  
+  response = c.get('/html/myvessels', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/help', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/help.html")
+  
+  response = c.get('/html/getdonations', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/getdonations.html")
+  
+  ##########################################################################
+  # the following pages expect POST requests. when they see a GET request, #
+  # they should bounce the user back to the 'My Vessels' page              #
+  ##########################################################################
+  response = c.get('/html/get_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/del_resource', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/del_all_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/renew_resource', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/renew_all_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/api_info', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/api_info.html")
+  assert("Your API key is" in response.content)
+  
+  ##########################################################################
+  
+  # The change_key page accepts either GET or POST. If it is a GET request,
+  # the the forms for changing keys are displayed. If it is a POST and the
+  # POST is valid (either a request to generate new keys or upload of a key),
+  # the user is shown the profile. If it is an invalid POST, then the same
+  # page is redisplayed with a message.
+  
+  response = c.get('/html/change_key', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/change_key.html")
+
+  # Empty post data is invalid.
+  response = c.post('/html/change_key', {}, follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/change_key.html")
+  
+  ##########################################################################
+  
+  # POST is required for deleting private key.
+  response = c.get('/html/del_priv', follow=True)
+  assert(response.status_code == 405)
+  
+  response = c.post('/html/del_priv', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  assert("Your private key has been deleted" in response.content)
+  
+  # Make sure that priv_key returns an attachment response
+  response = c.get('/html/priv_key', follow=True)
+  assert(response.status_code == 200)
+  assert("attachment" in response['Content-Disposition'])
+  assert(".privatekey" in response['Content-Disposition'])
+  
+  # Make sure that pub_key returns an attachment response
+  response = c.get('/html/pub_key', follow=True)
+  assert(response.status_code == 200)
+  assert("attachment" in response['Content-Disposition'])
+  assert(".publickey" in response['Content-Disposition'])
+
+  # Logging out should return an HttpResponseRedirect to login
+  response = c.get('/html/logout', follow=True)
+  assert(response.status_code == 302)
+  assert("/html/login" in response['Location'])
+
+
+
+
+
+def _login_test_user():
+  """
+  <Purpose>
+    Creates a test user in the test db, and uses the test client to 'login',
+    so all views that expect @login_required will now pass the login check. 
+  """
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+  
+
+if __name__=="__main__":
+  main()
diff --git a/website/html/tests/ut_html_test_change_api_key.py b/website/html/tests/ut_html_test_change_api_key.py
index cf747ae..0b73883 100644
--- a/website/html/tests/ut_html_test_change_api_key.py
+++ b/website/html/tests/ut_html_test_change_api_key.py
@@ -1,119 +1,119 @@
-"""
-<Program>
-  test_view_change_api_key.py
-
-<Started>
-  Oct 16, 2009
-
-<Author>
-  Justin Samuel
-
-<Purpose>
-  Tests that the api_info view function which is responsible for displaying and
-  handling requests to regenerate the user's api key.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-#pragma out
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-import tempfile
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-
-
-
-
-
-# Declare our mock functions
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-
-
-
-
-def mock_noop(*args, **kwargs):
-  pass
-  
-  
-  
-  
-
-c = Client()
-
-interface.regenerate_api_key = mock_noop
-
-
-
-
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    login_test_user()
-    test_regenerate_api_key()
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-
-
-def test_regenerate_api_key():
-  """
-  <Purpose>
-    Tests submission of form to generate a new api key.
-  """
-  post_data = {'generate_api_key':'yes'}
-  response = c.post('/html/api_info', post_data, follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/api_info.html")
-  assert("Your API key has been regenerated" in response.content)
-
-
-
-
-
-  
-# Creates a test user in the test db, and uses the test client to 'login',
-# so all views that expect @login_required will now pass the login check. 
-def login_test_user():
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-
-
-
-if __name__ == "__main__":
-  main()
+"""
+<Program>
+  test_view_change_api_key.py
+
+<Started>
+  Oct 16, 2009
+
+<Author>
+  Justin Samuel
+
+<Purpose>
+  Tests that the api_info view function which is responsible for displaying and
+  handling requests to regenerate the user's api key.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+#pragma out
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+import tempfile
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+
+
+
+
+
+# Declare our mock functions
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+
+
+
+
+def mock_noop(*args, **kwargs):
+  pass
+  
+  
+  
+  
+
+c = Client()
+
+interface.regenerate_api_key = mock_noop
+
+
+
+
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    login_test_user()
+    test_regenerate_api_key()
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+
+
+def test_regenerate_api_key():
+  """
+  <Purpose>
+    Tests submission of form to generate a new api key.
+  """
+  post_data = {'generate_api_key':'yes'}
+  response = c.post('/html/api_info', post_data, follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/api_info.html")
+  assert("Your API key has been regenerated" in response.content)
+
+
+
+
+
+  
+# Creates a test user in the test db, and uses the test client to 'login',
+# so all views that expect @login_required will now pass the login check. 
+def login_test_user():
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+
+
+
+if __name__ == "__main__":
+  main()
diff --git a/website/html/tests/ut_html_test_change_key.py b/website/html/tests/ut_html_test_change_key.py
index 8250bde..082228f 100644
--- a/website/html/tests/ut_html_test_change_key.py
+++ b/website/html/tests/ut_html_test_change_key.py
@@ -1,202 +1,202 @@
-"""
-<Program>
-  test_change_key.py
-
-<Started>
-  Oct 13, 2009
-
-<Author>
-  Justin Samuel
-
-<Purpose>
-  Tests that the change_key view function  handles normal operation and
-  exceptions correctly.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-#pragma out
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-import tempfile
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-
-
-
-
-# Declare our mock functions
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-
-
-
-
-def mock_noop(*args, **kwargs):
-  pass
-  
-  
-  
-  
-
-c = Client()
-
-interface.change_user_keys = mock_noop
-
-
-
-
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    login_test_user()
-    
-    test_regenerate_key()
-    test_upload_key_no_file()
-    test_upload_key_file()
-    test_upload_key_file_empty_file()
-    test_upload_key_file_invalid_key()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-
-def test_regenerate_key():
-  """
-  <Purpose>
-    Tests submission of form to generate a new user key.
-  """
-  post_data = {'generate':'yes'}
-  response = c.post('/html/change_key', post_data, follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  assert("Your new keys have been generated" in response.content)
-
-
-
-
-
-def test_upload_key_no_file():
-  """
-  <Purpose>
-    Tests submitting the upload key form with no key.
-  """
-  post_data = {}
-  response = c.post('/html/change_key', post_data, follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/change_key.html")
-  assert("You didn&#39;t select a public key file to upload" in response.content)
-
-
-
-
-
-def test_upload_key_file():
-  """
-  <Purpose>
-    Tests submitting the upload key form with no key.
-  """
-  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
-  uploaded_file.write('1 2')
-  uploaded_file.flush()
-  uploaded_file.seek(0)
-
-  post_data = {'pubkey':uploaded_file}
-  response = c.post('/html/change_key', post_data, follow=True)
-  
-  uploaded_file.close()
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  assert("Your public key has been successfully changed" in response.content)
-
-
-
-
-def test_upload_key_file_empty_file():
-  """
-  <Purpose>
-    Tests submitting the upload key form with no key.
-  """
-  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
-
-  post_data = {'pubkey':uploaded_file}
-  response = c.post('/html/change_key', post_data, follow=True)
-  
-  uploaded_file.close()
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/change_key.html")
-  assert("Invalid file uploaded" in response.content)
-
-
-
-
-
-def test_upload_key_file_invalid_key():
-  """
-  <Purpose>
-    Tests submitting the upload key form with no key.
-  """
-  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
-  uploaded_file.write('abc')
-  uploaded_file.flush()
-  uploaded_file.seek(0)
-
-  post_data = {'pubkey':uploaded_file}
-  response = c.post('/html/change_key', post_data, follow=True)
-  
-  uploaded_file.close()
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/change_key.html")
-  assert("Invalid public key uploaded" in response.content)
-
-
-
-
-  
-# Creates a test user in the test db, and uses the test client to 'login',
-# so all views that expect @login_required will now pass the login check. 
-def login_test_user():
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-
-
-
-if __name__ == "__main__":
-  main()
+"""
+<Program>
+  test_change_key.py
+
+<Started>
+  Oct 13, 2009
+
+<Author>
+  Justin Samuel
+
+<Purpose>
+  Tests that the change_key view function  handles normal operation and
+  exceptions correctly.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+#pragma out
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+import tempfile
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+
+
+
+
+# Declare our mock functions
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+
+
+
+
+def mock_noop(*args, **kwargs):
+  pass
+  
+  
+  
+  
+
+c = Client()
+
+interface.change_user_keys = mock_noop
+
+
+
+
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    login_test_user()
+    
+    test_regenerate_key()
+    test_upload_key_no_file()
+    test_upload_key_file()
+    test_upload_key_file_empty_file()
+    test_upload_key_file_invalid_key()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+
+def test_regenerate_key():
+  """
+  <Purpose>
+    Tests submission of form to generate a new user key.
+  """
+  post_data = {'generate':'yes'}
+  response = c.post('/html/change_key', post_data, follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  assert("Your new keys have been generated" in response.content)
+
+
+
+
+
+def test_upload_key_no_file():
+  """
+  <Purpose>
+    Tests submitting the upload key form with no key.
+  """
+  post_data = {}
+  response = c.post('/html/change_key', post_data, follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/change_key.html")
+  assert("You didn&#39;t select a public key file to upload" in response.content)
+
+
+
+
+
+def test_upload_key_file():
+  """
+  <Purpose>
+    Tests submitting the upload key form with no key.
+  """
+  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
+  uploaded_file.write('1 2')
+  uploaded_file.flush()
+  uploaded_file.seek(0)
+
+  post_data = {'pubkey':uploaded_file}
+  response = c.post('/html/change_key', post_data, follow=True)
+  
+  uploaded_file.close()
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  assert("Your public key has been successfully changed" in response.content)
+
+
+
+
+def test_upload_key_file_empty_file():
+  """
+  <Purpose>
+    Tests submitting the upload key form with no key.
+  """
+  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
+
+  post_data = {'pubkey':uploaded_file}
+  response = c.post('/html/change_key', post_data, follow=True)
+  
+  uploaded_file.close()
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/change_key.html")
+  assert("Invalid file uploaded" in response.content)
+
+
+
+
+
+def test_upload_key_file_invalid_key():
+  """
+  <Purpose>
+    Tests submitting the upload key form with no key.
+  """
+  uploaded_file = tempfile.NamedTemporaryFile(mode="w+")
+  uploaded_file.write('abc')
+  uploaded_file.flush()
+  uploaded_file.seek(0)
+
+  post_data = {'pubkey':uploaded_file}
+  response = c.post('/html/change_key', post_data, follow=True)
+  
+  uploaded_file.close()
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/change_key.html")
+  assert("Invalid public key uploaded" in response.content)
+
+
+
+
+  
+# Creates a test user in the test db, and uses the test client to 'login',
+# so all views that expect @login_required will now pass the login check. 
+def login_test_user():
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+
+
+
+if __name__ == "__main__":
+  main()
diff --git a/website/html/tests/ut_html_test_del_resources.py b/website/html/tests/ut_html_test_del_resources.py
index 470451f..16a4eb8 100644
--- a/website/html/tests/ut_html_test_del_resources.py
+++ b/website/html/tests/ut_html_test_del_resources.py
@@ -1,159 +1,159 @@
-"""
-<Program>
-  test_del_resources.py
-
-<Started>
-  8/30/2009
-
-<Author>
-  Jason Chen
-  jchen@cs.washington.edu
-
-<Purpose>
-  Tests that the del_resource view function 
-  handles normal operation and exceptions correctly.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-#pragma out
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-# Declare our mock functions
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-def mock_get_vessel_list(vesselhandle_list):
-  return ['test', 'test2']
-
-def mock_get_vessel_list_throws_DoesNotExistError(vesselhandle_list):
-  raise DoesNotExistError
-
-def mock_get_vessel_list_throws_InvalidRequestError(vesselhandle_list):
-  raise InvalidRequestError
-
-def mock_release_vessels(geniuser, vessel_list):
-  pass
-
-def mock_release_vessels_throws_InvalidRequestError(geniuser, vessel_list):
-  raise InvalidRequestError
-
-c = Client()
-good_data = {'handle':'12345'}
-interface.get_vessel_list = mock_get_vessel_list
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    login_test_user()
-    
-    test_normal()
-    test_get_vessel_list_throws_DoesNotExistError()
-    test_get_vessel_list_throws_InvalidRequestError()
-    test_release_vessels_throws_InvalidRequestError()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-def test_normal():
-  """
-  <Purpose>
-    Tests normal behavior.
-  """
-  interface.get_vessel_list = mock_get_vessel_list
-  interface.release_vessels = mock_release_vessels
-  response = c.post('/html/del_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_get_vessel_list_throws_DoesNotExistError():
-  """
-  <Purpose>
-    Tests behavior if interface.get_vessel_list throws a DoesNotExistError
-  """
-  interface.get_vessel_list = mock_get_vessel_list_throws_DoesNotExistError
-  interface.release_vessels = mock_release_vessels
-  response = c.post('/html/del_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to remove" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_get_vessel_list_throws_InvalidRequestError():
-  """
-  <Purpose>
-    Tests behavior if interface.get_vessel_list throws an InvalidRequestError 
-  """
-  interface.get_vessel_list = mock_get_vessel_list_throws_InvalidRequestError
-  interface.release_vessels = mock_release_vessels
-  response = c.post('/html/del_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to remove" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_release_vessels_throws_InvalidRequestError():
-  """
-  <Purpose>
-    Tests behavior if interface.release_vessels throws an InvalidRequestError
-  """
-  interface.get_vessel_list = mock_get_vessel_list
-  interface.release_vessels = mock_release_vessels_throws_InvalidRequestError
-  response = c.post('/html/del_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to remove" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-  
-  
-  
-# Creates a test user in the test db, and uses the test client to 'login',
-# so all views that expect @login_required will now pass the login check. 
-def login_test_user():
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-
-
-
-if __name__=="__main__":
-  main()
+"""
+<Program>
+  test_del_resources.py
+
+<Started>
+  8/30/2009
+
+<Author>
+  Jason Chen
+  jchen@cs.washington.edu
+
+<Purpose>
+  Tests that the del_resource view function 
+  handles normal operation and exceptions correctly.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+#pragma out
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+# Declare our mock functions
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+def mock_get_vessel_list(vesselhandle_list):
+  return ['test', 'test2']
+
+def mock_get_vessel_list_throws_DoesNotExistError(vesselhandle_list):
+  raise DoesNotExistError
+
+def mock_get_vessel_list_throws_InvalidRequestError(vesselhandle_list):
+  raise InvalidRequestError
+
+def mock_release_vessels(geniuser, vessel_list):
+  pass
+
+def mock_release_vessels_throws_InvalidRequestError(geniuser, vessel_list):
+  raise InvalidRequestError
+
+c = Client()
+good_data = {'handle':'12345'}
+interface.get_vessel_list = mock_get_vessel_list
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    login_test_user()
+    
+    test_normal()
+    test_get_vessel_list_throws_DoesNotExistError()
+    test_get_vessel_list_throws_InvalidRequestError()
+    test_release_vessels_throws_InvalidRequestError()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+def test_normal():
+  """
+  <Purpose>
+    Tests normal behavior.
+  """
+  interface.get_vessel_list = mock_get_vessel_list
+  interface.release_vessels = mock_release_vessels
+  response = c.post('/html/del_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_get_vessel_list_throws_DoesNotExistError():
+  """
+  <Purpose>
+    Tests behavior if interface.get_vessel_list throws a DoesNotExistError
+  """
+  interface.get_vessel_list = mock_get_vessel_list_throws_DoesNotExistError
+  interface.release_vessels = mock_release_vessels
+  response = c.post('/html/del_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to remove" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_get_vessel_list_throws_InvalidRequestError():
+  """
+  <Purpose>
+    Tests behavior if interface.get_vessel_list throws an InvalidRequestError 
+  """
+  interface.get_vessel_list = mock_get_vessel_list_throws_InvalidRequestError
+  interface.release_vessels = mock_release_vessels
+  response = c.post('/html/del_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to remove" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_release_vessels_throws_InvalidRequestError():
+  """
+  <Purpose>
+    Tests behavior if interface.release_vessels throws an InvalidRequestError
+  """
+  interface.get_vessel_list = mock_get_vessel_list
+  interface.release_vessels = mock_release_vessels_throws_InvalidRequestError
+  response = c.post('/html/del_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to remove" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+  
+  
+  
+# Creates a test user in the test db, and uses the test client to 'login',
+# so all views that expect @login_required will now pass the login check. 
+def login_test_user():
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+
+
+
+if __name__=="__main__":
+  main()
diff --git a/website/html/tests/ut_html_test_get_resources.py b/website/html/tests/ut_html_test_get_resources.py
index 5d959ac..99313b5 100644
--- a/website/html/tests/ut_html_test_get_resources.py
+++ b/website/html/tests/ut_html_test_get_resources.py
@@ -1,188 +1,188 @@
-"""
-<Program>
-  test_get_resources.py
-
-<Started>
-  8/30/2009
-
-<Author>
-  Jason Chen
-  jchen@cs.washington.edu
-
-<Purpose>
-  Tests that the get_resources view function 
-  handles normal operation and exceptions correctly.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-#pragma out
-
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-# Declare our mock functions
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-def mock_acquire_vessels(geniuser, vesselcount, vesseltype):
-  return ['test1', 'test2']
-
-def mock_acquire_vessels_throws_UnableToAcquireResourcesError(geniuser, vesselcount, vesseltype):
-  raise UnableToAcquireResourcesError
-
-def mock_acquire_vessels_throws_InsufficientUserResourcesError(geniuser, vesselcount, vesseltype):
-  raise InsufficientUserResourcesError
-
-c = Client()
-good_data = {'num':5, 'env':'rand'}
-
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    login_test_user()
-    
-    test_normal()
-    test_interface_throws_UnableToAcquireResourcesError()
-    test_interface_throws_InsufficientUserResourcesError()
-    test_blank_POST_data()
-    test_invalid_POST_data_invalid_num()
-    test_invalid_POST_data_invalid_env()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-def test_normal():
-  """
-  <Purpose>
-    Test normal behavior
-  """
-  interface.acquire_vessels = mock_acquire_vessels
-  response = c.post('/html/get_resources', good_data, follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-def test_interface_throws_UnableToAcquireResourcesError():
-  """
-  <Purpose>
-    Test behavior if interface throws UnableToAcquireResourcesError.
-  
-  <Note>
-    Checking only the existance of "action_summary" in the response
-    is sufficient in seeing whether the view caught the error, since 
-    error messages are shown in that html element. (Of course, so are
-    normal messages, but we are clearly having the interface throw an
-    exception, so normal messages don't even exist in this context).
-  """
-  interface.acquire_vessels = mock_acquire_vessels_throws_UnableToAcquireResourcesError
-  response = c.post('/html/get_resources', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-  assert("Unable to acquire vessels at this time" in response.content)
-
-
-
-def test_interface_throws_InsufficientUserResourcesError():
-  """
-  <Purpose>
-    Test behavior if interface throws InsufficientUserResourcesError.
-  """
-  interface.acquire_vessels = mock_acquire_vessels_throws_InsufficientUserResourcesError
-  response = c.post('/html/get_resources', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-  assert("Unable to acquire" in response.content)
-  assert("vessel credit" in response.content)
-
-
-
-def test_blank_POST_data():
-  """
-  <Purpose>
-    Test behavior if we submit blank POST data.
-  """
-  interface.acquire_vessels = mock_acquire_vessels
-  response = c.post('/html/get_resources', {}, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-  assert("This field is required" in response.content)
-
-
-
-def test_invalid_POST_data_invalid_num():
-  """
-  <Purpose>
-    Test behavior if we submit POST data with an invalid 'num' field.
-  """
-  interface.acquire_vessels = mock_acquire_vessels
-  test_data = {'num':-5, 'env':'rand'}
-  response = c.post('/html/get_resources', test_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-  assert("Select a valid choice" in response.content)
-
-
-
-def test_invalid_POST_data_invalid_env():
-  """
-  <Purpose>
-    Test behavior if we submit POST data with an invalid 'env' field.
-  """
-  interface.acquire_vessels = mock_acquire_vessels
-  test_data = {'num':5, 'env':'notvalid'}
-  response = c.post('/html/get_resources', test_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-  assert("Select a valid choice" in response.content)
-
-
-
-# Creates a test user in the test db, and uses the test client to 'login',
-# so all views that expect @login_required will now pass the login check. 
-def login_test_user():
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-
-
-
-if __name__=="__main__":
-  main()
+"""
+<Program>
+  test_get_resources.py
+
+<Started>
+  8/30/2009
+
+<Author>
+  Jason Chen
+  jchen@cs.washington.edu
+
+<Purpose>
+  Tests that the get_resources view function 
+  handles normal operation and exceptions correctly.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+#pragma out
+
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+# Declare our mock functions
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+def mock_acquire_vessels(geniuser, vesselcount, vesseltype):
+  return ['test1', 'test2']
+
+def mock_acquire_vessels_throws_UnableToAcquireResourcesError(geniuser, vesselcount, vesseltype):
+  raise UnableToAcquireResourcesError
+
+def mock_acquire_vessels_throws_InsufficientUserResourcesError(geniuser, vesselcount, vesseltype):
+  raise InsufficientUserResourcesError
+
+c = Client()
+good_data = {'num':5, 'env':'rand'}
+
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    login_test_user()
+    
+    test_normal()
+    test_interface_throws_UnableToAcquireResourcesError()
+    test_interface_throws_InsufficientUserResourcesError()
+    test_blank_POST_data()
+    test_invalid_POST_data_invalid_num()
+    test_invalid_POST_data_invalid_env()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+def test_normal():
+  """
+  <Purpose>
+    Test normal behavior
+  """
+  interface.acquire_vessels = mock_acquire_vessels
+  response = c.post('/html/get_resources', good_data, follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+def test_interface_throws_UnableToAcquireResourcesError():
+  """
+  <Purpose>
+    Test behavior if interface throws UnableToAcquireResourcesError.
+  
+  <Note>
+    Checking only the existance of "action_summary" in the response
+    is sufficient in seeing whether the view caught the error, since 
+    error messages are shown in that html element. (Of course, so are
+    normal messages, but we are clearly having the interface throw an
+    exception, so normal messages don't even exist in this context).
+  """
+  interface.acquire_vessels = mock_acquire_vessels_throws_UnableToAcquireResourcesError
+  response = c.post('/html/get_resources', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+  assert("Unable to acquire vessels at this time" in response.content)
+
+
+
+def test_interface_throws_InsufficientUserResourcesError():
+  """
+  <Purpose>
+    Test behavior if interface throws InsufficientUserResourcesError.
+  """
+  interface.acquire_vessels = mock_acquire_vessels_throws_InsufficientUserResourcesError
+  response = c.post('/html/get_resources', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+  assert("Unable to acquire" in response.content)
+  assert("vessel credit" in response.content)
+
+
+
+def test_blank_POST_data():
+  """
+  <Purpose>
+    Test behavior if we submit blank POST data.
+  """
+  interface.acquire_vessels = mock_acquire_vessels
+  response = c.post('/html/get_resources', {}, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+  assert("This field is required" in response.content)
+
+
+
+def test_invalid_POST_data_invalid_num():
+  """
+  <Purpose>
+    Test behavior if we submit POST data with an invalid 'num' field.
+  """
+  interface.acquire_vessels = mock_acquire_vessels
+  test_data = {'num':-5, 'env':'rand'}
+  response = c.post('/html/get_resources', test_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+  assert("Select a valid choice" in response.content)
+
+
+
+def test_invalid_POST_data_invalid_env():
+  """
+  <Purpose>
+    Test behavior if we submit POST data with an invalid 'env' field.
+  """
+  interface.acquire_vessels = mock_acquire_vessels
+  test_data = {'num':5, 'env':'notvalid'}
+  response = c.post('/html/get_resources', test_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+  assert("Select a valid choice" in response.content)
+
+
+
+# Creates a test user in the test db, and uses the test client to 'login',
+# so all views that expect @login_required will now pass the login check. 
+def login_test_user():
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+
+
+
+if __name__=="__main__":
+  main()
diff --git a/website/html/tests/ut_html_test_register.py b/website/html/tests/ut_html_test_register.py
index 39d9926..19edf91 100644
--- a/website/html/tests/ut_html_test_register.py
+++ b/website/html/tests/ut_html_test_register.py
@@ -1,394 +1,394 @@
-"""
-<Program>
-  test_register.py
-
-<Started>
-  8/26/2009
-
-<Author>
-  Jason Chen
-  jchen@cs.washington.edu
-
-<Purpose>
-  Tests the registration function of the HTML frontend view.
-
-<Notes>
-  We make use of the Django test client, which emulates a webclient and returns what django
-  considers the final rendered result (in HTML). This allows us to test purely the view functions.
-  Apart from testing the validity/sanity of the view functions, we also mock-out all calls into the
-  interface, and return test values to the view functions. This way, we can ensure that the views behave
-  properly in normal (and abnormal) interactions with the interface.
-"""
-
-#pragma out
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-import StringIO
-import os
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.common.util import validations
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-from clearinghouse.website.html import forms
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-# Declare our mock functions
-def mock_register_user(username, password, email, affiliation, pubkey=None):
-  testuser = DjangoUser()
-  testuser.username = "test_user"
-  return testuser
-
-def mock_register_user_throws_ValidationError(username, password, email, affiliation, pubkey=None):
-  raise ValidationError
-
-def mock_get_logged_in_user(request):
-  raise DoesNotExistError
-
-# set up test data
-c = Client()
-good_data = {'username': 'tester', 
-             'password1': '12345678',
-             'password2': '12345678',  
-             'email': 'test@test.com',  
-             'affiliation': 'test affil', 
-             'gen_upload_choice':'1'}
-
-test_data = {}
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    # mock out interface calls
-    interface.register_user = mock_register_user
-    interface.get_logged_in_user = mock_get_logged_in_user
-    
-    # run tests
-    test_post_blank_form()
-    test_short_username()
-    test_long_username()
-    test_invalid_username()
-    test_short_password()
-    test_nonmatching_password()
-    test_matching_username_password()
-    test_short_affil()
-    test_long_affil()
-    test_invalid_email()
-    test_key_upload_with_no_file()
-    test_key_upload_with_oversized_file()
-    test_key_upload_with_bad_format_key()
-    test_key_upload_with_valid_key()
-    test_normal()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-  
-
-def test_post_blank_form():
-  """
-  <Purpose>
-    Test for posting blank form
-  
-  <Note>
-    Checking for the existance of (p class=\"warning\") in response.content is
-    sufficient in detecting whether the view caught an error; since the page
-    will only ever show that html element in the event of an error. And, this 
-    is all we care about: that the page recognized that bad data was passed in, 
-    and an error was raised.
-  """
-  response = c.post('/html/register', {'username': '', 
-                                       'password1':'', 
-                                       'password2':'', 
-                                       'email':'', 
-                                       'affiliation':'', 
-                                       'gen_upload_choice':'1'}, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_short_username():
-  """
-  <Purpose>
-    Test for username too short
-  """  
-  shortuser = ""
-  for n in range(0, validations.USERNAME_MIN_LENGTH - 1):
-    shortuser += "a"
-  
-  test_data = good_data.copy()
-  test_data['username'] = shortuser
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_long_username():
-  """
-  <Purpose>
-    Test for username too long
-  """  
-  longuser = ""
-  for n in range(0, validations.USERNAME_MAX_LENGTH + 1):
-    longuser += "a"
-  
-  test_data = good_data.copy()
-  test_data['username'] = longuser
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_invalid_username():
-  """
-  <Purpose>
-    Test for invalid username
-  """  
-  test_data = good_data.copy()
-  test_data['username'] = 'tester!!!'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_short_password():
-  """
-  <Purpose>
-    Test for password too short
-  """  
-  test_data = good_data.copy()
-  test_data['password1'] = '12345'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_nonmatching_password():
-  """
-  <Purpose>
-    Test for non-matching passwords
-  """  
-  test_data = good_data.copy()
-  test_data['password2'] = '87654321'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_matching_username_password():
-  """
-  <Purpose>
-    Test for same username and password
-  """  
-  test_data = good_data.copy()
-  test_data['username'] = 'tester'
-  test_data['password1'] = 'tester'
-  test_data['password2'] = 'tester'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_short_affil():
-  """
-  <Purpose>
-    Test for affiliation too short
-  """  
-  shortaffil = ""
-  for n in range(0, validations.AFFILIATION_MIN_LENGTH - 1):
-    shortaffil += "a"
-  
-  test_data = good_data.copy()
-  test_data['affiliation'] = shortaffil
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_long_affil():
-  """
-  <Purpose>
-    Test for affiliation too long
-  """  
-  longaffil = ""
-  for n in range(0, validations.AFFILIATION_MAX_LENGTH + 1):
-    longaffil += "a"
-  
-  test_data = good_data.copy()
-  test_data['affiliation'] = longaffil
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_invalid_email():
-  """
-  <Purpose>
-    Test for invalid e-mail
-  """  
-  test_data = good_data.copy()
-  test_data['email'] = 'invalid@email'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_key_upload_with_no_file():
-  """
-  <Purpose>
-    Test key upload with no file
-  """  
-  test_data = good_data.copy()
-  test_data['gen_upload_choice'] = '2'
-  
-  response = c.post('/html/register', test_data, follow=True)
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_key_upload_with_oversized_file():
-  """
-  <Purpose>
-    Test key upload with oversized file
-  """  
-  test_data = good_data.copy()
-  test_data['gen_upload_choice'] = '2'
-  
-  # set up a temporary 'key' file object
-  data = ''
-  for n in range(0, forms.MAX_PUBKEY_UPLOAD_SIZE + 1):
-    data += '0'
-  
-  fh = open(os.path.join(os.getcwd(), 'bigkey'), 'w')
-  fh.write(data)
-  fh.close()
-  fh = open('bigkey')
-  test_data['pubkey'] = fh
-  
-  response = c.post('/html/register', test_data, follow=True)
-  fh.close()
-  os.remove(os.path.join(os.getcwd(), 'bigkey'))
-  
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_key_upload_with_bad_format_key():
-  """
-  <Purpose>
-    Test key upload with badly formatted key
-  """  
-  test_data = good_data.copy()
-  test_data['gen_upload_choice'] = '2'
-  
-  data = 'this is a fake key'
-  fh = open(os.path.join(os.getcwd(), 'fakekey'), 'w')
-  fh.write(data)
-  fh.close()
-  fh = open('fakekey')
-  test_data['pubkey'] = fh
-  
-  response = c.post('/html/register', test_data, follow=True)
-  fh.close()
-  os.remove(os.path.join(os.getcwd(), 'fakekey'))
-  
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_key_upload_with_valid_key():
-  """
-  <Purpose>
-    Test key upload with valid key
-  """  
-  test_data = good_data.copy()
-  test_data['gen_upload_choice'] = '2'
-  
-  data = '65537 1255529510320394315881981094520474315188224118590997402913761676258431241305254181126132200564438402053537493727356349330161335739149834523475129922460441305694528141374947142391183883986671526830986555904385942930184161960677388507'
-  fh = open(os.path.join(os.getcwd(), 'goodkey'), 'w')
-  fh.write(data)
-  fh.close()
-  fh = open('goodkey')
-  test_data['pubkey'] = fh
-  
-  response = c.post('/html/register', test_data, follow=True)
-  fh.close()
-  os.remove(os.path.join(os.getcwd(), 'goodkey'))
-  
-  assert(response.status_code == 200)
-  assert("successfully registered" in response.content)
-
-
-
-def test_interface_throws_ValidationError():
-  """
-  <Purpose>
-    Test behavior if interface throws a ValidationError, 
-    even after passing all validation
-  """  
-  interface.register_user = mock_register_user_throws_ValidationError
-  response = c.post('/html/register', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("p class=\"warning\"" in response.content)
-
-
-
-def test_normal():
-  """
-  <Purpose>
-    Test normal behavior
-  """  
-  interface.register_user = mock_register_user
-  response = c.post('/html/register', good_data, follow=True)
-  
-  # check that the view thinks the user has been registered
-  assert(response.status_code == 200)
-  assert("successfully registered" in response.content)
-  
-  # check that the current page is now the login page
-  assert(response.template[0].name == "accounts/login.html")
-
-
-if __name__=="__main__":
-  main()
+"""
+<Program>
+  test_register.py
+
+<Started>
+  8/26/2009
+
+<Author>
+  Jason Chen
+  jchen@cs.washington.edu
+
+<Purpose>
+  Tests the registration function of the HTML frontend view.
+
+<Notes>
+  We make use of the Django test client, which emulates a webclient and returns what django
+  considers the final rendered result (in HTML). This allows us to test purely the view functions.
+  Apart from testing the validity/sanity of the view functions, we also mock-out all calls into the
+  interface, and return test values to the view functions. This way, we can ensure that the views behave
+  properly in normal (and abnormal) interactions with the interface.
+"""
+
+#pragma out
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+import StringIO
+import os
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.common.util import validations
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+from clearinghouse.website.html import forms
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+# Declare our mock functions
+def mock_register_user(username, password, email, affiliation, pubkey=None):
+  testuser = DjangoUser()
+  testuser.username = "test_user"
+  return testuser
+
+def mock_register_user_throws_ValidationError(username, password, email, affiliation, pubkey=None):
+  raise ValidationError
+
+def mock_get_logged_in_user(request):
+  raise DoesNotExistError
+
+# set up test data
+c = Client()
+good_data = {'username': 'tester', 
+             'password1': '12345678',
+             'password2': '12345678',  
+             'email': 'test@test.com',  
+             'affiliation': 'test affil', 
+             'gen_upload_choice':'1'}
+
+test_data = {}
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    # mock out interface calls
+    interface.register_user = mock_register_user
+    interface.get_logged_in_user = mock_get_logged_in_user
+    
+    # run tests
+    test_post_blank_form()
+    test_short_username()
+    test_long_username()
+    test_invalid_username()
+    test_short_password()
+    test_nonmatching_password()
+    test_matching_username_password()
+    test_short_affil()
+    test_long_affil()
+    test_invalid_email()
+    test_key_upload_with_no_file()
+    test_key_upload_with_oversized_file()
+    test_key_upload_with_bad_format_key()
+    test_key_upload_with_valid_key()
+    test_normal()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+  
+
+def test_post_blank_form():
+  """
+  <Purpose>
+    Test for posting blank form
+  
+  <Note>
+    Checking for the existance of (p class=\"warning\") in response.content is
+    sufficient in detecting whether the view caught an error; since the page
+    will only ever show that html element in the event of an error. And, this 
+    is all we care about: that the page recognized that bad data was passed in, 
+    and an error was raised.
+  """
+  response = c.post('/html/register', {'username': '', 
+                                       'password1':'', 
+                                       'password2':'', 
+                                       'email':'', 
+                                       'affiliation':'', 
+                                       'gen_upload_choice':'1'}, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_short_username():
+  """
+  <Purpose>
+    Test for username too short
+  """  
+  shortuser = ""
+  for n in range(0, validations.USERNAME_MIN_LENGTH - 1):
+    shortuser += "a"
+  
+  test_data = good_data.copy()
+  test_data['username'] = shortuser
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_long_username():
+  """
+  <Purpose>
+    Test for username too long
+  """  
+  longuser = ""
+  for n in range(0, validations.USERNAME_MAX_LENGTH + 1):
+    longuser += "a"
+  
+  test_data = good_data.copy()
+  test_data['username'] = longuser
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_invalid_username():
+  """
+  <Purpose>
+    Test for invalid username
+  """  
+  test_data = good_data.copy()
+  test_data['username'] = 'tester!!!'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_short_password():
+  """
+  <Purpose>
+    Test for password too short
+  """  
+  test_data = good_data.copy()
+  test_data['password1'] = '12345'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_nonmatching_password():
+  """
+  <Purpose>
+    Test for non-matching passwords
+  """  
+  test_data = good_data.copy()
+  test_data['password2'] = '87654321'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_matching_username_password():
+  """
+  <Purpose>
+    Test for same username and password
+  """  
+  test_data = good_data.copy()
+  test_data['username'] = 'tester'
+  test_data['password1'] = 'tester'
+  test_data['password2'] = 'tester'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_short_affil():
+  """
+  <Purpose>
+    Test for affiliation too short
+  """  
+  shortaffil = ""
+  for n in range(0, validations.AFFILIATION_MIN_LENGTH - 1):
+    shortaffil += "a"
+  
+  test_data = good_data.copy()
+  test_data['affiliation'] = shortaffil
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_long_affil():
+  """
+  <Purpose>
+    Test for affiliation too long
+  """  
+  longaffil = ""
+  for n in range(0, validations.AFFILIATION_MAX_LENGTH + 1):
+    longaffil += "a"
+  
+  test_data = good_data.copy()
+  test_data['affiliation'] = longaffil
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_invalid_email():
+  """
+  <Purpose>
+    Test for invalid e-mail
+  """  
+  test_data = good_data.copy()
+  test_data['email'] = 'invalid@email'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_key_upload_with_no_file():
+  """
+  <Purpose>
+    Test key upload with no file
+  """  
+  test_data = good_data.copy()
+  test_data['gen_upload_choice'] = '2'
+  
+  response = c.post('/html/register', test_data, follow=True)
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_key_upload_with_oversized_file():
+  """
+  <Purpose>
+    Test key upload with oversized file
+  """  
+  test_data = good_data.copy()
+  test_data['gen_upload_choice'] = '2'
+  
+  # set up a temporary 'key' file object
+  data = ''
+  for n in range(0, forms.MAX_PUBKEY_UPLOAD_SIZE + 1):
+    data += '0'
+  
+  fh = open(os.path.join(os.getcwd(), 'bigkey'), 'w')
+  fh.write(data)
+  fh.close()
+  fh = open('bigkey')
+  test_data['pubkey'] = fh
+  
+  response = c.post('/html/register', test_data, follow=True)
+  fh.close()
+  os.remove(os.path.join(os.getcwd(), 'bigkey'))
+  
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_key_upload_with_bad_format_key():
+  """
+  <Purpose>
+    Test key upload with badly formatted key
+  """  
+  test_data = good_data.copy()
+  test_data['gen_upload_choice'] = '2'
+  
+  data = 'this is a fake key'
+  fh = open(os.path.join(os.getcwd(), 'fakekey'), 'w')
+  fh.write(data)
+  fh.close()
+  fh = open('fakekey')
+  test_data['pubkey'] = fh
+  
+  response = c.post('/html/register', test_data, follow=True)
+  fh.close()
+  os.remove(os.path.join(os.getcwd(), 'fakekey'))
+  
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_key_upload_with_valid_key():
+  """
+  <Purpose>
+    Test key upload with valid key
+  """  
+  test_data = good_data.copy()
+  test_data['gen_upload_choice'] = '2'
+  
+  data = '65537 1255529510320394315881981094520474315188224118590997402913761676258431241305254181126132200564438402053537493727356349330161335739149834523475129922460441305694528141374947142391183883986671526830986555904385942930184161960677388507'
+  fh = open(os.path.join(os.getcwd(), 'goodkey'), 'w')
+  fh.write(data)
+  fh.close()
+  fh = open('goodkey')
+  test_data['pubkey'] = fh
+  
+  response = c.post('/html/register', test_data, follow=True)
+  fh.close()
+  os.remove(os.path.join(os.getcwd(), 'goodkey'))
+  
+  assert(response.status_code == 200)
+  assert("successfully registered" in response.content)
+
+
+
+def test_interface_throws_ValidationError():
+  """
+  <Purpose>
+    Test behavior if interface throws a ValidationError, 
+    even after passing all validation
+  """  
+  interface.register_user = mock_register_user_throws_ValidationError
+  response = c.post('/html/register', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("p class=\"warning\"" in response.content)
+
+
+
+def test_normal():
+  """
+  <Purpose>
+    Test normal behavior
+  """  
+  interface.register_user = mock_register_user
+  response = c.post('/html/register', good_data, follow=True)
+  
+  # check that the view thinks the user has been registered
+  assert(response.status_code == 200)
+  assert("successfully registered" in response.content)
+  
+  # check that the current page is now the login page
+  assert(response.template[0].name == "accounts/login.html")
+
+
+if __name__=="__main__":
+  main()
diff --git a/website/html/tests/ut_html_test_renew_resources.py b/website/html/tests/ut_html_test_renew_resources.py
index 8035551..d0bce33 100644
--- a/website/html/tests/ut_html_test_renew_resources.py
+++ b/website/html/tests/ut_html_test_renew_resources.py
@@ -1,159 +1,159 @@
-"""
-<Program>
-  test_renew_resources.py
-
-<Started>
-  Oct 13, 2009
-
-<Author>
-  Jason Chen <jchen@cs.washington.edu>
-  Justin Samuel
-
-<Purpose>
-  Tests that the renew_resource view function 
-  handles normal operation and exceptions correctly.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-#pragma out
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-# Declare our mock functions
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-def mock_get_vessel_list(vesselhandle_list):
-  return ['test', 'test2']
-
-def mock_get_vessel_list_throws_DoesNotExistError(vesselhandle_list):
-  raise DoesNotExistError
-
-def mock_get_vessel_list_throws_InvalidRequestError(vesselhandle_list):
-  raise InvalidRequestError
-
-def mock_renew_vessels(geniuser, vessel_list):
-  pass
-
-def mock_renew_vessels_throws_InvalidRequestError(geniuser, vessel_list):
-  raise InvalidRequestError
-
-c = Client()
-good_data = {'handle':'12345'}
-interface.get_vessel_list = mock_get_vessel_list
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    login_test_user()
-    
-    test_normal()
-    test_get_vessel_list_throws_DoesNotExistError()
-    test_get_vessel_list_throws_InvalidRequestError()
-    test_renew_vessels_throws_InvalidRequestError()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-def test_normal():
-  """
-  <Purpose>
-    Tests normal behavior.
-  """
-  interface.get_vessel_list = mock_get_vessel_list
-  interface.renew_vessels = mock_renew_vessels
-  response = c.post('/html/renew_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_get_vessel_list_throws_DoesNotExistError():
-  """
-  <Purpose>
-    Tests behavior if interface.get_vessel_list throws a DoesNotExistError
-  """
-  interface.get_vessel_list = mock_get_vessel_list_throws_DoesNotExistError
-  interface.renew_vessels = mock_renew_vessels
-  response = c.post('/html/renew_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to renew" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_get_vessel_list_throws_InvalidRequestError():
-  """
-  <Purpose>
-    Tests behavior if interface.get_vessel_list throws an InvalidRequestError 
-  """
-  interface.get_vessel_list = mock_get_vessel_list_throws_InvalidRequestError
-  interface.renew_vessels = mock_renew_vessels
-  response = c.post('/html/renew_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to renew" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-
-
-
-def test_renew_vessels_throws_InvalidRequestError():
-  """
-  <Purpose>
-    Tests behavior if interface.renew_vessels throws an InvalidRequestError
-  """
-  interface.get_vessel_list = mock_get_vessel_list
-  interface.renew_vessels = mock_renew_vessels_throws_InvalidRequestError
-  response = c.post('/html/renew_resource', good_data, follow=True)
-  
-  assert(response.status_code == 200)
-  assert("Unable to renew" in response.content)
-  assert(response.template[0].name == 'control/myvessels.html')
-  
-  
-  
-# Creates a test user in the test db, and uses the test client to 'login',
-# so all views that expect @login_required will now pass the login check. 
-def login_test_user():
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-
-
-
-if __name__=="__main__":
-  main()
+"""
+<Program>
+  test_renew_resources.py
+
+<Started>
+  Oct 13, 2009
+
+<Author>
+  Jason Chen <jchen@cs.washington.edu>
+  Justin Samuel
+
+<Purpose>
+  Tests that the renew_resource view function 
+  handles normal operation and exceptions correctly.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+#pragma out
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+# Declare our mock functions
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+def mock_get_vessel_list(vesselhandle_list):
+  return ['test', 'test2']
+
+def mock_get_vessel_list_throws_DoesNotExistError(vesselhandle_list):
+  raise DoesNotExistError
+
+def mock_get_vessel_list_throws_InvalidRequestError(vesselhandle_list):
+  raise InvalidRequestError
+
+def mock_renew_vessels(geniuser, vessel_list):
+  pass
+
+def mock_renew_vessels_throws_InvalidRequestError(geniuser, vessel_list):
+  raise InvalidRequestError
+
+c = Client()
+good_data = {'handle':'12345'}
+interface.get_vessel_list = mock_get_vessel_list
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    login_test_user()
+    
+    test_normal()
+    test_get_vessel_list_throws_DoesNotExistError()
+    test_get_vessel_list_throws_InvalidRequestError()
+    test_renew_vessels_throws_InvalidRequestError()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+def test_normal():
+  """
+  <Purpose>
+    Tests normal behavior.
+  """
+  interface.get_vessel_list = mock_get_vessel_list
+  interface.renew_vessels = mock_renew_vessels
+  response = c.post('/html/renew_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_get_vessel_list_throws_DoesNotExistError():
+  """
+  <Purpose>
+    Tests behavior if interface.get_vessel_list throws a DoesNotExistError
+  """
+  interface.get_vessel_list = mock_get_vessel_list_throws_DoesNotExistError
+  interface.renew_vessels = mock_renew_vessels
+  response = c.post('/html/renew_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to renew" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_get_vessel_list_throws_InvalidRequestError():
+  """
+  <Purpose>
+    Tests behavior if interface.get_vessel_list throws an InvalidRequestError 
+  """
+  interface.get_vessel_list = mock_get_vessel_list_throws_InvalidRequestError
+  interface.renew_vessels = mock_renew_vessels
+  response = c.post('/html/renew_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to renew" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+
+
+
+def test_renew_vessels_throws_InvalidRequestError():
+  """
+  <Purpose>
+    Tests behavior if interface.renew_vessels throws an InvalidRequestError
+  """
+  interface.get_vessel_list = mock_get_vessel_list
+  interface.renew_vessels = mock_renew_vessels_throws_InvalidRequestError
+  response = c.post('/html/renew_resource', good_data, follow=True)
+  
+  assert(response.status_code == 200)
+  assert("Unable to renew" in response.content)
+  assert(response.template[0].name == 'control/myvessels.html')
+  
+  
+  
+# Creates a test user in the test db, and uses the test client to 'login',
+# so all views that expect @login_required will now pass the login check. 
+def login_test_user():
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+
+
+
+if __name__=="__main__":
+  main()
diff --git a/website/html/tests/ut_html_test_urls.py b/website/html/tests/ut_html_test_urls.py
index da483a0..ba37fff 100644
--- a/website/html/tests/ut_html_test_urls.py
+++ b/website/html/tests/ut_html_test_urls.py
@@ -1,319 +1,319 @@
-"""
-<Program>
-  test_urls.py
-
-<Started>
-  8/28/2009
-
-<Author>
-  Jason Chen
-  jchen@cs.washington.edu
-
-<Purpose>
-  Tests that all site urls are being *served* correctly.
-  This means that all urls eventually return an HTTP 200 OK, and that 
-  non-logged-in, and logged-in users are being redirected to correct pages.
-
-  Note that just because the pages are being served correctly does
-  not imply that they *function* correctly. Make sure all other tests
-  are run as well, to test the functional correctness of pages.
-  
-<Notes>
-  See test_register.py for an explanation of our usage of the Django test client.
-"""
-
-#pragma out
-
-import datetime
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-from clearinghouse.common.exceptions import *
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-from clearinghouse.website.html import forms
-
-from django.contrib.auth.models import User as DjangoUser
-
-# The django test client emulates a webclient, and returns what django
-# considers the final rendered result (in HTML). This allows to test purely the view
-# functions. 
-from django.test.client import Client
-
-
-
-# Declare our mock functions
-def mock_get_logged_in_user_throws_DoesNotExistError(request):
-  raise DoesNotExistError
-
-def mock_get_logged_in_user(request):
-  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  return geniuser
-
-def mock_get_total_vessel_credits(geniuser):
-  return 10
-
-def mock_get_acquired_vessels(geniuser):
-  return ['test', 'test2']
-
-def mock_get_vessel_infodict_list(vessel_list):
-  # At a minimum, the expires_in_seconds key must exist because it is used by
-  # the myvessels view.
-  return [{'expires_in_seconds':1}, 
-          {'expires_in_seconds':2}]
-
-def mock_delete_private_key(user):
-  pass
-
-# Mock out interface calls
-#interface.get_logged_in_user = mock_get_logged_in_user
-interface.get_total_vessel_credits = mock_get_total_vessel_credits
-interface.get_acquired_vessels = mock_get_acquired_vessels
-interface.get_vessel_infodict_list = mock_get_vessel_infodict_list
-interface.delete_private_key = mock_delete_private_key
-
-c = Client()
-
-
-
-def main():
-  
-  # Setup test environment
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    # Run tests
-    get_pages_without_user_logged_in()
-    get_pages_with_user_logged_in()
-    
-    print "All tests passed."
-    
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-def get_pages_without_user_logged_in():
-  # uses the mock get_logged_in_user function that represents no logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user_throws_DoesNotExistError
-  
-  response = c.get('/html/register', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/register.html")
-  
-  response = c.get('/html/login', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/logout', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/accounts_help', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/help.html")
-  
-  # The URLs we tell the user to distribute have "download" instead of "html"
-  # in them.
-  response = c.get('/download/tester/', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "download/installers.html")
-  
-  # The following pages should all bounce back to the login page,
-  # since there is no user logged in currently.
-  response = c.get('/html/profile', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/mygeni', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/myvessels', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/help', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/getdonations', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/get_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/del_resource', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/del_all_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/renew_resource', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/renew_all_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  # POST is required for deleting private key.
-  response = c.get('/html/del_priv', follow=True)
-  assert(response.status_code == 405)
-  
-  response = c.get('/html/priv_key', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-  
-  response = c.get('/html/pub_key', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-
-  response = c.get('/html/change_key', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-
-  response = c.get('/html/api_info', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "accounts/login.html")
-
-
-
-
-
-def get_pages_with_user_logged_in():
-  _login_test_user()
-  
-  response = c.get('/html/register', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  
-  response = c.get('/html/login', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  
-  response = c.get('/html/profile', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  
-  response = c.get('/html/mygeni', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/mygeni.html")
-  
-  response = c.get('/html/myvessels', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/help', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/help.html")
-  
-  response = c.get('/html/getdonations', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/getdonations.html")
-  
-  ##########################################################################
-  # the following pages expect POST requests. when they see a GET request, #
-  # they should bounce the user back to the 'My Vessels' page              #
-  ##########################################################################
-  response = c.get('/html/get_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/del_resource', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/del_all_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/renew_resource', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/renew_all_resources', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/myvessels.html")
-  
-  response = c.get('/html/api_info', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/api_info.html")
-  assert("Your API key is" in response.content)
-  
-  ##########################################################################
-  
-  # The change_key page accepts either GET or POST. If it is a GET request,
-  # the the forms for changing keys are displayed. If it is a POST and the
-  # POST is valid (either a request to generate new keys or upload of a key),
-  # the user is shown the profile. If it is an invalid POST, then the same
-  # page is redisplayed with a message.
-  
-  response = c.get('/html/change_key', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/change_key.html")
-
-  # Empty post data is invalid.
-  response = c.post('/html/change_key', {}, follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/change_key.html")
-  
-  ##########################################################################
-  
-  # POST is required for deleting private key.
-  response = c.get('/html/del_priv', follow=True)
-  assert(response.status_code == 405)
-  
-  response = c.post('/html/del_priv', follow=True)
-  assert(response.status_code == 200)
-  assert(response.template[0].name == "control/profile.html")
-  assert("Your private key has been deleted" in response.content)
-  
-  # Make sure that priv_key returns an attachment response
-  response = c.get('/html/priv_key', follow=True)
-  assert(response.status_code == 200)
-  assert("attachment" in response['Content-Disposition'])
-  assert(".privatekey" in response['Content-Disposition'])
-  
-  # Make sure that pub_key returns an attachment response
-  response = c.get('/html/pub_key', follow=True)
-  assert(response.status_code == 200)
-  assert("attachment" in response['Content-Disposition'])
-  assert(".publickey" in response['Content-Disposition'])
-
-  # Logging out should return an HttpResponseRedirect to login
-  response = c.get('/html/logout', follow=True)
-  assert(response.status_code == 302)
-  assert("/html/login" in response['Location'])
-
-
-
-
-
-def _login_test_user():
-  """
-  <Purpose>
-    Creates a test user in the test db, and uses the test client to 'login',
-    so all views that expect @login_required will now pass the login check. 
-  """
-  # uses the mock get_logged_in_user function that represents a logged in user
-  interface.get_logged_in_user = mock_get_logged_in_user
-  
-  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
-  user.save()
-  c.login(username='tester', password='testpassword')
-  
-
-if __name__=="__main__":
-  main()
+"""
+<Program>
+  test_urls.py
+
+<Started>
+  8/28/2009
+
+<Author>
+  Jason Chen
+  jchen@cs.washington.edu
+
+<Purpose>
+  Tests that all site urls are being *served* correctly.
+  This means that all urls eventually return an HTTP 200 OK, and that 
+  non-logged-in, and logged-in users are being redirected to correct pages.
+
+  Note that just because the pages are being served correctly does
+  not imply that they *function* correctly. Make sure all other tests
+  are run as well, to test the functional correctness of pages.
+  
+<Notes>
+  See test_register.py for an explanation of our usage of the Django test client.
+"""
+
+#pragma out
+
+import datetime
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+from clearinghouse.common.exceptions import *
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+from clearinghouse.website.html import forms
+
+from django.contrib.auth.models import User as DjangoUser
+
+# The django test client emulates a webclient, and returns what django
+# considers the final rendered result (in HTML). This allows to test purely the view
+# functions. 
+from django.test.client import Client
+
+
+
+# Declare our mock functions
+def mock_get_logged_in_user_throws_DoesNotExistError(request):
+  raise DoesNotExistError
+
+def mock_get_logged_in_user(request):
+  geniuser = models.GeniUser(username='tester', password='password', email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  return geniuser
+
+def mock_get_total_vessel_credits(geniuser):
+  return 10
+
+def mock_get_acquired_vessels(geniuser):
+  return ['test', 'test2']
+
+def mock_get_vessel_infodict_list(vessel_list):
+  # At a minimum, the expires_in_seconds key must exist because it is used by
+  # the myvessels view.
+  return [{'expires_in_seconds':1}, 
+          {'expires_in_seconds':2}]
+
+def mock_delete_private_key(user):
+  pass
+
+# Mock out interface calls
+#interface.get_logged_in_user = mock_get_logged_in_user
+interface.get_total_vessel_credits = mock_get_total_vessel_credits
+interface.get_acquired_vessels = mock_get_acquired_vessels
+interface.get_vessel_infodict_list = mock_get_vessel_infodict_list
+interface.delete_private_key = mock_delete_private_key
+
+c = Client()
+
+
+
+def main():
+  
+  # Setup test environment
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    # Run tests
+    get_pages_without_user_logged_in()
+    get_pages_with_user_logged_in()
+    
+    print "All tests passed."
+    
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+def get_pages_without_user_logged_in():
+  # uses the mock get_logged_in_user function that represents no logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user_throws_DoesNotExistError
+  
+  response = c.get('/html/register', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/register.html")
+  
+  response = c.get('/html/login', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/logout', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/accounts_help', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/help.html")
+  
+  # The URLs we tell the user to distribute have "download" instead of "html"
+  # in them.
+  response = c.get('/download/tester/', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "download/installers.html")
+  
+  # The following pages should all bounce back to the login page,
+  # since there is no user logged in currently.
+  response = c.get('/html/profile', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/mygeni', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/myvessels', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/help', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/getdonations', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/get_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/del_resource', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/del_all_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/renew_resource', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/renew_all_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  # POST is required for deleting private key.
+  response = c.get('/html/del_priv', follow=True)
+  assert(response.status_code == 405)
+  
+  response = c.get('/html/priv_key', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+  
+  response = c.get('/html/pub_key', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+
+  response = c.get('/html/change_key', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+
+  response = c.get('/html/api_info', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "accounts/login.html")
+
+
+
+
+
+def get_pages_with_user_logged_in():
+  _login_test_user()
+  
+  response = c.get('/html/register', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  
+  response = c.get('/html/login', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  
+  response = c.get('/html/profile', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  
+  response = c.get('/html/mygeni', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/mygeni.html")
+  
+  response = c.get('/html/myvessels', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/help', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/help.html")
+  
+  response = c.get('/html/getdonations', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/getdonations.html")
+  
+  ##########################################################################
+  # the following pages expect POST requests. when they see a GET request, #
+  # they should bounce the user back to the 'My Vessels' page              #
+  ##########################################################################
+  response = c.get('/html/get_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/del_resource', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/del_all_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/renew_resource', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/renew_all_resources', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/myvessels.html")
+  
+  response = c.get('/html/api_info', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/api_info.html")
+  assert("Your API key is" in response.content)
+  
+  ##########################################################################
+  
+  # The change_key page accepts either GET or POST. If it is a GET request,
+  # the the forms for changing keys are displayed. If it is a POST and the
+  # POST is valid (either a request to generate new keys or upload of a key),
+  # the user is shown the profile. If it is an invalid POST, then the same
+  # page is redisplayed with a message.
+  
+  response = c.get('/html/change_key', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/change_key.html")
+
+  # Empty post data is invalid.
+  response = c.post('/html/change_key', {}, follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/change_key.html")
+  
+  ##########################################################################
+  
+  # POST is required for deleting private key.
+  response = c.get('/html/del_priv', follow=True)
+  assert(response.status_code == 405)
+  
+  response = c.post('/html/del_priv', follow=True)
+  assert(response.status_code == 200)
+  assert(response.template[0].name == "control/profile.html")
+  assert("Your private key has been deleted" in response.content)
+  
+  # Make sure that priv_key returns an attachment response
+  response = c.get('/html/priv_key', follow=True)
+  assert(response.status_code == 200)
+  assert("attachment" in response['Content-Disposition'])
+  assert(".privatekey" in response['Content-Disposition'])
+  
+  # Make sure that pub_key returns an attachment response
+  response = c.get('/html/pub_key', follow=True)
+  assert(response.status_code == 200)
+  assert("attachment" in response['Content-Disposition'])
+  assert(".publickey" in response['Content-Disposition'])
+
+  # Logging out should return an HttpResponseRedirect to login
+  response = c.get('/html/logout', follow=True)
+  assert(response.status_code == 302)
+  assert("/html/login" in response['Location'])
+
+
+
+
+
+def _login_test_user():
+  """
+  <Purpose>
+    Creates a test user in the test db, and uses the test client to 'login',
+    so all views that expect @login_required will now pass the login check. 
+  """
+  # uses the mock get_logged_in_user function that represents a logged in user
+  interface.get_logged_in_user = mock_get_logged_in_user
+  
+  user = DjangoUser.objects.create_user('tester', 'test@test.com', 'testpassword')
+  user.save()
+  c.login(username='tester', password='testpassword')
+  
+
+if __name__=="__main__":
+  main()
diff --git a/website/html/views.py b/website/html/views.py
index e9ed3d1..590e6a7 100644
--- a/website/html/views.py
+++ b/website/html/views.py
@@ -1,1166 +1,1166 @@
-"""
-<Program>
-  views.py
-
-<Started>
-  October, 2008
-
-<Author>
-  Ivan Beschastnikh
-  Jason Chen
-  Justin Samuel
-
-<Purpose>
-  This module defines the functions that correspond to each possible request
-  made through the html frontend. The urls.py file in this same directory
-  lists the url paths which can be requested and the corresponding function name
-  in this file which will be invoked.
-"""
-
-import os
-import sys
-import shutil
-import subprocess
-import xmlrpclib
-
-# Needed to escape characters for the Android referrer...
-import urllib
-
-from django.http import HttpResponse
-from django.http import HttpResponseRedirect
-from django.contrib.auth.forms import AuthenticationForm
-from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
-
-#Used to display meaningful OpenID/OAuth error messages to the user
-from django.contrib.messages.api import get_messages
-from django.shortcuts import render_to_response, redirect
-from social_auth.utils import setting
-from django.template import RequestContext
-# Any requests that change state on the server side (e.g. result in database
-# modifications) need to be POST requests. This is for protecting against
-# CSRF attacks (part, but not all, of that is our use of the CSRF middleware
-# which only checks POST requests). Sometimes we use this decorator, sometimes
-# we check the request type inside the view function.
-from django.views.decorators.http import require_POST
-
-# Make available all of our own standard exceptions.
-from clearinghouse.common.exceptions import *
-
-# This is the logging decorator use use.
-from clearinghouse.common.util.decorators import log_function_call
-from clearinghouse.common.util.decorators import log_function_call_without_return
-
-# For user registration input validation
-from clearinghouse.common.util import validations
-
-from clearinghouse.common.util import log
-
-from clearinghouse.website import settings
-# FIXME: this patches the portability safe_type declaration, there might be a 
-# cleaner way of doing this. We rely in the backup made by the safe module to
-# reload type here.
-import safe
-__builtins__['type'] = safe._type
-
-from clearinghouse.website import settings
-
-# All of the work that needs to be done is passed through the controller interface.
-from clearinghouse.website.control import interface
-
-from clearinghouse.website.html import forms
-
-from seattle.repyportability import *
-add_dy_support(locals())
-
-rsa = dy_import_module("rsa.r2py")
-
-
-
-
-
-class LoggedInButFailedGetGeniUserError(Exception):
-  """
-  <Purpose>
-  Indicates that a function tried to get a GeniUser record, and failed;
-  while having passed the @login_required decorator. This means that a
-  DjangoUser is logged in, but there is no corresponding GeniUser record.
-  
-  This exception should only be thrown from _validate_and_get_geniuser,
-  and caught by methods with @login_required decorators.
-  """
-
-
-
-
-
-def _state_key_file_to_publickey_string(key_file_name):
-  """
-  Read a public key file from the the state keys directory and return it in
-  a key string format.
-  """
-  fullpath = os.path.join(settings.SEATTLECLEARINGHOUSE_STATE_KEYS_DIR, key_file_name)
-  return rsa.rsa_publickey_to_string(rsa.rsa_file_to_publickey(fullpath))
-
-
-
-
-
-# The key used as the state key for new donations.
-ACCEPTDONATIONS_STATE_PUBKEY = _state_key_file_to_publickey_string("acceptdonation.publickey")
-
-
-
-
-
-def error(request):
-  """
-  <Purpose>
-    If a OpenID/OAuth backend itself has an error(not a user or Seattle Clearinghouse's fault) 
-    a user will get redirected here.  This can happen if the backend rejects the user or from
-    user cancelation.
-
-  <Arguments>
-    request:
-      An HTTP request object.
-
-  <Exceptions>
-    None
-
-  <Side Effects>
-    None
-
-  <Returns>
-    An HTTP response object that represents the error page.
-  """
-  #Retrieve information which caused an error 
-  messages = get_messages(request)
-  info =''
-  try:
-    user = _validate_and_get_geniuser(request)
-    return profile(request, info, info, messages)
-  except:
-    return _show_login(request, 'accounts/login.html', {'messages' : messages}) 
-
-
-
-
-
-@login_required
-def associate_error(request):
-  """
-  <Purpose>
-    If an error occured during the OpenId/OAuth association process a user will get
-    redirected here.
-  <Arguments>
-    request:
-      An HTTP request object.
-    backend:
-      An OpenID/OAuth backend ex google,facebook etc.
-  <Exceptions>
-    None
-  <Side Effects>
-    None
-  <Returns>
-    An HTTP response object that represents the associate_error page.
-  """
-  info=''
-  error_msg = "Whoops, this account is already linked to another Seattle Clearninghouse user."
-  return profile(request, info, error_msg)
-
-
-
-
-
-def auto_register(request,backend=None,error_msgs=''):
-  """
-  <Purpose>
-  Part of the SOCIAL_AUTH_PIPELINE whose order is mapped in settings.py.  If
-  a user logs in with a OpenID/OAuth account and that account is not yet linked
-  with a Clearinghouse account, he gets redirected here.
-  If a valid username is entered then a new Seattle Clearinghouse user is created.
-
-  <Arguments>
-    request:
-      An HTTP request object.
-    backend:
-      An OpenID/OAuth backend ex google,facebook etc.
-  <Exceptions>
-
-  <Side Effects>
-    A new Seattle Clearinghouse user is created.
-  <Returns>
-    If a user passes in a valid username he continues the pipeline and moves
-    forward in the auto register process.
-  """
-  # Check if a username is provided 
-  username_form = forms.AutoRegisterForm()
-  if request.method == 'POST' and request.POST.get('username'):
-    name = setting('SOCIAL_AUTH_PARTIAL_PIPELINE_KEY', 'partial_pipeline')
-    username_form = forms.AutoRegisterForm(request.POST)
-    if username_form.is_valid():
-      username = username_form.cleaned_data['username']
-      try:
-        interface.get_user_without_password(username)
-        error_msgs ='That username is already in use.'
-      except DoesNotExistError:
-        request.session['saved_username'] = request.POST['username']
-        backend = request.session[name]['backend']
-        return redirect('socialauth_complete', backend=backend)  
-  name = setting('SOCIAL_AUTH_PARTIAL_PIPELINE_KEY', 'partial_pipeline')
-  backend=request.session[name]['backend']
-  return render_to_response('accounts/auto_register.html', {'backend' : backend, 'error_msgs' : error_msgs, 'username_form' : username_form}, RequestContext(request))
-
-
-
-
-
-@log_function_call_without_return
-@login_required
-def profile(request, info="", error_msg="", messages=""):
-  """
-  <Purpose>
-    Display information about the user account.
-    This method requires the request to represent a valid logged
-    in user. See the top-level comment about the @login_required()
-    decorator to achieve this property.  User account is editable through this 
-    method.
-  <Arguments>
-    request:
-      An HTTP request object.  
-    info:
-      Additional message to display at the top of the page in a green box.
-    error_msg:
-      Additional message to display at top of the page in a red box.
-    messages
-      Django social auth error message
-  <Exceptions>
-    None
-  <Side Effects>
-    None
-  <Returns>
-    An HTTP response object that represents the profile page.
-  """
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  email_form = forms.gen_edit_user_form(instance=user)
-  affiliation_form = forms.gen_edit_user_form(instance=user)
-  password_form = forms.EditUserPasswordForm()
-    
-  if request.method == 'POST':
-    if 'affiliation' in request.POST:
-       affiliation_form = forms.gen_edit_user_form(('affiliation',), request.POST, instance=user)
-       if affiliation_form.is_valid():
-         new_affiliation = affiliation_form.cleaned_data['affiliation']
-         interface.change_user_affiliation(user, new_affiliation)
-         info ="Affiliation has been successfully changed to %s." % (user.affiliation)
-    elif 'email' in request.POST:
-       email_form = forms.gen_edit_user_form(('email',), request.POST, instance=user)
-       if email_form.is_valid():
-         new_email = email_form.cleaned_data['email']
-         interface.change_user_email(user, new_email)
-         info ="Email has been successfully changed to %s." % (user.email)
-    elif 'password1' in request.POST:
-       password_form = forms.EditUserPasswordForm( request.POST, instance=user)
-       if password_form.is_valid():
-         new_password = password_form.cleaned_data['password1']
-         interface.change_user_password(user, new_password)
-         info ="Password has been successfully changed"
-  
-  username = user.username
-  affiliation = user.affiliation
-  email = user.email
-  port = user.usable_vessel_port
-  has_privkey = user.user_privkey != None
-  #currently not used, needed if editing user port is allowed
-  #port_range = interface.get_useable_ports()
-  #port_range_min = port_range[0]
-  #port_range_max = port_range[-1]
-  
-  return render_to_response('control/profile.html',
-                            {'email_form' : email_form,
-                             'affiliation_form' : affiliation_form,
-                             'password_form' : password_form,
-                             'username' : username,
-                             'affiliation' : affiliation,
-                             'email' : email,
-                             'port' : port,
-                             'api_key' : user.api_key,
-                             'has_privkey' : has_privkey,
-                             #'port_range_min' : port_range_min,
-                             #'port_range_max' : port_range_max,
-                             'info' : info,
-                             'error_msg' : error_msg,
-                             'messages' : messages},
-                            context_instance=RequestContext(request))
-
-
-
-
-
-def register(request):
-  try:
-    # check to see if a user is already logged in. if so, redirect them to profile.
-    user = interface.get_logged_in_user(request)
-  except DoesNotExistError:
-    pass
-  else:
-    return HttpResponseRedirect(reverse("profile"))
-  
-  page_top_errors = []
-  if request.method == 'POST':
-    
-    #TODO: what if the form data isn't in the POST request? we need to check for this.
-    form = forms.GeniUserCreationForm(request.POST, request.FILES)
-    # Calling the form's is_valid() function causes all form "clean_..." methods to be checked.
-    # If this succeeds, then the form input data is validated per field-specific cleaning checks. (see forms.py)
-    # However, we still need to do some checks which aren't doable from inside the form class.
-    if form.is_valid():
-      username = form.cleaned_data['username']
-      password = form.cleaned_data['password1']
-      affiliation = form.cleaned_data['affiliation']
-      email = form.cleaned_data['email']
-      pubkey = form.cleaned_data['pubkey']
-      
-      try:
-        validations.validate_username_and_password_different(username, password)
-      except ValidationError, err:
-        page_top_errors.append(str(err))
-      
-      # NOTE: gen_upload_choice turns out to be a *string* when retrieved, hence '2'
-      if form.cleaned_data['gen_upload_choice'] == '2' and pubkey == None:
-        page_top_errors.append("Please select a public key to upload.")
-      
-      # only proceed with registration if there are no validation errors
-      if page_top_errors == []:
-        try:
-          # we should never error here, since we've already finished validation at this point.
-          # but, just to be safe...
-          user = interface.register_user(username, password, email, affiliation, pubkey)
-        except ValidationError, err:
-          page_top_errors.append(str(err))
-        else:
-          return _show_login(request, 'accounts/login.html',
-                             {'msg' : "Username %s has been successfully registered." % (user.username)})
-  else:
-    form = forms.GeniUserCreationForm()
-  return render_to_response('accounts/register.html', 
-          {'form' : form, 'page_top_errors' : page_top_errors},
-          context_instance=RequestContext(request))
-  
-
-
-
-
-def _show_login(request, ltemplate, template_dict, form=None):
-    """
-    <Purpose>
-        Show the GENI login form
-
-    <Arguments>
-        request:
-            An HTTP request object to use to populate the form
-            
-        ltemplate:
-           The login template name to use for the login form. Right now
-           this can be one of 'accounts/simplelogin.html' and
-           'accounts/login.html'. They provide different ways of visualizing
-           the login page.
-
-        template_dict:
-           The dictionary of arguments to pass to the template
-
-        form:
-           Either None or the AuthenticationForm to use as a 'form' argument
-           to ltemplate. If form is None, a fresh AuthenticationForm() will be
-           created and used.
-
-    <Exceptions>
-        None.
-
-    <Side Effects>
-        None. 
-
-    <Returns>
-        An HTTP response object that represents the login page on
-        success.
-    """
-    if form == None:
-        # initial page load
-        form = AuthenticationForm()
-        # set test cookie, but only once -- remove it on login
-        #if not request.session.test_cookie_worked():
-        request.session.set_test_cookie()
-    template_dict['form'] = form
-    return render_to_response(ltemplate, template_dict, 
-            context_instance=RequestContext(request))
-  
-  
-  
-  
-
-def login(request):
-  try:
-    # check to see if a user is already logged in. if so, redirect them to profile.
-    user = interface.get_logged_in_user(request)
-  except DoesNotExistError:
-    pass
-  else:
-    return HttpResponseRedirect(reverse("profile"))
-
-  ltemplate = 'accounts/login.html'
-  if request.method == 'POST':
-    form = AuthenticationForm(request.POST)
-    
-    if not request.session.test_cookie_worked():
-      request.session.set_test_cookie()
-      return _show_login(request, ltemplate, {'err' : "Please enable your cookies and try again."}, form)
-
-    if request.POST.has_key('jsenabled') and request.POST['jsenabled'] == 'false':
-      return _show_login(request, ltemplate, {'err' : "Please enable javascript and try again."}, form)
-
-    try:
-      interface.login_user(request, request.POST['username'], request.POST['password'])
-    except DoesNotExistError:
-      return _show_login(request, ltemplate, {'err' : "Wrong username or password."}, form)
-      
-    # only clear out the cookie if we actually authenticate and login ok
-    request.session.delete_test_cookie()
-    
-    return HttpResponseRedirect(reverse("profile"))
-    
-  # request type is GET, show a fresh login page
-  return _show_login(request, ltemplate, {})
-
-
-
-
-
-def logout(request):
-  interface.logout_user(request)
-  # TODO: We should redirect straight to login page
-  return HttpResponseRedirect(reverse("profile"))
-
-
-
-
-
-@login_required
-def help(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  return render_to_response('control/help.html', {'username': user.username},
-          context_instance=RequestContext(request))
-
-
-
-
-
-def accounts_help(request):
-  return render_to_response('accounts/help.html', {}, 
-          context_instance=RequestContext(request))
-
-
-
-@login_required
-def mygeni(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  total_vessel_credits = interface.get_total_vessel_credits(user)
-  num_acquired_vessels = len(interface.get_acquired_vessels(user))
-  avail_vessel_credits = interface.get_available_vessel_credits(user)
-  
-  if num_acquired_vessels > total_vessel_credits:
-    percent_total_used = 100
-    over_vessel_credits = num_acquired_vessels - total_vessel_credits
-  else:
-    percent_total_used = int((num_acquired_vessels * 1.0 / total_vessel_credits * 1.0) * 100.0)
-    over_vessel_credits = 0
-  
-  # total_vessel_credits, percent_total_used, avail_vessel_credits
-  return request_ro_response('control/mygeni.html',
-                            {'username' : user.username,
-                             'total_vessel_credits' : total_vessel_credits,
-                             'used_vessel_credits' : num_acquired_vessels,
-                             'percent_total_used' : percent_total_used,
-                             'avail_vessel_credits' : avail_vessel_credits,
-                             'over_vessel_credits' : over_vessel_credits},
-                            context_instance=RequestContext(request))
-
-
-
-
-
-@login_required
-def myvessels(request, get_form=False, action_summary="", action_detail="", remove_summary=""):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  # get_form of None means don't show the form to acquire vessels.
-  if interface.get_available_vessel_credits(user) == 0:
-    get_form = None
-  elif get_form is False:
-    get_form = forms.gen_get_form(user)
-
-  # shared vessels that are used by others but which belong to this user (TODO)
-  shvessels = []
-
-  # this user's used vessels
-  my_vessels_raw = interface.get_acquired_vessels(user)
-  my_vessels = interface.get_vessel_infodict_list(my_vessels_raw)
-  
-  # this user's number of donations, max vessels, total vessels and free credits
-  my_donations = interface.get_donations(user)
-  my_max_vessels = interface.get_available_vessel_credits(user)	
-  my_free_vessel_credits = interface.get_free_vessel_credits_amount(user)
-  my_total_vessel_credits = interface.get_total_vessel_credits(user)
-
-  for vessel in my_vessels:
-    if vessel["expires_in_seconds"] <= 0:
-      # We shouldn't ever get here, but just in case, let's handle it.
-      vessel["expires_in"] = "Expired"
-    else:
-      days = vessel["expires_in_seconds"] / (3600 * 24)
-      hours = vessel["expires_in_seconds"] / 3600 % 24
-      minutes = vessel["expires_in_seconds"] / 60 % 60
-      vessel["expires_in"] = "%dd %dh %dm" % (days, hours, minutes)
-
-  # return the used resources page constructed from a template
-  return render_to_response('control/myvessels.html',
-                            {'username' : user.username,
-                             'num_vessels' : len(my_vessels),
-                             'my_vessels' : my_vessels,
-                             'sh_vessels' : shvessels,
-                             'get_form' : get_form,
-                             'action_summary' : action_summary,
-                             'action_detail' : action_detail,
-                             'my_donations' : len(my_donations),
-                             'my_max_vessels' : my_max_vessels, 
-                             'free_vessel_credits' : my_free_vessel_credits,
-                             'total_vessel_credits' : my_total_vessel_credits,
-                             'remove_summary' : remove_summary},
-                        context_instance=RequestContext(request))
-
-
-
-
-
-@login_required
-def getdonations(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  domain = "https://" + request.get_host()
-  
-  return render_to_response('control/getdonations.html',
-                            {'username' : user.username,
-                             'domain' : domain},
-                            context_instance=RequestContext(request))
-
-
-
-
-
-@login_required
-def get_resources(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  # the request must be via POST. if not, bounce user back to My Vessels page
-  if not request.method == 'POST':
-    return myvessels(request)
-  
-  # try and grab form from POST. if it can't, bounce user back to My Vessels page
-  get_form = forms.gen_get_form(user, request.POST)
-  
-  action_summary = ""
-  action_detail = ""
-  keep_get_form = False
-  
-  if get_form.is_valid():
-    vessel_num = get_form.cleaned_data['num']
-    vessel_type = get_form.cleaned_data['env']
-    
-    try:
-      acquired_vessels = interface.acquire_vessels(user, vessel_num, vessel_type)
-    except UnableToAcquireResourcesError, err:
-      action_summary = "Unable to acquire vessels at this time."
-      if str(err) == 'Acquiring NAT vessels is currently disabled. ':
-        link = """<a href="{{ TESTBED_URL }}}blog">blog</a>"""
-        action_detail += str(err) + 'Please check our '+ link  +' to see when we have re-enabled NAT vessels.'
-      else:
-        action_detail += str(err)
-      keep_get_form = True
-    except InsufficientUserResourcesError:
-      action_summary = "Unable to acquire vessels: you do not have enough vessel credits to fulfill this request."
-      keep_get_form = True
-  else:
-    keep_get_form = True
-  
-  if keep_get_form == True:
-    # return the original get_form, since the form wasn't valid (or there were errors)
-    return myvessels(request, get_form, action_summary=action_summary, action_detail=action_detail)
-  else:
-    # return a My Vessels page with the updated vessels/vessel acquire details/errors
-    return myvessels(request, False, action_summary=action_summary, action_detail=action_detail)
-  
-  
-  
-  
-
-@login_required
-def del_resource(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  # the request must be via POST. if not, bounce user back to My Vessels page
-  if not request.method == 'POST':
-    return myvessels(request)
-
-  if not request.POST['handle']:
-    return myvessels(request)
-  
-  # vessel_handle needs to be a list (even though we only add one handle), 
-  # since get_vessel_list expects a list.
-  vessel_handle = []
-  vessel_handle.append(request.POST['handle'])
-  remove_summary = ""
-  
-  try:
-    # convert handle to vessel
-    vessel_to_release = interface.get_vessel_list(vessel_handle)
-  except DoesNotExistError:
-    remove_summary = "Unable to remove vessel. The vessel you are trying to remove does not exist."
-  except InvalidRequestError, err:
-    remove_summary = "Unable to remove vessel. " + str(err)
-  else:
-    try:
-      interface.release_vessels(user, vessel_to_release)
-    except InvalidRequestError, err:
-      remove_summary = "Unable to remove vessel. The vessel does not belong"
-      remove_summary += " to you any more (maybe it expired?). " + str(err)
-  
-  return myvessels(request, remove_summary=remove_summary)
-
-
-
-
-
-
-@login_required
-def del_all_resources(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  # the request must be via POST. if not, bounce user back to My Vessels page
-  if not request.method == 'POST':
-    return myvessels(request)
-  
-  remove_summary = ""
-
-  try:
-    interface.release_all_vessels(user)
-  except InvalidRequestError, err:
-    remove_summary = "Unable to release all vessels: " + str(err)
-  
-  return myvessels(request, remove_summary=remove_summary)
-
-
-
-
-
-
-@login_required
-def renew_resource(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  # The request must be via POST. If not, bounce user back to My Vessels page.
-  if not request.method == 'POST':
-    return myvessels(request)
-  
-  if not request.POST.get('handle', ''):
-    return myvessels(request)
-  
-  action_summary = ""
-  action_detail = ""
-  
-  try:
-    # Convert handle to vessel object.
-    # Raises a DoesNotExistError if the vessel does not exist. This is more
-    # likely to be an error than an expected case, so we let it bubble up.
-    vessel_handle_list = [request.POST['handle']]
-    vessel_to_renew = interface.get_vessel_list(vessel_handle_list)
-  except DoesNotExistError:
-    action_summary = "Unable to renew vessel: The vessel you are trying to delete does not exist."
-  except InvalidRequestError, err:
-    action_summary = "Unable to renew vessel."
-    action_detail += str(err)
-  else:
-    try:
-      interface.renew_vessels(user, vessel_to_renew)
-    except InvalidRequestError, err:
-      action_summary = "Unable to renew vessel: " + str(err)
-    except InsufficientUserResourcesError, err:
-      action_summary = "Unable to renew vessel: you are currently over your"
-      action_summary += " vessel credit limit."
-      action_detail += str(err)
-  
-  return myvessels(request, False, action_summary=action_summary, action_detail=action_detail)
-
-
-
-
-
-@login_required
-def renew_all_resources(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  # The request must be via POST. If not, bounce user back to My Vessels page.
-  if not request.method == 'POST':
-    return myvessels(request)
-  
-  action_summary = ""
-  action_detail = ""
-  
-  try:
-    interface.renew_all_vessels(user)
-  except InvalidRequestError, err:
-    action_summary = "Unable to renew vessels: " + str(err)
-  except InsufficientUserResourcesError, err:
-    action_summary = "Unable to renew vessels: you are currently over your"
-    action_summary += " vessel credit limit."
-    action_detail += str(err)
-  
-  return myvessels(request, False, action_summary=action_summary, action_detail=action_detail)
-
-
-
-
-
-@login_required
-def change_key(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  info = ""
-  if request.method == 'GET':
-    return render_to_response('control/change_key.html',
-                              {'username' : user.username,
-                               'error_msg' : ""},
-                              context_instance=RequestContext(request))
-
-  # This is a POST, so figure out if a file was uploaded or if we are supposed
-  # to generate a new key for the user.
-  if request.POST.get('generate', False):
-    interface.change_user_keys(user, pubkey=None)
-    msg = "Your new keys have been generated. You should download them now."
-    return profile(request, msg)
-    
-  else:
-    file = request.FILES.get('pubkey', None)
-    if file is None:
-      msg = "You didn't select a public key file to upload." 
-      return profile(request, info, msg)
-
-    
-    if file.size == 0 or file.size > forms.MAX_PUBKEY_UPLOAD_SIZE:
-      msg = "Invalid file uploaded. The file size limit is " 
-      msg += str(forms.MAX_PUBKEY_UPLOAD_SIZE) + " bytes."
-      return profile(request, info, msg) 
-          
-    pubkey = file.read()
-    
-    try:
-      validations.validate_pubkey_string(pubkey)
-    except ValidationError:
-      msg = "Invalid public key uploaded."
-      return profile(request, info, msg)
-    
-    # If we made it here, the uploaded key is good.
-    interface.change_user_keys(user, pubkey=pubkey)
-    msg = "Your public key has been successfully changed."
-    return profile(request, msg)
-
-
-
-
-
-@login_required
-def api_info(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  if request.method == 'GET':
-    return render_to_response('control/api_info.html',
-                              {'username' : user.username,
-                               'api_key' : user.api_key,
-                               'msg' : ""},
-                              context_instance=RequestContext(request))
-
-  # This is a POST, so it should be generation of an API key.
-  if not request.POST.get('generate_api_key', False):
-    msg = "Sorry, we didn't understand your request."
-    return profile(request, info, msg) 
-    
-  interface.regenerate_api_key(user)
-  msg = "Your API key has been regenerated. Your old one will no longer work."
-  msg += " You should update any places you are using the API key"
-  msg += " (e.g. in programs using the XML-RPC client)."
-  return profile(request,msg)
-
-
-
-
-
-@log_function_call
-@require_POST
-@login_required
-def del_priv(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  if user.user_privkey == "":
-    msg = "Your private key has already been deleted."
-  else:
-    interface.delete_private_key(user)
-    msg = "Your private key has been deleted."
-  return profile(request, msg)
-
-
-
-
-
-@log_function_call
-@login_required
-def priv_key(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  response = HttpResponse(user.user_privkey, mimetype='text/plain')
-  response['Content-Disposition'] = 'attachment; filename=' + \
-          str(user.username) + '.privatekey'
-  return response
-
-
-
-
-
-@log_function_call
-@login_required
-def pub_key(request):
-  try:
-    user = _validate_and_get_geniuser(request)
-  except LoggedInButFailedGetGeniUserError:
-    return _show_failed_get_geniuser_page(request)
-  
-  response = HttpResponse(user.user_pubkey, mimetype='text/plain')
-  response['Content-Disposition'] = 'attachment; filename=' + \
-            str(user.username) + '.publickey'
-  return response
-
-
-
-
-
-def download(request, username):
-  validuser = True
-  try:
-    # validate that this username actually exists
-    user = interface.get_user_for_installers(username)
-  except DoesNotExistError:
-    validuser = False
-
-  templatedict = {}
-  templatedict['username'] = username
-  templatedict['validuser'] = validuser
-  templatedict['domain'] = "https://" + request.get_host()
-  # I need to build a URL for android to download the installer from.   (The
-  # same installer is downloaded from the Google Play store for all users.) 
-  # The URL is escaped twice (ask Akos why) and inserted in the referrer 
-  # information in the URL.   
-  #templatedict['android_installer_link'] = urllib.quote(urllib.quote(domain,safe=''),safe='')
-
-  return render_to_response('download/installers.html', templatedict,
-          context_instance=RequestContext(request))
-
-
-
-
-
-def build_android_installer(request, username):
-  """
-  <Purpose>
-    Allows the user to download a Android distribution of Seattle that will
-    donate resources to user with 'username'.
-  
-  <Arguments>
-    request:
-      Django HttpRequest object
-       
-    username:
-      A string representing the GENI user to which the installer will donate
-      resources.
-  
-  <Exceptions>
-    None
-  
-  <Side Effects>
-    None
-  
-  <Returns>
-    On failure, returns an HTTP response with a description of the error. On
-    success, redirects the user to download the installer.
-  """
-  
-  success, return_value = _build_installer(username, "android")
-  
-  if not success:
-    error_response = return_value
-    return error_response
-  
-  installer_url = return_value
-  return HttpResponseRedirect(installer_url)
-
-
-
-
-
-def build_win_installer(request, username):
-  """
-  <Purpose>
-    Allows the user to download a Windows distribution of Seattle that will
-    donate resources to user with 'username'.
-  
-  <Arguments>
-    request:
-      Django HttpRequest object
-       
-    username:
-      A string representing the GENI user to which the installer will donate
-      resources.
-  
-  <Exceptions>
-    None
-  
-  <Side Effects>
-    None
-  
-  <Returns>
-    On failure, returns an HTTP response with a description of the error. On
-    success, redirects the user to download the installer.
-  """
-  
-  success, return_value = _build_installer(username, "windows")
-  
-  if not success:
-    error_response = return_value
-    return error_response
-  
-  installer_url = return_value
-  return HttpResponseRedirect(installer_url)
-
-
-
-
-
-def build_linux_installer(request, username):
-  """
-  <Purpose>
-    Allows the user to download a Linux distribution of Seattle that will
-    donate resources to user with 'username'.
-
-  <Arguments>
-    request:
-      Django HttpRequest object
-
-    username:
-      A string representing the GENI user to which the installer will donate
-      resources.
-
-  <Exceptions>
-    None
-
-  <Side Effects>
-    None
-
-  <Returns>
-    On failure, returns an HTTP response with a description of the error. On
-    success, redirects the user to download the installer.
-  """
-
-  success, return_value = _build_installer(username, "linux")
-
-  if not success:
-    error_response = return_value
-    return error_response
-
-  installer_url = return_value
-  return HttpResponseRedirect(installer_url)
-
-
-
-
-
-def build_mac_installer(request, username):
-  """
-  <Purpose>
-    Allows the user to download a Mac distribution of Seattle that will
-    donate resources to user with 'username'.
-
-  <Arguments>
-    request:
-      Django HttpRequest object
-
-    username:
-      A string representing the GENI user to which the installer will donate
-      resources.
-
-  <Exceptions>
-    None
-
-  <Side Effects>
-    None
-
-  <Returns>
-    On failure, returns an HTTP response with a description of the error. On
-    success, redirects the user to download the installer.
-  """
-
-  success, return_value = _build_installer(username, "mac")
-
-  if not success:
-    error_response = return_value
-    return error_response
-
-  installer_url = return_value
-  return HttpResponseRedirect(installer_url)
-
-
-
-
-
-def _build_installer(username, platform):
-  """
-  <Purpose>
-    Builds an installer for the given platform that will donate resources to
-    the user with the given username.
-  
-  <Arguments>
-    username:
-      A string representing the GENI user to which the installer will donate
-      resources.
-      
-    platform:
-      A string representing the platform for which to build the installer.
-      Options include 'windows', 'linux', or 'mac'.
-  
-  <Exceptions>
-    None
-  
-  <Side Effects>
-    None
-  
-  <Returns>
-    On success, returns (True, installer_url) where installer_url is URL from
-    which the installer may be downloaded.
-    
-    On failure, returns (False, error_response) where error_repsponse is an
-    HttpResponse which specifies what went wrong.
-  """
-  try:
-    user = interface.get_user_for_installers(username)
-    username = user.username
-  except DoesNotExistError:
-    error_response = HttpResponse("Couldn't get user.")
-    return False, error_response
-
-  try:
-    xmlrpc_proxy = xmlrpclib.ServerProxy(settings.SEATTLECLEARINGHOUSE_INSTALLER_BUILDER_XMLRPC)
-    
-    vessel_list = [{'percentage': 80, 'owner': 'owner', 'users': ['user']}]
-    
-    user_data = {
-      'owner': {'public_key': user.donor_pubkey},
-      'user': {'public_key': ACCEPTDONATIONS_STATE_PUBKEY},
-    }
-    
-    build_results = xmlrpc_proxy.build_installers(vessel_list, user_data)
-  except:
-    error_response = HttpResponse("Failed to build installer.")
-    return False, error_response
-
-  installer_url = build_results['installers'][platform]
-  return True, installer_url
-
-
-
-
-
-def donations_help(request, username):
-  return render_to_response('download/help.html', {'username' : username},
-          context_instance=RequestContext(request))
-
-
-
-
-
-def _validate_and_get_geniuser(request):
-  try:
-    user = interface.get_logged_in_user(request)
-  except DoesNotExistError:
-    # Failed to get GeniUser record, but user is logged in
-    raise LoggedInButFailedGetGeniUserError
-  return user
-
-
-
-
-
-@log_function_call_without_return
-@login_required
-def new_auto_register_user(request):
-  msg = "Your account has been succesfully created. "
-  msg += "If you would like to login without OpenID/OAuth please change your password now."
-  return profile(request,msg)
-
-
-
-
-
-def _show_failed_get_geniuser_page(request):
-  err = "Sorry, we can't display the page you requested. "
-  err += "If you are logged in as an administrator, you'll need to logout, and login with a Seattle Clearinghouse account. "
-  err += "If you aren't logged in as an administrator, then this is a bug. Please contact us!"
-  return _show_login(request, 'accounts/login.html', {'err' : err})
+"""
+<Program>
+  views.py
+
+<Started>
+  October, 2008
+
+<Author>
+  Ivan Beschastnikh
+  Jason Chen
+  Justin Samuel
+
+<Purpose>
+  This module defines the functions that correspond to each possible request
+  made through the html frontend. The urls.py file in this same directory
+  lists the url paths which can be requested and the corresponding function name
+  in this file which will be invoked.
+"""
+
+import os
+import sys
+import shutil
+import subprocess
+import xmlrpclib
+
+# Needed to escape characters for the Android referrer...
+import urllib
+
+from django.http import HttpResponse
+from django.http import HttpResponseRedirect
+from django.contrib.auth.forms import AuthenticationForm
+from django.contrib.auth.decorators import login_required
+from django.core.urlresolvers import reverse
+
+#Used to display meaningful OpenID/OAuth error messages to the user
+from django.contrib.messages.api import get_messages
+from django.shortcuts import render_to_response, redirect
+from social_auth.utils import setting
+from django.template import RequestContext
+# Any requests that change state on the server side (e.g. result in database
+# modifications) need to be POST requests. This is for protecting against
+# CSRF attacks (part, but not all, of that is our use of the CSRF middleware
+# which only checks POST requests). Sometimes we use this decorator, sometimes
+# we check the request type inside the view function.
+from django.views.decorators.http import require_POST
+
+# Make available all of our own standard exceptions.
+from clearinghouse.common.exceptions import *
+
+# This is the logging decorator use use.
+from clearinghouse.common.util.decorators import log_function_call
+from clearinghouse.common.util.decorators import log_function_call_without_return
+
+# For user registration input validation
+from clearinghouse.common.util import validations
+
+from clearinghouse.common.util import log
+
+from clearinghouse.website import settings
+# FIXME: this patches the portability safe_type declaration, there might be a 
+# cleaner way of doing this. We rely in the backup made by the safe module to
+# reload type here.
+import safe
+__builtins__['type'] = safe._type
+
+from clearinghouse.website import settings
+
+# All of the work that needs to be done is passed through the controller interface.
+from clearinghouse.website.control import interface
+
+from clearinghouse.website.html import forms
+
+from seattle.repyportability import *
+add_dy_support(locals())
+
+rsa = dy_import_module("rsa.r2py")
+
+
+
+
+
+class LoggedInButFailedGetGeniUserError(Exception):
+  """
+  <Purpose>
+  Indicates that a function tried to get a GeniUser record, and failed;
+  while having passed the @login_required decorator. This means that a
+  DjangoUser is logged in, but there is no corresponding GeniUser record.
+  
+  This exception should only be thrown from _validate_and_get_geniuser,
+  and caught by methods with @login_required decorators.
+  """
+
+
+
+
+
+def _state_key_file_to_publickey_string(key_file_name):
+  """
+  Read a public key file from the the state keys directory and return it in
+  a key string format.
+  """
+  fullpath = os.path.join(settings.SEATTLECLEARINGHOUSE_STATE_KEYS_DIR, key_file_name)
+  return rsa.rsa_publickey_to_string(rsa.rsa_file_to_publickey(fullpath))
+
+
+
+
+
+# The key used as the state key for new donations.
+ACCEPTDONATIONS_STATE_PUBKEY = _state_key_file_to_publickey_string("acceptdonation.publickey")
+
+
+
+
+
+def error(request):
+  """
+  <Purpose>
+    If a OpenID/OAuth backend itself has an error(not a user or Seattle Clearinghouse's fault) 
+    a user will get redirected here.  This can happen if the backend rejects the user or from
+    user cancelation.
+
+  <Arguments>
+    request:
+      An HTTP request object.
+
+  <Exceptions>
+    None
+
+  <Side Effects>
+    None
+
+  <Returns>
+    An HTTP response object that represents the error page.
+  """
+  #Retrieve information which caused an error 
+  messages = get_messages(request)
+  info =''
+  try:
+    user = _validate_and_get_geniuser(request)
+    return profile(request, info, info, messages)
+  except:
+    return _show_login(request, 'accounts/login.html', {'messages' : messages}) 
+
+
+
+
+
+@login_required
+def associate_error(request):
+  """
+  <Purpose>
+    If an error occured during the OpenId/OAuth association process a user will get
+    redirected here.
+  <Arguments>
+    request:
+      An HTTP request object.
+    backend:
+      An OpenID/OAuth backend ex google,facebook etc.
+  <Exceptions>
+    None
+  <Side Effects>
+    None
+  <Returns>
+    An HTTP response object that represents the associate_error page.
+  """
+  info=''
+  error_msg = "Whoops, this account is already linked to another Seattle Clearninghouse user."
+  return profile(request, info, error_msg)
+
+
+
+
+
+def auto_register(request,backend=None,error_msgs=''):
+  """
+  <Purpose>
+  Part of the SOCIAL_AUTH_PIPELINE whose order is mapped in settings.py.  If
+  a user logs in with a OpenID/OAuth account and that account is not yet linked
+  with a Clearinghouse account, he gets redirected here.
+  If a valid username is entered then a new Seattle Clearinghouse user is created.
+
+  <Arguments>
+    request:
+      An HTTP request object.
+    backend:
+      An OpenID/OAuth backend ex google,facebook etc.
+  <Exceptions>
+
+  <Side Effects>
+    A new Seattle Clearinghouse user is created.
+  <Returns>
+    If a user passes in a valid username he continues the pipeline and moves
+    forward in the auto register process.
+  """
+  # Check if a username is provided 
+  username_form = forms.AutoRegisterForm()
+  if request.method == 'POST' and request.POST.get('username'):
+    name = setting('SOCIAL_AUTH_PARTIAL_PIPELINE_KEY', 'partial_pipeline')
+    username_form = forms.AutoRegisterForm(request.POST)
+    if username_form.is_valid():
+      username = username_form.cleaned_data['username']
+      try:
+        interface.get_user_without_password(username)
+        error_msgs ='That username is already in use.'
+      except DoesNotExistError:
+        request.session['saved_username'] = request.POST['username']
+        backend = request.session[name]['backend']
+        return redirect('socialauth_complete', backend=backend)  
+  name = setting('SOCIAL_AUTH_PARTIAL_PIPELINE_KEY', 'partial_pipeline')
+  backend=request.session[name]['backend']
+  return render_to_response('accounts/auto_register.html', {'backend' : backend, 'error_msgs' : error_msgs, 'username_form' : username_form}, RequestContext(request))
+
+
+
+
+
+@log_function_call_without_return
+@login_required
+def profile(request, info="", error_msg="", messages=""):
+  """
+  <Purpose>
+    Display information about the user account.
+    This method requires the request to represent a valid logged
+    in user. See the top-level comment about the @login_required()
+    decorator to achieve this property.  User account is editable through this 
+    method.
+  <Arguments>
+    request:
+      An HTTP request object.  
+    info:
+      Additional message to display at the top of the page in a green box.
+    error_msg:
+      Additional message to display at top of the page in a red box.
+    messages
+      Django social auth error message
+  <Exceptions>
+    None
+  <Side Effects>
+    None
+  <Returns>
+    An HTTP response object that represents the profile page.
+  """
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  email_form = forms.gen_edit_user_form(instance=user)
+  affiliation_form = forms.gen_edit_user_form(instance=user)
+  password_form = forms.EditUserPasswordForm()
+    
+  if request.method == 'POST':
+    if 'affiliation' in request.POST:
+       affiliation_form = forms.gen_edit_user_form(('affiliation',), request.POST, instance=user)
+       if affiliation_form.is_valid():
+         new_affiliation = affiliation_form.cleaned_data['affiliation']
+         interface.change_user_affiliation(user, new_affiliation)
+         info ="Affiliation has been successfully changed to %s." % (user.affiliation)
+    elif 'email' in request.POST:
+       email_form = forms.gen_edit_user_form(('email',), request.POST, instance=user)
+       if email_form.is_valid():
+         new_email = email_form.cleaned_data['email']
+         interface.change_user_email(user, new_email)
+         info ="Email has been successfully changed to %s." % (user.email)
+    elif 'password1' in request.POST:
+       password_form = forms.EditUserPasswordForm( request.POST, instance=user)
+       if password_form.is_valid():
+         new_password = password_form.cleaned_data['password1']
+         interface.change_user_password(user, new_password)
+         info ="Password has been successfully changed"
+  
+  username = user.username
+  affiliation = user.affiliation
+  email = user.email
+  port = user.usable_vessel_port
+  has_privkey = user.user_privkey != None
+  #currently not used, needed if editing user port is allowed
+  #port_range = interface.get_useable_ports()
+  #port_range_min = port_range[0]
+  #port_range_max = port_range[-1]
+  
+  return render_to_response('control/profile.html',
+                            {'email_form' : email_form,
+                             'affiliation_form' : affiliation_form,
+                             'password_form' : password_form,
+                             'username' : username,
+                             'affiliation' : affiliation,
+                             'email' : email,
+                             'port' : port,
+                             'api_key' : user.api_key,
+                             'has_privkey' : has_privkey,
+                             #'port_range_min' : port_range_min,
+                             #'port_range_max' : port_range_max,
+                             'info' : info,
+                             'error_msg' : error_msg,
+                             'messages' : messages},
+                            context_instance=RequestContext(request))
+
+
+
+
+
+def register(request):
+  try:
+    # check to see if a user is already logged in. if so, redirect them to profile.
+    user = interface.get_logged_in_user(request)
+  except DoesNotExistError:
+    pass
+  else:
+    return HttpResponseRedirect(reverse("profile"))
+  
+  page_top_errors = []
+  if request.method == 'POST':
+    
+    #TODO: what if the form data isn't in the POST request? we need to check for this.
+    form = forms.GeniUserCreationForm(request.POST, request.FILES)
+    # Calling the form's is_valid() function causes all form "clean_..." methods to be checked.
+    # If this succeeds, then the form input data is validated per field-specific cleaning checks. (see forms.py)
+    # However, we still need to do some checks which aren't doable from inside the form class.
+    if form.is_valid():
+      username = form.cleaned_data['username']
+      password = form.cleaned_data['password1']
+      affiliation = form.cleaned_data['affiliation']
+      email = form.cleaned_data['email']
+      pubkey = form.cleaned_data['pubkey']
+      
+      try:
+        validations.validate_username_and_password_different(username, password)
+      except ValidationError, err:
+        page_top_errors.append(str(err))
+      
+      # NOTE: gen_upload_choice turns out to be a *string* when retrieved, hence '2'
+      if form.cleaned_data['gen_upload_choice'] == '2' and pubkey == None:
+        page_top_errors.append("Please select a public key to upload.")
+      
+      # only proceed with registration if there are no validation errors
+      if page_top_errors == []:
+        try:
+          # we should never error here, since we've already finished validation at this point.
+          # but, just to be safe...
+          user = interface.register_user(username, password, email, affiliation, pubkey)
+        except ValidationError, err:
+          page_top_errors.append(str(err))
+        else:
+          return _show_login(request, 'accounts/login.html',
+                             {'msg' : "Username %s has been successfully registered." % (user.username)})
+  else:
+    form = forms.GeniUserCreationForm()
+  return render_to_response('accounts/register.html', 
+          {'form' : form, 'page_top_errors' : page_top_errors},
+          context_instance=RequestContext(request))
+  
+
+
+
+
+def _show_login(request, ltemplate, template_dict, form=None):
+    """
+    <Purpose>
+        Show the GENI login form
+
+    <Arguments>
+        request:
+            An HTTP request object to use to populate the form
+            
+        ltemplate:
+           The login template name to use for the login form. Right now
+           this can be one of 'accounts/simplelogin.html' and
+           'accounts/login.html'. They provide different ways of visualizing
+           the login page.
+
+        template_dict:
+           The dictionary of arguments to pass to the template
+
+        form:
+           Either None or the AuthenticationForm to use as a 'form' argument
+           to ltemplate. If form is None, a fresh AuthenticationForm() will be
+           created and used.
+
+    <Exceptions>
+        None.
+
+    <Side Effects>
+        None. 
+
+    <Returns>
+        An HTTP response object that represents the login page on
+        success.
+    """
+    if form == None:
+        # initial page load
+        form = AuthenticationForm()
+        # set test cookie, but only once -- remove it on login
+        #if not request.session.test_cookie_worked():
+        request.session.set_test_cookie()
+    template_dict['form'] = form
+    return render_to_response(ltemplate, template_dict, 
+            context_instance=RequestContext(request))
+  
+  
+  
+  
+
+def login(request):
+  try:
+    # check to see if a user is already logged in. if so, redirect them to profile.
+    user = interface.get_logged_in_user(request)
+  except DoesNotExistError:
+    pass
+  else:
+    return HttpResponseRedirect(reverse("profile"))
+
+  ltemplate = 'accounts/login.html'
+  if request.method == 'POST':
+    form = AuthenticationForm(request.POST)
+    
+    if not request.session.test_cookie_worked():
+      request.session.set_test_cookie()
+      return _show_login(request, ltemplate, {'err' : "Please enable your cookies and try again."}, form)
+
+    if request.POST.has_key('jsenabled') and request.POST['jsenabled'] == 'false':
+      return _show_login(request, ltemplate, {'err' : "Please enable javascript and try again."}, form)
+
+    try:
+      interface.login_user(request, request.POST['username'], request.POST['password'])
+    except DoesNotExistError:
+      return _show_login(request, ltemplate, {'err' : "Wrong username or password."}, form)
+      
+    # only clear out the cookie if we actually authenticate and login ok
+    request.session.delete_test_cookie()
+    
+    return HttpResponseRedirect(reverse("profile"))
+    
+  # request type is GET, show a fresh login page
+  return _show_login(request, ltemplate, {})
+
+
+
+
+
+def logout(request):
+  interface.logout_user(request)
+  # TODO: We should redirect straight to login page
+  return HttpResponseRedirect(reverse("profile"))
+
+
+
+
+
+@login_required
+def help(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  return render_to_response('control/help.html', {'username': user.username},
+          context_instance=RequestContext(request))
+
+
+
+
+
+def accounts_help(request):
+  return render_to_response('accounts/help.html', {}, 
+          context_instance=RequestContext(request))
+
+
+
+@login_required
+def mygeni(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  total_vessel_credits = interface.get_total_vessel_credits(user)
+  num_acquired_vessels = len(interface.get_acquired_vessels(user))
+  avail_vessel_credits = interface.get_available_vessel_credits(user)
+  
+  if num_acquired_vessels > total_vessel_credits:
+    percent_total_used = 100
+    over_vessel_credits = num_acquired_vessels - total_vessel_credits
+  else:
+    percent_total_used = int((num_acquired_vessels * 1.0 / total_vessel_credits * 1.0) * 100.0)
+    over_vessel_credits = 0
+  
+  # total_vessel_credits, percent_total_used, avail_vessel_credits
+  return request_ro_response('control/mygeni.html',
+                            {'username' : user.username,
+                             'total_vessel_credits' : total_vessel_credits,
+                             'used_vessel_credits' : num_acquired_vessels,
+                             'percent_total_used' : percent_total_used,
+                             'avail_vessel_credits' : avail_vessel_credits,
+                             'over_vessel_credits' : over_vessel_credits},
+                            context_instance=RequestContext(request))
+
+
+
+
+
+@login_required
+def myvessels(request, get_form=False, action_summary="", action_detail="", remove_summary=""):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  # get_form of None means don't show the form to acquire vessels.
+  if interface.get_available_vessel_credits(user) == 0:
+    get_form = None
+  elif get_form is False:
+    get_form = forms.gen_get_form(user)
+
+  # shared vessels that are used by others but which belong to this user (TODO)
+  shvessels = []
+
+  # this user's used vessels
+  my_vessels_raw = interface.get_acquired_vessels(user)
+  my_vessels = interface.get_vessel_infodict_list(my_vessels_raw)
+  
+  # this user's number of donations, max vessels, total vessels and free credits
+  my_donations = interface.get_donations(user)
+  my_max_vessels = interface.get_available_vessel_credits(user)	
+  my_free_vessel_credits = interface.get_free_vessel_credits_amount(user)
+  my_total_vessel_credits = interface.get_total_vessel_credits(user)
+
+  for vessel in my_vessels:
+    if vessel["expires_in_seconds"] <= 0:
+      # We shouldn't ever get here, but just in case, let's handle it.
+      vessel["expires_in"] = "Expired"
+    else:
+      days = vessel["expires_in_seconds"] / (3600 * 24)
+      hours = vessel["expires_in_seconds"] / 3600 % 24
+      minutes = vessel["expires_in_seconds"] / 60 % 60
+      vessel["expires_in"] = "%dd %dh %dm" % (days, hours, minutes)
+
+  # return the used resources page constructed from a template
+  return render_to_response('control/myvessels.html',
+                            {'username' : user.username,
+                             'num_vessels' : len(my_vessels),
+                             'my_vessels' : my_vessels,
+                             'sh_vessels' : shvessels,
+                             'get_form' : get_form,
+                             'action_summary' : action_summary,
+                             'action_detail' : action_detail,
+                             'my_donations' : len(my_donations),
+                             'my_max_vessels' : my_max_vessels, 
+                             'free_vessel_credits' : my_free_vessel_credits,
+                             'total_vessel_credits' : my_total_vessel_credits,
+                             'remove_summary' : remove_summary},
+                        context_instance=RequestContext(request))
+
+
+
+
+
+@login_required
+def getdonations(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  domain = "https://" + request.get_host()
+  
+  return render_to_response('control/getdonations.html',
+                            {'username' : user.username,
+                             'domain' : domain},
+                            context_instance=RequestContext(request))
+
+
+
+
+
+@login_required
+def get_resources(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  # the request must be via POST. if not, bounce user back to My Vessels page
+  if not request.method == 'POST':
+    return myvessels(request)
+  
+  # try and grab form from POST. if it can't, bounce user back to My Vessels page
+  get_form = forms.gen_get_form(user, request.POST)
+  
+  action_summary = ""
+  action_detail = ""
+  keep_get_form = False
+  
+  if get_form.is_valid():
+    vessel_num = get_form.cleaned_data['num']
+    vessel_type = get_form.cleaned_data['env']
+    
+    try:
+      acquired_vessels = interface.acquire_vessels(user, vessel_num, vessel_type)
+    except UnableToAcquireResourcesError, err:
+      action_summary = "Unable to acquire vessels at this time."
+      if str(err) == 'Acquiring NAT vessels is currently disabled. ':
+        link = """<a href="{{ TESTBED_URL }}}blog">blog</a>"""
+        action_detail += str(err) + 'Please check our '+ link  +' to see when we have re-enabled NAT vessels.'
+      else:
+        action_detail += str(err)
+      keep_get_form = True
+    except InsufficientUserResourcesError:
+      action_summary = "Unable to acquire vessels: you do not have enough vessel credits to fulfill this request."
+      keep_get_form = True
+  else:
+    keep_get_form = True
+  
+  if keep_get_form == True:
+    # return the original get_form, since the form wasn't valid (or there were errors)
+    return myvessels(request, get_form, action_summary=action_summary, action_detail=action_detail)
+  else:
+    # return a My Vessels page with the updated vessels/vessel acquire details/errors
+    return myvessels(request, False, action_summary=action_summary, action_detail=action_detail)
+  
+  
+  
+  
+
+@login_required
+def del_resource(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  # the request must be via POST. if not, bounce user back to My Vessels page
+  if not request.method == 'POST':
+    return myvessels(request)
+
+  if not request.POST['handle']:
+    return myvessels(request)
+  
+  # vessel_handle needs to be a list (even though we only add one handle), 
+  # since get_vessel_list expects a list.
+  vessel_handle = []
+  vessel_handle.append(request.POST['handle'])
+  remove_summary = ""
+  
+  try:
+    # convert handle to vessel
+    vessel_to_release = interface.get_vessel_list(vessel_handle)
+  except DoesNotExistError:
+    remove_summary = "Unable to remove vessel. The vessel you are trying to remove does not exist."
+  except InvalidRequestError, err:
+    remove_summary = "Unable to remove vessel. " + str(err)
+  else:
+    try:
+      interface.release_vessels(user, vessel_to_release)
+    except InvalidRequestError, err:
+      remove_summary = "Unable to remove vessel. The vessel does not belong"
+      remove_summary += " to you any more (maybe it expired?). " + str(err)
+  
+  return myvessels(request, remove_summary=remove_summary)
+
+
+
+
+
+
+@login_required
+def del_all_resources(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  # the request must be via POST. if not, bounce user back to My Vessels page
+  if not request.method == 'POST':
+    return myvessels(request)
+  
+  remove_summary = ""
+
+  try:
+    interface.release_all_vessels(user)
+  except InvalidRequestError, err:
+    remove_summary = "Unable to release all vessels: " + str(err)
+  
+  return myvessels(request, remove_summary=remove_summary)
+
+
+
+
+
+
+@login_required
+def renew_resource(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  # The request must be via POST. If not, bounce user back to My Vessels page.
+  if not request.method == 'POST':
+    return myvessels(request)
+  
+  if not request.POST.get('handle', ''):
+    return myvessels(request)
+  
+  action_summary = ""
+  action_detail = ""
+  
+  try:
+    # Convert handle to vessel object.
+    # Raises a DoesNotExistError if the vessel does not exist. This is more
+    # likely to be an error than an expected case, so we let it bubble up.
+    vessel_handle_list = [request.POST['handle']]
+    vessel_to_renew = interface.get_vessel_list(vessel_handle_list)
+  except DoesNotExistError:
+    action_summary = "Unable to renew vessel: The vessel you are trying to delete does not exist."
+  except InvalidRequestError, err:
+    action_summary = "Unable to renew vessel."
+    action_detail += str(err)
+  else:
+    try:
+      interface.renew_vessels(user, vessel_to_renew)
+    except InvalidRequestError, err:
+      action_summary = "Unable to renew vessel: " + str(err)
+    except InsufficientUserResourcesError, err:
+      action_summary = "Unable to renew vessel: you are currently over your"
+      action_summary += " vessel credit limit."
+      action_detail += str(err)
+  
+  return myvessels(request, False, action_summary=action_summary, action_detail=action_detail)
+
+
+
+
+
+@login_required
+def renew_all_resources(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  # The request must be via POST. If not, bounce user back to My Vessels page.
+  if not request.method == 'POST':
+    return myvessels(request)
+  
+  action_summary = ""
+  action_detail = ""
+  
+  try:
+    interface.renew_all_vessels(user)
+  except InvalidRequestError, err:
+    action_summary = "Unable to renew vessels: " + str(err)
+  except InsufficientUserResourcesError, err:
+    action_summary = "Unable to renew vessels: you are currently over your"
+    action_summary += " vessel credit limit."
+    action_detail += str(err)
+  
+  return myvessels(request, False, action_summary=action_summary, action_detail=action_detail)
+
+
+
+
+
+@login_required
+def change_key(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  info = ""
+  if request.method == 'GET':
+    return render_to_response('control/change_key.html',
+                              {'username' : user.username,
+                               'error_msg' : ""},
+                              context_instance=RequestContext(request))
+
+  # This is a POST, so figure out if a file was uploaded or if we are supposed
+  # to generate a new key for the user.
+  if request.POST.get('generate', False):
+    interface.change_user_keys(user, pubkey=None)
+    msg = "Your new keys have been generated. You should download them now."
+    return profile(request, msg)
+    
+  else:
+    file = request.FILES.get('pubkey', None)
+    if file is None:
+      msg = "You didn't select a public key file to upload." 
+      return profile(request, info, msg)
+
+    
+    if file.size == 0 or file.size > forms.MAX_PUBKEY_UPLOAD_SIZE:
+      msg = "Invalid file uploaded. The file size limit is " 
+      msg += str(forms.MAX_PUBKEY_UPLOAD_SIZE) + " bytes."
+      return profile(request, info, msg) 
+          
+    pubkey = file.read()
+    
+    try:
+      validations.validate_pubkey_string(pubkey)
+    except ValidationError:
+      msg = "Invalid public key uploaded."
+      return profile(request, info, msg)
+    
+    # If we made it here, the uploaded key is good.
+    interface.change_user_keys(user, pubkey=pubkey)
+    msg = "Your public key has been successfully changed."
+    return profile(request, msg)
+
+
+
+
+
+@login_required
+def api_info(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  if request.method == 'GET':
+    return render_to_response('control/api_info.html',
+                              {'username' : user.username,
+                               'api_key' : user.api_key,
+                               'msg' : ""},
+                              context_instance=RequestContext(request))
+
+  # This is a POST, so it should be generation of an API key.
+  if not request.POST.get('generate_api_key', False):
+    msg = "Sorry, we didn't understand your request."
+    return profile(request, info, msg) 
+    
+  interface.regenerate_api_key(user)
+  msg = "Your API key has been regenerated. Your old one will no longer work."
+  msg += " You should update any places you are using the API key"
+  msg += " (e.g. in programs using the XML-RPC client)."
+  return profile(request,msg)
+
+
+
+
+
+@log_function_call
+@require_POST
+@login_required
+def del_priv(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  if user.user_privkey == "":
+    msg = "Your private key has already been deleted."
+  else:
+    interface.delete_private_key(user)
+    msg = "Your private key has been deleted."
+  return profile(request, msg)
+
+
+
+
+
+@log_function_call
+@login_required
+def priv_key(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  response = HttpResponse(user.user_privkey, mimetype='text/plain')
+  response['Content-Disposition'] = 'attachment; filename=' + \
+          str(user.username) + '.privatekey'
+  return response
+
+
+
+
+
+@log_function_call
+@login_required
+def pub_key(request):
+  try:
+    user = _validate_and_get_geniuser(request)
+  except LoggedInButFailedGetGeniUserError:
+    return _show_failed_get_geniuser_page(request)
+  
+  response = HttpResponse(user.user_pubkey, mimetype='text/plain')
+  response['Content-Disposition'] = 'attachment; filename=' + \
+            str(user.username) + '.publickey'
+  return response
+
+
+
+
+
+def download(request, username):
+  validuser = True
+  try:
+    # validate that this username actually exists
+    user = interface.get_user_for_installers(username)
+  except DoesNotExistError:
+    validuser = False
+
+  templatedict = {}
+  templatedict['username'] = username
+  templatedict['validuser'] = validuser
+  templatedict['domain'] = "https://" + request.get_host()
+  # I need to build a URL for android to download the installer from.   (The
+  # same installer is downloaded from the Google Play store for all users.) 
+  # The URL is escaped twice (ask Akos why) and inserted in the referrer 
+  # information in the URL.   
+  #templatedict['android_installer_link'] = urllib.quote(urllib.quote(domain,safe=''),safe='')
+
+  return render_to_response('download/installers.html', templatedict,
+          context_instance=RequestContext(request))
+
+
+
+
+
+def build_android_installer(request, username):
+  """
+  <Purpose>
+    Allows the user to download a Android distribution of Seattle that will
+    donate resources to user with 'username'.
+  
+  <Arguments>
+    request:
+      Django HttpRequest object
+       
+    username:
+      A string representing the GENI user to which the installer will donate
+      resources.
+  
+  <Exceptions>
+    None
+  
+  <Side Effects>
+    None
+  
+  <Returns>
+    On failure, returns an HTTP response with a description of the error. On
+    success, redirects the user to download the installer.
+  """
+  
+  success, return_value = _build_installer(username, "android")
+  
+  if not success:
+    error_response = return_value
+    return error_response
+  
+  installer_url = return_value
+  return HttpResponseRedirect(installer_url)
+
+
+
+
+
+def build_win_installer(request, username):
+  """
+  <Purpose>
+    Allows the user to download a Windows distribution of Seattle that will
+    donate resources to user with 'username'.
+  
+  <Arguments>
+    request:
+      Django HttpRequest object
+       
+    username:
+      A string representing the GENI user to which the installer will donate
+      resources.
+  
+  <Exceptions>
+    None
+  
+  <Side Effects>
+    None
+  
+  <Returns>
+    On failure, returns an HTTP response with a description of the error. On
+    success, redirects the user to download the installer.
+  """
+  
+  success, return_value = _build_installer(username, "windows")
+  
+  if not success:
+    error_response = return_value
+    return error_response
+  
+  installer_url = return_value
+  return HttpResponseRedirect(installer_url)
+
+
+
+
+
+def build_linux_installer(request, username):
+  """
+  <Purpose>
+    Allows the user to download a Linux distribution of Seattle that will
+    donate resources to user with 'username'.
+
+  <Arguments>
+    request:
+      Django HttpRequest object
+
+    username:
+      A string representing the GENI user to which the installer will donate
+      resources.
+
+  <Exceptions>
+    None
+
+  <Side Effects>
+    None
+
+  <Returns>
+    On failure, returns an HTTP response with a description of the error. On
+    success, redirects the user to download the installer.
+  """
+
+  success, return_value = _build_installer(username, "linux")
+
+  if not success:
+    error_response = return_value
+    return error_response
+
+  installer_url = return_value
+  return HttpResponseRedirect(installer_url)
+
+
+
+
+
+def build_mac_installer(request, username):
+  """
+  <Purpose>
+    Allows the user to download a Mac distribution of Seattle that will
+    donate resources to user with 'username'.
+
+  <Arguments>
+    request:
+      Django HttpRequest object
+
+    username:
+      A string representing the GENI user to which the installer will donate
+      resources.
+
+  <Exceptions>
+    None
+
+  <Side Effects>
+    None
+
+  <Returns>
+    On failure, returns an HTTP response with a description of the error. On
+    success, redirects the user to download the installer.
+  """
+
+  success, return_value = _build_installer(username, "mac")
+
+  if not success:
+    error_response = return_value
+    return error_response
+
+  installer_url = return_value
+  return HttpResponseRedirect(installer_url)
+
+
+
+
+
+def _build_installer(username, platform):
+  """
+  <Purpose>
+    Builds an installer for the given platform that will donate resources to
+    the user with the given username.
+  
+  <Arguments>
+    username:
+      A string representing the GENI user to which the installer will donate
+      resources.
+      
+    platform:
+      A string representing the platform for which to build the installer.
+      Options include 'windows', 'linux', or 'mac'.
+  
+  <Exceptions>
+    None
+  
+  <Side Effects>
+    None
+  
+  <Returns>
+    On success, returns (True, installer_url) where installer_url is URL from
+    which the installer may be downloaded.
+    
+    On failure, returns (False, error_response) where error_repsponse is an
+    HttpResponse which specifies what went wrong.
+  """
+  try:
+    user = interface.get_user_for_installers(username)
+    username = user.username
+  except DoesNotExistError:
+    error_response = HttpResponse("Couldn't get user.")
+    return False, error_response
+
+  try:
+    xmlrpc_proxy = xmlrpclib.ServerProxy(settings.SEATTLECLEARINGHOUSE_INSTALLER_BUILDER_XMLRPC)
+    
+    vessel_list = [{'percentage': 80, 'owner': 'owner', 'users': ['user']}]
+    
+    user_data = {
+      'owner': {'public_key': user.donor_pubkey},
+      'user': {'public_key': ACCEPTDONATIONS_STATE_PUBKEY},
+    }
+    
+    build_results = xmlrpc_proxy.build_installers(vessel_list, user_data)
+  except:
+    error_response = HttpResponse("Failed to build installer.")
+    return False, error_response
+
+  installer_url = build_results['installers'][platform]
+  return True, installer_url
+
+
+
+
+
+def donations_help(request, username):
+  return render_to_response('download/help.html', {'username' : username},
+          context_instance=RequestContext(request))
+
+
+
+
+
+def _validate_and_get_geniuser(request):
+  try:
+    user = interface.get_logged_in_user(request)
+  except DoesNotExistError:
+    # Failed to get GeniUser record, but user is logged in
+    raise LoggedInButFailedGetGeniUserError
+  return user
+
+
+
+
+
+@log_function_call_without_return
+@login_required
+def new_auto_register_user(request):
+  msg = "Your account has been succesfully created. "
+  msg += "If you would like to login without OpenID/OAuth please change your password now."
+  return profile(request,msg)
+
+
+
+
+
+def _show_failed_get_geniuser_page(request):
+  err = "Sorry, we can't display the page you requested. "
+  err += "If you are logged in as an administrator, you'll need to logout, and login with a Seattle Clearinghouse account. "
+  err += "If you aren't logged in as an administrator, then this is a bug. Please contact us!"
+  return _show_login(request, 'accounts/login.html', {'err' : err})
diff --git a/website/reports/views.py b/website/reports/views.py
index bd69950..2bdf365 100644
--- a/website/reports/views.py
+++ b/website/reports/views.py
@@ -1,195 +1,195 @@
-"""
-<Program>
-  views.py
-
-<Started>
-  September 4, 2009
-
-<Author>
-  Justin Samuel
-
-<Purpose>
-  Views for reports about clearinghouse.
-"""
-
-import django.contrib.auth.decorators
-from django.http import HttpResponse
-
-from clearinghouse.common.util import statistics
-
-
-
-
-
-
-def user_is_staff_member(user):
-  return user.is_authenticated() and user.is_staff
-
-
-
-
-
-@django.contrib.auth.decorators.user_passes_test(user_is_staff_member)
-def index(request):
-  html = '<html><head><style>body { font-family : sans-serif; }</style></head><body>'
-  html += '<h2>Available reports</h2>'
-  html += 'Note: some of these reports are not generated efficiently. The ones '
-  html += 'that take a long time to load are probably hammering the database.<br /><br />'
-  html += '<ul>'
-  html += '<li><a href="%s">%s</a></li>' % ("all", "All reports on one page") 
-  html += '<li><a href="%s">%s</a></li>' % ("donations", "Donations")
-  html += '<li><a href="%s">%s</a></li>' % ("acquired_vessels", "Acquired vessels")
-  html += '<li><a href="%s">%s</a></li>' % ("vessels_by_port", "Available vessels by port")
-  html += '<li><a href="%s">%s</a></li>' % ("lan_sizes_by_port", "Available LAN sizes by port")
-  html += '</ul>'
-  html += '</body></html>'
-  return HttpResponse(html)
-
-
-
-
-
-@django.contrib.auth.decorators.user_passes_test(user_is_staff_member)
-def all(request):
-  lines = []
-  lines += _get_text_number_of_vessels_acquired_per_user()
-  lines.append("")
-  lines += _get_text_donations_per_user()
-  lines.append("")
-  lines += _get_text_available_vessels_by_port()
-  lines.append("")
-  lines += _get_text_lan_sizes_by_port()
-  output = "\n".join(lines)
-  return HttpResponse(output, content_type='text/plain')
-  
-  
-  
-
-
-@django.contrib.auth.decorators.user_passes_test(user_is_staff_member)
-def acquired_vessels(request):
-  output = "\n".join(_get_text_number_of_vessels_acquired_per_user())
-  return HttpResponse(output, content_type='text/plain')
-  
-  
-
-
-
-@django.contrib.auth.decorators.user_passes_test(user_is_staff_member)
-def donations(request):
-  output = "\n".join(_get_text_donations_per_user())
-  return HttpResponse(output, content_type='text/plain')
-
-
-  
-
-
-@django.contrib.auth.decorators.user_passes_test(user_is_staff_member)
-def vessels_by_port(request):
-  output = "\n".join(_get_text_available_vessels_by_port())
-  return HttpResponse(output, content_type='text/plain')
-
-
-
-
-
-def lan_sizes_by_port(request):
-  output = "\n".join(_get_text_lan_sizes_by_port())
-  return HttpResponse(output, content_type='text/plain')
-
-  
-
-
-
-def _get_text_number_of_vessels_acquired_per_user():
-  
-  lines = []
-  lines.append("Number of vessels acquired per user")
-  lines.append("-----------------------------------")
-  
-  vessel_acquisition_dict = statistics.get_vessel_acquisition_counts_by_user()
-  
-  for username in vessel_acquisition_dict:
-    lines.append(username + (" " * (25 - len(username))) + str(vessel_acquisition_dict[username]))
-  
-  lines.append("")
-  lines.append("Vessel acquisition summary")
-  lines.append("--------------------------")
-  lines.append("There are " +  str(len(vessel_acquisition_dict.keys())) + " users who have acquired vessels.")
-  lines.append("There are " + str(sum(vessel_acquisition_dict.values())) + " acquired vessels.")
-
-  return lines
-
-
-
-
-
-def _get_text_donations_per_user():
-  
-  lines = []
-  lines.append("Donations per user")
-  lines.append("------------------")
-  
-  donations_dict = statistics.get_donation_counts_by_user()
-  
-  lines.append("User" + (" " * (25 - len("User"))) + "Active" + "\t" + "Inactive")
-  lines.append("----" + (" " * (25 - len("----"))) + "------" + "\t" + "--------")
-    
-  total_active_donations = 0
-  total_inactive_donations = 0
-    
-  for username in donations_dict:
-    (active_donation_count, inactive_donation_count) = donations_dict[username]
-    total_active_donations += active_donation_count 
-    total_inactive_donations +=  inactive_donation_count
-    lines.append(username + (" " * (25 - len(username))) + str(active_donation_count) + "\t" + str(inactive_donation_count))
-
-  lines.append("")
-  lines.append("Donation summary")
-  lines.append("--------------------------")
-  lines.append("Total active donations:   " +  str(total_active_donations))
-  lines.append("Total inactive donations: " +  str(total_inactive_donations))
-  
-  return lines
-
-  
-
-  
-  
-def _get_text_available_vessels_by_port():
-  
-  lines = []
-  lines.append("Available vessels by port")
-  lines.append("-------------------------")
-  
-  available_vessels_dict = statistics.get_available_vessel_counts_by_port()
-  
-  lines.append("%s\t%s\t%s\t%s" % ("Port", "All", "No-NAT", "Only-NAT"))
-  lines.append("%s\t%s\t%s\t%s" % ("----", "---", "------", "--------"))
-  
-  for port in available_vessels_dict:
-    portdict = available_vessels_dict[port]
-    lines.append("%s\t%s\t%s\t%s" % (port, portdict["all"], portdict["no_nat"], portdict["only_nat"]))
-
-  return lines
-
-
-
-
-
-def _get_text_lan_sizes_by_port():
-  
-  lines = []
-  lines.append("Available LAN sizes by port")
-  lines.append("---------------------------")
-  
-  lan_sizes_by_port = statistics.get_available_lan_vessel_counts()
-  
-  lines.append("%s\t%s" % ("Port", "Size List (top five)"))
-  lines.append("%s\t%s" % ("----", "--------------------"))
-  
-  for port in lan_sizes_by_port:
-    size_list = lan_sizes_by_port[port][:5]
-    lines.append("%s\t%s" % (port, size_list))
-
-  return lines
+"""
+<Program>
+  views.py
+
+<Started>
+  September 4, 2009
+
+<Author>
+  Justin Samuel
+
+<Purpose>
+  Views for reports about clearinghouse.
+"""
+
+import django.contrib.auth.decorators
+from django.http import HttpResponse
+
+from clearinghouse.common.util import statistics
+
+
+
+
+
+
+def user_is_staff_member(user):
+  return user.is_authenticated() and user.is_staff
+
+
+
+
+
+@django.contrib.auth.decorators.user_passes_test(user_is_staff_member)
+def index(request):
+  html = '<html><head><style>body { font-family : sans-serif; }</style></head><body>'
+  html += '<h2>Available reports</h2>'
+  html += 'Note: some of these reports are not generated efficiently. The ones '
+  html += 'that take a long time to load are probably hammering the database.<br /><br />'
+  html += '<ul>'
+  html += '<li><a href="%s">%s</a></li>' % ("all", "All reports on one page") 
+  html += '<li><a href="%s">%s</a></li>' % ("donations", "Donations")
+  html += '<li><a href="%s">%s</a></li>' % ("acquired_vessels", "Acquired vessels")
+  html += '<li><a href="%s">%s</a></li>' % ("vessels_by_port", "Available vessels by port")
+  html += '<li><a href="%s">%s</a></li>' % ("lan_sizes_by_port", "Available LAN sizes by port")
+  html += '</ul>'
+  html += '</body></html>'
+  return HttpResponse(html)
+
+
+
+
+
+@django.contrib.auth.decorators.user_passes_test(user_is_staff_member)
+def all(request):
+  lines = []
+  lines += _get_text_number_of_vessels_acquired_per_user()
+  lines.append("")
+  lines += _get_text_donations_per_user()
+  lines.append("")
+  lines += _get_text_available_vessels_by_port()
+  lines.append("")
+  lines += _get_text_lan_sizes_by_port()
+  output = "\n".join(lines)
+  return HttpResponse(output, content_type='text/plain')
+  
+  
+  
+
+
+@django.contrib.auth.decorators.user_passes_test(user_is_staff_member)
+def acquired_vessels(request):
+  output = "\n".join(_get_text_number_of_vessels_acquired_per_user())
+  return HttpResponse(output, content_type='text/plain')
+  
+  
+
+
+
+@django.contrib.auth.decorators.user_passes_test(user_is_staff_member)
+def donations(request):
+  output = "\n".join(_get_text_donations_per_user())
+  return HttpResponse(output, content_type='text/plain')
+
+
+  
+
+
+@django.contrib.auth.decorators.user_passes_test(user_is_staff_member)
+def vessels_by_port(request):
+  output = "\n".join(_get_text_available_vessels_by_port())
+  return HttpResponse(output, content_type='text/plain')
+
+
+
+
+
+def lan_sizes_by_port(request):
+  output = "\n".join(_get_text_lan_sizes_by_port())
+  return HttpResponse(output, content_type='text/plain')
+
+  
+
+
+
+def _get_text_number_of_vessels_acquired_per_user():
+  
+  lines = []
+  lines.append("Number of vessels acquired per user")
+  lines.append("-----------------------------------")
+  
+  vessel_acquisition_dict = statistics.get_vessel_acquisition_counts_by_user()
+  
+  for username in vessel_acquisition_dict:
+    lines.append(username + (" " * (25 - len(username))) + str(vessel_acquisition_dict[username]))
+  
+  lines.append("")
+  lines.append("Vessel acquisition summary")
+  lines.append("--------------------------")
+  lines.append("There are " +  str(len(vessel_acquisition_dict.keys())) + " users who have acquired vessels.")
+  lines.append("There are " + str(sum(vessel_acquisition_dict.values())) + " acquired vessels.")
+
+  return lines
+
+
+
+
+
+def _get_text_donations_per_user():
+  
+  lines = []
+  lines.append("Donations per user")
+  lines.append("------------------")
+  
+  donations_dict = statistics.get_donation_counts_by_user()
+  
+  lines.append("User" + (" " * (25 - len("User"))) + "Active" + "\t" + "Inactive")
+  lines.append("----" + (" " * (25 - len("----"))) + "------" + "\t" + "--------")
+    
+  total_active_donations = 0
+  total_inactive_donations = 0
+    
+  for username in donations_dict:
+    (active_donation_count, inactive_donation_count) = donations_dict[username]
+    total_active_donations += active_donation_count 
+    total_inactive_donations +=  inactive_donation_count
+    lines.append(username + (" " * (25 - len(username))) + str(active_donation_count) + "\t" + str(inactive_donation_count))
+
+  lines.append("")
+  lines.append("Donation summary")
+  lines.append("--------------------------")
+  lines.append("Total active donations:   " +  str(total_active_donations))
+  lines.append("Total inactive donations: " +  str(total_inactive_donations))
+  
+  return lines
+
+  
+
+  
+  
+def _get_text_available_vessels_by_port():
+  
+  lines = []
+  lines.append("Available vessels by port")
+  lines.append("-------------------------")
+  
+  available_vessels_dict = statistics.get_available_vessel_counts_by_port()
+  
+  lines.append("%s\t%s\t%s\t%s" % ("Port", "All", "No-NAT", "Only-NAT"))
+  lines.append("%s\t%s\t%s\t%s" % ("----", "---", "------", "--------"))
+  
+  for port in available_vessels_dict:
+    portdict = available_vessels_dict[port]
+    lines.append("%s\t%s\t%s\t%s" % (port, portdict["all"], portdict["no_nat"], portdict["only_nat"]))
+
+  return lines
+
+
+
+
+
+def _get_text_lan_sizes_by_port():
+  
+  lines = []
+  lines.append("Available LAN sizes by port")
+  lines.append("---------------------------")
+  
+  lan_sizes_by_port = statistics.get_available_lan_vessel_counts()
+  
+  lines.append("%s\t%s" % ("Port", "Size List (top five)"))
+  lines.append("%s\t%s" % ("----", "--------------------"))
+  
+  for port in lan_sizes_by_port:
+    size_list = lan_sizes_by_port[port][:5]
+    lines.append("%s\t%s" % (port, size_list))
+
+  return lines
diff --git a/website/settings.py b/website/settings.py
index ddcbd11..4c106f3 100644
--- a/website/settings.py
+++ b/website/settings.py
@@ -56,7 +56,7 @@
 
 # Not currently used. This is left in for legacy installs
 #The url that corresponds to SEATTLECLEARINGHOUSE_USER_INSTALLERS_DIR
-#SEATTLECLEARINGHOUSE_USER_INSTALLERS_URL = "https://blackbox.cs.washington.edu/dist/geni"
+
 
 # Need to specify the LOGIN_URL, as our login page isn't at the default login
 # location (the default is /accounts/login).
diff --git a/website/xmlrpc/tests/ut_xmlrpc_frontend.py b/website/xmlrpc/tests/ut_xmlrpc_frontend.py
index cfbeee6..ab2fed5 100644
--- a/website/xmlrpc/tests/ut_xmlrpc_frontend.py
+++ b/website/xmlrpc/tests/ut_xmlrpc_frontend.py
@@ -1,509 +1,509 @@
-"""
-<Program>
-  test_urls.py
-
-<Started>
-  Oct 13, 2009
-
-<Author>
-  Justin Samuel
-
-<Purpose>
-  
-<Notes>
-  Uses a Django test client, not our xmlrpc client. This is intentional.
-  The xmlrpc client should be tested separately.
-"""
-
-#pragma out
-#pragma error OK
-
-
-# We import the testlib FIRST, as the test db settings 
-# need to be set before we import anything else.
-from clearinghouse.tests import testlib
-
-import xmlrpclib
-import unittest
-
-from django.contrib.auth.models import User as DjangoUser
-
-from clearinghouse.common.exceptions import *
-
-from clearinghouse.common.api import maindb
-
-from clearinghouse.website.xmlrpc import views
-
-from clearinghouse.website.xmlrpc.tests import xmlrpctestutil
-
-from clearinghouse.website.control import interface
-from clearinghouse.website.control import models
-
-from seattle.repyportability import *
-add_dy_support(locals())
-
-rsa = dy_import_module("rsa.r2py")
-
-
-
-
-def mock_raises_DoesNotExistError(*args, **kwargs):
-  raise DoesNotExistError
-
-
-
-def mock_raises_InvalidRequestError(*args, **kwargs):
-  raise InvalidRequestError
-
-
-
-def mock_raises_InsufficientUserResourcesError(*args, **kwargs):
-  raise InsufficientUserResourcesError
-
-
-
-def mock_raises_UnableToAcquireResourcesError(*args, **kwargs):
-  raise UnableToAcquireResourcesError
-
-
-
-def mock_noop(*args, **kwargs):
-  pass
-
-
-
-def mock_interface_get_user_with_api_key(username, api_key):
-  geniuser = models.GeniUser(username=username, password="password", email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  geniuser.api_key = api_key
-  # Not saving the geniuser record, we're not trying to interact with the db.
-  return geniuser
-
-
-
-def mock_interface_get_user_with_password(username, password):
-  geniuser = models.GeniUser(username=username, password=password, email='test@test.com',
-                             affiliation='test affil', user_pubkey='user_pubkey',
-                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10)
-  geniuser.password = password
-  # Not saving the geniuser record, we're not trying to interact with the db.
-  return geniuser
-
-
-
-def create_mock_get_user(username, password="testpassword", api_key="testapikey",
-                         pubkeystr="pubkeystr", privkeystr="privkeystr"):
-  
-  geniuser = models.GeniUser(username=username, password=password, email='test@test.com',
-                             affiliation='test affil', user_pubkey=pubkeystr,
-                             user_privkey=privkeystr, donor_pubkey='donor_pubkey',
-                             usable_vessel_port='12345', free_vessel_credits=10,
-                             api_key = api_key)
-  # Not saving the geniuser record, we're not trying to interact with the db.
-
-  def mock_interface_get_user(username, *args, **kwargs):
-    return geniuser
-
-  return mock_interface_get_user
-
-
-
-def mock_interface_get_vessel_list(vesselhandle_list):
-  return []
-
-
-
-def mock_interface_get_vessel_infodict_list(vessel_list):
-  return []
-
-
-def mock_interface_regenerate_api_key(geniuser):
-  return "a" * maindb.API_KEY_LENGTH
-
-
-def mock_interface_change_user_keys(geniuser, pubkeystring):
-  pass
-
-
-proxy = xmlrpclib.ServerProxy('http://fakehost/xmlrpc/',
-                              transport=xmlrpctestutil.TestTransport())
-
-
-
-
-class SeattleGeniTestCase(unittest.TestCase):
-
-
-  def setUp(self):
-    # Indicate a user record was found with the provided auth info.
-    interface.get_user_with_api_key = mock_interface_get_user_with_api_key
-    interface.get_user_with_password = mock_interface_get_user_with_password
-
-
-  def tearDown(self):
-    pass
-
-
-
-  def test_invalid_auth_dict(self):
-    
-    auth = 'not a dict'
-    
-    try:
-      proxy.get_account_info(auth)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-    
-    auth = {'username':'tester'}
-    
-    try:
-      proxy.get_account_info(auth)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-    
-    
-    
-  def test_all_functions_auth_failure(self):
-    """
-    Make sure all of the xmlrpc calls raise an exception if the auth check
-    fails.
-    """
-    
-    auth = {'username':'tester', 'api_key':'api_key'}
-
-    # Indicate no user record was found with the provided auth info.
-    interface.get_user_with_api_key = mock_raises_DoesNotExistError
-    
-    try:
-      proxy.renew_resources(auth, [])
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
-    else:
-      self.fail("Expected an exception.")
-    
-    try:
-      proxy.acquire_resources(auth, {})
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
-    else:
-      self.fail("Expected an exception.")
-      
-    try:
-      proxy.acquire_specific_vessels(auth, [])
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
-    else:
-      self.fail("Expected an exception.")
-    
-    try:
-      proxy.release_resources(auth, [])
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
-    else:
-      self.fail("Expected an exception.")
-
-    try:
-      proxy.get_resource_info(auth)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
-    else:
-      self.fail("Expected an exception.")
-
-    try:
-      proxy.get_account_info(auth)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
-    else:
-      self.fail("Expected an exception.")
-
-    try:
-      proxy.get_public_key(auth)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
-    else:
-      self.fail("Expected an exception.")
-
-    
-
-  def test_renew_resources_invalid_vessel_handle_list(self):
-    
-    auth = {'username':'tester', 'api_key':'api_key'}
-
-    vesselhandle_list = {'dict not a list':'123'}
-    
-    try:
-      proxy.renew_resources(auth, vesselhandle_list)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-
-
-  
-  def test_renew_resources(self):
-    
-    auth = {'username':'tester', 'api_key':'api_key'}
-    vesselhandle_list = ['vessel1', 'vessel2']
-    
-    # Check successful case. Returns a zero to indicate success.
-    
-    interface.get_vessel_list = mock_interface_get_vessel_list
-    interface.renew_vessels = mock_noop
-    
-    response = proxy.renew_resources(auth, vesselhandle_list)
-    self.assertEqual(response, 0)
-    
-    # Check various error cases. These all return FAULTCODE_INVALIDREQUEST.
-    
-    interface.get_vessel_list = mock_raises_DoesNotExistError
-    interface.renew_vessels = mock_noop
-    
-    try:
-      proxy.renew_resources(auth, vesselhandle_list)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-    
-    interface.get_vessel_list = mock_raises_InvalidRequestError
-    interface.renew_vessels = mock_noop
-    
-    try:
-      proxy.renew_resources(auth, vesselhandle_list)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-  
-    interface.get_vessel_list = mock_interface_get_vessel_list
-    interface.renew_vessels = mock_raises_InvalidRequestError
-    
-    try:
-      proxy.renew_resources(auth, vesselhandle_list)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-    
-    # This is the case where the user has less credits than acquired resources.
-    
-    interface.get_vessel_list = mock_interface_get_vessel_list
-    interface.renew_vessels = mock_raises_InsufficientUserResourcesError
-    
-    try:
-      proxy.renew_resources(auth, vesselhandle_list)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_NOTENOUGHCREDITS)
-    else:
-      self.fail("Expected an exception.")
-
-
-  
-  def test_acquire_resources_rspecs(self):
-    
-    auth = {'username':'tester', 'api_key':'api_key'}
-    vesselhandle_list = ['vessel1', 'vessel2']
-    
-    rspec_valid = {'rspec_type':'random', 'number_of_nodes':2}
-    
-    # invalid rspecs
-    rspec_negativenodes = {'rspec_type':'random', 'number_of_nodes':-10}
-    rspec_invalid_rtype = {'rspec_type':'wtf', 'number_of_nodes':10}
-    rspec_badtype = {'rspec_type':42, 'number_of_nodes':'a string'}
-    rspec_empty = {'rspec_type':'', 'number_of_nodes':0}
-    rspec_missingkey = {'number_of_nodes':10}
-    rspec_badkeys = {'bad':'', 'keys':''}
-    
-    try:
-      proxy.acquire_resources(auth, rspec_negativenodes)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-      
-    try:
-      proxy.acquire_resources(auth, rspec_invalid_rtype)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-    
-    try:
-      proxy.acquire_resources(auth, rspec_badtype)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-      
-    try:
-      proxy.acquire_resources(auth, rspec_empty)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-    
-    try:
-      proxy.acquire_resources(auth, rspec_missingkey)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-    
-    try:
-      proxy.acquire_resources(auth, rspec_badkeys)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-      
-    # This is the case where the user has less credits than the number of
-    # vessels they are trying to acquire.
-    
-    interface.get_vessel_list = mock_interface_get_vessel_list
-    interface.acquire_vessels = mock_raises_InsufficientUserResourcesError
-    
-    try:
-      proxy.acquire_resources(auth, rspec_valid)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_NOTENOUGHCREDITS)
-    else:
-      self.fail("Expected an exception.")
-      
-    # This is the case where SeattleGENI doesn't have enough resources to
-    # acquire the requested vessels.
-
-    interface.get_vessel_list = mock_interface_get_vessel_list
-    interface.acquire_vessels = mock_raises_UnableToAcquireResourcesError
-    
-    try:
-      proxy.acquire_resources(auth, rspec_valid)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_UNABLETOACQUIRE)
-    else:
-      self.fail("Expected an exception.")
-
-
-
-  def test_acquire_specific_vessels(self):
-    
-    auth = {'username':'tester', 'api_key':'api_key'}
-    vesselhandle_list = ['vessel1', 'vessel2']
-    
-    # Check successful case. Returns a zero to indicate success.
-    
-    interface.get_vessel_list = mock_interface_get_vessel_list
-    interface.get_vessel_infodict_list = mock_interface_get_vessel_infodict_list
-    interface.acquire_specific_vessels = mock_noop
-    
-    response = proxy.acquire_specific_vessels(auth, vesselhandle_list)
-    self.assertTrue(isinstance(response, list))
-    
-    # vesselhandle_list is not a list.
-    try:
-      proxy.acquire_specific_vessels(auth, 1)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
-    else:
-      self.fail("Expected an exception.")
-
-    # This is the case where the user has less credits than the number of
-    # vessels they are trying to acquire.
-    
-    interface.get_vessel_list = mock_interface_get_vessel_list
-    interface.acquire_specific_vessels = mock_raises_InsufficientUserResourcesError
-    
-    try:
-      proxy.acquire_specific_vessels(auth, vesselhandle_list)
-    except xmlrpclib.Fault, e:
-      self.assertEqual(e.faultCode, views.FAULTCODE_NOTENOUGHCREDITS)
-    else:
-      self.fail("Expected an exception.")
-
-
-
-  def test_get_encrypted_api_key(self):
-    
-    username = "testuser"
-    api_key = "testapikey"
-    
-    (pubkeydict, privkeydict) = rsa.rsa_gen_pubpriv_keys(512)
-    pubkeystr = rsa.rsa_publickey_to_string(pubkeydict)
-    privkeystr = rsa.rsa_privatekey_to_string(privkeydict)
-    
-    interface.get_user_without_password = create_mock_get_user(username, api_key=api_key,
-                                                               pubkeystr=pubkeystr,
-                                                               privkeystr=privkeystr)
-    
-    response = proxy.get_encrypted_api_key(username)
-    self.assertTrue(isinstance(response, str))
-    
-    encrypted_data = proxy.get_encrypted_api_key(username)
-    decrypted_data = rsa.rsa_decrypt(encrypted_data, privkeydict)
-    split_data = decrypted_data.split("!")
-    
-    self.assertEqual(api_key, split_data[1])
-
-
-
-  def test_regenerate_api_key(self):
-    
-    username = "testuser"
-    password = "testpassword"
-    original_api_key = "original_api_key"
-    
-    interface.get_user_without_password = create_mock_get_user(username, password=password,
-                                                               api_key=original_api_key)
-    interface.regenerate_api_key = mock_interface_regenerate_api_key
-    
-    pwauth = {"username" : username, "password" : password}
-    
-    response = proxy.regenerate_api_key(pwauth)
-    self.assertTrue(isinstance(response, str))
-    self.assertNotEqual(response, original_api_key)
-    self.assertEqual(len(response), maindb.API_KEY_LENGTH)
-
-
-
-  def test_set_public_key(self):
-    
-    username = "testuser"
-    password = "testpassword"
-    original_api_key = "original_api_key"
-    
-    interface.get_user_without_password = create_mock_get_user(username, password=password,
-                                                               api_key=original_api_key)
-    interface.change_user_keys = mock_interface_change_user_keys
-    
-    pwauth = {"username" : username, "password" : password}
-    
-    (pubkeydict, privkeydict) = rsa.rsa_gen_pubpriv_keys(512)
-    pubkeystr = rsa.rsa_publickey_to_string(pubkeydict)
-    
-    proxy.set_public_key(pwauth, pubkeystr)
-
-
-
-def main():
-  # The tests don't use the database, so we just make a single database
-  # so that it exists to prevent unrelated errors when we use the models.
-  testlib.setup_test_environment()
-  testlib.setup_test_db()
-  
-  try:
-    unittest.main()
-  
-  finally:
-    testlib.teardown_test_db()
-    testlib.teardown_test_environment()
-
-
-
-if __name__ == "__main__":
-  main()
+"""
+<Program>
+  test_urls.py
+
+<Started>
+  Oct 13, 2009
+
+<Author>
+  Justin Samuel
+
+<Purpose>
+  
+<Notes>
+  Uses a Django test client, not our xmlrpc client. This is intentional.
+  The xmlrpc client should be tested separately.
+"""
+
+#pragma out
+#pragma error OK
+
+
+# We import the testlib FIRST, as the test db settings 
+# need to be set before we import anything else.
+from clearinghouse.tests import testlib
+
+import xmlrpclib
+import unittest
+
+from django.contrib.auth.models import User as DjangoUser
+
+from clearinghouse.common.exceptions import *
+
+from clearinghouse.common.api import maindb
+
+from clearinghouse.website.xmlrpc import views
+
+from clearinghouse.website.xmlrpc.tests import xmlrpctestutil
+
+from clearinghouse.website.control import interface
+from clearinghouse.website.control import models
+
+from seattle.repyportability import *
+add_dy_support(locals())
+
+rsa = dy_import_module("rsa.r2py")
+
+
+
+
+def mock_raises_DoesNotExistError(*args, **kwargs):
+  raise DoesNotExistError
+
+
+
+def mock_raises_InvalidRequestError(*args, **kwargs):
+  raise InvalidRequestError
+
+
+
+def mock_raises_InsufficientUserResourcesError(*args, **kwargs):
+  raise InsufficientUserResourcesError
+
+
+
+def mock_raises_UnableToAcquireResourcesError(*args, **kwargs):
+  raise UnableToAcquireResourcesError
+
+
+
+def mock_noop(*args, **kwargs):
+  pass
+
+
+
+def mock_interface_get_user_with_api_key(username, api_key):
+  geniuser = models.GeniUser(username=username, password="password", email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  geniuser.api_key = api_key
+  # Not saving the geniuser record, we're not trying to interact with the db.
+  return geniuser
+
+
+
+def mock_interface_get_user_with_password(username, password):
+  geniuser = models.GeniUser(username=username, password=password, email='test@test.com',
+                             affiliation='test affil', user_pubkey='user_pubkey',
+                             user_privkey='user_privkey', donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10)
+  geniuser.password = password
+  # Not saving the geniuser record, we're not trying to interact with the db.
+  return geniuser
+
+
+
+def create_mock_get_user(username, password="testpassword", api_key="testapikey",
+                         pubkeystr="pubkeystr", privkeystr="privkeystr"):
+  
+  geniuser = models.GeniUser(username=username, password=password, email='test@test.com',
+                             affiliation='test affil', user_pubkey=pubkeystr,
+                             user_privkey=privkeystr, donor_pubkey='donor_pubkey',
+                             usable_vessel_port='12345', free_vessel_credits=10,
+                             api_key = api_key)
+  # Not saving the geniuser record, we're not trying to interact with the db.
+
+  def mock_interface_get_user(username, *args, **kwargs):
+    return geniuser
+
+  return mock_interface_get_user
+
+
+
+def mock_interface_get_vessel_list(vesselhandle_list):
+  return []
+
+
+
+def mock_interface_get_vessel_infodict_list(vessel_list):
+  return []
+
+
+def mock_interface_regenerate_api_key(geniuser):
+  return "a" * maindb.API_KEY_LENGTH
+
+
+def mock_interface_change_user_keys(geniuser, pubkeystring):
+  pass
+
+
+proxy = xmlrpclib.ServerProxy('http://fakehost/xmlrpc/',
+                              transport=xmlrpctestutil.TestTransport())
+
+
+
+
+class SeattleGeniTestCase(unittest.TestCase):
+
+
+  def setUp(self):
+    # Indicate a user record was found with the provided auth info.
+    interface.get_user_with_api_key = mock_interface_get_user_with_api_key
+    interface.get_user_with_password = mock_interface_get_user_with_password
+
+
+  def tearDown(self):
+    pass
+
+
+
+  def test_invalid_auth_dict(self):
+    
+    auth = 'not a dict'
+    
+    try:
+      proxy.get_account_info(auth)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+    
+    auth = {'username':'tester'}
+    
+    try:
+      proxy.get_account_info(auth)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+    
+    
+    
+  def test_all_functions_auth_failure(self):
+    """
+    Make sure all of the xmlrpc calls raise an exception if the auth check
+    fails.
+    """
+    
+    auth = {'username':'tester', 'api_key':'api_key'}
+
+    # Indicate no user record was found with the provided auth info.
+    interface.get_user_with_api_key = mock_raises_DoesNotExistError
+    
+    try:
+      proxy.renew_resources(auth, [])
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
+    else:
+      self.fail("Expected an exception.")
+    
+    try:
+      proxy.acquire_resources(auth, {})
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
+    else:
+      self.fail("Expected an exception.")
+      
+    try:
+      proxy.acquire_specific_vessels(auth, [])
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
+    else:
+      self.fail("Expected an exception.")
+    
+    try:
+      proxy.release_resources(auth, [])
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
+    else:
+      self.fail("Expected an exception.")
+
+    try:
+      proxy.get_resource_info(auth)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
+    else:
+      self.fail("Expected an exception.")
+
+    try:
+      proxy.get_account_info(auth)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
+    else:
+      self.fail("Expected an exception.")
+
+    try:
+      proxy.get_public_key(auth)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_AUTHERROR)
+    else:
+      self.fail("Expected an exception.")
+
+    
+
+  def test_renew_resources_invalid_vessel_handle_list(self):
+    
+    auth = {'username':'tester', 'api_key':'api_key'}
+
+    vesselhandle_list = {'dict not a list':'123'}
+    
+    try:
+      proxy.renew_resources(auth, vesselhandle_list)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+
+
+  
+  def test_renew_resources(self):
+    
+    auth = {'username':'tester', 'api_key':'api_key'}
+    vesselhandle_list = ['vessel1', 'vessel2']
+    
+    # Check successful case. Returns a zero to indicate success.
+    
+    interface.get_vessel_list = mock_interface_get_vessel_list
+    interface.renew_vessels = mock_noop
+    
+    response = proxy.renew_resources(auth, vesselhandle_list)
+    self.assertEqual(response, 0)
+    
+    # Check various error cases. These all return FAULTCODE_INVALIDREQUEST.
+    
+    interface.get_vessel_list = mock_raises_DoesNotExistError
+    interface.renew_vessels = mock_noop
+    
+    try:
+      proxy.renew_resources(auth, vesselhandle_list)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+    
+    interface.get_vessel_list = mock_raises_InvalidRequestError
+    interface.renew_vessels = mock_noop
+    
+    try:
+      proxy.renew_resources(auth, vesselhandle_list)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+  
+    interface.get_vessel_list = mock_interface_get_vessel_list
+    interface.renew_vessels = mock_raises_InvalidRequestError
+    
+    try:
+      proxy.renew_resources(auth, vesselhandle_list)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+    
+    # This is the case where the user has less credits than acquired resources.
+    
+    interface.get_vessel_list = mock_interface_get_vessel_list
+    interface.renew_vessels = mock_raises_InsufficientUserResourcesError
+    
+    try:
+      proxy.renew_resources(auth, vesselhandle_list)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_NOTENOUGHCREDITS)
+    else:
+      self.fail("Expected an exception.")
+
+
+  
+  def test_acquire_resources_rspecs(self):
+    
+    auth = {'username':'tester', 'api_key':'api_key'}
+    vesselhandle_list = ['vessel1', 'vessel2']
+    
+    rspec_valid = {'rspec_type':'random', 'number_of_nodes':2}
+    
+    # invalid rspecs
+    rspec_negativenodes = {'rspec_type':'random', 'number_of_nodes':-10}
+    rspec_invalid_rtype = {'rspec_type':'wtf', 'number_of_nodes':10}
+    rspec_badtype = {'rspec_type':42, 'number_of_nodes':'a string'}
+    rspec_empty = {'rspec_type':'', 'number_of_nodes':0}
+    rspec_missingkey = {'number_of_nodes':10}
+    rspec_badkeys = {'bad':'', 'keys':''}
+    
+    try:
+      proxy.acquire_resources(auth, rspec_negativenodes)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+      
+    try:
+      proxy.acquire_resources(auth, rspec_invalid_rtype)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+    
+    try:
+      proxy.acquire_resources(auth, rspec_badtype)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+      
+    try:
+      proxy.acquire_resources(auth, rspec_empty)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+    
+    try:
+      proxy.acquire_resources(auth, rspec_missingkey)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+    
+    try:
+      proxy.acquire_resources(auth, rspec_badkeys)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+      
+    # This is the case where the user has less credits than the number of
+    # vessels they are trying to acquire.
+    
+    interface.get_vessel_list = mock_interface_get_vessel_list
+    interface.acquire_vessels = mock_raises_InsufficientUserResourcesError
+    
+    try:
+      proxy.acquire_resources(auth, rspec_valid)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_NOTENOUGHCREDITS)
+    else:
+      self.fail("Expected an exception.")
+      
+    # This is the case where SeattleGENI doesn't have enough resources to
+    # acquire the requested vessels.
+
+    interface.get_vessel_list = mock_interface_get_vessel_list
+    interface.acquire_vessels = mock_raises_UnableToAcquireResourcesError
+    
+    try:
+      proxy.acquire_resources(auth, rspec_valid)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_UNABLETOACQUIRE)
+    else:
+      self.fail("Expected an exception.")
+
+
+
+  def test_acquire_specific_vessels(self):
+    
+    auth = {'username':'tester', 'api_key':'api_key'}
+    vesselhandle_list = ['vessel1', 'vessel2']
+    
+    # Check successful case. Returns a zero to indicate success.
+    
+    interface.get_vessel_list = mock_interface_get_vessel_list
+    interface.get_vessel_infodict_list = mock_interface_get_vessel_infodict_list
+    interface.acquire_specific_vessels = mock_noop
+    
+    response = proxy.acquire_specific_vessels(auth, vesselhandle_list)
+    self.assertTrue(isinstance(response, list))
+    
+    # vesselhandle_list is not a list.
+    try:
+      proxy.acquire_specific_vessels(auth, 1)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_INVALIDREQUEST)
+    else:
+      self.fail("Expected an exception.")
+
+    # This is the case where the user has less credits than the number of
+    # vessels they are trying to acquire.
+    
+    interface.get_vessel_list = mock_interface_get_vessel_list
+    interface.acquire_specific_vessels = mock_raises_InsufficientUserResourcesError
+    
+    try:
+      proxy.acquire_specific_vessels(auth, vesselhandle_list)
+    except xmlrpclib.Fault, e:
+      self.assertEqual(e.faultCode, views.FAULTCODE_NOTENOUGHCREDITS)
+    else:
+      self.fail("Expected an exception.")
+
+
+
+  def test_get_encrypted_api_key(self):
+    
+    username = "testuser"
+    api_key = "testapikey"
+    
+    (pubkeydict, privkeydict) = rsa.rsa_gen_pubpriv_keys(512)
+    pubkeystr = rsa.rsa_publickey_to_string(pubkeydict)
+    privkeystr = rsa.rsa_privatekey_to_string(privkeydict)
+    
+    interface.get_user_without_password = create_mock_get_user(username, api_key=api_key,
+                                                               pubkeystr=pubkeystr,
+                                                               privkeystr=privkeystr)
+    
+    response = proxy.get_encrypted_api_key(username)
+    self.assertTrue(isinstance(response, str))
+    
+    encrypted_data = proxy.get_encrypted_api_key(username)
+    decrypted_data = rsa.rsa_decrypt(encrypted_data, privkeydict)
+    split_data = decrypted_data.split("!")
+    
+    self.assertEqual(api_key, split_data[1])
+
+
+
+  def test_regenerate_api_key(self):
+    
+    username = "testuser"
+    password = "testpassword"
+    original_api_key = "original_api_key"
+    
+    interface.get_user_without_password = create_mock_get_user(username, password=password,
+                                                               api_key=original_api_key)
+    interface.regenerate_api_key = mock_interface_regenerate_api_key
+    
+    pwauth = {"username" : username, "password" : password}
+    
+    response = proxy.regenerate_api_key(pwauth)
+    self.assertTrue(isinstance(response, str))
+    self.assertNotEqual(response, original_api_key)
+    self.assertEqual(len(response), maindb.API_KEY_LENGTH)
+
+
+
+  def test_set_public_key(self):
+    
+    username = "testuser"
+    password = "testpassword"
+    original_api_key = "original_api_key"
+    
+    interface.get_user_without_password = create_mock_get_user(username, password=password,
+                                                               api_key=original_api_key)
+    interface.change_user_keys = mock_interface_change_user_keys
+    
+    pwauth = {"username" : username, "password" : password}
+    
+    (pubkeydict, privkeydict) = rsa.rsa_gen_pubpriv_keys(512)
+    pubkeystr = rsa.rsa_publickey_to_string(pubkeydict)
+    
+    proxy.set_public_key(pwauth, pubkeystr)
+
+
+
+def main():
+  # The tests don't use the database, so we just make a single database
+  # so that it exists to prevent unrelated errors when we use the models.
+  testlib.setup_test_environment()
+  testlib.setup_test_db()
+  
+  try:
+    unittest.main()
+  
+  finally:
+    testlib.teardown_test_db()
+    testlib.teardown_test_environment()
+
+
+
+if __name__ == "__main__":
+  main()
diff --git a/xmlrpc_clients/seattleclearinghouse_xmlrpc.py b/xmlrpc_clients/seattleclearinghouse_xmlrpc.py
index 0a25260..7d3dd04 100644
--- a/xmlrpc_clients/seattleclearinghouse_xmlrpc.py
+++ b/xmlrpc_clients/seattleclearinghouse_xmlrpc.py
@@ -1,582 +1,582 @@
-"""
-<Program>
-  seattleclearinghouse_xmlrpc.py
-
-<Started>
-  6/28/2009
-
-<Author>
-  Jason Chen
-  Justin Samuel
-
-<Purpose>
-  A client library for communicating with the SeattleClearinghouse XMLRPC Server.
-  
-  Your Python scripts can import this library, create an instance of the
-  SeattleClearinghouseClient class, then call methods on the object to perform XMLRPC
-  calls through the SeattleClearinghouse XMLRPC API.
-
-  Full tutorials on using this library, see:
-  https://seattle.poly.edu/wiki/SeattleGeniClientLib
-  
-  In order to perform secure SSL communication with SeattleClearinghouse:
-    * You must have M2Crypto installed.
-    * You must set the value of CA_CERTIFICATES_FILE to the location of a PEM
-      file containing CA certificates that you trust. If you don't know where
-      this is on your own system, you can download this file from a site you
-      trust. One such place to download this file from is:
-        http://curl.haxx.se/ca/cacert.pem
-        
-  If you can't fulfill the above requirements, you can still use this client with
-  XMLRPC servers that use https but you will be vulnerable to a man-in-the-middle
-  attack. To enable this insecure mode, include the argument:
-    allow_ssl_insecure=True
-  when creating a SeattleClearinghouseClient instance.
-  
-<Notes>
-  All methods of the client class may raise the following errors in addition to
-  any others described in the method's docstring:
-    CommunicationError
-    AuthenticationError
-    InvalidRequestError
-    InternalError
-  The safest way to be certain to catch any of these errors  is to the catch
-  their base class:
-    SeattleClearinghouseError
-"""
-
-import os
-import socket
-import xmlrpclib
-
-# If a user does not provide us with an API key, we'll need to load
-# their private key instead.
-from repyportability import add_dy_support
-add_dy_support(locals())
-
-# Location of a file containing one or more PEM-encoded CA certificates
-# concatenated together. This is required if using allow_ssl_insecure=False.
-# By default it looks for a cacert.pem file in the same directory as this
-# python module is in.
-DEFAULT_CA_CERTIFICATES_FILE = os.path.join(os.path.dirname(__file__), "cacert.pem")
-
-# The location of the SeattleClearinghouse XMLRPC server to use.
-DEFAULT_XMLRPC_URL = "https://seattleclearinghouse.poly.edu/xmlrpc/"
-
-# SeattleClearinghouse XMLRPC Fault Code Constants
-FAULTCODE_INTERNALERROR = 100
-FAULTCODE_AUTHERROR = 101
-FAULTCODE_INVALIDREQUEST = 102
-FAULTCODE_NOTENOUGHCREDITS = 103
-FAULTCODE_UNABLETOACQUIRE = 105
-
-
-
-class SeattleClearinghouseClient(object):
-  """
-  Implementation of an XMLRPC client for communicating with a SeattleClearinghouse
-  server. This uses the public API described at:
-  https://seattle.poly.edu/wiki/SeattleGeniApi
-  """
-  
-  def __init__(self, username, api_key=None, private_key_string=None,
-               xmlrpc_url=None,
-               allow_ssl_insecure=None,
-               ca_certs_file=None):
-    
-    if xmlrpc_url is None:
-      xmlrpc_url = DEFAULT_XMLRPC_URL
-      
-    if allow_ssl_insecure is None:
-      allow_ssl_insecure = False
-      
-    if ca_certs_file is None:
-      ca_certs_file = DEFAULT_CA_CERTIFICATES_FILE
-    
-    if not isinstance(username, basestring):
-      raise TypeError("username must be a string")
-    
-    if api_key is not None:
-      if not isinstance(api_key, basestring):
-        raise TypeError("api_key must be a string")
-    else:
-      if not private_key_string:
-        raise TypeError("private_key_string must be provided if api_key is not")
-      if not isinstance(private_key_string, basestring):
-        raise TypeError("private_key_string must be a string")
-      
-    if not isinstance(xmlrpc_url, basestring):
-      raise TypeError("xmlrpc_url must be a string")
-    if not isinstance(allow_ssl_insecure, bool):
-      raise TypeError("allow_ssl_insecure must be True or False")
-    if not isinstance(ca_certs_file, basestring):
-      raise TypeError("ca_certs_file must be a string")
-    
-    if allow_ssl_insecure:
-      self.proxy = xmlrpclib.Server(xmlrpc_url)
-    else:
-      ssl_transport = _get_ssl_transport(ca_certs_file)
-      self.proxy = xmlrpclib.Server(xmlrpc_url, transport=ssl_transport)
-
-    if not api_key:
-      api_key = self._get_api_key(username, private_key_string)
-    
-    self.auth = {'username':username, 'api_key':api_key}
-
-
-
-  def _get_api_key(self, username, private_key_string):
-    # Normally we try not to import modules anywhere but globally,
-    # but I'd like to keep this xmlrpc client usable without repy files
-    # available when the user provides their api key and doesn't require
-    # it to be retrieved.
-    try:
-      rsa = dy_import_module("rsa.r2py")
-    except ImportError, e:
-      raise SeattleClearinghouseError("Unable to get API key from SeattleClearinghouse " +
-                             "because a required python or repy module " + 
-                             "cannot be found:" + str(e))
-    
-    # This will raise a ValueError if the private key is not valid.
-    private_key_dict = rsa.rsa_string_to_privatekey(private_key_string)
-    
-    encrypted_data = self.proxy.get_encrypted_api_key(username)
-    decrypted_data = rsa.rsa_decrypt(encrypted_data, private_key_dict)
-    split_data = decrypted_data.split("!")
-
-    # The encrypted data has 20 bytes of random data followed by a "!" which
-    # is then followed by the actual API key. If the private key was the wrong
-    # key, we will end up with garbage data (if it was an invalid key, it
-    # might be empty, though). So, we're going to make the fairly safe
-    # assumption that the odds of a random decryption with the wrong key
-    # resulting in data that starts with 20 bytes which aren't exclamation
-    # marks followed by a single exclamation mark and no others is pretty low.
-    if len(split_data) != 2 or len(split_data[0]) != 20:
-      raise AuthenticationError("The provided private key does not appear " +
-                                "to correspond to this account's public key: " +
-                                "encrypted API key could not be decrypted.")
-    api_key = split_data[1]
-    
-    return api_key
-
-
-  
-  def _do_call(self, function, *args):
-    try:
-      return function(self.auth, *args)
-    except socket.error, err:
-      raise CommunicationError("XMLRPC failed: " + str(err))
-    except xmlrpclib.Fault, fault:
-      if fault.faultCode == FAULTCODE_AUTHERROR:
-        raise AuthenticationError
-      elif fault.faultCode == FAULTCODE_INVALIDREQUEST:
-        raise InvalidRequestError(fault.faultString)
-      elif fault.faultCode == FAULTCODE_NOTENOUGHCREDITS:
-        raise NotEnoughCreditsError(fault.faultString)
-      elif fault.faultCode == FAULTCODE_UNABLETOACQUIRE:
-        raise UnableToAcquireResourcesError(fault.faultString)
-      else:
-        raise InternalError(fault.faultString)
-
-
-
-  def _do_pwauth_call(self, function, password, *args):
-    """For use by calls that require a password rather than an api key."""
-    pwauth = {'username':self.auth['username'], 'password':password}
-    try:
-      return function(pwauth, *args)
-    except socket.error, err:
-      raise CommunicationError("XMLRPC failed: " + str(err))
-    except xmlrpclib.Fault, fault:
-      if fault.faultCode == FAULTCODE_AUTHERROR:
-        raise AuthenticationError
-      elif fault.faultCode == FAULTCODE_INVALIDREQUEST:
-        raise InvalidRequestError(fault.faultString)
-      elif fault.faultCode == FAULTCODE_NOTENOUGHCREDITS:
-        raise NotEnoughCreditsError(fault.faultString)
-      elif fault.faultCode == FAULTCODE_UNABLETOACQUIRE:
-        raise UnableToAcquireResourcesError(fault.faultString)
-      else:
-        raise InternalError(fault.faultString)
-
-
-
-  def acquire_lan_resources(self, count):
-    """
-    <Purpose>
-      Acquire LAN vessels.
-    <Arguments>
-      count
-        The number of vessels to acquire.
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-      SeattleClearinghouseNotEnoughCredits
-        If the account does not have enough available vessel credits to fulfill
-        the request.
-    <Side Effects>
-      If successful, 'count' LAN vessels have been acquired for the account.
-    <Returns>
-      A list of vessel handles of the acquired vessels.
-    """
-    return self.acquire_resources('lan', count)
-
-
-
-  def acquire_wan_resources(self, count):
-    """
-    <Purpose>
-      Acquire WAN vessels.
-    <Arguments>
-      count
-        The number of vessels to acquire.
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-      SeattleClearinghouseNotEnoughCredits
-        If the account does not have enough available vessel credits to fulfill
-        the request.
-    <Side Effects>
-      If successful, 'count' WAN vessels have been acquired for the account.
-    <Returns>
-      A list of vessel handles of the acquired vessels.
-    """
-    return self.acquire_resources('wan', count)
-
-
-
-  def acquire_nat_resources(self, count):
-    """
-    <Purpose>
-      Acquire NAT vessels.
-    <Arguments>
-      count
-        The number of vessels to acquire.
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-      SeattleClearinghouseNotEnoughCredits
-        If the account does not have enough available vessel credits to fulfill
-        the request.
-    <Side Effects>
-      If successful, 'count' NAT vessels have been acquired for the account.
-    <Returns>
-      A list of vessel handles of the acquired vessels.
-    """
-    return self.acquire_resources('nat', count)
-
-
-
-  def acquire_random_resources(self, count):
-    """
-    <Purpose>
-      Acquire vessels (they can be LAN, WAN, NAT, or any combination of these).
-    <Arguments>
-      count
-        The number of vessels to acquire.
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-      SeattleClearinghouseNotEnoughCredits
-        If the account does not have enough available vessel credits to fulfill
-        the request.
-    <Side Effects>
-      If successful, 'count' vessels have been acquired for the account.
-    <Returns>
-      A list of vessel handles of the acquired vessels.
-    """
-    return self.acquire_resources('random', count)
-    
-    
-    
-  def acquire_resources(self, res_type, count):
-    """
-    <Purpose>
-      Acquire vessels.
-    <Arguments>
-      res_type
-        A string describing the type of vessels to acquire.
-      count
-        The number of vessels to acquire.
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-      SeattleClearinghouseNotEnoughCredits
-        If the account does not have enough available vessel credits to fulfill
-        the request.
-    <Side Effects>
-      If successful, 'count' vessels have been acquired for the account.
-    <Returns>
-      A list of vessel handles of the acquired vessels.
-    """
-    if not isinstance(res_type, basestring):
-      raise TypeError("res_type must be a string")
-    if type(count) not in [int, long]:
-      raise TypeError("count must be an integer")
-    
-    rspec = {'rspec_type':res_type, 'number_of_nodes':count}
-    return self._do_call(self.proxy.acquire_resources, rspec)
-
-
-
-  def acquire_specific_vessels(self, handlelist):
-    """
-    <Purpose>
-      Attempt to acquire specific vessels.
-    <Arguments>
-      handlelist
-        A list of vessel handles.
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-      SeattleClearinghouseNotEnoughCredits
-        If the account does not have enough available vessel credits to fulfill
-        the request.
-    <Side Effects>
-      If successful, zero or more vessels from handlelist have been acquired.
-    <Returns>
-      A list of vessel handles of the acquired vessels.
-    """
-    _validate_handle_list(handlelist)
-    return self._do_call(self.proxy.acquire_specific_vessels, handlelist)
-
-
-
-  def release_resources(self, handlelist):
-    """
-    <Purpose>
-      Release vessels.
-    <Arguments>
-      handlelist
-        A list of handles as returned by acquire_vessels() or found in the
-        'handle' key of the dictionaries returned by get_resource_info().
-    <Exceptions>
-      The common exceptions described in the module comments.
-    <Side Effects>
-      If successful, the vessels in handlelist have been released. If not
-      successful, it is possible that a partial set of the vessels was
-      released.
-    <Returns>
-      None
-    """
-    _validate_handle_list(handlelist)
-    return self._do_call(self.proxy.release_resources, handlelist)
-
-      
-      
-  def renew_resources(self, handlelist):
-    """
-    <Purpose>
-      Renew vessels.
-    <Arguments>
-      handlelist
-        A list of handles as returned by acquire_vessels() or found in the
-        'handle' key of the dictionaries returned by get_resource_info().
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-      SeattleClearinghouseNotEnoughCredits
-        If the account is currently over its vessel credit limit, then vessels
-        cannot be renewed until the account is no longer over its credit limit.
-    <Side Effects>
-      If successful, the vessels in handlelist have been renewed. If not
-      successful, it is possible that a partial set of the vessels was
-      renewed.
-    <Returns>
-      None
-    """
-    _validate_handle_list(handlelist)
-    return self._do_call(self.proxy.renew_resources, handlelist)
-    
-
-
-  def get_resource_info(self):
-    """
-    <Purpose>
-      Obtain information about acquired vessels.
-    <Arguments>
-      None
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-    <Side Effects>
-      None
-    <Returns>
-      A list of dictionaries, where each dictionary describes a vessel that
-      is currently acquired by the account.
-    """
-    return self._do_call(self.proxy.get_resource_info)
-      
-      
-      
-  def get_account_info(self):
-    """
-    <Purpose>
-      Obtain information about the account.
-    <Arguments>
-      None
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-    <Side Effects>
-      None
-    <Returns>
-      A dictionary with information about the account.
-    """
-    return self._do_call(self.proxy.get_account_info)
-    
-    
-    
-  def get_public_key(self):
-    """
-    <Purpose>
-      Obtain the public key of the account.
-    <Arguments>
-      None
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-        None
-    <Side Effects>
-      None
-    <Returns>
-      A string containing the public key of the account.
-    """
-    return self._do_call(self.proxy.get_public_key)
-
-
-
-  def set_public_key(self, password, pubkeystring):
-    """
-    <Purpose>
-      Set the public key of the account.
-    <Arguments>
-      password
-        The account password. This is required because changing the public
-        key of the account cannot be done with just the api key.
-      pubkeystring
-        A string representing the new public key to be set for the account.
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-        InvalidRequestError
-          If the pubkey is invalid.
-    <Side Effects>
-      The public key of the account is changed and will be updated on all
-      vessels the account has acquired.
-    <Returns>
-      None
-    """
-    self._do_pwauth_call(self.proxy.set_public_key, password, pubkeystring)
-
-
-
-  def regenerate_api_key(self, password):
-    """
-    <Purpose>
-      Generate a new API key for the account..
-    <Arguments>
-      password
-        The account password. This is required because changing the api
-        key of the account cannot be done with just the current api key.
-    <Exceptions>
-      The common exceptions described in the module comments, as well as:
-        None
-    <Side Effects>
-      The account's api key has been changed.
-    <Returns>
-      The new api key for the account.
-    """
-    api_key = self._do_pwauth_call(self.proxy.regenerate_api_key, password)
-    self.auth['api_key'] = api_key
-    return api_key
-   
-      
-
-
-def _validate_handle_list(handlelist):
-  """
-  Raise a TypeError or ValueError if handlelist is not a non-empty list of
-  string.
-  """
-  if not isinstance(handlelist, list):
-    raise TypeError("Invalid data type for handle list: " + 
-                    str(type(handlelist)))
-  
-  for handle in handlelist:
-    if not isinstance(handle, basestring):
-      raise TypeError("Invalid data type for a handle in the handle list: " + 
-                      str(type(handle)))
-  
-  if not handlelist:
-    raise ValueError("Given handlelist is empty.")
-
-
-
-
-
-def _get_ssl_transport(ca_certs_file):
-  """
-  Returns an object usable as the transport for an xmlrpclib proxy. This will
-  be an M2Crypto.m2xmlrpclib.SSL_Transport that has been configured with a
-  context that has the ca_certs_file loaded, will not allow SSLv2, and will
-  reject certificate names that don't match the hostname.
-  """
-  try:
-    import M2Crypto
-  except ImportError, err:
-    raise ImportError("In order to use the SeattleClearinghouse XMLRPC client with " + 
-                      "allow_ssl_insecure=False, you need M2Crypto " + 
-                      "installed. " + str(err))
-  
-  # We don't define this class until here because otherwise M2Crypto may not
-  # be available.
-  class M2CryptoSSLTransport(M2Crypto.m2xmlrpclib.SSL_Transport):
-    def request(self, host, handler, request_body, verbose=0):
-      if host.find(":") == -1:
-        host = host + ":443"
-      return M2Crypto.m2xmlrpclib.SSL_Transport.request(self, host, handler,
-                                                        request_body, verbose)
-
-  ctx = M2Crypto.SSL.Context("sslv3")
-  ctx.set_verify(M2Crypto.SSL.verify_peer | 
-                 M2Crypto.SSL.verify_fail_if_no_peer_cert, depth=9)
-  if ctx.load_verify_locations(ca_certs_file) != 1:
-    raise SeattleClearinghouseError("No CA certs found in file: " + ca_certs_file)
-
-  return M2CryptoSSLTransport(ctx)
-
-
-
-
-
-class SeattleClearinghouseError(Exception):
-  """Base class for exceptions raised by the SeattleClearinghouseClient."""
-  
-
-class CommunicationError(SeattleClearinghouseError):
-  """
-  Indicates that XMLRPC communication failed.
-  """
-  
-  
-class InternalError(SeattleClearinghouseError):
-  """
-  Indicates an unexpected error occurred, probably either a bug in this
-  client or a bug in SeattleClearinghouse.
-  """
-
-
-class AuthenticationError(SeattleClearinghouseError):
-  """Indicates an authentication failure (invalid username and/or API key)."""
-  def __init__(self, msg=None):
-    if msg is None:
-      msg = "Authentication failed. Invalid username and/or API key."
-    SeattleClearinghouseError.__init__(self, msg)
-
-
-class InvalidRequestError(SeattleClearinghouseError):
-  """Indicates that the request is invalid."""
-
-
-class NotEnoughCreditsError(SeattleClearinghouseError):
-  """
-  Indicates that the requested operation requires more vessel credits to
-  be available then the account currently has.
-  """
-  
-  
-class UnableToAcquireResourcesError(SeattleClearinghouseError):
-  """
-  Indicates that the requested operation failed because SeattleClearinghouse was unable
-  to acquire the requested resources.
-  """
+"""
+<Program>
+  seattleclearinghouse_xmlrpc.py
+
+<Started>
+  6/28/2009
+
+<Author>
+  Jason Chen
+  Justin Samuel
+
+<Purpose>
+  A client library for communicating with the SeattleClearinghouse XMLRPC Server.
+  
+  Your Python scripts can import this library, create an instance of the
+  SeattleClearinghouseClient class, then call methods on the object to perform XMLRPC
+  calls through the SeattleClearinghouse XMLRPC API.
+
+  Full tutorials on using this library, see:
+  https://seattle.poly.edu/wiki/SeattleGeniClientLib
+  
+  In order to perform secure SSL communication with SeattleClearinghouse:
+    * You must have M2Crypto installed.
+    * You must set the value of CA_CERTIFICATES_FILE to the location of a PEM
+      file containing CA certificates that you trust. If you don't know where
+      this is on your own system, you can download this file from a site you
+      trust. One such place to download this file from is:
+        http://curl.haxx.se/ca/cacert.pem
+        
+  If you can't fulfill the above requirements, you can still use this client with
+  XMLRPC servers that use https but you will be vulnerable to a man-in-the-middle
+  attack. To enable this insecure mode, include the argument:
+    allow_ssl_insecure=True
+  when creating a SeattleClearinghouseClient instance.
+  
+<Notes>
+  All methods of the client class may raise the following errors in addition to
+  any others described in the method's docstring:
+    CommunicationError
+    AuthenticationError
+    InvalidRequestError
+    InternalError
+  The safest way to be certain to catch any of these errors  is to the catch
+  their base class:
+    SeattleClearinghouseError
+"""
+
+import os
+import socket
+import xmlrpclib
+
+# If a user does not provide us with an API key, we'll need to load
+# their private key instead.
+from repyportability import add_dy_support
+add_dy_support(locals())
+
+# Location of a file containing one or more PEM-encoded CA certificates
+# concatenated together. This is required if using allow_ssl_insecure=False.
+# By default it looks for a cacert.pem file in the same directory as this
+# python module is in.
+DEFAULT_CA_CERTIFICATES_FILE = os.path.join(os.path.dirname(__file__), "cacert.pem")
+
+# The location of the SeattleClearinghouse XMLRPC server to use.
+DEFAULT_XMLRPC_URL = "https://seattleclearinghouse.poly.edu/xmlrpc/"
+
+# SeattleClearinghouse XMLRPC Fault Code Constants
+FAULTCODE_INTERNALERROR = 100
+FAULTCODE_AUTHERROR = 101
+FAULTCODE_INVALIDREQUEST = 102
+FAULTCODE_NOTENOUGHCREDITS = 103
+FAULTCODE_UNABLETOACQUIRE = 105
+
+
+
+class SeattleClearinghouseClient(object):
+  """
+  Implementation of an XMLRPC client for communicating with a SeattleClearinghouse
+  server. This uses the public API described at:
+  https://seattle.poly.edu/wiki/SeattleGeniApi
+  """
+  
+  def __init__(self, username, api_key=None, private_key_string=None,
+               xmlrpc_url=None,
+               allow_ssl_insecure=None,
+               ca_certs_file=None):
+    
+    if xmlrpc_url is None:
+      xmlrpc_url = DEFAULT_XMLRPC_URL
+      
+    if allow_ssl_insecure is None:
+      allow_ssl_insecure = False
+      
+    if ca_certs_file is None:
+      ca_certs_file = DEFAULT_CA_CERTIFICATES_FILE
+    
+    if not isinstance(username, basestring):
+      raise TypeError("username must be a string")
+    
+    if api_key is not None:
+      if not isinstance(api_key, basestring):
+        raise TypeError("api_key must be a string")
+    else:
+      if not private_key_string:
+        raise TypeError("private_key_string must be provided if api_key is not")
+      if not isinstance(private_key_string, basestring):
+        raise TypeError("private_key_string must be a string")
+      
+    if not isinstance(xmlrpc_url, basestring):
+      raise TypeError("xmlrpc_url must be a string")
+    if not isinstance(allow_ssl_insecure, bool):
+      raise TypeError("allow_ssl_insecure must be True or False")
+    if not isinstance(ca_certs_file, basestring):
+      raise TypeError("ca_certs_file must be a string")
+    
+    if allow_ssl_insecure:
+      self.proxy = xmlrpclib.Server(xmlrpc_url)
+    else:
+      ssl_transport = _get_ssl_transport(ca_certs_file)
+      self.proxy = xmlrpclib.Server(xmlrpc_url, transport=ssl_transport)
+
+    if not api_key:
+      api_key = self._get_api_key(username, private_key_string)
+    
+    self.auth = {'username':username, 'api_key':api_key}
+
+
+
+  def _get_api_key(self, username, private_key_string):
+    # Normally we try not to import modules anywhere but globally,
+    # but I'd like to keep this xmlrpc client usable without repy files
+    # available when the user provides their api key and doesn't require
+    # it to be retrieved.
+    try:
+      rsa = dy_import_module("rsa.r2py")
+    except ImportError, e:
+      raise SeattleClearinghouseError("Unable to get API key from SeattleClearinghouse " +
+                             "because a required python or repy module " + 
+                             "cannot be found:" + str(e))
+    
+    # This will raise a ValueError if the private key is not valid.
+    private_key_dict = rsa.rsa_string_to_privatekey(private_key_string)
+    
+    encrypted_data = self.proxy.get_encrypted_api_key(username)
+    decrypted_data = rsa.rsa_decrypt(encrypted_data, private_key_dict)
+    split_data = decrypted_data.split("!")
+
+    # The encrypted data has 20 bytes of random data followed by a "!" which
+    # is then followed by the actual API key. If the private key was the wrong
+    # key, we will end up with garbage data (if it was an invalid key, it
+    # might be empty, though). So, we're going to make the fairly safe
+    # assumption that the odds of a random decryption with the wrong key
+    # resulting in data that starts with 20 bytes which aren't exclamation
+    # marks followed by a single exclamation mark and no others is pretty low.
+    if len(split_data) != 2 or len(split_data[0]) != 20:
+      raise AuthenticationError("The provided private key does not appear " +
+                                "to correspond to this account's public key: " +
+                                "encrypted API key could not be decrypted.")
+    api_key = split_data[1]
+    
+    return api_key
+
+
+  
+  def _do_call(self, function, *args):
+    try:
+      return function(self.auth, *args)
+    except socket.error, err:
+      raise CommunicationError("XMLRPC failed: " + str(err))
+    except xmlrpclib.Fault, fault:
+      if fault.faultCode == FAULTCODE_AUTHERROR:
+        raise AuthenticationError
+      elif fault.faultCode == FAULTCODE_INVALIDREQUEST:
+        raise InvalidRequestError(fault.faultString)
+      elif fault.faultCode == FAULTCODE_NOTENOUGHCREDITS:
+        raise NotEnoughCreditsError(fault.faultString)
+      elif fault.faultCode == FAULTCODE_UNABLETOACQUIRE:
+        raise UnableToAcquireResourcesError(fault.faultString)
+      else:
+        raise InternalError(fault.faultString)
+
+
+
+  def _do_pwauth_call(self, function, password, *args):
+    """For use by calls that require a password rather than an api key."""
+    pwauth = {'username':self.auth['username'], 'password':password}
+    try:
+      return function(pwauth, *args)
+    except socket.error, err:
+      raise CommunicationError("XMLRPC failed: " + str(err))
+    except xmlrpclib.Fault, fault:
+      if fault.faultCode == FAULTCODE_AUTHERROR:
+        raise AuthenticationError
+      elif fault.faultCode == FAULTCODE_INVALIDREQUEST:
+        raise InvalidRequestError(fault.faultString)
+      elif fault.faultCode == FAULTCODE_NOTENOUGHCREDITS:
+        raise NotEnoughCreditsError(fault.faultString)
+      elif fault.faultCode == FAULTCODE_UNABLETOACQUIRE:
+        raise UnableToAcquireResourcesError(fault.faultString)
+      else:
+        raise InternalError(fault.faultString)
+
+
+
+  def acquire_lan_resources(self, count):
+    """
+    <Purpose>
+      Acquire LAN vessels.
+    <Arguments>
+      count
+        The number of vessels to acquire.
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+      SeattleClearinghouseNotEnoughCredits
+        If the account does not have enough available vessel credits to fulfill
+        the request.
+    <Side Effects>
+      If successful, 'count' LAN vessels have been acquired for the account.
+    <Returns>
+      A list of vessel handles of the acquired vessels.
+    """
+    return self.acquire_resources('lan', count)
+
+
+
+  def acquire_wan_resources(self, count):
+    """
+    <Purpose>
+      Acquire WAN vessels.
+    <Arguments>
+      count
+        The number of vessels to acquire.
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+      SeattleClearinghouseNotEnoughCredits
+        If the account does not have enough available vessel credits to fulfill
+        the request.
+    <Side Effects>
+      If successful, 'count' WAN vessels have been acquired for the account.
+    <Returns>
+      A list of vessel handles of the acquired vessels.
+    """
+    return self.acquire_resources('wan', count)
+
+
+
+  def acquire_nat_resources(self, count):
+    """
+    <Purpose>
+      Acquire NAT vessels.
+    <Arguments>
+      count
+        The number of vessels to acquire.
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+      SeattleClearinghouseNotEnoughCredits
+        If the account does not have enough available vessel credits to fulfill
+        the request.
+    <Side Effects>
+      If successful, 'count' NAT vessels have been acquired for the account.
+    <Returns>
+      A list of vessel handles of the acquired vessels.
+    """
+    return self.acquire_resources('nat', count)
+
+
+
+  def acquire_random_resources(self, count):
+    """
+    <Purpose>
+      Acquire vessels (they can be LAN, WAN, NAT, or any combination of these).
+    <Arguments>
+      count
+        The number of vessels to acquire.
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+      SeattleClearinghouseNotEnoughCredits
+        If the account does not have enough available vessel credits to fulfill
+        the request.
+    <Side Effects>
+      If successful, 'count' vessels have been acquired for the account.
+    <Returns>
+      A list of vessel handles of the acquired vessels.
+    """
+    return self.acquire_resources('random', count)
+    
+    
+    
+  def acquire_resources(self, res_type, count):
+    """
+    <Purpose>
+      Acquire vessels.
+    <Arguments>
+      res_type
+        A string describing the type of vessels to acquire.
+      count
+        The number of vessels to acquire.
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+      SeattleClearinghouseNotEnoughCredits
+        If the account does not have enough available vessel credits to fulfill
+        the request.
+    <Side Effects>
+      If successful, 'count' vessels have been acquired for the account.
+    <Returns>
+      A list of vessel handles of the acquired vessels.
+    """
+    if not isinstance(res_type, basestring):
+      raise TypeError("res_type must be a string")
+    if type(count) not in [int, long]:
+      raise TypeError("count must be an integer")
+    
+    rspec = {'rspec_type':res_type, 'number_of_nodes':count}
+    return self._do_call(self.proxy.acquire_resources, rspec)
+
+
+
+  def acquire_specific_vessels(self, handlelist):
+    """
+    <Purpose>
+      Attempt to acquire specific vessels.
+    <Arguments>
+      handlelist
+        A list of vessel handles.
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+      SeattleClearinghouseNotEnoughCredits
+        If the account does not have enough available vessel credits to fulfill
+        the request.
+    <Side Effects>
+      If successful, zero or more vessels from handlelist have been acquired.
+    <Returns>
+      A list of vessel handles of the acquired vessels.
+    """
+    _validate_handle_list(handlelist)
+    return self._do_call(self.proxy.acquire_specific_vessels, handlelist)
+
+
+
+  def release_resources(self, handlelist):
+    """
+    <Purpose>
+      Release vessels.
+    <Arguments>
+      handlelist
+        A list of handles as returned by acquire_vessels() or found in the
+        'handle' key of the dictionaries returned by get_resource_info().
+    <Exceptions>
+      The common exceptions described in the module comments.
+    <Side Effects>
+      If successful, the vessels in handlelist have been released. If not
+      successful, it is possible that a partial set of the vessels was
+      released.
+    <Returns>
+      None
+    """
+    _validate_handle_list(handlelist)
+    return self._do_call(self.proxy.release_resources, handlelist)
+
+      
+      
+  def renew_resources(self, handlelist):
+    """
+    <Purpose>
+      Renew vessels.
+    <Arguments>
+      handlelist
+        A list of handles as returned by acquire_vessels() or found in the
+        'handle' key of the dictionaries returned by get_resource_info().
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+      SeattleClearinghouseNotEnoughCredits
+        If the account is currently over its vessel credit limit, then vessels
+        cannot be renewed until the account is no longer over its credit limit.
+    <Side Effects>
+      If successful, the vessels in handlelist have been renewed. If not
+      successful, it is possible that a partial set of the vessels was
+      renewed.
+    <Returns>
+      None
+    """
+    _validate_handle_list(handlelist)
+    return self._do_call(self.proxy.renew_resources, handlelist)
+    
+
+
+  def get_resource_info(self):
+    """
+    <Purpose>
+      Obtain information about acquired vessels.
+    <Arguments>
+      None
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+    <Side Effects>
+      None
+    <Returns>
+      A list of dictionaries, where each dictionary describes a vessel that
+      is currently acquired by the account.
+    """
+    return self._do_call(self.proxy.get_resource_info)
+      
+      
+      
+  def get_account_info(self):
+    """
+    <Purpose>
+      Obtain information about the account.
+    <Arguments>
+      None
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+    <Side Effects>
+      None
+    <Returns>
+      A dictionary with information about the account.
+    """
+    return self._do_call(self.proxy.get_account_info)
+    
+    
+    
+  def get_public_key(self):
+    """
+    <Purpose>
+      Obtain the public key of the account.
+    <Arguments>
+      None
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+        None
+    <Side Effects>
+      None
+    <Returns>
+      A string containing the public key of the account.
+    """
+    return self._do_call(self.proxy.get_public_key)
+
+
+
+  def set_public_key(self, password, pubkeystring):
+    """
+    <Purpose>
+      Set the public key of the account.
+    <Arguments>
+      password
+        The account password. This is required because changing the public
+        key of the account cannot be done with just the api key.
+      pubkeystring
+        A string representing the new public key to be set for the account.
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+        InvalidRequestError
+          If the pubkey is invalid.
+    <Side Effects>
+      The public key of the account is changed and will be updated on all
+      vessels the account has acquired.
+    <Returns>
+      None
+    """
+    self._do_pwauth_call(self.proxy.set_public_key, password, pubkeystring)
+
+
+
+  def regenerate_api_key(self, password):
+    """
+    <Purpose>
+      Generate a new API key for the account..
+    <Arguments>
+      password
+        The account password. This is required because changing the api
+        key of the account cannot be done with just the current api key.
+    <Exceptions>
+      The common exceptions described in the module comments, as well as:
+        None
+    <Side Effects>
+      The account's api key has been changed.
+    <Returns>
+      The new api key for the account.
+    """
+    api_key = self._do_pwauth_call(self.proxy.regenerate_api_key, password)
+    self.auth['api_key'] = api_key
+    return api_key
+   
+      
+
+
+def _validate_handle_list(handlelist):
+  """
+  Raise a TypeError or ValueError if handlelist is not a non-empty list of
+  string.
+  """
+  if not isinstance(handlelist, list):
+    raise TypeError("Invalid data type for handle list: " + 
+                    str(type(handlelist)))
+  
+  for handle in handlelist:
+    if not isinstance(handle, basestring):
+      raise TypeError("Invalid data type for a handle in the handle list: " + 
+                      str(type(handle)))
+  
+  if not handlelist:
+    raise ValueError("Given handlelist is empty.")
+
+
+
+
+
+def _get_ssl_transport(ca_certs_file):
+  """
+  Returns an object usable as the transport for an xmlrpclib proxy. This will
+  be an M2Crypto.m2xmlrpclib.SSL_Transport that has been configured with a
+  context that has the ca_certs_file loaded, will not allow SSLv2, and will
+  reject certificate names that don't match the hostname.
+  """
+  try:
+    import M2Crypto
+  except ImportError, err:
+    raise ImportError("In order to use the SeattleClearinghouse XMLRPC client with " + 
+                      "allow_ssl_insecure=False, you need M2Crypto " + 
+                      "installed. " + str(err))
+  
+  # We don't define this class until here because otherwise M2Crypto may not
+  # be available.
+  class M2CryptoSSLTransport(M2Crypto.m2xmlrpclib.SSL_Transport):
+    def request(self, host, handler, request_body, verbose=0):
+      if host.find(":") == -1:
+        host = host + ":443"
+      return M2Crypto.m2xmlrpclib.SSL_Transport.request(self, host, handler,
+                                                        request_body, verbose)
+
+  ctx = M2Crypto.SSL.Context("sslv3")
+  ctx.set_verify(M2Crypto.SSL.verify_peer | 
+                 M2Crypto.SSL.verify_fail_if_no_peer_cert, depth=9)
+  if ctx.load_verify_locations(ca_certs_file) != 1:
+    raise SeattleClearinghouseError("No CA certs found in file: " + ca_certs_file)
+
+  return M2CryptoSSLTransport(ctx)
+
+
+
+
+
+class SeattleClearinghouseError(Exception):
+  """Base class for exceptions raised by the SeattleClearinghouseClient."""
+  
+
+class CommunicationError(SeattleClearinghouseError):
+  """
+  Indicates that XMLRPC communication failed.
+  """
+  
+  
+class InternalError(SeattleClearinghouseError):
+  """
+  Indicates an unexpected error occurred, probably either a bug in this
+  client or a bug in SeattleClearinghouse.
+  """
+
+
+class AuthenticationError(SeattleClearinghouseError):
+  """Indicates an authentication failure (invalid username and/or API key)."""
+  def __init__(self, msg=None):
+    if msg is None:
+      msg = "Authentication failed. Invalid username and/or API key."
+    SeattleClearinghouseError.__init__(self, msg)
+
+
+class InvalidRequestError(SeattleClearinghouseError):
+  """Indicates that the request is invalid."""
+
+
+class NotEnoughCreditsError(SeattleClearinghouseError):
+  """
+  Indicates that the requested operation requires more vessel credits to
+  be available then the account currently has.
+  """
+  
+  
+class UnableToAcquireResourcesError(SeattleClearinghouseError):
+  """
+  Indicates that the requested operation failed because SeattleClearinghouse was unable
+  to acquire the requested resources.
+  """