@@ -4,7 +4,7 @@ from django.http import Http404, HttpResponse from django.views.generic.list_detail import object_list, object_detail from sshkeys.keys.models import Address, SSHKey, AddressKey from datetime import datetime - +import re # favour django-mailer but fall back to django.core.mail try: @@ -46,22 +46,43 @@ def detail(request, address=None, id=None): def upload(request): address_str = request.POST['address'] - keytext_str = request.POST['keytext'] + if not "@" in address_str: - return HttpResponse("Address given is not a valid e-mail address.", status=404) - if not keytext_str.startswith("ssh-"): - return HttpResponse("Key given is not an ASCII ssh public key.", status=404) - newaddress, undef = Address.objects.get_or_create(address=address_str) - newkey, undef = SSHKey.objects.get_or_create(keytext=keytext_str) - newrel, created = AddressKey.objects.get_or_create( - address=newaddress, sshkey=newkey, - defaults={'date_added': datetime.now(), - 'verified': False, - 'token_sent': datetime.now()}) - - # "if created:" can tell us whether we created a new pair or - # just sent out a reminder about an old one, if we care. - newrel.send_confirmation(newrel) + return HttpResponse("Address given is not a valid e-mail address.", + status=404) + + if request.POST.has_key('keytext') and request.POST['keytext']: + keystr = request.POST['keytext'] + elif request.FILES.has_key('keyfile'): + keystr = request.FILES['keyfile'].read() + else: + return HttpResponse("No key provided.", status=404) + + keytext_lines = ''.join(keystr) + pattern = re.compile("ssh-\w+ \S+ \S+") + match = pattern.findall(keytext_lines) + + if not match: + return HttpResponse("File provided does not contain SSH public keys.", + status=404) + + for line in match: + if not line.startswith("ssh-"): + return HttpResponse("Key given is not an ASCII ssh public key.", + status=404) + + newaddress, undef = Address.objects.get_or_create(address=address_str) + newkey, undef = SSHKey.objects.get_or_create(keytext=line) + newrel, created = AddressKey.objects.get_or_create( + address=newaddress, sshkey=newkey, + defaults={'date_added': datetime.now(), + 'verified': False, + 'token_sent': datetime.now()}) + + # "if created:" can tell us whether we created a new pair or + # just sent out a reminder about an old one, if we care. + newrel.send_confirmation(newrel) + return render_to_response("keys/address_uploaded.html") def search(request, **kwargs): keys/views.py @@ -1,6 +1,6 @@ # Django settings for sshkeys project. -DEBUG = False +DEBUG = True#False TEMPLATE_DEBUG = DEBUG ADMINS = ( settings.py sshkeys.db @@ -41,10 +41,13 @@ {% block content %} <div id="secone"> <h3>Upload a key</h3> - <form action="/upload/" method="post"> + <form action="/upload" method="post" enctype="multipart/form-data"> <b>E-mail address:</b> <input type="text" name="address" size="30"><p> <b>SSH key ("<tt>id_XXX.pub</tt>" on Unix):</b><p> + You can paste your key directly:<p> <textarea rows="4" cols="80" wrap="soft" name="keytext"></textarea><p> + Or upload it from a local (<tt>authorized_keys</tt>) file on your machine:<p> + <input type="file" name="keyfile" size="40"><p> Your public key filename will be of the form "<tt>id_XXẊ.pub</tt>" on Unix; the .pub is very important, as you must not try to upload your private key (which has a filename of the form "<tt>id_XXX</tt>". The first few templates/keys/address_index.html @@ -4,7 +4,7 @@ Someone has requested adding the following e-mail address and SSH public key to the public database at http://sshkeys.net/: E-mail: {{ email_address }} - Public key(s): + Public key: {{ sshkey }} templates/keys/email_confirmation_message.txt e28cbd15feaf7b86201019a6fe598bfb998b21ad Chris Ball chris@void.printf.net http://github.com/cjb/sshkeys/commit/770f89363707b87bcb91775e8c97eb84f8bf857e 770f89363707b87bcb91775e8c97eb84f8bf857e 2008-09-14T22:55:35-07:00 2008-09-14T22:55:35-07:00 Add a file upload field. 0e2291a0762957193bb5b3fbedced5a488e7048d Chris Ball chris@void.printf.net