lastpass 1.1.0 → 1.2.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+Version 1.2.0
+-------------
+
+- Server secure note support
+
+
 Version 1.1.0
 -------------
 

data/lib/lastpass/parser.rb

@@ -20,15 +20,36 @@ module LastPass
         end
 
         # Parses an account chunk, decrypts and creates an Account object.
+        # May return nil when the chunk does not represent an account.
+        # All secure notes are ACCTs but not all of them strore account
+        # information.
+        #
+        # TODO: Make a test case that covers secure note account
         def self.parse_ACCT chunk, encryption_key
             StringIO.open chunk.payload do |io|
                 id = read_item io
                 name = decode_aes256_auto read_item(io), encryption_key
                 group = decode_aes256_auto read_item(io), encryption_key
                 url = decode_hex read_item io
-                3.times { skip_item io }
+                notes = decode_aes256_auto read_item(io), encryption_key
+                2.times { skip_item io }
                 username = decode_aes256_auto read_item(io), encryption_key
                 password = decode_aes256_auto read_item(io), encryption_key
+                2.times { skip_item io }
+                secure_note = read_item io
+
+                # Parse secure note
+                if secure_note == "1"
+                    17.times { skip_item io }
+                    secure_note_type = read_item io
+
+                    # Only "Server" secure note stores account information
+                    if secure_note_type != "Server"
+                        return nil
+                    end
+
+                    url, username, password = parse_secure_note_server notes
+                end
 
                 Account.new id, name, username, password, url, group
             end
@@ -84,6 +105,26 @@ module LastPass
             end
         end
 
+        def self.parse_secure_note_server notes
+            url = nil
+            username = nil
+            password = nil
+
+            notes.split("\n").each do |i|
+                key, value = i.split ":", 2
+                case key
+                when "Hostname"
+                    url = value
+                when "Username"
+                    username = value
+                when "Password"
+                    password = value
+                end
+            end
+
+            [url, username, password]
+        end
+
         # Reads one chunk from a stream and creates a Chunk object with the data read.
         def self.read_chunk stream
             # LastPass blob chunk is made up of 4-byte ID,

data/lib/lastpass/vault.rb

@@ -36,7 +36,10 @@ module LastPass
                 case i.id
                 when "ACCT"
                     # TODO: Put shared folder name as group in the account
-                    @accounts.push Parser.parse_ACCT i, key
+                    account = Parser.parse_ACCT i, key
+                    if account
+                        @accounts << account
+                    end
                 when "PRIK"
                     rsa_private_key = Parser.parse_PRIK i, encryption_key
                 when "SHAR"

data/lib/lastpass/version.rb

@@ -2,5 +2,5 @@
 # Licensed under the terms of the MIT license. See LICENCE for details.
 
 module LastPass
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
 end

data/spec/parser_spec.rb

@@ -185,6 +185,20 @@ describe LastPass::Parser do
         end
     end
 
+    describe ".parse_secure_note_server" do
+        let(:url) { "url" }
+        let(:username) { "username" }
+        let(:password) { "password" }
+        let(:notes) { "Hostname:#{url}\nUsername:#{username}\nPassword:#{password}" }
+
+        it "returns parsed values" do
+            result = LastPass::Parser.parse_secure_note_server notes
+            expect(result[0]).to eq url
+            expect(result[1]).to eq username
+            expect(result[2]).to eq password
+        end
+    end
+
     describe ".read_chunk" do
         it "returns a chunk" do
             with_chunk_hex "ABCD", "DEADBEEF", padding do |io|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lastpass
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty