clarion 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5249d0149fd5e04b1a474b7bd2d39f122966513e6be736cb2028435c7d655b5
-  data.tar.gz: 41112a12351bd0e74f0ed2153c31b2d19f067e2f39650d23a7e87b7d3c7ea40a
+  metadata.gz: a9dc196ee5f2c8ed0672cd8ac94a7da79df64610526ba0590ee49a6a06e8a11f
+  data.tar.gz: c4c9253becb0aa8825b3f5c3e40826f0dba345d87f97fc5625b0b46b095ab625
 SHA512:
-  metadata.gz: 29f9d9de7234dc3e0080e2d2dc355b6f94c5c8f233ed4520f1bd5aa239e9ab17fbc8b1a480d9386e00eec748296a6af9101e68dc740d450e194cb77550196042
-  data.tar.gz: e0bd803dfc4491dd8028413359def1ecaa854385018b490df4d4379cc3730a031127e12aee1898a012ed469549e6f5caf7b660b52dc0fb33047fcb55e24524ca
+  metadata.gz: 599032ddf520cd979702ed6abb808c1340e7dc123d38754abdecda59c97f6508bbdcb88bcdc55a9899d7f4e41ae635fecf9e591ce1dcf55ea8e6b5d31302c3d2
+  data.tar.gz: 02a673769db0de5f84f51806c5ad130cbc278240c620bc8f35c3719b117819b63ec32fb10d9e2266809a4af51e07607e9440a1a4821185c31c0c1b459f6bb4e8

data/app/public/sign.js

@@ -18,9 +18,38 @@ document.addEventListener("DOMContentLoaded", function() {
     let requests = JSON.parse(processionElem.attributes['data-requests'].value);
     let challenge = JSON.parse(processionElem.attributes['data-challenge'].value);
 
+    let requestCancel  = (e) => {
+      if (e) e.preventDefault();
+      let payload = JSON.stringify({
+        req_id: reqId,
+      });
+
+      let handleError = (err) => {
+        console.log(err);
+        processionElem.className = 'procession_error';
+      };
+
+      fetch(`/ui/cancel/${authnId}`, {credentials: 'include', method: 'POST', body: payload}).then((resp) => {
+        console.log(resp);
+        if (!resp.ok) {
+          processionElem.className = 'procession_error';
+          return;
+        }
+        return resp.json().then((json) => {
+          console.log(json);
+          if (json.ok) {
+            processionElem.className = 'procession_cancel';
+          } else {
+            processionElem.className = 'procession_error';
+          }
+        });
+      }).catch(handleError);
+    };
+    document.getElementById("cancel_link").addEventListener("click", requestCancel);
 
     let processCallback = (json) => {
       processionElem.className = 'procession_ok';
+      if (window.opener) window.close();
     }
 
     let cb = (response) => {

data/app/views/authn.erb

@@ -2,6 +2,9 @@
   #procession > div {
     display: none;
   }
+  #procession > div.procession_always {
+    display: block;
+  }
   #procession.procession_init > div.procession_init {
     display: block;
   }
@@ -20,13 +23,20 @@
   #procession.procession_error > div.procession_error {
     display: block;
   }
+  #procession.procession_cancel > div.procession_cancel {
+    display: block;
+  }
   #procession.procession_timeout > div.procession_timeout {
     display: block;
   }
 
 </style>
 
-<p class='center'><strong>U2F 2FA <%- if @authn.name -%> for <%= @authn.name %><%- end -%></strong></p>
+<p class='center'><strong>U2F 2FA <%- if @authn.name -%> for <%= @authn.name %><%- end -%></strong><br>
+<%- if @authn.comment -%>
+<small><%= @authn.comment %></small></p>
+<%- end -%>
+</p>
 <div id="procession" class="procession_init" data-authn-id="<%= @authn.id %>" data-app-id="<%= @app_id %>" data-requests='<%= @requests.to_json %>' data-challenge='<%= @challenge.to_json %>' data-req-id='<%= @req_id %>'>
   <div class="procession_init">
     <p>Initializing...</p>
@@ -46,14 +56,17 @@
   <div class="procession_error">
     <p>Error: Reload and try again?</p>
   </div>
+  <div class="procession_cancel">
+    <p>Cancelled: You may now close this page.</p>
+  </div>
   <div class="procession_timeout">
     <p>Timed out...</p>
     <p><button id="retry_button">Try again</button></p>
   </div>
+  <div class="procession_unsupported procession_error procession_wait procession_timeout">
+    <p class='text-muted right'><a href='#' id="cancel_link"><small>Cancel</small></a></p>
+  </div>
 </div>
-<%- if @authn.comment -%>
-<p><small><%= @authn.comment %></small></p>
-<%- end -%>
 
 
 <script src="/sign.js"></script>

data/app/views/layout.erb

@@ -20,13 +20,19 @@
       strong {
         font-weight: bold;
       }
-      small {
+      small, small * {
         font-size: 12px;
       }
 
       .center {
         text-align: center;
       }
+      .right {
+        text-align: right;
+      }
+      .text-muted, .text-muted * {
+        color: #767676;
+      }
 
       body {
         text-align: center;

data/lib/clarion/app.rb

@@ -90,13 +90,12 @@ module Clarion
       unless @authn
         halt 404, "authn not found"
       end
-      if @authn.verified?
-        halt 410, "Authn already processed"
-      end
       if @authn.expired?
         halt 410, "Authn expired"
       end
-
+      if @authn.closed?
+        halt 410, "Authn already processed"
+      end
 
       authenticator = Authenticator.new(@authn, u2f, counter, store)
       @app_id, @requests, @challenge = authenticator.request
@@ -114,8 +113,14 @@ module Clarion
       unless params[:name] && params[:callback] && params[:public_key]
         halt 400, 'missing params'
       end
-      if params[:callback].start_with?('js:') && !(conf.registration_allowed_url === params[:callback])
-        halt 400, 'invalid callback'
+      if params[:callback].start_with?('js:')
+        unless conf.registration_allowed_url === params[:callback][3..-1]
+          halt 400, 'invalid callback'
+        end
+      else
+        unless conf.registration_allowed_url === params[:callback]
+          halt 400, 'invalid callback'
+        end
       end
 
       public_key = begin
@@ -173,9 +178,9 @@ module Clarion
       {ok: true, name: key.name, encrypted_key: key.to_encrypted_json(public_key, :all)}.to_json
     end
 
-    post '/ui/verify/:id' do
+    post '/ui/cancel/:id' do
       content_type :json
-      unless data[:req_id] && data[:response]
+      unless data[:req_id]
         halt 400, '{"error": "missing params"}'
       end
       session[:reqs] ||= {}
@@ -191,12 +196,44 @@ module Clarion
       unless @authn
         halt 404, '{"error": "authn not found"}'
       end
-      if @authn.verified?
+      if @authn.expired?
+        halt 410, '{"error": "authn expired"}'
+      end
+      if @authn.closed?
         halt 410, '{"error": "authn already processed"}'
       end
+
+      @authn.cancel!
+      store.store_authn(@authn)
+      session[:reqs].delete data[:req_id]
+
+      '{"ok": true}'
+    end
+
+    post '/ui/verify/:id' do
+      content_type :json
+      unless data[:req_id] && data[:response]
+        halt 400, '{"error": "missing params"}'
+      end
+      session[:reqs] ||= {}
+      unless session[:reqs][data[:req_id]]
+        halt 400, '{"error": "invalid :req_id"}'
+      end
+      challenge = session[:reqs][data[:req_id]][:challenge]
+      unless challenge
+        halt 400, '{"error": "invalid :req_id"}'
+      end
+
+      @authn = store.find_authn(params[:id])
+      unless @authn
+        halt 404, '{"error": "authn not found"}'
+      end
       if @authn.expired?
         halt 410, '{"error": "authn expired"}'
       end
+      if @authn.closed?
+        halt 410, '{"error": "authn already processed"}'
+      end
 
       authenticator = Authenticator.new(@authn, u2f, counter, store)
 

data/lib/clarion/authn.rb

@@ -4,14 +4,19 @@ require 'clarion/key'
 
 module Clarion
   class Authn
-    STATUSES = %i(open verified)
+    STATUSES = %i(open cancelled verified expired)
 
     class << self
       def make(**kwargs)
         kwargs.delete(:id)
+        kwargs.delete(:created_at)
+        kwargs.delete(:status)
+        kwargs.delete(:verified_at)
+        kwargs.delete(:verified_key)
         new(
           id: random_id,
           created_at: Time.now,
+          status: :open,
           **kwargs,
         )
       end
@@ -36,6 +41,8 @@ module Clarion
       @expires_at = Time.xmlschema(@expires_at) if @expires_at && @expires_at.is_a?(String)
       @verified_at = Time.xmlschema(@verified_at) if @verified_at && @verified_at.is_a?(String)
 
+      @status = :expired if expired?
+
       raise ArgumentError, ":status not valid" unless STATUSES.include?(@status)
     end
 
@@ -58,6 +65,14 @@ module Clarion
       status == :verified
     end
 
+    def cancelled?
+      status == :cancelled
+    end
+
+    def closed?
+      !open? || expired? 
+    end
+
     def key_for_handle(handle)
       keys.find { |_| _.handle == handle }
     end
@@ -72,6 +87,11 @@ module Clarion
       true
     end
 
+    def cancel!
+      @status = :cancelled
+      true
+    end
+
     def to_h(all=false)
       {
         id: id,

data/lib/clarion/version.rb

@@ -1,3 +1,3 @@
 module Clarion
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clarion
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Sorah Fukumori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: u2f