Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-31 04:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

removes more timing calls

Browse Source
This commit is contained in:
Keagan McClelland
2020-11-30 22:08:45 -07:00
parent 5fa2c563cc
commit 4f1eb69378
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
agent/src/Lib/Ssl.hs
View File

@@ -304,18 +304,15 @@ data DeriveCertificate = DeriveCertificate
, duration :: Integer , duration :: Integer
} }
writeIntermediateCert :: MonadIO m => DeriveCertificate -> m (ExitCode, String, String) writeIntermediateCert :: MonadIO m => DeriveCertificate -> m (ExitCode, String, String)
writeIntermediateCert DeriveCertificate {..} = liftIO $ fromSys $ interpret $ do writeIntermediateCert DeriveCertificate {..} = liftIO $ interpret $ do
lift . lift $ time "Intermediate Cert Write Start"
-- openssl genrsa -out dump/int.key 4096 -- openssl genrsa -out dump/int.key 4096
segment $ openssl [i|ecparam -genkey -name prime256v1 -noout -out #{applicantKeyPath}|] segment $ openssl [i|ecparam -genkey -name prime256v1 -noout -out #{applicantKeyPath}|]
lift . lift $ time "Generate intermediate RSA Key"
-- openssl req -new -config dump/int-csr.conf -key dump/int.key -nodes -out dump/int.csr -- openssl req -new -config dump/int-csr.conf -key dump/int.key -nodes -out dump/int.csr
segment $ openssl [i|req -new segment $ openssl [i|req -new
-config #{applicantConfPath} -config #{applicantConfPath}
-key #{applicantKeyPath} -key #{applicantKeyPath}
-nodes -nodes
-out #{applicantCertPath <> ".csr"}|] -out #{applicantCertPath <> ".csr"}|]
lift . lift $ time "Generate intermediate CSR"
-- openssl x509 -CA dump/ca.crt -CAkey dump/ca.key -CAcreateserial -days 3650 -req -in dump/int.csr -out dump/int.crt -- openssl x509 -CA dump/ca.crt -CAkey dump/ca.key -CAcreateserial -days 3650 -req -in dump/int.csr -out dump/int.crt
segment $ openssl [i|ca -batch segment $ openssl [i|ca -batch
-config #{signingConfPath} -config #{signingConfPath}
@@ -327,21 +324,16 @@ writeIntermediateCert DeriveCertificate {..} = liftIO $ fromSys $ interpret $ do
-notext -notext
-in #{applicantCertPath <> ".csr"} -in #{applicantCertPath <> ".csr"}
-out #{applicantCertPath}|] -out #{applicantCertPath}|]
lift . lift $ time "Sign intermediate certificate"
liftIO $ readFile signingCertPath >>= appendFile applicantCertPath liftIO $ readFile signingCertPath >>= appendFile applicantCertPath
lift . lift $ time "Update certificate chain"
writeLeafCert :: MonadIO m => DeriveCertificate -> Text -> Text -> m (ExitCode, String, String) writeLeafCert :: MonadIO m => DeriveCertificate -> Text -> Text -> m (ExitCode, String, String)
writeLeafCert DeriveCertificate {..} hostname torAddress = liftIO $ fromSys $ interpret $ do writeLeafCert DeriveCertificate {..} hostname torAddress = liftIO $ interpret $ do
lift . lift $ time "Leaf Cert Write Start"
segment $ openssl [i|ecparam -genkey -name prime256v1 -noout -out #{applicantKeyPath}|] segment $ openssl [i|ecparam -genkey -name prime256v1 -noout -out #{applicantKeyPath}|]
lift . lift $ time "Generate leaf RSA Key"
segment $ openssl [i|req -config #{applicantConfPath} segment $ openssl [i|req -config #{applicantConfPath}
-key #{applicantKeyPath} -key #{applicantKeyPath}
-new -new
-addext subjectAltName=DNS:#{hostname},DNS:*.#{hostname},DNS:#{torAddress},DNS:*.#{torAddress} -addext subjectAltName=DNS:#{hostname},DNS:*.#{hostname},DNS:#{torAddress},DNS:*.#{torAddress}
-out #{applicantCertPath <> ".csr"}|] -out #{applicantCertPath <> ".csr"}|]
lift . lift $ time "Generate leaf CSR"
segment $ openssl [i|ca -batch segment $ openssl [i|ca -batch
-config #{signingConfPath} -config #{signingConfPath}
-rand_serial -rand_serial
@@ -353,9 +345,7 @@ writeLeafCert DeriveCertificate {..} hostname torAddress = liftIO $ fromSys $ in
-in #{applicantCertPath <> ".csr"} -in #{applicantCertPath <> ".csr"}
-out #{applicantCertPath} -out #{applicantCertPath}
|] |]
lift . lift $ time "Sign leaf CSR"
liftIO $ readFile signingCertPath >>= appendFile applicantCertPath liftIO $ readFile signingCertPath >>= appendFile applicantCertPath
lift . lift $ time "Update certificate chain"
openssl :: MonadIO m => Text -> m (ExitCode, String, String) openssl :: MonadIO m => Text -> m (ExitCode, String, String)
openssl = liftIO . ($ "") . readProcessWithExitCode "openssl" . fmap toS . words openssl = liftIO . ($ "") . readProcessWithExitCode "openssl" . fmap toS . words
@@ -374,14 +364,3 @@ segment action = (lift . lift) action >>= \case
(ExitSuccess, o, e) -> modify (bimap (<> o) (<> e)) (ExitSuccess, o, e) -> modify (bimap (<> o) (<> e))
(ec , o, e) -> modify (bimap (<> o) (<> e)) *> throwE ec (ec , o, e) -> modify (bimap (<> o) (<> e)) *> throwE ec
{-# INLINE segment #-} {-# INLINE segment #-}
time :: MonadIO m => Text -> StateT UTCTime m ()
time t = do
last <- Startlude.get
now <- liftIO getCurrentTime
putStrLn @Text [i|#{t}: #{diffUTCTime now last}|]
put now
fromSys :: MonadIO m => StateT UTCTime m a -> m a
fromSys m = liftIO getCurrentTime >>= evalStateT m