Remove the remembered endLines when a secret is added to the list.

histcleaner.cabal

@@ -40,6 +40,7 @@ library
   exposed-modules:
     HistCleaner
       HistCleaner.Cleaner
+      HistCleaner.Config
       HistCleaner.FileParser
       HistCleaner.Hash
       HistCleaner.SecretStorage

src/HistCleaner/Cleaner.hs

@@ -4,9 +4,9 @@ module HistCleaner.Cleaner where
 
 import Control.Monad.State.Lazy
 import Crypto.Error (CryptoFailable(..))
+import Data.Base64.Types (extractBase64)
 import Data.ByteString (ByteString)
 import Data.ByteString.Base64
-import Data.Base64.Types (extractBase64)
 import qualified Data.ByteString.Char8 as C8
 import Data.ByteString.UTF8 (fromString, toString)
 import Data.Foldable
@@ -18,10 +18,10 @@ import System.IO
 import System.Posix.Files
 import System.Posix.Signals
 
+import HistCleaner.Config
 import HistCleaner.FileParser
 import HistCleaner.Hash
 import qualified HistCleaner.SecretStorage as St
-import HistCleaner.SecretStorage (getConfigFolder)
 
 data CleanResult
   = CSuccess
@@ -177,11 +177,6 @@ storeEndlines filepath prevELinesInfo text = do
               contLines
       C8.writeFile endInfosPath $ C8.unlines $ filteredLines ++ curEndInfo
 
-getEndInfosPath :: IO FilePath
-getEndInfosPath = do
-  configFolderPath <- getConfigFolder
-  pure $ configFolderPath </> "endInfos"
-
 dropAlreadyChecked :: [ByteString] -> [ByteString] -> [ByteString]
 dropAlreadyChecked endLines allLines =
   if length allLines < 3 || length endLines < 3

src/HistCleaner/Config.hs

@@ -0,0 +1,15 @@
+module HistCleaner.Config where
+
+import System.Environment.XDG.BaseDir
+import System.FilePath
+
+getConfigFolder :: IO FilePath
+getConfigFolder = getUserConfigDir "histcleaner"
+
+getEndInfosPath :: IO FilePath
+getEndInfosPath = do
+  configFolderPath <- getConfigFolder
+  pure $ configFolderPath </> "endInfos"
+
+getSecretsFilepath :: IO FilePath
+getSecretsFilepath = getUserConfigFile "histcleaner" "secrets"

src/HistCleaner/SecretStorage.hs

@@ -7,16 +7,16 @@ import Control.DeepSeq
 import Control.Exception
 import Control.Monad
 import Crypto.Error (CryptoFailable(..))
+import Data.Base64.Types (extractBase64)
 import Data.ByteString (ByteString)
 import Data.ByteString.Base64
-import Data.Base64.Types (extractBase64)
 import qualified Data.ByteString.Char8 as C8
-import System.Directory (doesDirectoryExist)
-import System.Environment.XDG.BaseDir
+import System.Directory (doesDirectoryExist, removeFile)
+import System.Posix (ownerModes)
 import System.Posix.Directory (createDirectory)
 
+import HistCleaner.Config
 import qualified HistCleaner.Hash as Hash
-import System.Posix (ownerModes)
 
 data SStorageResult
   = SSuccess
@@ -37,6 +37,7 @@ storeSecret secret = do
           pure $ StoreFail "Secret already stored."
         else do
           storeLine res
+          getEndInfosPath >>= removeFile
           pure SSuccess
 
 -- Storing config & hashes
@@ -92,7 +93,8 @@ getSecrets = do
     (\(e :: IOException) -> do
        salt <- Hash.newSalt
        C8.writeFile filepath $
-         extractBase64 (encodeBase64' salt) <> "\n----------------------------------\n"
+         extractBase64 (encodeBase64' salt) <>
+         "\n----------------------------------\n"
        pure $ Vault salt [])
 
 -- Inverts the list while decoding it
@@ -105,9 +107,3 @@ decodeSecrets input =
         Left _ -> do
           error "Decoding error"
         Right b -> (b : decodeSecrets rest)
-
-getConfigFolder :: IO FilePath
-getConfigFolder = getUserConfigDir "histcleaner"
-
-getSecretsFilepath :: IO FilePath
-getSecretsFilepath = getUserConfigFile "histcleaner" "secrets"