prepare rebase

Author: pdavid-cssopra

eodag/api/product/_assets.py

@@ -113,7 +113,7 @@ def _pre_check(self, asset_key: str, asset_values: dict[str, Any]) -> bool:
             asset_values["order_link"] = order_link
 
         if "href" not in asset_values and "order_link" not in asset_values:
-            logger.warning(
+            logger.debug(
                 "asset '{}' skipped ignored because neither href nor order_link is available".format(
                     asset_key
                 ),

eodag/plugins/authentication/eoiam/eoiamsessionauth.py

@@ -19,6 +19,7 @@
 
 from typing import TYPE_CHECKING
 
+import requests
 from requests.auth import AuthBase
 
 if TYPE_CHECKING:
@@ -37,19 +38,19 @@ def __call__(self, request):
         This is called by requests before sending a request.
         We use the session's get/post to ensure login happens if needed.
         """
-        session = self.auth_plugin.session
 
-        # Lazy login
-        if not self.auth_plugin._logged_in:
+        session = self.auth_plugin.session
+        try:
             resp = session.get(request.url, allow_redirects=True)
             if "Earth Observation Identity and Access Management System" in resp.text:
-                self.auth_plugin._login_from_html(resp.text, req_url=request.url)
-            self.auth_plugin._logged_in = True
+                resp = self.auth_plugin._login_from_html(resp.text, request.url)
 
-        # Copy cookies from session to the request
-        request.prepare_cookies(self.auth_plugin.session.cookies)
+            # Copy cookies from session to the request
+            request.prepare_cookies(self.auth_plugin.session.cookies)
 
-        return request
+            return request
+        finally:
+            self.auth_plugin.session = requests.Session()
 
 
 __all__ = ["EOIAMSessionAuth"]

eodag/resources/providers.yml

@@ -7408,6 +7408,29 @@
         - $.null
       eodag:quicklook: '$.Assets[?(@.Type="QUICKLOOK")].DownloadLink'
       eodag:thumbnail: '$.Assets[?(@.Type="QUICKLOOK")].DownloadLink'
+      assets: '$.Assets'
+    assets_mapping:
+      download_link:
+        href: '$.S3Path.`sub(/^(.*)$/, s3:/\\1)`'
+        roles:
+        - 'archive'
+        - 'data'
+        type: 'application/octet-stream'
+        order:status: '{$.Online#get_group_name((?P<succeeded>True)|(?P<orderable>False))}'
+      quicklook:
+        # Mixed protocol makes error, http with S3 downloader
+        href: '$.Assets[?(@.Type="QUICKLOOK")].DownloadLink'
+        title: "quicklook"
+        roles:
+        - 'overwiev'
+        type: 'image/jpeg'
+      thumbnail:
+        # Mixed protocol makes error, http with S3 downloader
+        href: '$.Assets[?(@.Type="QUICKLOOK")].DownloadLink'
+        title: "quicklook"
+        roles:
+        - 'overwiev'
+        type: 'image/jpeg'
   download: !plugin
     type: AwsDownload
     s3_endpoint: 'https://eodata.dataspace.copernicus.eu'

tests/units/auth_plugins/test_eoiamauth.py

@@ -17,10 +17,13 @@
 
 from unittest import mock
 
+import requests
 import responses
+from requests import Request
 from requests.auth import AuthBase
 
 from eodag.api.provider import ProvidersDict
+from eodag.plugins.authentication.eoiam import EOIAMSessionAuth
 from eodag.plugins.manager import PluginManager
 from eodag.utils.exceptions import AuthenticationError, MisconfiguredError
 from tests.units.auth_plugins.base import BaseAuthPluginTest
@@ -107,9 +110,9 @@ def test_plugins_auth_eoiam_authenticate_no_login_required(self):
         auth = auth_plugin.authenticate()
         req = mock.Mock(headers={})
         req.url = "http://test.url"
-        auth(req)
-
-        self.assertFalse(auth_plugin._logged_in is False)
+        with mock.patch.object(auth_plugin, "_login_from_html") as mock_login_from_html:
+            auth(req)
+            mock_login_from_html.assert_not_called()
 
     @responses.activate
     def test_plugins_auth_eoiam_login_from_html_success(self):
@@ -556,3 +559,74 @@ def test_plugins_auth_eoiam_data_access_required(self):
             AuthenticationError, f"Data access request required: .* {final_url}"
         ):
             auth_plugin._login_from_html(login_html, req_url="http://test.url")
+
+    def test_eoiam_session_auth_call_triggers_login_and_prepares_cookies(self):
+        """_EOIAMSessionAuth.__call__ should trigger login when landing on EOIAM page"""
+        auth_plugin = self.get_auth_plugin("foo_provider")
+        auth_plugin.config.credentials = {
+            "username": "test_user",
+            "password": "test_pass",
+        }
+
+        # prepare a requests PreparedRequest
+        req = Request("GET", "http://service.test/resource").prepare()
+
+        # initial session.get returns EOIAM page
+        initial_resp = requests.Response()
+        initial_resp._content = (
+            b"Earth Observation Identity and Access Management System"
+        )
+        initial_resp.url = "http://login"
+
+        # login result is a normal response
+        login_result = requests.Response()
+        login_result._content = b"{}"
+
+        old_session = auth_plugin.session
+
+        with mock.patch.object(auth_plugin.session, "get", return_value=initial_resp):
+            with mock.patch.object(
+                auth_plugin, "_login_from_html", return_value=login_result
+            ) as mock_login:
+                # ensure there is a cookie jar so prepare_cookies can operate
+                jar = requests.cookies.RequestsCookieJar()
+                jar.set("sid", "1234", domain="service.test", path="/")
+                auth_plugin.session.cookies = jar
+
+                auth = EOIAMSessionAuth(auth_plugin)
+                returned = auth(req)
+
+                mock_login.assert_called_once_with(initial_resp.text, req.url)
+                self.assertIs(returned, req)
+
+        self.assertIsInstance(auth_plugin.session, requests.Session)
+        self.assertIsNot(auth_plugin.session, old_session)
+
+    def test_eoiam_session_auth_call_resets_session_on_login_error(self):
+        """_EOIAMSessionAuth.__call__ should reset session even when login fails"""
+        auth_plugin = self.get_auth_plugin("foo_provider")
+        auth_plugin.config.credentials = {
+            "username": "test_user",
+            "password": "test_pass",
+        }
+
+        req = Request("GET", "http://service.test/resource").prepare()
+        initial_resp = requests.Response()
+        initial_resp._content = (
+            b"Earth Observation Identity and Access Management System"
+        )
+        initial_resp.url = "http://login"
+
+        old_session = auth_plugin.session
+        with mock.patch.object(auth_plugin.session, "get", return_value=initial_resp):
+            with mock.patch.object(
+                auth_plugin,
+                "_login_from_html",
+                side_effect=AuthenticationError("boom"),
+            ):
+                auth = EOIAMSessionAuth(auth_plugin)
+                with self.assertRaises(AuthenticationError):
+                    auth(req)
+
+        self.assertIsInstance(auth_plugin.session, requests.Session)
+        self.assertIsNot(auth_plugin.session, old_session)