Skip to content

Commit 9b23b33

Browse files
authored
Use default as a basis for TLS connection settings. (#197)
1 parent fd202f7 commit 9b23b33

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

minio-hs.cabal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ common base-settings
117117
, crypton-connection
118118
, cryptonite >= 0.25
119119
, cryptonite-conduit >= 0.2
120+
, data-default-class
120121
, digest >= 0.0.1
121122
, directory
122123
, filepath >= 1.4

src/Network/Minio/Data.hs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import qualified Data.Aeson as A
3535
import qualified Data.ByteArray as BA
3636
import qualified Data.ByteString as B
3737
import qualified Data.ByteString.Lazy as LB
38+
import Data.Default.Class (def)
3839
import qualified Data.HashMap.Strict as H
3940
import qualified Data.Ini as Ini
4041
import qualified Data.List as List
@@ -1115,7 +1116,11 @@ connect :: ConnectInfo -> IO MinioConn
11151116
connect ci = do
11161117
let settings
11171118
| connectIsSecure ci && connectDisableTLSCertValidation ci =
1118-
let badTlsSettings = Conn.TLSSettingsSimple True False False
1119+
let badTlsSettings =
1120+
case def of
1121+
tlsSettings@Conn.TLSSettingsSimple {} ->
1122+
tlsSettings {Conn.settingDisableCertificateValidation = True}
1123+
_ -> def
11191124
in TLS.mkManagerSettings badTlsSettings Nothing
11201125
| connectIsSecure ci = NC.tlsManagerSettings
11211126
| otherwise = defaultManagerSettings

0 commit comments

Comments
 (0)