cachedContents for caching passwords read from fd

1 files changed, 23 insertions, 3 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 66b5df6..003317e 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -36,7 +36,7 @@ import Data.Time.Clock.POSIX ( getPOSIXTime )
 import qualified Data.Map as Map
 import qualified Data.ByteString.Lazy as L ( unpack, pack, null, readFile, writeFile
         , ByteString, toChunks )
-import qualified Data.ByteString      as S ( unpack, splitAt, concat, cons )
+import qualified Data.ByteString      as S ( ByteString, unpack, splitAt, concat, cons, spanEnd, hGetContents )
 import qualified Data.ByteString.Lazy.Char8 as Char8 ( span, unpack, break, concat, lines )
 import qualified Crypto.Types.PubKey.ECC as ECC
 import qualified Codec.Binary.Base32 as Base32
@@ -44,12 +44,16 @@ import qualified Codec.Binary.Base64 as Base64
 import qualified Crypto.Hash.SHA1 as SHA1
 import qualified Data.Text as T ( Text, unpack, pack,
         strip, reverse, drop, break, dropAround )
-import System.Posix.Types (EpochTime)
+import qualified System.Posix.Types as Posix
 import System.Posix.Files ( modificationTime, getFileStatus
         , setFileCreationMask, setFileTimes )
 import System.FilePath ( takeDirectory )
 import System.IO (hPutStrLn,withFile,IOMode(..))
 import Data.Binary ( encode )
+import Data.IORef
+import System.Posix.IO (fdToHandle,fdRead)
+
+
 
 import qualified CryptoCoins as CryptoCoins
 import Base58
@@ -610,6 +614,22 @@ seek_key (KeyUidMatch pat) ps = if null bs
     uidStr _                = ""
 
 
+cachedContents :: Posix.Fd -> IO (IO S.ByteString)
+cachedContents fd = do
+    ref <- newIORef Nothing
+    return $ get ref fd
+ where
+    trimCR bs = fst $ S.spanEnd (\x -> x==10 || x==13) bs
+
+    get ref fd = do
+        pw <- readIORef ref 
+        flip (flip maybe return) pw $ do
+        do pwh <- fdToHandle fd -- (read fd)
+           pw <- fmap trimCR $ S.hGetContents pwh
+           writeIORef ref (Just pw)
+           return pw
+        
+
 importPEMKey db' tup = do
             try db' $ \(db',report0) -> do
             r <- doImport doDecrypt 
@@ -1300,7 +1320,7 @@ secretToPublic pkt = pkt
 
 
 
-slurpWIPKeys :: System.Posix.Types.EpochTime -> L.ByteString -> ( [(Word8,Packet)], [L.ByteString])
+slurpWIPKeys :: Posix.EpochTime -> L.ByteString -> ( [(Word8,Packet)], [L.ByteString])
 slurpWIPKeys stamp "" = ([],[])
 slurpWIPKeys stamp cs =
     let (b58,xs) = Char8.span (\x -> elem x base58chars) cs