diff --git a/src/Tahoe/Download/Internal/Client.hs b/src/Tahoe/Download/Internal/Client.hs index 76865c23dd8f5b030bcaa95d60cb7f7a4ac6e746..308ebe38127ba4b9e60388bd5a4b102c0c8ad5b7 100644 --- a/src/Tahoe/Download/Internal/Client.hs +++ b/src/Tahoe/Download/Internal/Client.hs @@ -7,13 +7,8 @@ import Control.Exception import Control.Monad.IO.Class import qualified Data.ByteString as B import Data.ByteString.Base32 -import qualified Data.ByteString.Base64 as Base64 import qualified Data.Set as Set import qualified Data.Text as T -import Data.Text.Encoding -import Network.Connection -import Network.HTTP.Client (Manager, ManagerSettings (managerModifyRequest), Request (requestHeaders)) -import Network.HTTP.Client.TLS import Network.HTTP.Types (ByteRange) import Network.URI (uriToString) import Servant.Client @@ -24,51 +19,6 @@ import Tahoe.CHK.Server ( import TahoeLAFS.Storage.API (CBORSet (CBORSet), ShareNumber (ShareNumber)) import TahoeLAFS.Storage.Client (NURL, parseNURL, runGBS) --- | Make an HTTPS URL. -https :: String -> Int -> BaseUrl -https host port = - BaseUrl - { baseUrlScheme = Https - , baseUrlHost = host - , baseUrlPort = port - , baseUrlPath = "" - } - -{- | Make an HTTPS manager for the given SPKI hash and swissnum. - - The SPKI hash is _not_ used to authenticate the server! See - https://whetstone.private.storage/privatestorage/tahoe-great-black-swamp/-/issues/27 --} -managerSettingsForService :: T.Text -> T.Text -> ManagerSettings -managerSettingsForService _ swissnum = - (mkManagerSettings tlsSettings sockSettings){managerModifyRequest = pure . authorize} - where - tlsSettings = TLSSettingsSimple True True True - sockSettings = Nothing - swissnumBytes = encodeUtf8 swissnum - swissnumBase64 = Base64.encode swissnumBytes - headerCompleteBytes = B.concat ["Tahoe-LAFS ", swissnumBase64] - authorize req = - req - { requestHeaders = - ( "Authorization" - , headerCompleteBytes - ) : - requestHeaders req - } - --- | Make a manager suitable for use with a Great Black Swamp server. -newGBSManager :: - MonadIO m => - [Char] -> - String -> - m Manager -newGBSManager tubid swissnum = - newTlsManagerWith $ - managerSettingsForService - (T.pack . init $ tubid) - (T.pack swissnum) - {- | An unrecoverable problem arose while attempting to download and/or read some application data. -}