Switch timetable parsing connection settings from RequireEMS to AllowEMS (#1546)

Author: david-yz-liu

CHANGELOG.md

@@ -61,6 +61,7 @@
 - Upgraded to React v19
 - Added dependabot group for `react` and `react-dom`
 - Switched from Yarn PnP to node-modules to fix issues running tests with Node v20+
+- Switched connection for timetable parsing from `RequireEMS` to `AllowEMS`
 
 ## [0.6.0] - 2024-06-24
 

app/Config.hs

@@ -183,7 +183,7 @@ createReqBody page = object [ "campuses" .= ([] :: [T.Text]),
                         "page" .= page,
                         "pageSize" .= (300 :: Int),
                         "requirementProps" .= ([] :: [T.Text]),
-                        "sessions" .= [T.pack "20249", T.pack "20251", T.pack "20249-20251"],
+                        "sessions" .= [T.pack "20255"],
                         "timePreferences" .= ([] :: [T.Text])
                      ]
 

app/WebParsing/UtsgJsonParser.hs

@@ -6,13 +6,15 @@ import Control.Monad.IO.Class (liftIO)
 import Data.Aeson (FromJSON (parseJSON), decode, encode, withObject, (.!=), (.:), (.:?))
 import Data.Aeson.Types (parseMaybe)
 import Data.ByteString.Lazy.Internal (ByteString)
+import Data.Default.Class (def)
 import qualified Data.Text as T
 import Database.Persist.Sqlite (SqlPersistM, Update, deleteWhere, entityKey, insert, insertMany_,
                                 selectFirst, upsert, (=.), (==.))
 import Database.Tables (EntityField (..), MeetTime (..), Meeting (..), buildTimes)
-import Network.HTTP.Conduit (RequestBody (RequestBodyLBS), httpLbs, method, newManager,
-                             parseRequest, requestBody, requestHeaders, responseBody,
-                             tlsManagerSettings)
+import Network.Connection (TLSSettings (TLSSettingsSimple))
+import Network.HTTP.Conduit (RequestBody (RequestBodyLBS), httpLbs, method, mkManagerSettings,
+                             newManager, parseRequest, requestBody, requestHeaders, responseBody)
+import Network.TLS (EMSMode (AllowEMS), Supported (..))
 
 -- | Parse all timetable data.
 parseTimetable :: IO ()
@@ -29,7 +31,7 @@ makeRequest pageNum = do
     let request' = request {method = "POST", requestBody = RequestBodyLBS $ encode reqBody, requestHeaders = reqHeaders}
 
     -- make the request
-    manager <- liftIO $ newManager tlsManagerSettings
+    manager <- liftIO $ newManager $ mkManagerSettings (TLSSettingsSimple False False False (def { supportedExtendedMainSecret = AllowEMS })) Nothing
     response <- liftIO $ httpLbs request' manager
     return $ responseBody response
 

courseography.cabal

@@ -46,6 +46,8 @@ library
     bytestring,
     Cabal >= 1.16.0,
     containers,
+    crypton-connection,
+    data-default-class,
     directory,
     happstack-server,
     hlint,
@@ -64,6 +66,7 @@ library
     tagsoup,
     text,
     time,
+    tls,
     transformers,
     unordered-containers,
     yaml
@@ -191,6 +194,8 @@ executable courseography
     bytestring,
     conduit,
     containers,
+    crypton-connection,
+    data-default-class,
     diagrams-lib >= 1.3,
     diagrams-svg >= 1.3.1,
     directory,
@@ -226,6 +231,7 @@ executable courseography
     tagsoup,
     text,
     time,
+    tls,
     transformers,
     unordered-containers,
     vector,