summaryrefslogtreecommitdiffhomepage
path: root/Role/User.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2017-04-26 14:26:59 -0400
committerJoey Hess <joeyh@joeyh.name>2017-04-26 14:26:59 -0400
commit4989367e8888cbe1457e2c11fad2ebb9cd75fb4f (patch)
tree948f0163187c030a43bc67ccc5f0c6747d4365d9 /Role/User.hs
parent6591e2b974ac22cbc2a06141edef76a775726e11 (diff)
downloaddebug-me-4989367e8888cbe1457e2c11fad2ebb9cd75fb4f.tar.gz
rename fields
Diffstat (limited to 'Role/User.hs')
-rw-r--r--Role/User.hs12
1 files changed, 6 insertions, 6 deletions
diff --git a/Role/User.hs b/Role/User.hs
index 94625c2..7a1c01c 100644
--- a/Role/User.hs
+++ b/Role/User.hs
@@ -69,7 +69,7 @@ type Backlog = NonEmpty Log
data UserState = UserState
{ backLog :: Backlog
, userSessionKey :: MySessionKey
- , userSigVerifier :: SigVerifier
+ , sigVerifier :: SigVerifier
}
-- | Start by establishing our session key, and displaying the starttxt.
@@ -92,7 +92,7 @@ startProtocol starttxt ochan logger = do
newTVarIO $ UserState
{ backLog = l :| []
, userSessionKey = sk
- , userSigVerifier = mempty
+ , sigVerifier = mempty
}
-- | Forward things the user types to the Pty.
@@ -206,7 +206,7 @@ getDeveloperMessage' msg ochan us now = do
if verifySigned sigverifier msg
then return (InputMessage msg)
else return (BadlySignedMessage msg)
- _ -> if verifySigned (userSigVerifier st) msg
+ _ -> if verifySigned (sigVerifier st) msg
then case msg of
ActivityMessage entered -> do
-- Don't need to retain backlog
@@ -227,16 +227,16 @@ getDeveloperMessage' msg ochan us now = do
else return (BadlySignedMessage msg)
-- | Check if the public key a developer presented is one we want to use,
--- and if so, add it to the userSigVerifier.
+-- and if so, add it to the sigVerifier.
checkDeveloperPublicKey :: TMChan (Message Seen) -> TVar UserState -> Logger -> PublicKey -> IO ()
checkDeveloperPublicKey ochan us logger pk = do
now <- getPOSIXTime
-- TODO check gpg sig..
msg <- atomically $ do
st <- readTVar us
- let sv = userSigVerifier st
+ let sv = sigVerifier st
let sv' = sv `mappend` mkSigVerifier pk
- let st' = st { userSigVerifier = sv' }
+ let st' = st { sigVerifier = sv' }
writeTVar us st'
sendDeveloper ochan us (SessionKeyAccepted pk) now
logger $ User msg