From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 18 Sep 2008 18:43:32 +0000 (+0200)
Subject: Handle files not readable by unix permissions
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b1d9d9de58c5d1cc8c1549139e1d13d1a1211e6;p=pwstore

Handle files not readable by unix permissions
---

diff --git a/pws b/pws
index c188a08..85a9ea5 100755
--- a/pws
+++ b/pws
@@ -88,9 +88,14 @@ class GnuPG
 end
 
 class EncryptedFile
-  attr_reader :readable, :encrypted
+  attr_reader :accessible, :encrypted, :readable
 
   def initialize(filename)
+    unless FileTest.readable?(filename)
+      @accessible = false
+      return
+    end
+    @accessible = true
     content = File.read(filename)
     (outtxt, stderrtxt, statustxt) = GnuPG.gpgcall(content, %w{--with-colons --no-default-keyring --secret-keyring=/dev/null --keyring=/dev/null})
     @encrypted = !(statustxt =~ /\[GNUPG:\] NODATA/)
@@ -148,14 +153,14 @@ class Ls
           puts "(other)    #{filename}" if (@all >= 2)
         else
           f = EncryptedFile.new(filename)
-          if f.encrypted
-            if f.readable
-              puts "(ok)       #{filename}"
-            else
-              puts "(locked)   #{filename}" if (@all >= 1)
-            end
-          else
+          if !f.accessible
+            puts "(!perm)    #{filename}"
+          elsif !f.encrypted
             puts "(file)     #{filename}" if (@all >= 2)
+          elsif f.readable
+            puts "(ok)       #{filename}"
+          else
+            puts "(locked)   #{filename}" if (@all >= 1)
           end
         end
       end