Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
istex
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
crawlers
istex
Commits
dd94ce88
Verified
Commit
dd94ce88
authored
Mar 19, 2025
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[crypto] app executes properly now
parent
5dc1d983
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
8 deletions
+33
-8
crawlerISTEX.cabal
crawlerISTEX.cabal
+3
-0
flake.nix
flake.nix
+0
-2
ISTEX.hs
src/ISTEX.hs
+30
-6
No files found.
crawlerISTEX.cabal
View file @
dd94ce88
...
@@ -44,6 +44,7 @@ common defaults
...
@@ -44,6 +44,7 @@ common defaults
, servant >= 0.20 && < 0.21
, servant >= 0.20 && < 0.21
, servant-client >= 0.20 && < 0.21
, servant-client >= 0.20 && < 0.21
, text >= 2.0.2 && < 2.2
, text >= 2.0.2 && < 2.2
ghc-options: -Wall -Wunused-imports -Wunused-binds -Wmissing-signatures -Werror
library
library
import:
import:
...
@@ -58,6 +59,8 @@ library
...
@@ -58,6 +59,8 @@ library
build-depends:
build-depends:
bytestring >= 0.11.5 && < 0.15
bytestring >= 0.11.5 && < 0.15
, crypton-connection >= 0.4.2 && < 0.5
, crypton-connection >= 0.4.2 && < 0.5
, crypton-x509-store >= 1.6 && < 1.7
, crypton-x509-system >= 1.6 && < 1.7
, data-default-class >= 0.2 && < 0.3
, data-default-class >= 0.2 && < 0.3
, tls >= 2.1.7 && < 2.4
, tls >= 2.1.7 && < 2.4
default-language: Haskell2010
default-language: Haskell2010
...
...
flake.nix
View file @
dd94ce88
...
@@ -25,8 +25,6 @@
...
@@ -25,8 +25,6 @@
# `cabal`, `hlint` and `haskell-language-server`
# `cabal`, `hlint` and `haskell-language-server`
shell
.
tools
=
{
shell
.
tools
=
{
cabal
=
{};
cabal
=
{};
hlint
=
{};
haskell-language-server
=
{};
};
};
};
};
})
})
...
...
src/ISTEX.hs
View file @
dd94ce88
module
ISTEX
where
module
ISTEX
where
import
Data.ByteString
qualified
as
B
import
Data.Default.Class
(
def
)
import
Data.Text
(
Text
)
import
Data.X509.CertificateStore
(
CertificateStore
)
import
ISTEX.Client
import
ISTEX.Client
import
Network.HTTP.Client
(
newManager
)
import
Network.Connection
(
TLSSettings
(
..
))
import
Network.HTTP.Client.TLS
(
tlsManagerSettings
)
import
Network.HTTP.Client
(
ManagerSettings
,
newManager
)
import
Network.HTTP.Client.TLS
(
mkManagerSettings
)
import
Network.TLS
(
ClientParams
(
..
),
EMSMode
(
AllowEMS
),
Supported
(
..
),
defaultParamsClient
,
sharedCAStore
)
import
Servant.Client
import
Servant.Client
import
System.X509
(
getSystemCertificateStore
)
import
Data.Text
(
Text
)
runIstexAPIClient
::
ClientM
(
Documents
)
->
IO
(
Either
ClientError
Documents
)
runIstexAPIClient
::
ClientM
(
Documents
)
->
IO
(
Either
ClientError
Documents
)
runIstexAPIClient
cmd
=
do
runIstexAPIClient
cmd
=
do
manager'
<-
newManager
tlsManagerSettings
-- manager' <- newManager tlsManagerSettings
scs
<-
getSystemCertificateStore
manager'
<-
newManager
$
getTLSManagerSettings
scs
runClientM
cmd
(
mkClientEnv
manager'
$
BaseUrl
Https
"api.istex.fr"
443
"document"
)
runClientM
cmd
(
mkClientEnv
manager'
$
BaseUrl
Https
"api.istex.fr"
443
"document"
)
-- | https://gitlab.iscpif.fr/gargantext/haskell-gargantext/issues/456
getTLSManagerSettings
::
CertificateStore
->
ManagerSettings
getTLSManagerSettings
scs
=
mkManagerSettings
tlsSettings
Nothing
where
tlsSettings
=
TLSSettings
clientParams
-- See Network.Connection code on how `TLSSettings` is handled to make client params.
-- We need to change EMS and also apply system certificates, as they aren't in the defaults.
clientParams
=
(
defaultParamsClient
""
B
.
empty
)
{
clientSupported
=
supported
,
clientShared
=
def
{
sharedCAStore
=
scs
}
}
supported
=
def
{
supportedExtendedMainSecret
=
AllowEMS
}
getMetadataWith
::
Text
->
Maybe
Int
->
IO
(
Either
ClientError
Documents
)
getMetadataWith
::
Text
->
Maybe
Int
->
IO
(
Either
ClientError
Documents
)
getMetadataWith
q
n
=
do
getMetadataWith
q
n
=
do
runIstexAPIClient
$
runIstexAPIClient
$
...
@@ -25,7 +47,9 @@ type ErrorHandler = ClientError -> IO ()
...
@@ -25,7 +47,9 @@ type ErrorHandler = ClientError -> IO ()
runIstexScrollAPIClient
::
ClientM
(
ScrollResponse
)
->
IO
(
Either
ClientError
ScrollResponse
)
runIstexScrollAPIClient
::
ClientM
(
ScrollResponse
)
->
IO
(
Either
ClientError
ScrollResponse
)
runIstexScrollAPIClient
cmd
=
do
runIstexScrollAPIClient
cmd
=
do
manager'
<-
newManager
tlsManagerSettings
-- manager' <- newManager tlsManagerSettings
scs
<-
getSystemCertificateStore
manager'
<-
newManager
$
getTLSManagerSettings
scs
runClientM
cmd
(
mkClientEnv
manager'
$
BaseUrl
Https
"api.istex.fr"
443
"document"
)
runClientM
cmd
(
mkClientEnv
manager'
$
BaseUrl
Https
"api.istex.fr"
443
"document"
)
maxScrollPages
::
Int
maxScrollPages
::
Int
...
@@ -47,7 +71,7 @@ getMetadataScroll q scroll scrollId page = do
...
@@ -47,7 +71,7 @@ getMetadataScroll q scroll scrollId page = do
scrollId
scrollId
case
eRes
of
case
eRes
of
Left
err
->
pure
$
Left
err
Left
err
->
pure
$
Left
err
Right
res
@
(
ScrollResponse
{
..
})
->
do
Right
_
res
@
(
ScrollResponse
{
..
})
->
do
eDocs
<-
getMetadataScroll
q
scroll
_scroll_scrollId
(
page
+
1
)
eDocs
<-
getMetadataScroll
q
scroll
_scroll_scrollId
(
page
+
1
)
case
eDocs
of
case
eDocs
of
Left
err
->
pure
$
Left
err
Left
err
->
pure
$
Left
err
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment