version 0.3.1

...because I'm an idiot.

.gitignore

@@ -1,3 +1,2 @@
 .stack-work/
-passman.cabal
 *~

ChangeLog.md

@@ -1,5 +1,24 @@
 # Changelog for passman
 
+## 0.3.1
+
+- set maximum version of transformers package
+- allow user to specifiy a temporary master password to retrieve a password
+
+## 0.3.0.2
+
+- more dependency versions
+
+## 0.3.0.1
+
+- updated to latest stackage LTS
+- specified versions for dependencies
+
+## 0.3.0
+
+- updated to more recent LTS snapshot
+- use microlens instead of lens
+
 ## 0.2.1
 
 - refactoring

README.md

@@ -1,7 +1,7 @@
 # passman
 
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as

app/Main.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -22,7 +22,6 @@ License along with this program.  If not, see
 
 module Main where
 
-import Control.Monad (mapM_)
 import Control.Monad.Trans.State as S
 import System.Console.HCL (Request, reqIO, runRequest)
 import System.EasyFile

app/Types.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -24,7 +24,8 @@ License along with this program.  If not, see
 
 module Types (Status (Status), gen, dbPath, masterPass, database) where
 
-import Control.Lens (makeLenses, set, (^.))
+import Lens.Micro (set, (^.))
+import Lens.Micro.TH (makeLenses)
 import System.Random (RandomGen (next, split), StdGen)
 
 import Password

app/UI.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -24,10 +24,11 @@ License along with this program.  If not, see
 
 module UI (getMasterPass, mainMenu) where
 
-import Control.Lens (over, set, view, (^.))
 import Control.Monad (when)
 import Control.Monad.Trans.Class (lift)
 import qualified Control.Monad.Trans.State as S
+import Lens.Micro (over, set, (^.), (.~))
+import Lens.Micro.Extras (view)
 import System.Console.HCL
   ( Request
   , prompt
@@ -161,6 +162,7 @@ selectServ xs = menu "Select Service" $
 servMenu :: String -> S.StateT Status IO ()
 servMenu x = menu x
   [ ( "show password",           showPass x >> servMenu x )
+  , ( "show alternate password", showAltPass x            )
   , ( "edit password",           editPassMenu x           )
   , ( "remove service",          removeServ x             )
   , ( "rename service",          renameServ x             )
@@ -224,16 +226,25 @@ doEditPolicy x = withService x mainMenu $ \d -> do
   editPassMenu x
 
 showPass :: String -> S.StateT Status IO ()
-showPass x = do
+showPass x = withService x
-  lift $ putStrLn ""
-  withService x
   (lift $ putStrLn "The service could not be found in the database.") $
   \d -> do
+    lift $ putStrLn ""
     mp <- S.gets $ view masterPass
     lift $ putStrLn $ case pwGenerate mp d of
       Nothing -> "The password data were not valid."
       Just pw -> "password for " ++ x ++ ": " ++ pw
 
+showAltPass :: String -> S.StateT Status IO ()
+showAltPass srv = do
+  lift $ putStrLn ""
+  old <- S.gets $ view masterPass
+  Just new <- lift $ runRequest $ required $ prompt "alternate master password: " reqPassword
+  S.modify $ masterPass .~ new
+  showPass srv
+  S.modify $ masterPass .~ old
+  servMenu srv
+
 -- TODO: refactor this monstrosity
 editPolicy :: PWPolicy -> Request PWPolicy
 editPolicy policy = do

app/Util.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -33,12 +33,13 @@ module Util
   , save
   ) where
 
-import Control.Lens (over, view)
 import Control.Monad (join)
 import Control.Monad.Trans.Class (lift)
 import qualified Control.Monad.Trans.State as S
 import Data.Aeson (decodeFileStrict, encodeFile)
 import Data.Maybe (fromJust, fromMaybe)
+import Lens.Micro (over)
+import Lens.Micro.Extras (view)
 import System.Console.HCL
   ( Request
   , prompt

package.yaml

@@ -1,10 +1,10 @@
 name:                passman
-version:             0.2.1
+version:             0.3.1
 github:              "jlamothe/passman"
 license:             LGPL-3
 author:              "Jonathan Lamothe"
-maintainer:          "jlamothe1980@gmail.com"
+maintainer:          "jonathan@jlamothe.net"
-copyright:           "(C) 2018, 2019 Jonathan Lamothe"
+copyright:           "(C) 2018-2021 Jonathan Lamothe"
 
 extra-source-files:
 - README.md
@@ -21,11 +21,12 @@ description:         Please see the README on GitHub at <https://github.com/jlam
 
 dependencies:
 - base >= 4.7 && < 5
-- aeson
+- aeson >= 1.5.6.0 && < 1.6
-- bytestring
+- bytestring >= 0.10.12.0 && < 0.11
-- containers
+- containers >= 0.6.2.1 && < 0.7
-- lens
+- microlens >= 0.4.11.2 && < 0.5
-- random
+- microlens-th >= 0.4.3.6 && < 0.5
+- random >=1.1 && < 1.2
 
 ghc-options:
 - -Wall
@@ -33,10 +34,10 @@ ghc-options:
 library:
   source-dirs: src
   dependencies:
-  - base16-bytestring
+  - base16-bytestring >= 0.1.1.7 && < 0.2
-  - base64-bytestring
+  - base64-bytestring >= 1.1.0.0 && < 1.2
-  - SHA
+  - SHA >= 1.6.4.4 && < 1.7
-  - text
+  - text >= 1.2.4.1 && < 1.3
 
 executables:
   passman:
@@ -49,8 +50,8 @@ executables:
     dependencies:
     - passman
     - easy-file >= 0.2.2 && < 0.3
-    - HCL >= 1.7.1 && < 2
+    - HCL >= 1.8 && < 1.9
-    - transformers
+    - transformers >= 0.5.6.2 && < 0.6
 
 tests:
   passman-test:

passman.cabal

@@ -0,0 +1,108 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.33.0.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: e3bd0ca2b360b025666f4503e3115caaaed34c7719487d90ae4d5eb58f9621e9
+
+name:           passman
+version:        0.3.1
+synopsis:       a simple password manager
+description:    Please see the README on GitHub at <https://github.com/jlamothe/passman#readme>
+category:       Security
+homepage:       https://github.com/jlamothe/passman#readme
+bug-reports:    https://github.com/jlamothe/passman/issues
+author:         Jonathan Lamothe
+maintainer:     jonathan@jlamothe.net
+copyright:      (C) 2018-2021 Jonathan Lamothe
+license:        LGPL-3
+license-file:   LICENSE
+build-type:     Simple
+extra-source-files:
+    README.md
+    ChangeLog.md
+
+source-repository head
+  type: git
+  location: https://github.com/jlamothe/passman
+
+library
+  exposed-modules:
+      Password
+  other-modules:
+      Paths_passman
+  hs-source-dirs:
+      src
+  ghc-options: -Wall
+  build-depends:
+      SHA >=1.6.4.4 && <1.7
+    , aeson >=1.5.6.0 && <1.6
+    , base >=4.7 && <5
+    , base16-bytestring >=0.1.1.7 && <0.2
+    , base64-bytestring >=1.1.0.0 && <1.2
+    , bytestring >=0.10.12.0 && <0.11
+    , containers >=0.6.2.1 && <0.7
+    , microlens >=0.4.11.2 && <0.5
+    , microlens-th >=0.4.3.6 && <0.5
+    , random >=1.1 && <1.2
+    , text >=1.2.4.1 && <1.3
+  default-language: Haskell2010
+
+executable passman
+  main-is: Main.hs
+  other-modules:
+      Types
+      UI
+      Util
+      Paths_passman
+  hs-source-dirs:
+      app
+  ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      HCL >=1.8 && <1.9
+    , aeson >=1.5.6.0 && <1.6
+    , base >=4.7 && <5
+    , bytestring >=0.10.12.0 && <0.11
+    , containers >=0.6.2.1 && <0.7
+    , easy-file >=0.2.2 && <0.3
+    , microlens >=0.4.11.2 && <0.5
+    , microlens-th >=0.4.3.6 && <0.5
+    , passman
+    , random >=1.1 && <1.2
+    , transformers >=0.5.6.2 && <0.6
+  default-language: Haskell2010
+
+test-suite passman-test
+  type: exitcode-stdio-1.0
+  main-is: Spec.hs
+  other-modules:
+      Spec.JSON
+      Spec.NewPWData
+      Spec.NewPWDatabase
+      Spec.NewPWPolicy
+      Spec.NewPWSalt
+      Spec.PWGenerate
+      Spec.PWGetService
+      Spec.PWHasService
+      Spec.PWRemoveService
+      Spec.PWSearch
+      Spec.PWSetService
+      Spec.ValidatePWData
+      Spec.ValidatePWDatabase
+      Spec.ValidatePWPolicy
+      Paths_passman
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      HUnit
+    , aeson >=1.5.6.0 && <1.6
+    , base >=4.7 && <5
+    , bytestring >=0.10.12.0 && <0.11
+    , containers >=0.6.2.1 && <0.7
+    , microlens >=0.4.11.2 && <0.5
+    , microlens-th >=0.4.3.6 && <0.5
+    , passman
+    , random >=1.1 && <1.2
+  default-language: Haskell2010

src/Password.hs

@@ -2,9 +2,9 @@
 
 Module:      Password
 Description: a simple password manager
-Copyright:   (C) 2018, 2019 Jonathan Lamothe
+Copyright:   (C) 2018-2021 Jonathan Lamothe
 License:     LGPLv3 (or later)
-Maintainer:  jlamothe1980@gmail.com
+Maintainer:  jonathan@jlamothe.net
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -47,7 +47,6 @@ module Password (
   pwHasService, pwSetService, pwGetService, pwRemoveService, pwSearch
   ) where
 
-import Control.Lens (makeLenses, over, set, to, (^.))
 import Data.Aeson
   ( FromJSON (parseJSON)
   , ToJSON (toJSON)
@@ -67,6 +66,8 @@ import Data.Digest.Pure.SHA
 import qualified Data.Map as M
 import Data.Maybe (fromMaybe)
 import qualified Data.Text as T
+import Lens.Micro (over, set, to, (^.))
+import Lens.Micro.TH (makeLenses)
 import System.Random (RandomGen, randoms, split)
 
 -- | a mapping of service names to password data

stack.yaml

@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-12.21
+resolver: lts-17.10
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -38,7 +38,7 @@ packages:
 # using the same syntax as the packages field.
 # (e.g., acme-missiles-0.3)
 extra-deps:
-- HCL-1.7.1@sha256:7bc617fbc9ba4b1f9c10d9b3e195042c1f031629f86d08253eec87660492d646
+- HCL-1.8@sha256:39ec0da0cd6157f20c395e1b0df474df45efb0088afdaab20bb9dfb3662baf7c,1726
 
 # Override default flag values for local packages and extra-deps
 # flags: {}

stack.yaml.lock

@@ -5,15 +5,15 @@
 
 packages:
 - completed:
-    hackage: HCL-1.7.1@sha256:7bc617fbc9ba4b1f9c10d9b3e195042c1f031629f86d08253eec87660492d646,1627
+    hackage: HCL-1.8@sha256:39ec0da0cd6157f20c395e1b0df474df45efb0088afdaab20bb9dfb3662baf7c,1726
     pantry-tree:
       size: 1223
-      sha256: 5dd9d6b52e85caae6e47d8686be92873e00de14791c4e2c2753492ff288454fe
+      sha256: 5c93c5184dc378de5ecf235aa1a60dc24163ab7e0efad19c8f3bbc94354cf2b8
   original:
-    hackage: HCL-1.7.1@sha256:7bc617fbc9ba4b1f9c10d9b3e195042c1f031629f86d08253eec87660492d646
+    hackage: HCL-1.8@sha256:39ec0da0cd6157f20c395e1b0df474df45efb0088afdaab20bb9dfb3662baf7c,1726
 snapshots:
 - completed:
-    size: 508406
+    size: 567241
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/12/21.yaml
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/10.yaml
-    sha256: 609dd00c32f59e11bb333b9113d9d2e54269627de1268cbb3cc576af8c7b6237
+    sha256: 321b3b9f0c7f76994b39e0dabafdc76478274b4ff74cc5e43d410897a335ad3b
-  original: lts-12.21
+  original: lts-17.10

test/Spec.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as

test/Spec/JSON.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as

test/Spec/NewPWData.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -22,7 +22,7 @@ License along with this program.  If not, see
 
 module Spec.NewPWData (tests) where
 
-import Control.Lens ((^.))
+import Lens.Micro ((^.))
 import System.Random (mkStdGen, StdGen)
 import Test.HUnit (Test  (..), (~?=))
 

test/Spec/NewPWDatabase.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as

test/Spec/NewPWPolicy.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -22,7 +22,7 @@ License along with this program.  If not, see
 
 module Spec.NewPWPolicy (tests) where
 
-import Control.Lens ((^.))
+import Lens.Micro ((^.))
 import Test.HUnit (Test(..), (~?=))
 
 import Password

test/Spec/NewPWSalt.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as

test/Spec/PWGenerate.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -22,8 +22,8 @@ License along with this program.  If not, see
 
 module Spec.PWGenerate (tests) where
 
-import Control.Lens (set, (^.))
 import Data.Maybe (fromJust)
+import Lens.Micro (set, (^.))
 import System.Random (mkStdGen, StdGen)
 import Test.HUnit
   (Test (..)

test/Spec/PWGetService.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as

test/Spec/PWHasService.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as

test/Spec/PWRemoveService.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as

test/Spec/PWSearch.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as

test/Spec/PWSetService.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as

test/Spec/ValidatePWData.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -22,8 +22,8 @@ License along with this program.  If not, see
 
 module Spec.ValidatePWData (tests) where
 
-import Control.Lens (set)
 import qualified Data.ByteString.Lazy as B
+import Lens.Micro (set)
 import System.Random (mkStdGen, StdGen)
 import Test.HUnit (Test (..), (~?=))
 

test/Spec/ValidatePWDatabase.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -22,8 +22,8 @@ License along with this program.  If not, see
 
 module Spec.ValidatePWDatabase (tests) where
 
-import Control.Lens (set)
 import qualified Data.Map as M
+import Lens.Micro (set)
 import System.Random (mkStdGen, StdGen)
 import Test.HUnit (Test (..), (~?=))
 

test/Spec/ValidatePWPolicy.hs

@@ -1,8 +1,8 @@
 {-
 
 passman
-Copyright (C) 2018, 2019 Jonathan Lamothe
+Copyright (C) 2018-2021 Jonathan Lamothe
-<jlamothe1980@gmail.com>
+<jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -22,7 +22,7 @@ License along with this program.  If not, see
 
 module Spec.ValidatePWPolicy (tests) where
 
-import Control.Lens (set)
+import Lens.Micro (set)
 import Test.HUnit (Test(..), (~?=))
 
 import Password