pwnedkeys-filter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b916d185473c8a9bb1a2cc28036121d7c015af4abc287a4cc778f91d8184ea5
-  data.tar.gz: 3622ef85be404de370844c1fcede849a43e536d4c8261d43285ad45cc5d7ded4
+  metadata.gz: 796245e9ca46b1a37b657cac0f5cbd0157c132e7f1d887e5f2f4f1392e61473c
+  data.tar.gz: 37806ed3fe2de6c008ccc2cf7de48c1a73d426d29e54aadd7b7a77496f31f4f7
 SHA512:
-  metadata.gz: e5a97277a35b9f2dd1901ab599bd3de39954c8bfceb868f3c33a3b275bc7390d2bb81a988d660d5f88d6cb5caf8043cacc830b02ebf14d4cb6d5d92094dce64a
-  data.tar.gz: 9d1ee32b9cec58d5d235aa569192ddbd7fecff7db735217d925d2b9ddbaf46d99e0766388300110227edb7e3f5c8dd25f575ccc20654615020cd8e534b783ab5
+  metadata.gz: 34d5b2e319c3018c0778489ef5896a3b6a09d1b0bde206daef1d61452072f7cddfb7754a14ff207131c093e1c1780910c190a29b51f0ad5a42da155e7d158f4b
+  data.tar.gz: 47bf7be5f1ff4a5e6b55a9626c513b40117a647e3215b219b8204a60d50c2d93ec928926fdd495500b41619f28d6be60cc90efeca0136819eba645d01f2d330d

data/lib/pwnedkeys/filter.rb

@@ -182,7 +182,11 @@ module Pwnedkeys
       filter = Pwnedkeys::Filter.new(filename)
 
       if block_given?
-        yield filter
+        begin
+          yield filter
+        ensure
+          filter.close
+        end
       else
         filter
       end
@@ -242,28 +246,34 @@ module Pwnedkeys
 
       spki = spkify(key)
 
-      filter_positions(spki.to_der).each do |n|
-        @fd.seek(n / 8 + @header.header_size, :SET)
-        byte = @fd.read(1).ord
-        @fd.seek(-1, :CUR)
+      begin
+        @fd.flock(File::LOCK_EX)
+        filter_positions(spki.to_der).each do |n|
+          @fd.seek(n / 8 + @header.header_size, :SET)
+          byte = @fd.read(1).ord
+          @fd.seek(-1, :CUR)
 
-        mask = 2 ** (7 - (n % 8))
-        new_byte = byte | mask
+          mask = 2 ** (7 - (n % 8))
+          new_byte = byte | mask
 
-        @fd.write(new_byte.chr)
-      end
+          @fd.write(new_byte.chr)
+        end
 
-      @header.entry_added!
+        @header.entry_added!
 
-      # Only update the revision if this is the first add in this filter,
-      # because otherwise the revision counter would just be the same as the
-      # entry counter, and that would be pointless.
-      unless @already_modified
-        @header.update!
-      end
+        # Only update the revision if this is the first add in this filter,
+        # because otherwise the revision counter would just be the same as the
+        # entry counter, and that would be pointless.
+        unless @already_modified
+          @header.update!
+        end
 
-      @fd.seek(0)
-      @fd.write(@header.to_s)
+        @fd.seek(0)
+        @fd.write(@header.to_s)
+        @fd.fdatasync
+      ensure
+        @fd.flock(File::LOCK_UN)
+      end
 
       @already_modified = true
     end
@@ -333,12 +343,17 @@ module Pwnedkeys
     end
 
     def filter_bits(s)
-      filter_positions(s).map do |n|
-        @fd.seek(n / 8 + @header.header_size, :SET)
-        byte = @fd.read(1).ord
-        mask = 2 ** (7 - (n % 8))
-
-        (byte & mask) > 0
+      begin
+        @fd.flock(File::LOCK_SH)
+        filter_positions(s).map do |n|
+          @fd.seek(n / 8 + @header.header_size, :SET)
+          byte = @fd.read(1).ord
+          mask = 2 ** (7 - (n % 8))
+
+          (byte & mask) > 0
+        end
+      ensure
+        @fd.flock(File::LOCK_UN)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwnedkeys-filter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openssl-additions