Merge branch 'master' into 8393/show-SCA

hosting/forms.py

@@ -2,6 +2,7 @@ import datetime
 import logging
 import subprocess
 import tempfile
+import xml
 
 from django import forms
 from django.conf import settings
@@ -207,7 +208,7 @@ class UserHostingKeyForm(forms.ModelForm):
                 logger.debug(
                     "Not a correct ssh format {error}".format(error=str(cpe)))
                 raise forms.ValidationError(KEY_ERROR_MESSAGE)
-        return openssh_pubkey_str
+        return xml.sax.saxutils.escape(openssh_pubkey_str)
 
     def clean_name(self):
         INVALID_NAME_MESSAGE = _("Comma not accepted in the name of the key")

hosting/views.py

@@ -1,6 +1,7 @@
 import logging
 import uuid
 from datetime import datetime
+from urllib.parse import quote
 from time import sleep
 
 import stripe
@@ -1313,7 +1314,7 @@ class InvoiceListView(LoginRequiredMixin, TemplateView):
         if ('user_email' in self.request.GET
             and self.request.user.email == settings.ADMIN_EMAIL):
             user_email = self.request.GET['user_email']
-            context['user_email'] = user_email
+            context['user_email'] = '%s' % quote(user_email)
             logger.debug(
                 "user_email = {}".format(user_email)
             )