ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-18 20:57:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix response of PUT /restful/keyring/SID/lock (fixes #139)

Browse Source 
To be consistent with documentation, the response must contain the
details of the locked identity.  Added relevant assertions to the
lock/unlock test case.
This commit is contained in:
Andrew Bettison 2018-05-17 11:39:37 +09:30
parent 1b2147074f
commit 9e89a6ddcf
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
keyring_restful.c
View File

@ -86,7 +86,7 @@ static int http_request_keyring_response(struct httpd_request *r, uint16_t resul
return result;
}
static int http_request_keyring_response_identity(struct httpd_request *r, uint16_t result, const keyring_identity *id)
static int http_request_keyring_response_identity(struct httpd_request *r, uint16_t result, const keyring_identity *id, const char *message)
{
const char *did = NULL;
const char *name = NULL;
@ -124,7 +124,7 @@ static int http_request_keyring_response_identity(struct httpd_request *r, uint1
}
r->http.response.result_extra[0].label = "identity";
r->http.response.result_extra[0].value = json_id;
return http_request_keyring_response(r, result, NULL);
return http_request_keyring_response(r, result, message);
}
static HTTP_CONTENT_GENERATOR restful_keyring_identitylist_json_content;
@ -235,7 +235,7 @@ static int restful_keyring_add(httpd_request *r, const char *remainder)
keyring_free_identity(keyring, id);
return http_request_keyring_response(r, 500, "Could not store new identity");
}
return http_request_keyring_response_identity(r, 201, id);
return http_request_keyring_response_identity(r, 201, id, "Identity added");
}
static int restful_keyring_get(httpd_request *r, const char *remainder)
@ -248,7 +248,7 @@ static int restful_keyring_get(httpd_request *r, const char *remainder)
keyring_identity *id = keyring_find_identity_sid(keyring, &r->sid1);
if (!id)
return http_request_keyring_response(r, 404, "Identity not found");
return http_request_keyring_response_identity(r, 200, id);
return http_request_keyring_response_identity(r, 200, id, NULL);
}
static int restful_keyring_remove(httpd_request *r, const char *remainder)
@ -264,7 +264,7 @@ static int restful_keyring_remove(httpd_request *r, const char *remainder)
keyring_destroy_identity(keyring, id);
if (keyring_commit(keyring) == -1)
return http_request_keyring_response(r, 500, "Could not erase removed identity");
int ret = http_request_keyring_response_identity(r, 200, id);
int ret = http_request_keyring_response_identity(r, 200, id, "Identity removed");
keyring_free_identity(keyring, id);
return ret;
}
@ -289,7 +289,7 @@ static int restful_keyring_set(httpd_request *r, const char *remainder)
return http_request_keyring_response(r, 500, "Could not set identity DID/Name");
if (keyring_commit(keyring) == -1)
return http_request_keyring_response(r, 500, "Could not store new identity");
return http_request_keyring_response_identity(r, 200, id);
return http_request_keyring_response_identity(r, 200, id, "Identity updated");
}
static int restful_keyring_lock(httpd_request *r, const char *remainder)
@ -300,6 +300,7 @@ static int restful_keyring_lock(httpd_request *r, const char *remainder)
if (!id)
return http_request_keyring_response(r, 404, "Identity not found");
keyring_release_identity(keyring, id);
int ret = http_request_keyring_response_identity(r, 200, id, "Identity locked");
keyring_free_identity(keyring, id);
return http_request_keyring_response(r, 200, "Identity locked");
return ret;
}

2
tests/keyringrestful
View File

@ -221,6 +221,7 @@ test_keyringLockUnlock() {
# Lock the only PIN1 identity and assert that it no longer appears in the
# identity list.
rest_request PUT "/restful/keyring/$SIDA2/lock"
assertJq response.json 'contains({"identity": {"sid": "'$SIDA2'", "identity": "'"$IDA2"'"}})'
rest_request GET "/restful/keyring/identities.json"
transform_list_json response.json ids1.json
assert [ "$(jq 'length' ids1.json)" = $((IDENTITY_COUNT - 1)) ]
@ -228,6 +229,7 @@ test_keyringLockUnlock() {
# Lock the second PIN2 identity and assert that it no longer appears in the
# identity list.
rest_request PUT "/restful/keyring/$SIDA4/lock"
assertJq response.json 'contains({"identity": {"sid": "'$SIDA4'", "identity": "'"$IDA4"'"}})'
rest_request GET "/restful/keyring/identities.json"
transform_list_json response.json ids2.json
assert [ "$(jq 'length' ids2.json)" = $((IDENTITY_COUNT - 2)) ]