lockr 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 462008cc42bd0110c7cae997a4716b04074a3fc3
-  data.tar.gz: 8f1723b88197dda7f18a78642aabe3777b2adc05
+  metadata.gz: 7587dffcce20576a1946dbda5557fe589cb11dd9
+  data.tar.gz: 3ee86753bf4dfd6045301b541909ab418571d80f
 SHA512:
-  metadata.gz: 3cf9c61ab52876c0bb9260313bbb20d1b6826f9631e9c46861b842a697e82c66a652c465ca4eed5bca7ae90c076c5ec6867db9634b7c9305fdac5f7516197859
-  data.tar.gz: c2f24dbdef030f1a6909fdb8602c8d1b36b61886c3e4cd13a75c17c5d7e9594cafded6c60e1c1849b444589c6f71af23f60f09099362c066ed96321420f90a9b
+  metadata.gz: ac68c79724e8eb520310eee218b23a042153b22a0c6781fef34983bf6ff58fac367dee90b45b7f40d573e2b52e680ec3c49f0643980ae2769f449a7efd294dd2
+  data.tar.gz: c55f59479c943aef242149ace41bd1aae174f1c6cfa738d452441a2a02fd481d9db5f75eea15823a7913001deba670190b87d10be11adc8d3c2bc56ab2dfc270

data/bin/weblockr

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+
+require 'lockr/http/httplockrinit'
+require 'erb'
+require 'clipboard'  
+require 'padrino-helpers'
+require 'json'
+
+include ERB::Util
+
+init = HttpLockrInit.new()
+init.start()
+
+# now start sinatra
+require 'sinatra'
+require "sinatra/json"
+
+if init.getLoadBrowser
+  require "browser_gui"  
+end
+
+register Padrino::Helpers
+
+set :pwdmgr, init.getPwdMgr()
+# server config
+set :public_dir, File.expand_path('../../resources/static', __FILE__) 
+set :bind, '127.0.0.1'
+set :port, 32187
+set :views, File.expand_path('../../resources/views', __FILE__) 
+enable :run
+ 
+get '/' do
+  dir = settings.pwdmgr.list()
+  erb :index, :locals => { :directory => dir }
+end
+
+get '/password' do
+  settings.pwdmgr.copy_to_clipboard( params[:id], params[:username])
+  json({:message => "Password copied to clipboard. Clipboard reset in 15 seconds."})
+end
+
+post '/password' do
+  json = convertFormToMap( request.body.read)
+  newPwdstore = settings.pwdmgr.add( json['id'], json['username'], json['password'], json['url'])
+  dir = settings.pwdmgr.list()
+  json({:message => "Site "#{json['id']}/#{json['username']}" added", 
+        :row => [
+           	json['id'], 
+           	json['username'], 
+           	json['url']
+       	]})
+end
+
+patch '/password' do
+  json = convertFormToMap( request.body.read)
+  settings.pwdmgr.change( json['id'], json['username'], json['password'], json['url'])
+  json({:message => "Password for site "#{json['id']}/#{json['username']}" updated"})
+end
+
+delete '/password' do
+  json = convertFormToMap( request.body.read)
+  settings.pwdmgr.delete( json['id'], json['username'])
+  json({:message => "Password for site "#{json['id']}/#{json['username']}" deleted"})
+end
+
+def convertFormToMap( jsonForm)
+  Hash[JSON.parse(jsonForm).map{|el| [el['name'], el['value']]}]
+end

data/lib/lockr/action/add.rb

@@ -19,8 +19,7 @@ class AddAction < BaseAction
       end
     end
     
-    # ###TODO add url
-    @pwdmgr.add( id, username, pwd)
+    @pwdmgr.add( id, username, pwd, url)
     say("Password saved for ID '<%= color('#{id}', :blue) %>' and user '<%= color('#{username}', :green) %>'")
   end
   

data/lib/lockr/http/httplockrinit.rb

@@ -13,8 +13,11 @@ class HttpLockrInit
     end
     
     configfile = Configuration.new()
-    cfg = configfile.config[:lockr]
-    options[:vault] = File.expand_path(cfg[:vault]) if options[:vault] == 'vault.yaml'
+    cfg = nil
+    if configfile.config
+      cfg = configfile.config[:lockr]
+    end
+    options[:vault] = File.expand_path(cfg[:vault]) if options[:vault] == 'vault.yaml' and cfg != nil
     
     @pwdmgr = PasswordManager.new( options[:keyfile], options[:vault])
     @load_browser = options[:browser]

data/lib/lockr/pwdmgr.rb

@@ -42,7 +42,7 @@ class PasswordManager
     end
   end
   
-  def add( id, username, password)
+  def add( id, username, password, url)
     vault = decrypt_vault()
     site_dir = {}
     
@@ -51,8 +51,7 @@ class PasswordManager
       site_dir = vault[id]
     end
     
-    # TODO add url
-    new_store = PasswordStore.new( id, nil, username, password)
+    new_store = PasswordStore.new( id, url, username, password)
     site_dir[username] = new_store
     vault[id] = site_dir
     
@@ -61,10 +60,11 @@ class PasswordManager
     return new_store
   end
   
-  def change( id, username, password)
+  def change( id, username, password, url)
     vault = decrypt_vault()
     site_dir = vault[id]
-    site_dir[username].password = password
+    site_dir[username].password = password if ! password.nil?
+    site_dir[username].url = url if ! url.nil?
     
     encrypt_vault( vault)
     puts 'Changed password'

data/lib/lockr/version.rb

@@ -1,4 +1,4 @@
 module LockrVer
-  VERSION = "0.5.1"
-  DATE = "2013-11-10"
+  VERSION = "0.5.2"
+  DATE = "2013-11-19"
 end

data/resources/static/css/lockr.css

@@ -4,7 +4,7 @@ body {
 }
 
 div.center {
-    width: 800px;
+    width: 1000px;
     margin: auto;
 }
 
@@ -18,6 +18,11 @@ tr.even {
 
 table.entrytable{
     width: 100%;
+    table-layout:fixed;
+}
+
+table.entrytable td {
+	word-wrap: break-word;
 }
 
 table.entrytable .css_right {

data/resources/static/js/lockr.js

@@ -3,9 +3,10 @@ $(document).ready(function() {
         "bJQueryUI": true,
         "bPaginate": false,
         "aoColumns": [
-          { "sWidth": "25%" },
-          { "sWidth": "25%" },
-          { "sWidth": "50%" }
+          { "sWidth": "20%" },
+          { "sWidth": "20%" },
+          { "sWidth": "30%" },
+          { "sWidth": "30%" }
         ]
     });
     
@@ -15,61 +16,114 @@ $(document).ready(function() {
         $( "#dialog-addnewsite" ).dialog( "open" );
     });
     
+    $( '#resultbox').hide();
+    $( '#errorbox').hide();
+    
+    $( "a#copypwd").click( function() {
+      var data = $( this).parents("tr.data")[0].dataset;
+      jQuery.ajax({
+        url: '/password',
+        data: {"id": data.id, "username": data.username},
+        contentType: 'application/json',
+        dataType: 'json'
+      }).done(function (response) {
+        $( '#errorbox').hide();
+        $( '#resultbox').show();
+        $( '#resultmsg').html( response.message);
+      }).fail(function () {
+        $( '#resultbox').hide();
+        $( '#errorbox').show();
+        $( '#errormsg').html( "Something went wrong.");
+      });
+    });
+    
     $( "#dialog-addnewsite" ).dialog({
       autoOpen: false,
-      height: 400,
+      height: 450,
       width: 400,
+      position: { my: "left top", at: "left bottom", of: "a#addnew" },
       modal: true,
       buttons: {
         "Save": function() {
-          $( "form#form-add").submit();
+          jQuery.ajax({
+            url: '/password',
+            method: 'POST',
+            data: JSON.stringify($('#form-add').serializeArray()),
+            contentType: 'application/json',
+            dataType: 'json'
+          }).done(function (response) {
+            $( "#form-add").find("input[type=text], input[type=password]").val("");
+            $( "#dialog-addnewsite" ).dialog( "close" );
+            $( '#errorbox').hide();
+            $( '#resultbox').show();
+            $( '#resultmsg').html( response.message);
+            $( '.entrytable').dataTable().fnAddData( [
+	        	response.row[0],
+	        	response.row[1],
+	        	response.row[2],
+	        	'<a id="copypwd" class="button">Copy</a> <a id="changepwd" class="button">Change</a> <a id="deletepwd" class="button">Delete</a>'] );
+	      	$( "a.button" ).button();
+          }).fail(function () {
+            $( "#dialog-addnewsite" ).dialog( "close" );
+            $( '#resultbox').hide();
+            $( '#errorbox').show();
+            $( '#errormsg').html( "Something went wrong.");
+          });
         },
         "Cancel": function() {
           $( this ).dialog( "close" );
         }
-      },
-      close: function() {
-          // clean all fields
-          $("dialog-addnewsite input").each().val( "" ).removeClass( "ui-state-error" );
       }
     });
     
     $( "a#changepwd").click( function() {
-        var id = $( this).siblings( ".id").get(0).value;
-        var username = $( this).siblings( ".username").get(0).value;
-        $("#dialog-changepwd #id").attr('value', id);
-        $("#dialog-changepwd #id_label").html( id);
-        $("#dialog-changepwd #username").attr('value', username);
-        $("#dialog-changepwd #username_label").html( username);
+        var data = $( this).parents("tr.data")[0].dataset;
+        $("#dialog-changepwd #id").attr('value', data.id);
+        $("#dialog-changepwd #id_label").html( data.id);
+        $("#dialog-changepwd #username").attr('value', data.username);
+        $("#dialog-changepwd #username_label").html( data.username);
+        $("#dialog-changepwd #url").attr('value', data.url);
         $("#dialog-changepwd" ).dialog( "open" );
     });
     
     $( "#dialog-changepwd" ).dialog({
       autoOpen: false,
-      height: 400,
+      height: 450,
       width: 400,
       modal: true,
       buttons: {
         "Change": function() {
-          $( "form#form-change").submit();
+          jQuery.ajax({
+            url: '/password',
+            method: 'PATCH',
+            data: JSON.stringify($('#form-change').serializeArray()),
+            contentType: 'application/json',
+            dataType: 'json'
+          }).done(function (response) {
+            $( "#form-change").find("input[type=text], input[type=password]").val("");
+            $( "#dialog-changepwd" ).dialog( "close" );
+            $( '#errorbox').hide();
+            $( '#resultbox').show();
+            $( '#resultmsg').html( response.message);
+          }).fail(function () {
+            $( "#dialog-changepwd" ).dialog( "close" );
+            $( '#resultbox').hide();
+            $( '#errorbox').show();
+            $( '#errormsg').html( "Something went wrong.");
+          });
         },
         "Cancel": function() {
           $( this ).dialog( "close" );
         }
-      },
-      close: function() {
-          // clean all fields
-          $("dialog-changepwd input").each().val( "" ).removeClass( "ui-state-error" );
       }
     });
     
     $( "a#deletepwd").click( function() {
-        var id = $( this).siblings( ".id").get(0).value;
-        var username = $( this).siblings( ".username").get(0).value;
-        $("#dialog-deletepwd #id").attr('value', id);
-        $("#dialog-deletepwd #id_label").html( id);
-        $("#dialog-deletepwd #username").attr('value', username);
-        $("#dialog-deletepwd #username_label").html( username);
+        var data = $( this).parents("tr.data")[0].dataset;
+        $("#dialog-deletepwd #id").attr('value', data.id);
+        $("#dialog-deletepwd #id_label").html( data.id);
+        $("#dialog-deletepwd #username").attr('value', data.username);
+        $("#dialog-deletepwd #username_label").html( data.username);
         $("#dialog-deletepwd" ).dialog( "open" );
     });
     
@@ -80,15 +134,33 @@ $(document).ready(function() {
       modal: true,
       buttons: {
         "Delete": function() {
-          $( "form#form-delete").submit();
+          jQuery.ajax({
+            url: '/password',
+            method: 'DELETE',
+            data: JSON.stringify($('#form-delete').serializeArray()),
+            contentType: 'application/json',
+            dataType: 'json'
+          }).done(function (response) {
+            var id = $('#form-delete #id').attr('value');
+            console.log(id);
+            var tr = $(".entrytable tr[data-id='" + id + "']")[0];
+			console.log(tr);
+            $( "#form-delete").find("input[type=text], input[type=password]").val("");
+            $( "#dialog-deletepwd" ).dialog( "close" );
+            $( '#errorbox').hide();
+            $( '#resultbox').show();
+            $( '#resultmsg').html( response.message);
+            $( '.entrytable').dataTable().fnDeleteRow( tr);
+          }).fail(function () {
+            $( "#dialog-delete" ).dialog( "close" );
+            $( '#resultbox').hide();
+            $( '#errorbox').show();
+            $( '#errormsg').html( "Something went wrong.");
+          });
         },
         "Cancel": function() {
           $( this ).dialog( "close" );
         }
-      },
-      close: function() {
-          // clean all fields
-          $("dialog-deletepwd input").each().val( "" ).removeClass( "ui-state-error" );
       }
     });
     

data/resources/views/addnewsite.erb

@@ -1,5 +1,5 @@
 <div id="dialog-addnewsite" title="Add new site" class="dialog">
-  <form id="form-add" action="/password" method="post">
+  <form id="form-add">
       <fieldset>
         <label for="name">Site-ID</label>
         <input type="text" name="id" id="id" class="text ui-widget-content ui-corner-all" />
@@ -7,6 +7,8 @@
         <input type="text" name="username" id="username" class="text ui-widget-content ui-corner-all" />
         <label for="password">Password</label>
         <input type="password" name="password" id="password" class="text ui-widget-content ui-corner-all" />
+        <label for="url">Url</label>
+        <input type="text" name="url" id="url" class="text ui-widget-content ui-corner-all" />
       </fieldset>
   </form>
 </div>

data/resources/views/changepwd.erb

@@ -1,6 +1,5 @@
 <div id="dialog-changepwd" title="Change password" class="dialog">
-  <form id="form-change" action="/password" method="post">
-      <input type="hidden" name="_method" value="PATCH"/>
+  <form id="form-change">
       <input type="hidden" name="id" id="id"/>
       <input type="hidden" name="username" id="username"/>
       <fieldset>
@@ -10,6 +9,8 @@
         <label class="labelfield ui-widget-content ui-corner-all"><span id="username_label"></span></label>
         <label for="password">Password</label>
         <input type="password" name="password" id="password" class="text ui-widget-content ui-corner-all" />
+        <label for="url">Url</label>
+        <input type="text" name="url" id="url" class="text ui-widget-content ui-corner-all" />
       </fieldset>
   </form>
 </div>

data/resources/views/deletepwd.erb

@@ -1,6 +1,5 @@
 <div id="dialog-deletepwd" title="Delete password" class="dialog">
-  <form id="form-delete" action="/password" method="post">
-      <input type="hidden" name="_method" value="DELETE"/>
+  <form id="form-delete">
       <input type="hidden" name="id" id="id"/>
       <input type="hidden" name="username" id="username"/>
       <fieldset>

data/resources/views/entryrow.erb

@@ -1,4 +1,4 @@
-<tr>
+<tr class="data" data-id="<%= store.id %>" data-username="<%= store.username %>" data-url="<%= store.url %>">
     <td>
         <%= store.id %>
     </td>
@@ -6,10 +6,13 @@
         <%= store.username %>
     </td>
     <td>
-        <input type="hidden" class="id" value="<%= store.id %>"/>
-        <input type="hidden" class="username" value="<%= store.username %>"/>
-        <a href="/password?id=<%= u(store.id) %>&amp;username=<%= u(store.username) %>" class="button">Copy</a>
+    	<a href="<%= store.url %>" target="_blank">
+        	<%= store.url %>
+      	</a>
+    </td>
+    <td>
+        <a id="copypwd" class="button">Copy</a>
         <a id="changepwd" class="button">Change</a>
-        <a id="deletepwd" class="button">Delete</a>                            
+        <a id="deletepwd" class="button">Delete</a>
     </td>
 </tr>

data/resources/views/index.erb

@@ -3,6 +3,22 @@
 <div class="spacebelow">
     <a id="addnew" class="button">Add new site</a>
 </div>
+<div class="ui-widget" id="resultbox">
+    <div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;">
+        <p>
+            <span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
+            <span id="resultmsg"></span>
+        </p>
+    </div>
+</div>
+<div class="ui-widget" id="errorbox">
+    <div class="ui-state-error ui-corner-all" style="padding: 0 .7em;">
+        <p>
+            <span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>
+            <span id="errormsg"></span>
+        </p>
+    </div>
+</div>
 <div class="entries">
     <table class="entrytable">
         <thead>
@@ -12,6 +28,9 @@
             <th>
                 Username
             </th>
+            <th>
+                Url
+            </th>
             <th>
                 Password functions
             </th>

data/resources/views/layout.erb

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
     <head>
         <title> Lockr password management </title>

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lockr
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Marc Doerflinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.13
+        version: 1.6.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.13
+        version: 1.6.20
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.4
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -130,12 +144,12 @@ description: "Lockr is a password manager that features a local web interface \n
 email: info@byteblues.com
 executables:
 - lockr
-- httplockr.rb
+- weblockr
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/httplockr.rb
 - bin/lockr
+- bin/weblockr
 - lib/lockr/action/add.rb
 - lib/lockr/action/base.rb
 - lib/lockr/action/list.rb

data/bin/httplockr.rb

@@ -1,65 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'lockr/http/httplockrinit'
-require 'erb'
-require 'clipboard'  
-require 'padrino-helpers'
-
-include ERB::Util
-
-init = HttpLockrInit.new()
-init.start()
-
-# now start sinatra
-require 'sinatra'
-
-if init.getLoadBrowser
-  require "browser_gui"  
-end
-
-register Padrino::Helpers
-
-set :pwdmgr, init.getPwdMgr()
-# server config
-set :public_dir, File.expand_path('../../resources/static', __FILE__) 
-set :bind, '127.0.0.1'
-set :port, 32187
-set :views, File.expand_path('../../resources/views', __FILE__) 
-enable :run
- 
-get '/' do
-  dir = settings.pwdmgr.list()
-  erb :index, :locals => { :directory => dir }
-end
-
-get '/password' do
-  id = params[:id]
-  username = params[:username]
-  settings.pwdmgr.copy_to_clipboard( id, username)
-  redirect '/'
-end
-
-post '/password' do
-  id = params[:id]
-  username = params[:username]
-  password = params[:password]
-  newPwdstore = settings.pwdmgr.add( id, username, password)
-  dir = settings.pwdmgr.list()
-  redirect '/'
-end
-
-patch '/password' do
-  id = params[:id]
-  username = params[:username]
-  password = params[:password]
-  settings.pwdmgr.change( id, username, password)
-  redirect '/'
-end
-
-delete '/password' do
-  id = params[:id]
-  username = params[:username]
-  settings.pwdmgr.delete( id, username)
-  redirect '/'
-end
-