diff options
| -rw-r--r-- | Gpg.hs | 1 | ||||
| -rw-r--r-- | Role/Developer.hs | 10 |
2 files changed, 7 insertions, 4 deletions
@@ -31,6 +31,7 @@ myPublicKey (MySessionKey _ epk) (GpgSign gpgsign) = do gpgSign :: PublicKey -> IO (PerhapsSigned PublicKey) gpgSign pk = do + putStrLn "Using gpg to sign the debug-me session key." -- Write it to a temp file because gpg sometimes is unhappy -- about password prompting when stdin is not connected to -- the console. diff --git a/Role/Developer.hs b/Role/Developer.hs index d3fc11c..6f762a7 100644 --- a/Role/Developer.hs +++ b/Role/Developer.hs @@ -51,17 +51,19 @@ run' runner url = do developer :: TMVar (TVar DeveloperState) -> TMChan (Message Entered) -> TMChan (MissingHashes AnyMessage) -> SessionID -> IO () developer dsv ichan ochan sid = withSessionLogger (Just "remote") sid $ \logger -> do sk <- genMySessionKey - (controlinput, controloutput) <- openControlWindow - displayInControlWindow controlinput - "Using gpg to sign the debug-me session key." spk <- myPublicKey sk (GpgSign True) + (controlinput, controloutput) <- openControlWindow displayInControlWindow controlinput "Connecting to the user's session ..." inRawMode $ do (devstate, startoutput) <- processSessionStart sk ochan logger dsv + displayInControlWindow controlinput + "Connected. You can now see what the user is doing." + displayInControlWindow controlinput + "(But, you can't type anything yet.)" emitOutput startoutput displayInControlWindow controlinput - "Waiting for the user to check your Gnupg key and grant access ..." + "Waiting for the user to check your Gnupg key and grant write access ..." authUser spk ichan ochan devstate logger >>= go controlinput controloutput logger devstate where |