Release version 0.1.20

2025-10-30 08:59:13 +00:00 · 2016-01-10 19:51:54 +02:00
parent 6a45592cd0
commit de08ba759d
22 changed files with 371 additions and 87 deletions
--- a/certidude/static/authority.html
+++ b/certidude/static/authority.html
@@ -52,9 +52,7 @@
 <section id="revoked">
    <h1>Revoked certificates</h1>
    <p>To fetch certificate revocation list:</p>
-    <pre>
-    curl {{window.location.href}}api/revoked/ | openssl crl -text -noout
-    </pre>
+    <pre>curl {{window.location.href}}api/revoked/ | openssl crl -text -noout</pre>
    <!--
    <p>To perform online certificate status request</p>

@@ -74,3 +72,6 @@
 	    {% endfor %}
    </ul>
 </section>
+
+<section id="config">
+</section>
--- a/certidude/static/configuration.html
+++ b/certidude/static/configuration.html
@@ -0,0 +1,31 @@
+
+<h1>Create a rule</h1>
+<p>
+
+    <datalist id="tag_autocomplete">
+
+    </datalist>
+
+     <span>Filter</span>
+      <select id="tags_autocomplete"></select>
+      attaches attribute
+      <select>
+        {% include 'tagtypes.html' %}
+      </select>
+      <span contenteditable>something</span>
+      <button>Add rule</button>
+</p>
+
+{% for grouper, items in configuration | groupby('tag_id') %}
+
+<h1>Filter {{ items[0].match_key }} is {{ items[0].match_value }}</h1>
+<ul>
+
+{% for item in items %}
+    <li>Attach {{ item.key }} attribute {{ item.value }}</li>
+{% endfor %}
+</ul>
+
+{% endfor %}
+
+
--- a/certidude/static/css/style.css
+++ b/certidude/static/css/style.css
@@ -216,5 +216,8 @@ select {
 .icon.room { background-image: url("../img/iconmonstr-home-4-icon.svg"); }
 .icon.serial { background-image: url("../img/iconmonstr-barcode-4-icon.svg"); }

+.icon.wireless { background-image: url("../img/iconmonstr-wireless-6-icon.svg"); }
+.icon.password { background-image: url("../img/iconmonstr-lock-3-icon.svg"); }
+
 /* Make sure this is the last one */
 .icon.busy{background-image:url("https://software.opensuse.org/assets/ajax-loader-ea46060b6c9f42822a3d58d075c83ea2.gif");}
--- a/certidude/static/img/iconmonstr-lock-3-icon.svg
+++ b/certidude/static/img/iconmonstr-lock-3-icon.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- The icon can be used freely in both personal and commercial projects with no attribution required, but always appreciated. 
+You may NOT sub-license, resell, rent, redistribute or otherwise transfer the icon without express written permission from iconmonstr.com -->
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
+<path id="lock-3-icon" d="M195.334,223.333h-50v-62.666C145.334,99.645,194.979,50,256,50c61.022,0,110.667,49.645,110.667,110.667
+	v62.666h-50v-62.666C316.667,127.215,289.452,100,256,100c-33.451,0-60.666,27.215-60.666,60.667V223.333z M404,253.333V462H108
+	V253.333H404z M283,341c0-14.912-12.088-27-27-27s-27,12.088-27,27c0,7.811,3.317,14.844,8.619,19.773
+	c4.385,4.075,6.881,9.8,6.881,15.785V399.5h23v-22.941c0-5.989,2.494-11.708,6.881-15.785C279.683,355.844,283,348.811,283,341z"/>
+</svg>
--- a/certidude/static/img/iconmonstr-wireless-6-icon.svg
+++ b/certidude/static/img/iconmonstr-wireless-6-icon.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- The icon can be used freely in both personal and commercial projects with no attribution required, but always appreciated. 
+You may NOT sub-license, resell, rent, redistribute or otherwise transfer the icon without express written permission from iconmonstr.com -->
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
+<path id="wireless-6-icon" d="M50,178.599c52.72-52.72,125.552-85.328,206-85.328c80.448,0,153.28,32.608,206,85.328l-35,35
+	c-43.763-43.763-104.221-70.83-171-70.83c-66.78,0-127.237,27.067-171,70.83L50,178.599z M148.196,276.796
+	c27.589-27.59,65.704-44.654,107.804-44.654s80.215,17.064,107.804,44.654l35.935-35.936
+	c-36.785-36.787-87.604-59.539-143.738-59.539s-106.953,22.752-143.738,59.539L148.196,276.796z M211,339.599
+	c11.517-11.517,27.427-18.64,45-18.64s33.483,7.123,45,18.64l35.313-35.312c-20.554-20.554-48.949-33.269-80.313-33.269
+	s-59.76,12.715-80.313,33.269L211,339.599z M256,356.138c-17.284,0-31.299,14.01-31.299,31.297
+	c0,17.285,14.015,31.295,31.299,31.295c17.283,0,31.296-14.01,31.296-31.295C287.296,370.147,273.283,356.138,256,356.138z"/>
+</svg>
--- a/certidude/static/index.html
+++ b/certidude/static/index.html
@@ -16,6 +16,7 @@
          <li data-section="requests">Requests</li>
          <li data-section="signed">Signed</li>
          <li data-section="revoked">Revoked</li>
+          <li data-section="config">Configuration</li>
          <li data-section="log">Log</li>
        </ul>
    </nav>
--- a/certidude/static/js/certidude.js
+++ b/certidude/static/js/certidude.js
@@ -15,6 +15,7 @@ function onTagClicked() {
            url: "/api/tag/" + $(this).attr("data-id"),
            dataType: "json",
            data: {
+                key: $(this).attr("data-key"),
                value: updated
            }
        });
@@ -40,6 +41,11 @@ function onNewTagClicked() {
    });
 }

+function onTagFilterChanged() {
+    var key = $(event.target).val();
+    console.info("New key is:", key);
+}
+
 function onLogEntry (e) {
    var entry = JSON.parse(e.data);
    if ($("#log_level_" + entry.severity).prop("checked")) {
@@ -128,7 +134,7 @@ function onTagAdded(e) {
        dataType: "json",
        success: function(tag, status, xhr) {
            // TODO: Deduplicate
-            $tag = $("<span id=\"tag_" + tag.id + "\" class=\"" + tag.key + " icon tag\" data-id=\""+tag.id+"\">" + tag.value + "</span>");
+            $tag = $("<span id=\"tag_" + tag.id + "\" title=\"" + tag.key + "=" + tag.value + "\" class=\"" + tag.key.replace(/\./g, " ") + " icon tag\" data-id=\""+tag.id+"\" data-key=\"" + tag.key + "\">" + tag.value + "</span>");
            $tags = $("#signed_certificates [data-cn='" + tag.cn + "'] .tags").prepend(" ");
            $tags = $("#signed_certificates [data-cn='" + tag.cn + "'] .tags").prepend($tag);
            $tag.click(onTagClicked);
@@ -201,29 +207,6 @@ $(document).ready(function() {
                $("section#" + $(e.target).attr("data-section")).show();
            });

-            /**
-             * Fetch log entries
-             */
-            $.ajax({
-                method: "GET",
-                url: "/api/log/",
-                dataType: "json",
-                success:function(entries, status, xhr) {
-                    console.info("Got", entries.length, "log entries");
-                    for (var j = 0; j < entries.length; j++) {
-                        if ($("#log_level_" + entries[j].severity).prop("checked")) {
-                            $("#log_entries").append(nunjucks.render("logentry.html", {
-                                entry: {
-                                    created: new Date(entries[j].created).toLocaleString("et-EE"),
-                                    message: entries[j].message,
-                                    severity: entries[j].severity
-                                }
-                            }));
-                        }
-                    }
-                }
-            });
-
            /**
             * Set up search bar
              */
@@ -248,22 +231,35 @@ $(document).ready(function() {

            });

-            /**
-             * Fetch tags for certificates
-             */
+
+
            $.ajax({
                method: "GET",
-                url: "/api/tag/",
+                url: "/api/config/",
                dataType: "json",
-                success:function(tags, status, xhr) {
-                    console.info("Got", tags.length, "tags");
-                    for (var j = 0; j < tags.length; j++) {
-                        // TODO: Deduplicate
-                        $tag = $("<span id=\"tag_" + tags[j].id + "\" class=\"" + tags[j].key + " icon tag\" data-id=\""+tags[j].id+"\">" + tags[j].value + "</span>");
-                        $tags = $("#signed_certificates [data-cn='" + tags[j].cn + "'] .tags").prepend(" ");
-                        $tags = $("#signed_certificates [data-cn='" + tags[j].cn + "'] .tags").prepend($tag);
-                        $tag.click(onTagClicked);
-                    }
+                success: function(configuration, status, xhr) {
+                    console.info("Appending " + configuration.length + " configuration items");
+                    $("#config").html(nunjucks.render('configuration.html', { configuration:configuration}));
+                    /**
+                     * Fetch tags for certificates
+                     */
+                    $.ajax({
+                        method: "GET",
+                        url: "/api/tag/",
+                        dataType: "json",
+                        success:function(tags, status, xhr) {
+                            console.info("Got", tags.length, "tags");
+                            for (var j = 0; j < tags.length; j++) {
+                                // TODO: Deduplicate
+                                $tag = $("<span id=\"tag_" + tags[j].id + "\"  title=\"" + tags[j].key + "=" + tags[j].value + "\" class=\"" + tags[j].key.replace(/\./g, " ") + " icon tag\" data-id=\""+tags[j].id+"\" data-key=\"" + tags[j].key + "\">" + tags[j].value + "</span>");
+                                console.info("Inserting tag", tags[j], $tag);
+                                $tags = $("#signed_certificates [data-cn='" + tags[j].cn + "'] .tags").prepend(" ");
+                                $tags = $("#signed_certificates [data-cn='" + tags[j].cn + "'] .tags").prepend($tag);
+                                $tag.click(onTagClicked);
+                                $("#tags_autocomplete").prepend("<option value=\"" + tags[j].id + "\">" + tags[j].key + "='" + tags[j].value + "'</option>");
+                            }
+                        }
+                    });
                }
            });

@@ -293,6 +289,29 @@ $(document).ready(function() {

                }
            });
+            return;
+            /**
+             * Fetch log entries
+             */
+            $.ajax({
+                method: "GET",
+                url: "/api/log/",
+                dataType: "json",
+                success:function(entries, status, xhr) {
+                    console.info("Got", entries.length, "log entries");
+                    for (var j = 0; j < entries.length; j++) {
+                        if ($("#log_level_" + entries[j].severity).prop("checked")) {
+                            $("#log_entries").append(nunjucks.render("logentry.html", {
+                                entry: {
+                                    created: new Date(entries[j].created).toLocaleString("et-EE"),
+                                    message: entries[j].message,
+                                    severity: entries[j].severity
+                                }
+                            }));
+                        }
+                    }
+                }
+            });
        }
    });
 });
--- a/certidude/static/request.html
+++ b/certidude/static/request.html
@@ -1,4 +1,4 @@
-<li id="request_{{ request.sha256sum }}" class="filterable">
+<li id="request_{{ request.common_name }}" class="filterable">

 <a class="button icon download" href="/api/request/{{request.common_name}}/">Fetch</a>
 {% if request.signable %}
--- a/certidude/static/signed.html
+++ b/certidude/static/signed.html
@@ -11,6 +11,8 @@
    <div class="email">{% include 'img/iconmonstr-email-2-icon.svg' %} {{ certificate.email_address }}</div>
    {% endif %}

+    {#
+
    <div class="monospace">
    {% include 'img/iconmonstr-key-2-icon.svg' %}
    <span title="SHA-256 of public key">
@@ -25,13 +27,12 @@
    {{certificate.key_usage}}
    </div>

+    #}
+
    <div class="tags">
      <select class="icon tag" data-cn="{{ certificate.common_name }}" onChange="onNewTagClicked();">
        <option value="">Add tag...</option>
-        <option value="location">Location</option>
-        <option value="phone">Phone</option>
-        <option value="room">Room</option>
-        <option value="serial">Product serial</option>
+        {% include 'tagtypes.html' %}
      </select>
    </div>

--- a/certidude/static/status.html
+++ b/certidude/static/status.html
@@ -8,7 +8,7 @@
 {% if lease.released %}
 Last seen {{ lease.released }} at {{ lease.address }}
 {% else %}
-Online since {{ lease.acquired }} at {{ lease.address }}
+Online since {{ lease.acquired }} at <a target="{{ lease.address }}" href="http://{{ lease.address }}">{{ lease.address }}</a>
 {% endif %}
 {% else %}
 Not seen
--- a/certidude/static/tagtypes.html
+++ b/certidude/static/tagtypes.html
@@ -0,0 +1,11 @@
+<option value="location">Location</option>
+<option value="phone">Phone</option>
+<option value="room">Room</option>
+<option value="serial">Product serial</option>
+
+<option value="wireless.protected.password">Protected wireless network password</option>
+<option value="wireless.protected.name">Protected wireless network name</option>
+<option value="wireless.public.name">Public wireless network name</option>
+<option value="wireless.channela">5GHz channel number</option>
+<option value="wireless.channelb">2.4GHz channel number</option>
+<option value="usb.approved">Approved USB device</option>