Start private key generation vie

Author: spapas

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
     "python.formatting.provider": "black",
-    "python.pythonPath": "~/.virtualenvs/etsd/bin/"
+    "python.pythonPath": "~/.virtualenvs/etsd/bin/",
+    "python.linting.pylintEnabled": true
 }

etsd/core/templatetags/core_tags.py

@@ -12,4 +12,4 @@ def get_setting_value(value):
 @register.simple_tag(takes_context=True)
 def get_user_authority(context):
     auth = context.request.user.get_authority()
-    return auth.name if auth else None
+    return auth

etsd/keys/forms.py

@@ -12,7 +12,7 @@ class Meta:
         fields = ("key", "fingerprint", "confirmation_document")
 
     def __init__(self, *args, **kwargs):
-        super(PublicKeyCreateForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.fields["fingerprint"].widget.attrs["readonly"] = True
 
     def clean(self):
@@ -54,4 +54,15 @@ def __init__(self, *args, **kwargs):
         self.fields['user_id'].widget.attrs['readonly'] = True
         self.fields['creation_time'].widget.attrs['readonly'] = True
     #file = forms.FileField()
-    #passphrase = forms.CharField()
+    #passphrase = forms.CharField()
+
+
+class KeyPairCreateForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['fingerprint'].widget.attrs['readonly'] = True
+        self.fields['key'].widget.attrs.update({'readonly': True, 'rows': 4})
+
+    class Meta:
+        model = models.PublicKey
+        fields = ("key", "fingerprint", )

etsd/keys/models.py

@@ -16,14 +16,14 @@ class PublicKey(UserDateAbstractModel):
     authority = models.ForeignKey("authorities.Authority", on_delete=models.PROTECT)
     key = models.TextField(
         verbose_name=_("Key text"),
-        help_text=_("Please paste the key text in armored format ASCII"),
+        help_text=_("The key text in armored ASCII format"),
     )
     fingerprint = models.CharField(
         max_length=128,
         verbose_name=_("Key fingerprint"),
         unique=True,
         help_text=_(
-            "The fingerprint of the key will be automatically generated after the key is validated"
+            "The fingerprint of the key"
         ),
     )
     status = models.CharField(

etsd/keys/templates/keys/key_pair_create.html

@@ -0,0 +1,126 @@
+{% extends "site_base.html" %}
+{% load render_table from django_tables2 %}
+{% load crispy_forms_tags %}
+{% load core_tags %}
+{% load i18n static %}
+
+
+{% block head_title %}Create new key pair{% endblock %}
+{% block page_title %}Create new key pair{% endblock %}
+{% block page_content %}
+{% get_user_authority as auth %}
+{% trans "Authority:" %} {{ auth.name }} {{ auth.email }}
+<div class="row">
+  <div class="col-md-12">
+    <div class='alert alert-info'> 
+      
+      {% blocktrans  %}
+        <p>
+        You can submit a new public key through this form. The publickey must be in the ASCII armored format i.e it 
+        should start with <code>-----BEGIN PGP PUBLIC KEY BLOCK-----</code> contain the key data in printable ASCII
+        format (base64 encoded) and end with <code>-----END PGP PUBLIC KEY BLOCK-----</code>.
+        </p>
+        
+        </p>
+      {% endblocktrans %}
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-md-12">
+    <div class="mb-3"> 
+      <label for="passphrase" class="form-label requiredField">
+        {% trans "Passphrase" %}<span class="asteriskField">*</span>
+      </label>
+      <input type="password" name="passphrase" maxlength="512" class="textinput textInput form-control" required="" id="passphrase"> 
+      <small class="form-text text-muted">
+        Please use a secure enough passphrase to enrypt your private key. Rules: Must be > <b id='passphraseLength'>16</b> characters. Should be a passphrase 
+        ie a combination of multiple words and contain lower and capital letters, numbers, punctuation and special characters.
+        
+      </small>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+      <form method="POST" id='keyform' enctype="multipart/form-data" >
+        {% csrf_token %}
+          {{ form|crispy }}
+        <button  id='generateButton' type='button' class='btn btn-warning' >{% trans "Generate Key Pair" %}</button>
+        <button  id='saveButton' type='button' disabled class='btn btn-danger' >{% trans "Download Private Key" %}</button>
+        <button id='submitButton'  type='button' disabled class='btn btn-success' >{% trans "Submit" %}</button>
+        <a class='btn btn-secondary' href='{% url "public_key_list" %}'>{% trans "Return" %}</a>
+      </form>
+    </div>
+</div>
+
+{% endblock %}
+
+{% block extra_script %}
+{% get_user_authority as auth %}
+<script>
+  const authority = '{{ auth.name }}';
+  const authority_email = '{{ auth.email }}';
+</script>
+
+<script>
+const passphraseLength = 4
+
+
+const loadPK = (async(key_data) => {
+    
+    let publicKey = await openpgp.readKey({
+        armoredKey: key_data
+    });
+    let fingerprint = publicKey.keyPacket.getFingerprint()
+    
+    return {key_data, fingerprint}
+    
+})
+
+$(function() { 
+  $('#passphraseLength').html(passphraseLength)
+  $('#generateButton').click(function() { 
+    
+    const passphrase = $('#passphrase').val()
+    if(!passphrase) {
+      bootstrap5Alert({'message': "Please enter a passphrase", 'title': "ERROR"})
+      return 
+    }
+    if (passphrase.length < passphraseLength) {
+      bootstrap5Alert({'message': `Passphrase must be at least ${passphraseLength} characters`, 'title': "ERROR"})
+      return 
+    }
+    
+    (async () => {
+        const { privateKey, publicKey, revocationCertificate } = await openpgp.generateKey({
+            type: 'ecc', 
+            curve: 'curve25519', 
+            userIDs: [{ name: authority, email: authority_email, comment: "ETSD Generated Key" }], 
+            passphrase, 
+            format: 'armored' 
+        });
+
+        return {
+            privateKey,
+            publicKey
+        }
+    })().then(({ privateKey, publicKey }) => {
+      console.log("OK")
+      $('#id_key').val(publicKey)
+      console.log(privateKey, publicKey)
+    }).catch(err => {
+        console.log(err)
+    })
+
+    
+  })
+
+  $('#submitButton').click(function() { 
+    $(this).closest('form').submit()
+  })
+})
+</script>
+{% endblock %}

etsd/keys/templates/keys/publickey_list.html

@@ -9,6 +9,9 @@
   <path d="M8 0a1 1 0 0 1 1 1v6h6a1 1 0 1 1 0 2H9v6a1 1 0 1 1-2 0V9H1a1 1 0 0 1 0-2h6V1a1 1 0 0 1 1-1z"/>
 </svg>
 </a>
+<a class='btn btn-warning' href='{% url "key_pair_create" %}'>
+New key pair
+</a>
 {% endblock %}
 {% block page_content %}
 

etsd/keys/urls.py

@@ -39,6 +39,13 @@ def any_permission_required(*args):
         ),
         name="public_key_create",
     ),
+    path(
+        "new_key_pair/",
+        any_permission_required("core.admin", "core.user")(
+            views.KeyPairCreateView.as_view()
+        ),
+        name="key_pair_create",
+    ),
     path(
         "detail/<int:pk>/",
         any_permission_required("core.admin", "core.user")(

etsd/keys/views.py

@@ -1,10 +1,10 @@
 from django.http.response import HttpResponseRedirect
 from django.contrib import messages
 from django.views.generic import ListView, DetailView, CreateView, FormView
-from django_tables2 import RequestConfig
 from django.urls import reverse
 from django.utils.translation import ugettext as _
 
+from django_tables2 import RequestConfig
 from django_tables2.export.views import ExportMixin
 
 from . import models, tables, filters, forms
@@ -45,6 +45,26 @@ class PublicKeyDetailView(AdminOrAuthorityQsMixin, DetailView):
     model = models.PublicKey
 
 
+class KeyPairCreateView(CreateView):
+    model = models.PublicKey
+    form_class = forms.KeyPairCreateForm
+    template_name = 'keys/key_pair_create.html'
+
+    def dispatch(self, request, *args, **kwargs):
+        self.user_authority = self.request.user.get_authority()
+        if not self.user_authority:
+            messages.error(
+                self.request,
+                "Key pair creation is not allowed from users without an authority!",
+            )
+            return HttpResponseRedirect(reverse("home"))
+        return super().dispatch(request, *args, **kwargs)
+    
+
+    def form_valid(self, form):
+        a+=1
+
+
 class PublicKeyCreateView(CreateView):
     model = models.PublicKey
     form_class = forms.PublicKeyCreateForm
@@ -58,7 +78,7 @@ def form_valid(self, form):
             )
             return HttpResponseRedirect(reverse("home"))
         form.instance.authority = user_authority
-        obj = form.save()
+        _obj = form.save()
 
         messages.add_message(
             self.request,
@@ -72,18 +92,22 @@ def form_valid(self, form):
 
 class LoadPrivateKey(FormView):
     form_class = forms.LoadPrivateKeyForm
-    template_name = 'keys/load_private_key.html'
+    template_name = "keys/load_private_key.html"
 
     def form_valid(self, form):
-        fingerprint = form.cleaned_data['fingerprint']
-        user_id = form.cleaned_data['user_id']
-        self.request.session['private_key_data'] = {
-            'fingerprint': fingerprint,
-            'user_id': user_id,
+        fingerprint = form.cleaned_data["fingerprint"]
+        user_id = form.cleaned_data["user_id"]
+        self.request.session["private_key_data"] = {
+            "fingerprint": fingerprint,
+            "user_id": user_id,
         }
-        messages.add_message(self.request, messages.SUCCESS, _(
-            "Private Key has been loaded. User id: {0}, fingerprint {1}".format(
-                user_id, fingerprint
-            )
-        ))
+        messages.add_message(
+            self.request,
+            messages.SUCCESS,
+            _(
+                "Private Key has been loaded. User id: {0}, fingerprint {1}".format(
+                    user_id, fingerprint
+                )
+            ),
+        )
         return HttpResponseRedirect(reverse("home"))

pylintrc

@@ -45,7 +45,7 @@ limit-inference-results=100
 
 # List of plugins (as comma separated values of python module names) to load,
 # usually to register additional checkers.
-load-plugins=
+load-plugins=pylint_django
 
 # Pickle collected data for later comparisons.
 persistent=yes
@@ -155,7 +155,11 @@ disable=print-statement,
         comprehension-escape,
         missing-class-docstring,
         missing-function-docstring,
-        missing-module-docstring
+        missing-module-docstring,
+        too-few-public-methods,
+        too-many-ancestors,
+        no-self-use,
+        attribute-defined-outside-init
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
@@ -290,7 +294,7 @@ indent-after-paren=4
 indent-string='    '
 
 # Maximum number of characters on a single line.
-max-line-length=100
+max-line-length=120
 
 # Maximum number of lines in a module.
 max-module-lines=1000

templates/partials/_filter.html

@@ -5,7 +5,7 @@
     <div class="col-md-12">
         <form class="row row-cols-md-auto g-3 align-items-center" method='GET' action=''>
             {{ filter.form|crispy }}
-            <div class="col-12 d-flex align-self-end">
+            <div class="col mb-3 d-flex align-self-end">
                 <input class='btn btn-info' type='submit' value='Φίλτρο'>
                 <a href='{{ request.path }}' class='btn btn-secondary'>Επαναφορά</a>