-
-
Notifications
You must be signed in to change notification settings - Fork 644
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
.json
errors should be returned as JSON
#1949
Comments
Most datasette/datasette/handle_exception.py Lines 19 to 24 in c094dde
datasette/datasette/handle_exception.py Lines 57 to 58 in c094dde
But that code triggers when the URL ends with |
I need a way for those JSON endpoints to communicate back to the Since it gets the It's a bit of a cludge though! |
I'm going to prototype that up to see what it looks like. |
This raises a more complicated issue At some point I'm likely to want to add an HTML interface for creating tables and inserting and updating rows. The obvious URLs for that are the same as for the JSON API: Those endpoints are currently POST only - and can return JSON all the time. If they start accepting form POSTs too they'll need to be able to accept form-encoded data and return HTML instead. That's OK - they can detect incoming JSON thanks to the I think it can still work though: I'll only set |
Sniffing for a datasette/datasette/utils/asgi.py Lines 127 to 135 in 9ad76d2
|
Easiest fix would be to look for Not bullet-proof, so people might occasionally make JSON requests and get back an HTML error - but the documentation can tell people that they need to send those headers if they want to reliably get back JSON error messages. I'm happy with this as a solution. |
Looks like the code I've written for permission checking on datasette/datasette/views/database.py Lines 580 to 584 in 9ad76d2
Which uses this: datasette/datasette/views/base.py Lines 547 to 548 in 9ad76d2
Having two different patterns to return errors is bad, I should fix that. |
Also weird: errors returned by that mechanism look like this: {
"ok": false,
"errors": ["list of error messages"]
} While errors returned by the rest of Datasette look like this: https://latest.datasette.io/fixtures/no_table.json {
"ok": false,
"error": "Table not found: no_table",
"status": 404,
"title": null
} Related: |
I fixed this issue to help research this further: Now this search works: https://ripgrep.datasette.io/-/ripgrep?pattern=return+_error&literal=on&glob=datasette%2F** I wish I had this feature! Looks like I have both |
I got this far: diff --git a/datasette/handle_exception.py b/datasette/handle_exception.py
index 8b7e83e3..31d41e00 100644
--- a/datasette/handle_exception.py
+++ b/datasette/handle_exception.py
@@ -54,7 +54,17 @@ def handle_exception(datasette, request, exception):
headers = {}
if datasette.cors:
add_cors_headers(headers)
- if request.path.split("?")[0].endswith(".json"):
+ # Return JSON error under certain conditions
+ should_return_json = (
+ # URL ends in .json
+ request.path.split("?")[0].endswith(".json")
+ or
+ # Hints from incoming request headers
+ request.headers.get("content-type") == "application/json"
+ or "application/json" in request.headers.get("accept", "")
+ )
+ breakpoint()
+ if should_return_json:
return Response.json(info, status=status, headers=headers)
else:
template = datasette.jinja_env.select_template(templates)
diff --git a/tests/test_api_write.py b/tests/test_api_write.py
index f27d143f..982543a6 100644
--- a/tests/test_api_write.py
+++ b/tests/test_api_write.py
@@ -1140,6 +1140,38 @@ async def test_create_table_permissions(
assert data["errors"] == expected_errors
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+ "headers,expect_json",
+ (
+ ({}, False),
+ ({"Accept": "text/html"}, True),
+ ({"Accept": "application/json"}, True),
+ ({"Content-Type": "application/json"}, True),
+ ({"Accept": "application/json, text/plain, */*"}, True),
+ ({"Content-Type": "application/json"}, True),
+ ({"accept": "application/json, text/plain, */*"}, True),
+ ({"content-type": "application/json"}, True),
+ ),
+)
+async def test_permission_errors_html_and_json(ds_write, headers, expect_json):
+ request_headers = {"Authorization": "Bearer bad_token"}
+ request_headers.update(headers)
+ response = await ds_write.client.post(
+ "/data/-/create",
+ json={},
+ headers=request_headers,
+ )
+ assert response.status_code == 403
+ if expect_json:
+ data = response.json()
+ assert data["ok"] is False
+ assert data["errors"] == ["Permission denied"]
+ else:
+ assert response.headers["Content-Type"] == "text/html; charset=utf-8"
+ assert "Permission denied" in response.text
+
+
@pytest.mark.asyncio
@pytest.mark.parametrize(
"input,expected_rows_after", Then decided I would punt this until the next milestone. |
Eg the error in this issue:
view-instance
should not be checked for /-/actor.json #1945The text was updated successfully, but these errors were encountered: