clue-api 1.0.1.dev83__tar.gz → 1.0.1.dev91__tar.gz

{clue_api-1.0.1.dev83 → clue_api-1.0.1.dev91}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clue-api
-Version: 1.0.1.dev83
+Version: 1.0.1.dev91
 Summary: Clue distributed enrichment service
 License: MIT
 License-File: LICENSE
@@ -20,7 +20,7 @@ Provides-Extra: server
 Requires-Dist: PyYAML (>=6.0.1,<7.0.0) ; extra == "server"
 Requires-Dist: Werkzeug (>=3.0.2,<4.0.0) ; extra == "server"
 Requires-Dist: apscheduler (>=3.10.4,<4.0.0) ; extra == "server"
-Requires-Dist: authlib (<1.0.0) ; extra == "server"
+Requires-Dist: authlib (<2.0.0) ; extra == "server"
 Requires-Dist: bcrypt (>=4.1.2,<5.0.0) ; extra == "server"
 Requires-Dist: beautifulsoup4 (>=4.13.3,<5.0.0)
 Requires-Dist: cart (>=1.2.3,<2.0.0)
@@ -56,9 +56,6 @@ Description-Content-Type: text/markdown
 To start the API for clue, check to ensure that:
 
 1. Docker is composed up through `dev/docker-compose.yml`
-    1. Note that you may need to set up uchimera container connections if you have not tyet done so:
-    2. `az login && az acr login -n uchimera`
-    3. If you do not have permission, reach out to APA2B.
 2. `cd clue/api`
 3. Run `poetry install` within the clue/api folder to install all dependencies
 4. You may need to run `poetry install --with test,dev,types,plugins --all-extras`
@@ -88,7 +85,7 @@ Troubleshooting:
 
 ## Contributing
 
-See [CONTRIBUTING.md](documentation/CONTRIBUTING.md) for more information
+See [CONTRIBUTING.md](docs/CONTRIBUTING.en.md) for more information
 
 ## FAQ
 
@@ -98,7 +95,7 @@ Run `sudo chmod a+rw /var/log/clue/` and `sudo chmod a+rw /etc/clue/conf/`.
 
 ### How can I add dependencies for my plugin?
 
-See [this section](documentation/CONTRIBUTING.md#external-dependencies) of CONTRIBUTING.md.
+See [this section](docs/CONTRIBUTING.en.md#external-dependencies) of CONTRIBUTING.md.
 
 ### Email rendering does not seem to be working?
 

{clue_api-1.0.1.dev83 → clue_api-1.0.1.dev91}/README.md

@@ -3,9 +3,6 @@
 To start the API for clue, check to ensure that:
 
 1. Docker is composed up through `dev/docker-compose.yml`
-    1. Note that you may need to set up uchimera container connections if you have not tyet done so:
-    2. `az login && az acr login -n uchimera`
-    3. If you do not have permission, reach out to APA2B.
 2. `cd clue/api`
 3. Run `poetry install` within the clue/api folder to install all dependencies
 4. You may need to run `poetry install --with test,dev,types,plugins --all-extras`
@@ -35,7 +32,7 @@ Troubleshooting:
 
 ## Contributing
 
-See [CONTRIBUTING.md](documentation/CONTRIBUTING.md) for more information
+See [CONTRIBUTING.md](docs/CONTRIBUTING.en.md) for more information
 
 ## FAQ
 
@@ -45,7 +42,7 @@ Run `sudo chmod a+rw /var/log/clue/` and `sudo chmod a+rw /etc/clue/conf/`.
 
 ### How can I add dependencies for my plugin?
 
-See [this section](documentation/CONTRIBUTING.md#external-dependencies) of CONTRIBUTING.md.
+See [this section](docs/CONTRIBUTING.en.md#external-dependencies) of CONTRIBUTING.md.
 
 ### Email rendering does not seem to be working?
 

{clue_api-1.0.1.dev83 → clue_api-1.0.1.dev91}/clue/api/v1/auth.py

@@ -125,7 +125,7 @@ def login(**_) -> dict[str, Any]:  # noqa: C901
                 uri = urlparse(referer if referer else request.host_url)
                 port_portion = ":" + str(uri.port) if uri.port else ""
                 redirect_uri = f"{uri.scheme}://{uri.hostname}{port_portion}/login?provider={oauth_provider}"
-                return provider.authorize_redirect(redirect_uri=redirect_uri)
+                return provider.authorize_redirect(redirect_uri=redirect_uri, nonce=request.args.get("nonce", None))
 
             # At this point we know the code exists, so we're good to use that to exchange for an JSON Web Token with
             # user data in it. token_data contains the access token, expiry, refresh token, and id token,

{clue_api-1.0.1.dev83 → clue_api-1.0.1.dev91}/clue/api/v1/registration.py

@@ -40,7 +40,7 @@ def register_application(**kwargs):
             "classification": "TLP:CLEAR",
             "max_classification": "TLP:CLEAR",
             "url": "http://localhost:5008/",
-            "maintainer": "APA2B <apa2b-dl@cyber.gc.ca>",
+            "maintainer": "Example <example@example.com>",
             "datahub_link": "http://example.com",
             "documentation_link": "http://example.com"
         },

{clue_api-1.0.1.dev83 → clue_api-1.0.1.dev91}/clue/api/v1/static.py

@@ -69,7 +69,7 @@ def serve_documentation_file(filename: str, **kwargs) -> dict[str, str]:
     None
 
     Result Example:
-    URL Link: /api/v1/static/docs/alfred-docs.md
+    URL Link: /api/v1/static/docs/howler-docs.md
 
     {"markdown": "Markdown documentation of howler-docs.md"}
 

{clue_api-1.0.1.dev83 → clue_api-1.0.1.dev91}/clue/services/user_service.py

@@ -1,7 +1,7 @@
 from typing import Any
 
 import elasticapm
-from flask import current_app
+from flask import current_app, request
 
 from clue.common.exceptions import (
     AccessDeniedException,
@@ -49,7 +49,9 @@ def parse_user_data(
     provider = oauth.create_client(oauth_provider)
 
     if "id_token" in data:
-        data = provider.parse_id_token(data)
+        data = provider.parse_id_token(
+            data, nonce=request.args.get("nonce", data.get("userinfo", {}).get("nonce", None))
+        )
 
     oauth_provider_config = config.auth.oauth.providers[oauth_provider]
 

{clue_api-1.0.1.dev83 → clue_api-1.0.1.dev91}/pyproject.toml

@@ -146,7 +146,7 @@ log_cli_level = "WARN"
 [tool.poetry]
 package-mode = true
 name = "clue-api"
-version = "1.0.1.dev83"
+version = "1.0.1.dev91"
 description = "Clue distributed enrichment service"
 authors = ["Canadian Centre for Cyber Security <contact@cyber.gc.ca>"]
 license = "MIT"
@@ -205,7 +205,7 @@ prometheus-client = { version = "^0.20.0", optional = true }
 apscheduler = { version = "^3.10.4", optional = true }
 pytz = { version = "^2024.1", optional = true }
 passlib = { version = "^1.7.4", optional = true }
-authlib = { version = "<1.0.0", optional = true }
+authlib = { version = "<2.0.0", optional = true }
 flask-cors = { version = ">=4.0.1,<7.0.0", optional = true }
 flasgger = { version = "^0.9.7.1", optional = true }
 trino = "^0.336.0"