datasette-secrets 0.1a2__tar.gz → 0.1a3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of datasette-secrets might be problematic. Click here for more details.
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/PKG-INFO +1 -1
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets/__init__.py +10 -7
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets.egg-info/PKG-INFO +1 -1
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/pyproject.toml +1 -1
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/tests/test_secrets.py +6 -1
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/LICENSE +0 -0
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/README.md +0 -0
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets/hookspecs.py +0 -0
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets/templates/secrets_index.html +0 -0
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets/templates/secrets_update.html +0 -0
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets.egg-info/SOURCES.txt +0 -0
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets.egg-info/dependency_links.txt +0 -0
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets.egg-info/entry_points.txt +0 -0
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets.egg-info/requires.txt +0 -0
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets.egg-info/top_level.txt +0 -0
- {datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/setup.cfg +0 -0
|
@@ -3,7 +3,7 @@ from cryptography.fernet import Fernet
|
|
|
3
3
|
import dataclasses
|
|
4
4
|
from datasette import hookimpl, Forbidden, Permission, Response
|
|
5
5
|
from datasette.plugins import pm
|
|
6
|
-
from datasette.utils import await_me_maybe
|
|
6
|
+
from datasette.utils import await_me_maybe, sqlite3
|
|
7
7
|
import os
|
|
8
8
|
from typing import Optional
|
|
9
9
|
from . import hookspecs
|
|
@@ -24,12 +24,15 @@ async def get_secret(datasette, secret_name, actor_id=None):
|
|
|
24
24
|
# Now look it up in the database
|
|
25
25
|
config = get_config(datasette)
|
|
26
26
|
db = get_database(datasette)
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
27
|
+
try:
|
|
28
|
+
db_secret = (
|
|
29
|
+
await db.execute(
|
|
30
|
+
"select id, encrypted from datasette_secrets where name = ? order by version desc limit 1",
|
|
31
|
+
(secret_name,),
|
|
32
|
+
)
|
|
33
|
+
).first()
|
|
34
|
+
except sqlite3.OperationalError:
|
|
35
|
+
return None
|
|
33
36
|
if not db_secret:
|
|
34
37
|
return None
|
|
35
38
|
key = Fernet(config["encryption_key"].encode("utf-8"))
|
|
@@ -4,7 +4,7 @@ from datasette import hookimpl
|
|
|
4
4
|
from datasette.app import Datasette
|
|
5
5
|
from datasette.cli import cli
|
|
6
6
|
from datasette.plugins import pm
|
|
7
|
-
from datasette_secrets import get_secret, Secret
|
|
7
|
+
from datasette_secrets import get_secret, Secret, startup
|
|
8
8
|
import pytest
|
|
9
9
|
from unittest.mock import ANY
|
|
10
10
|
|
|
@@ -269,6 +269,11 @@ async def test_get_secret(ds, monkeypatch):
|
|
|
269
269
|
"""
|
|
270
270
|
assert remove_whitespace(expected_html) in remove_whitespace(response.text)
|
|
271
271
|
|
|
272
|
+
# Finally it should still work even if the datasette_secrets table is missing
|
|
273
|
+
await db.execute_write("drop table datasette_secrets")
|
|
274
|
+
monkeypatch.delenv("DATASETTE_SECRETS_EXAMPLE_SECRET")
|
|
275
|
+
assert await get_secret(ds, "EXAMPLE_SECRET") is None
|
|
276
|
+
|
|
272
277
|
|
|
273
278
|
@pytest.mark.asyncio
|
|
274
279
|
async def test_secret_index_page(ds, register_multiple_secrets):
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets/templates/secrets_index.html
RENAMED
|
File without changes
|
{datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets/templates/secrets_update.html
RENAMED
|
File without changes
|
|
File without changes
|
{datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
{datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets.egg-info/entry_points.txt
RENAMED
|
File without changes
|
|
File without changes
|
{datasette_secrets-0.1a2 → datasette_secrets-0.1a3}/datasette_secrets.egg-info/top_level.txt
RENAMED
|
File without changes
|
|
File without changes
|