clarion 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 699d1c5cabc3e667559acac59425771c17c7364b655655e072149648c4e23a8e
-  data.tar.gz: db1dd4fe19189a5b8169c218f0d62c7a82661c98ca766c964949aeb86152acd2
+  metadata.gz: 587de9691a8ad2c343fb006830a7ad625489e1dafe3470a7b9f69797db777ab7
+  data.tar.gz: a2cc0b81450d83f3c581e0de7186fe6ff95b6cac6e3c7272d89b0e58098f5a28
 SHA512:
-  metadata.gz: f1d33dfe907acbda086bb486db4ae472ee6ae024ce893d988cebd4388a83e9bf97a4c7f4b85bfd12a729ec7389689c9e1bd9a91659aeacd6b0f9b067745c9de9
-  data.tar.gz: 25e19c67f5c4ec5c7b47616f7f4ea580b4514f3944b0f90b3dbe965030c3a4c937ba33f7d42eee1f68511f7e1a9d0c9fb897ca7157a8e137e30aa3da61ae0952
+  metadata.gz: 39fb7f981bf9738f9675b5116f0e1a62a793d280c634e416887c8be9f19bc1d5d0596689d194ac189ab137352e8804d1230afeab6ebabfe77f02f6d4c741d3ee
+  data.tar.gz: 65fee6e98b981f03d3e1abff530f5b92c90975c4beda98f8bec440773376a551fb3eab9ce1e9e1bb40e0c38cc745fa8a2c63237d12d3efef35b45046fe562183

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+Gemfile.lock

data/Dockerfile

@@ -0,0 +1,13 @@
+FROM sorah/ruby:2.4
+
+EXPOSE 8080
+
+RUN mkdir -p /app /app/tmp /app/lib/clarion
+
+COPY Gemfile* /app/
+COPY *.gemspec /app/
+COPY lib/clarion/version.rb /app/lib/clarion/version.rb
+RUN cd /app && bundle install -j4 --deployment --without 'development test'
+
+WORKDIR /app
+CMD ["bundle", "exec", "puma", "-w", "2", "-t", "4:16", "-p", "8080"]

data/Gemfile

@@ -4,3 +4,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in clarion.gemspec
 gemspec
+
+gem 'puma'

data/app/public/register.js

@@ -17,6 +17,7 @@ document.addEventListener("DOMContentLoaded", function() {
     let state = processionElem.attributes['data-state'].value;
     let callbackUrl = processionElem.attributes['data-callback'].value;
 
+    var u2fResponse;
 
     let processCallback = (json) => {
       processionElem.className = 'procession_ok';
@@ -37,18 +38,13 @@ document.addEventListener("DOMContentLoaded", function() {
       }
     }
 
-    let cb = (response) => {
-      console.log(response);
-
-      if (response.errorCode) {
-        processionElem.className = 'procession_error';
-        return;
-      }
+    let submitKey = () => {
       processionElem.className = 'procession_contact';
 
       let payload = JSON.stringify({
         reg_id: regId,
-        response: JSON.stringify(response),
+        response: JSON.stringify(u2fResponse),
+        name: document.getElementById("key_name").value,
       });
 
       let handleError = (err) => {
@@ -72,10 +68,36 @@ document.addEventListener("DOMContentLoaded", function() {
         });
       }).catch(handleError);
     };
+    document.getElementById("key_name_form").addEventListener("submit", (e) => {
+      e.preventDefault();
+      if (u2fResponse) submitKey();
+    });
+
+    let u2fCallback = (response) => {
+      console.log(response);
+
+      if (response.errorCode == window.u2f.ErrorCodes.TIMEOUT) {
+        processionElem.className = 'procession_timeout';
+        return;
+      } else if (response.errorCode) {
+        processionElem.className = 'procession_error';
+        return;
+      }
+      u2fResponse = response;
+      processionElem.className = 'procession_edit';
+      document.getElementById("key_name").focus();
+    };
+
+    let startRequest = () => {
+      processionElem.className = 'procession_wait';
+      window.u2f.register(appId, requests, [], u2fCallback);
+    };
+
+    document.getElementById("retry_button").addEventListener("click", (e) => {
+      startRequest();
+    });
 
-    processionElem.className = 'procession_wait';
-    console.log(requests);
-    window.u2f.register(appId, requests, [], cb, 300000);
+    startRequest();
   });
 
 

data/app/public/sign.js

@@ -26,7 +26,10 @@ document.addEventListener("DOMContentLoaded", function() {
     let cb = (response) => {
       console.log(response);
 
-      if (response.errorCode) {
+      if (response.errorCode == window.u2f.ErrorCodes.TIMEOUT) {
+        processionElem.className = 'procession_timeout';
+        return;
+      } else if (response.errorCode) {
         processionElem.className = 'procession_error';
         return;
       }
@@ -59,8 +62,14 @@ document.addEventListener("DOMContentLoaded", function() {
       }).catch(handleError);
     };
 
-    processionElem.className = 'procession_wait';
-    window.u2f.sign(appId, challenge, requests, cb, 300000);
+    let startRequest = () => {
+      processionElem.className = 'procession_wait';
+      window.u2f.sign(appId, challenge, requests, cb);
+    };
+    document.getElementById("retry_button").addEventListener("click", (e) => {
+      startRequest();
+    });
+    startRequest();
   });
 
 

data/app/views/authn.erb

@@ -20,6 +20,10 @@
   #procession.procession_error > div.procession_error {
     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>
@@ -42,6 +46,10 @@
   <div class="procession_error">
     <p>Error: Reload and try again?</p>
   </div>
+  <div class="procession_timeout">
+    <p>Timed out...</p>
+    <p><button id="retry_button">Try again</button></p>
+  </div>
 </div>
 <%- if @authn.comment -%>
 <p><small><%= @authn.comment %></small></p>

data/app/views/layout.erb

@@ -76,14 +76,14 @@
         -webkit-box-sizing: border-box;
         box-sizing: border-box;
 
-        font-size: 20px;
-        padding: 6px 4px;
+        padding: 8px 4px;
 
         border: 1px solid #e9e9e9;
         border-radius: 3px;
       }
 
       input[type="submit"], button {
+        font-size: 16px;
         background-color: #337AB7;
         color: white;
       }

data/app/views/register.erb

@@ -11,6 +11,9 @@
   #procession.procession_wait > div.procession_wait {
     display: block;
   }
+  #procession.procession_edit > div.procession_edit {
+    display: block;
+  }
   #procession.procession_contact > div.procession_contact {
     display: block;
   }
@@ -20,6 +23,9 @@
   #procession.procession_error > div.procession_error {
     display: block;
   }
+  #procession.procession_timeout > div.procession_timeout {
+    display: block;
+  }
 </style>
 
 <p><strong>U2F key registration<%- if @name -%> for <%= @name %><%- end -%></strong></p>
@@ -37,6 +43,13 @@
   <div class="procession_wait">
     <p>Insert and tap your security key.</p>
   </div>
+  <div class="procession_edit">
+    <p>Security key recognized:</p>
+    <form id="key_name_form">
+      <p><input type="text" id="key_name" placeholder="Name your key" required></p>
+      <p><input type="submit" value="Save"></p>
+    </form>
+  </div>
   <div class="procession_contact">
     <p>Contacting...</p>
   </div>
@@ -46,7 +59,12 @@
   <div class="procession_error">
     <p>Error: try again from the previous page?</p>
   </div>
+  <div class="procession_timeout">
+    <p>Timed out...</p>
+    <p><button id="retry_button">Try again</button></p>
+  </div>
 </div>
+
 <%- if @comment -%>
 <p><small><%= @comment %></small></p>
 <%- end -%>

data/lib/clarion/app.rb

@@ -127,11 +127,13 @@ module Clarion
       @reg_id = SecureRandom.urlsafe_base64(12)
       registrator = Registrator.new(u2f, counter)
       @app_id, @requests = registrator.request
-      session[:regs] ||= {}
-      session[:regs][@reg_id] = {
+      session[:regis] ||= []
+      session[:regis] << {
+        id: @reg_id,
         challenges: @requests.map(&:challenge),
         key: public_key.to_der,
       }
+      session[:regis].shift(session[:regis].size - 4) if session[:regis].size > 4
 
       @callback = params[:callback]
       @state = params[:state]
@@ -150,8 +152,8 @@ module Clarion
         halt 400, '{"error": "Missing params"}'
       end
 
-      session[:regs] ||= {}
-      reg = session[:regs][data[:reg_id]]
+      session[:regis] ||= []
+      reg = session[:regis].find { |_| _[:id] == data[:reg_id] }
       unless reg && reg[:challenges] && reg[:key]
         halt 400, '{"error": "Invalid :reg"}'
       end
@@ -164,8 +166,9 @@ module Clarion
 
       registrator = Registrator.new(u2f, counter)
       key = registrator.register!(reg[:challenges], data[:response])
+      key.name = data[:name]
 
-      session[:regs].delete(data[:reg_id])
+      session[:regis].reject! { |_| _[:id] == data[:reg_id] }
 
       {ok: true, encrypted_key: key.to_encrypted_json(public_key, :all)}.to_json
     end

data/lib/clarion/key.rb

@@ -33,8 +33,8 @@ module Clarion
       @counter = counter
     end
 
-    attr_reader :handle, :name, :public_key
-    attr_accessor :counter
+    attr_reader :handle, :public_key
+    attr_accessor :counter, :name
 
     def to_h(all=false)
       {

data/lib/clarion/version.rb

@@ -1,3 +1,3 @@
 module Clarion
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clarion
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sorah Fukumori
@@ -132,8 +132,8 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,69 +0,0 @@
-PATH
-  remote: .
-  specs:
-    clarion (0.1.0)
-      aws-sdk-dynamodb
-      aws-sdk-s3
-      erubis
-      sinatra
-      u2f
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    aws-partitions (1.45.0)
-    aws-sdk-core (3.11.0)
-      aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-dynamodb (1.3.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-kms (1.3.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.8.0)
-      aws-sdk-core (~> 3)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.2)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    jmespath (1.3.1)
-    mustermann (1.0.1)
-    rack (2.0.3)
-    rack-protection (2.0.0)
-      rack
-    rake (12.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    sinatra (2.0.0)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.0)
-      tilt (~> 2.0)
-    tilt (2.0.8)
-    u2f (1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  clarion!
-  rake
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.0