aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Werner Rau2023-06-27 17:11:26 +0200
committerChris Werner Rau2023-06-27 17:11:26 +0200
commitf99ebd729519049edd9cf257cea91bfa628dddbf (patch)
tree168d2d3a9849dc8ea26bc10034854615a0f8e06e
parent900f24a1becfa3a04b5cf68ee69e6910072bf962 (diff)
downloadaur-f99ebd729519049edd9cf257cea91bfa628dddbf.tar.gz
fix: reload file instead of throwing error when expired
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rwxr-xr-xgopass-fuse8
3 files changed, 5 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 38ef8fc77738..538f21bc0d34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,7 @@ pkgbase = gopass-fuse
source = gopass-fuse
source = gopass-fuse.service
source = gopass-fuse.conf
- sha512sums = 4518ec735a7992fbeb976f8954168f134d153668014f54664b0d347643be6464d26cae24292e862b99d8ee13de6f11f393535973c7c34ea92280d1963eb330f6
+ sha512sums = 43b89e85d7807926c43f98eec0f40d5c28cf0a71fb3f6b27cd86b66c06347eea374228c18f775c734e9b375af2b1bdd9e06a1121b19bfe8b3440620dfe276e4a
sha512sums = 7813e0272a2bda08b0ec477a3b7d1bf742c75ef0a83f0fe1a712ecc444c23121e6b3b42024d9076141af1c6ed9e57aa9a3bf11b66d3e5019e4116d7ff4ab0e98
sha512sums = 3dc50f27806bb67aa8c99a8d305c5ec7b83de2c6a5d506852492919518d86d06ffc996dfa9813019fe60da3e520a33f386486cd93215c7ae12d525d2bb9963d2
diff --git a/PKGBUILD b/PKGBUILD
index 136f635fd35c..1aee0284d21a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ license=('APACHE')
arch=('x86_64')
depends=('gopass' 'python-fusepy' 'python-dateutil')
source=("$pkgname" "$pkgname.service" "$pkgname.conf")
-sha512sums=('4518ec735a7992fbeb976f8954168f134d153668014f54664b0d347643be6464d26cae24292e862b99d8ee13de6f11f393535973c7c34ea92280d1963eb330f6'
+sha512sums=('43b89e85d7807926c43f98eec0f40d5c28cf0a71fb3f6b27cd86b66c06347eea374228c18f775c734e9b375af2b1bdd9e06a1121b19bfe8b3440620dfe276e4a'
'7813e0272a2bda08b0ec477a3b7d1bf742c75ef0a83f0fe1a712ecc444c23121e6b3b42024d9076141af1c6ed9e57aa9a3bf11b66d3e5019e4116d7ff4ab0e98'
'3dc50f27806bb67aa8c99a8d305c5ec7b83de2c6a5d506852492919518d86d06ffc996dfa9813019fe60da3e520a33f386486cd93215c7ae12d525d2bb9963d2')
diff --git a/gopass-fuse b/gopass-fuse
index dd439772fe6e..424c270b9e66 100755
--- a/gopass-fuse
+++ b/gopass-fuse
@@ -58,10 +58,6 @@ class File(Entry):
@property
def content(self):
- if time() > self.expiration:
- self.loaded = False
- self.__cached_content = None
-
if self.loaded:
return self.__cached_content
raise FuseOSError(errno.EIO)
@@ -198,7 +194,9 @@ class GopassFilesystem(LoggingMixIn, Operations):
return entry
def get_file_content(self, file: File) -> Union[str, None]:
- if not file.loaded:
+ if not file.loaded or time() > file.expiration:
+ file.loaded = False
+ file.content = None
secret: Union[str, None] = get_secret(file)
if secret is None:
raise FuseOSError(errno.EIO)